Fix internal field change causing issue on ModSet creation

DoctorVanGogh · Dec 9, 2018 · f8df230 · f8df230
1 parent da09406
commit f8df230
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/Assemblies/ModSwitch.dll b/Assemblies/ModSwitch.dll
diff --git a/Source/ModSwitch/Model/ModSet.cs b/Source/ModSwitch/Model/ModSet.cs
@@ -7,14 +7,15 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using Harmony;
+using RimWorld;
 using UnityEngine;
 using Verse;
 
 namespace DoctorVanGogh.ModSwitch {
     internal class ModSet : IExposable {
         private static readonly FieldInfo fiModsConfig_data;
         private static readonly FieldInfo fiModsConfigData_activeMods;
-        private static readonly FieldInfo fiModsConfigData_buildNumber;
+        private static readonly FieldInfo fiModsConfigData_version;
 
         private static readonly Regex rgxSteamModId;
 
@@ -37,7 +38,7 @@ static ModSet() {
             Type tModsConfig = typeof(ModsConfig);
             Type tModsConfigData = AccessTools.Inner(tModsConfig, @"ModsConfigData");
             fiModsConfigData_activeMods = AccessTools.Field(tModsConfigData, @"activeMods");
-            fiModsConfigData_buildNumber = AccessTools.Field(tModsConfigData, @"buildNumber");
+            fiModsConfigData_version = AccessTools.Field(tModsConfigData, @"version");
             fiModsConfig_data = AccessTools.Field(tModsConfig, @"data");
 
             rgxSteamModId = new Regex(@"^\d+$", RegexOptions.Singleline | RegexOptions.Compiled);        
@@ -229,7 +230,7 @@ public static ModSet FromCurrent(string name, Settings owner) {
 
             return new ModSet(owner) {
                                          Name = name,
-                                         BuildNumber = (int) fiModsConfigData_buildNumber.GetValue(modsConfigData),
+                                         BuildNumber = VersionControl.BuildFromVersionString((string)fiModsConfigData_version.GetValue(modsConfigData)),
                                          Mods = new List<string>((IEnumerable<string>) fiModsConfigData_activeMods.GetValue(modsConfigData))
                                      };
         }

diff --git a/Source/ModSwitch/Properties/AssemblyInfo.cs b/Source/ModSwitch/Properties/AssemblyInfo.cs
@@ -12,6 +12,6 @@
 [assembly: System.Reflection.AssemblyCopyright("Copyright © DoctorVanGogh 2017")]
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
 [assembly: System.Runtime.InteropServices.Guid("ab2e8e89-3d1d-4e36-a0ae-489b6ebc84a6")]
-[assembly: System.Reflection.AssemblyVersion("1.7.0.218")]
+[assembly: System.Reflection.AssemblyVersion("1.7.1.223")]
 
 
diff --git a/Source/ModSwitch/Properties/version.txt b/Source/ModSwitch/Properties/version.txt
@@ -1 +1 @@
-1.7.0.218
+1.7.1.223
diff --git a/Source/ModSwitch/[Patches]/Patches.cs b/Source/ModSwitch/[Patches]/Patches.cs
@@ -790,9 +790,10 @@ public static bool FindFragment(List<CodeInstruction> instructions, OpCode[] opC
                     return false;
                 }
 
-                public static string ShortVerisonString(string targetVersion)
-                {
-                    return VersionControl.MajorFromVersionString(targetVersion).ToString() + "." + VersionControl.MinorFromVersionString(targetVersion).ToString();
+                public static string ShortVerisonString(string targetVersion) {
+                    return VersionControl.IsWellFormattedVersionString(targetVersion)
+                        ? VersionControl.VersionFromString(targetVersion).ToString(2)
+                        : targetVersion;
                 }
             }
         }