diff --git a/Source/GameSaving.cs b/Source/GameSaving.cs index bfc5df7..ac15ab3 100644 --- a/Source/GameSaving.cs +++ b/Source/GameSaving.cs @@ -227,7 +227,13 @@ private static Part[] LoadParts(GameSaving.VesselSave vesselToLoad) array[i].orientation = vesselToLoad.parts[i].orientation; array[i].partData.tags = new Dictionary(); - array[i].partData.GUID = vesselToLoad.parts[i].GUID; + try + { + array[i].partData.GUID = new Guid(vesselToLoad.parts[i].GUID); + } catch + { + array[i].partData.GUID = Guid.NewGuid(); + } try { if (vesselToLoad.parts[i].tagsString != null) diff --git a/Source/NewBuildSystem/Build.cs b/Source/NewBuildSystem/Build.cs index c65043a..da3781d 100644 --- a/Source/NewBuildSystem/Build.cs +++ b/Source/NewBuildSystem/Build.cs @@ -799,7 +799,7 @@ public PlacedPartSave(PlacedPart part) this.partName = part.partData.name; this.position = part.position; this.orientation = part.orientation; - this.GUID = part.partData.GUID; + this.GUID = part.partData.GUID.ToString(); //Tags formatting for save StringBuilder stringBuilder = new StringBuilder(); @@ -837,7 +837,13 @@ public static List FromSave(List par bool flag = partByName != null; if (flag) { - partByName.GUID = parts[i].GUID; + try + { + partByName.GUID = new Guid(parts[i].GUID); + } catch + { + partByName.GUID = Guid.NewGuid(); + } //Tags parsing from text back to a Dictionary partByName.tags = new Dictionary(); try @@ -893,7 +899,7 @@ public static List FromSave(List par //Custom field for custom values saving public string tagsString; - public Guid GUID; + public string GUID; } } } diff --git a/Source/NewBuildSystem/PartData.cs b/Source/NewBuildSystem/PartData.cs index dc590d4..c18a2cb 100644 --- a/Source/NewBuildSystem/PartData.cs +++ b/Source/NewBuildSystem/PartData.cs @@ -85,7 +85,7 @@ public void OnValidate() //Custom field for custom values saving public Dictionary tags = new Dictionary(); - public Guid GUID = new Guid(); + public Guid GUID = Guid.NewGuid(); [Space] public PartData.Area[] areas; diff --git a/Source/NewBuildSystem/PartGrid.cs b/Source/NewBuildSystem/PartGrid.cs index 663b65f..a1b8b94 100644 --- a/Source/NewBuildSystem/PartGrid.cs +++ b/Source/NewBuildSystem/PartGrid.cs @@ -577,7 +577,7 @@ public float GetThrust() return num; } - private float GetMass() + public float GetMass() { float num = 0f; for (int i = 0; i < this.parts.Count; i++) diff --git a/Source/Part.cs b/Source/Part.cs index 952be7b..e12195d 100644 --- a/Source/Part.cs +++ b/Source/Part.cs @@ -445,7 +445,7 @@ public Save(Part part, Orientation orientation, List parts) })); } this.tagsString = sb.ToString(); - this.GUID = part.partData.GUID; + this.GUID = part.partData.GUID.ToString(); } [Header("Part")] @@ -457,6 +457,6 @@ public Save(Part part, Orientation orientation, List parts) public string tagsString; - public Guid GUID; + public string GUID; } } diff --git a/Source/SFSML/ModLoader.cs b/Source/SFSML/ModLoader.cs index a8af921..9ebf087 100644 --- a/Source/SFSML/ModLoader.cs +++ b/Source/SFSML/ModLoader.cs @@ -363,7 +363,7 @@ static ModLoader() public MyConsole myConsole; - public static readonly string version = "1.3.1"; + public static readonly string version = "1.3.5"; private static string logTag = "ModLoader " + ModLoader.version; diff --git a/Source/SFSML/Translation/Languages/ModLoaderLang.cs b/Source/SFSML/Translation/Languages/ModLoaderLang.cs index b6e04ba..05cab14 100644 --- a/Source/SFSML/Translation/Languages/ModLoaderLang.cs +++ b/Source/SFSML/Translation/Languages/ModLoaderLang.cs @@ -8,9 +8,9 @@ public ModLoaderLang() { } - public string Version = "1.3.1"; + public string Version = "1.3.5"; - public string LoaderTag = "Hydria [1.3.1]"; + public string LoaderTag = "Hydria [%Version%]"; public string LoaderVersion = "1.3.1"; diff --git a/Source/SFSML/Utility/IMGUIUtil.cs b/Source/SFSML/Utility/IMGUIUtil.cs index 1e0ff6a..c98ded8 100644 --- a/Source/SFSML/Utility/IMGUIUtil.cs +++ b/Source/SFSML/Utility/IMGUIUtil.cs @@ -5,7 +5,7 @@ namespace SFSML.Utility { - static class IMGUIUtil + public static class IMGUIUtil { private static int ID = int.MaxValue; diff --git a/Source/obj/Debug/Assembly-CSharp.dll b/Source/obj/Debug/Assembly-CSharp.dll index dc84159..a5ef198 100644 Binary files a/Source/obj/Debug/Assembly-CSharp.dll and b/Source/obj/Debug/Assembly-CSharp.dll differ diff --git a/Source/obj/Debug/Assembly-CSharp.pdb b/Source/obj/Debug/Assembly-CSharp.pdb index beaa31d..4f83286 100644 Binary files a/Source/obj/Debug/Assembly-CSharp.pdb and b/Source/obj/Debug/Assembly-CSharp.pdb differ