Slight refactor

Reload language upon Subnautica SetLanguage
DingoDjango · Mar 16, 2019 · 900ad13 · 900ad13
1 parent 8fc4ea0
commit 900ad13
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/QMods/StorageInfo/StorageInfo.dll b/QMods/StorageInfo/StorageInfo.dll
diff --git a/QMods/StorageInfo/mod.json b/QMods/StorageInfo/mod.json
@@ -2,7 +2,7 @@
   "Id": "StorageInfo",
   "DisplayName": "Storage Info",
   "Author": "Dingo",
-  "Version": "1.0.2",
+  "Version": "1.0.3",
   "Enable": true,
   "Game": "Subnautica",
   "AssemblyName": "StorageInfo.dll",

diff --git a/Source/HarmonyPatches.cs b/Source/HarmonyPatches.cs
@@ -50,7 +50,7 @@ private static IEnumerable<CodeInstruction> Patch_StorageContainer_OnHandHover_T
             {
                 CodeInstruction instruction = codes[i];
 
-                // HandleReticle::main is the first IL we need
+                // IL_0033 is the first IL we aim to replace
                 if (!foundFirstHandReticle)
                 {
                     if (instruction.opcode == OpCodes.Ldsfld && instruction.operand == handleReticleMain
@@ -63,7 +63,7 @@ private static IEnumerable<CodeInstruction> Patch_StorageContainer_OnHandHover_T
                     }
                 }
 
-                // SetInteractText is the final IL we aim to replace
+                // IL_0058 is the final IL we aim to replace
                 else if (instruction.opcode == OpCodes.Ldsfld && instruction.operand == handleReticleMain
                     && codes[i - 1].opcode == OpCodes.Callvirt && codes[i - 1].operand == setInteractText)
                 {
@@ -96,7 +96,7 @@ private static IEnumerable<CodeInstruction> Patch_StorageContainer_OnHandHover_T
 
         private static void Patch_SetCurrentLanguage_Postfix()
         {
-            Translation.ClearCache();
+            Translation.ReloadLanguage();
         }
 
         internal static void InitializeHarmony()

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.3.0")]
diff --git a/Source/Translation.cs b/Source/Translation.cs
@@ -78,7 +78,7 @@ private static bool TryTranslate(string candidate, out string translated)
 
             else
             {
-                LoadLanguageData();
+                ReloadLanguage();
 
                 if (languageStrings.TryGetValue(candidate, out translated))
                 {
@@ -122,9 +122,11 @@ internal static string FormatSingle(this string source, string arg0)
             return basic;
         }
 
-        internal static void ClearCache()
+        internal static void ReloadLanguage()
         {
             languageStrings.Clear();
+
+            LoadLanguageData();
         }
     }
-}
+}
diff --git a/Source/mod.json b/Source/mod.json
@@ -2,7 +2,7 @@
   "Id": "StorageInfo",
   "DisplayName": "Storage Info",
   "Author": "Dingo",
-  "Version": "1.0.2",
+  "Version": "1.0.3",
   "Enable": true,
   "Game": "Subnautica",
   "AssemblyName": "StorageInfo.dll",