New translation and fixes

- Added German translation - Some refactoring to load languages properly - Internal mod structure
DingoDjango · Mar 16, 2019 · 8fc4ea0 · 8fc4ea0
1 parent 797e7bf
commit 8fc4ea0
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 28 deletions.
diff --git a/QMods/StorageInfo/Languages/English.json b/QMods/StorageInfo/Languages/English.json
@@ -1,6 +1,6 @@
 {
   "ContainerEmpty": "empty",
   "ContainerOneItem": "1 item (not full)",
-  "ContainerFull": "completely full",
+  "ContainerFull": "full",
   "ContainerNonempty": "{0} items (not full)"
 }
diff --git a/QMods/StorageInfo/Languages/German.json b/QMods/StorageInfo/Languages/German.json
@@ -0,0 +1,6 @@
+{
+  "ContainerEmpty": "Leer",
+  "ContainerOneItem": "1 Gegenstand",
+  "ContainerFull": "Voll",
+  "ContainerNonempty": "{0} Gegenstände"
+}
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.1",
+  "Version": "1.0.2",
   "Enable": true,
   "Game": "Subnautica",
   "AssemblyName": "StorageInfo.dll",

diff --git a/Source/Entry.cs b/Source/Entry.cs
@@ -1,35 +1,15 @@
 using System;
-using System.Reflection;
-using Harmony;
 using UnityEngine;
 
 namespace StorageInfo
 {
     public class Entry
     {
-        private static void InitializeHarmony()
-        {
-            HarmonyInstance harmony = HarmonyInstance.Create("dingo.storageinfo");
-
-#if DEBUG
-            HarmonyInstance.DEBUG = true;
-#endif
-
-            MethodInfo containerOnHandHover = AccessTools.Method(typeof(StorageContainer), nameof(StorageContainer.OnHandHover));
-
-            // Removes original SetInteractText and injects SetCustomInteractText
-            harmony.Patch(
-                original: containerOnHandHover,
-                prefix: null,
-                postfix: null,
-                transpiler: new HarmonyMethod(typeof(HarmonyPatches), nameof(HarmonyPatches.Patch_StorageContainer_OnHandHover_Transpiler)));
-        }
-
         public static void Initialize()
         {
             try
             {
-                InitializeHarmony();
+                HarmonyPatches.InitializeHarmony();
             }
 
             catch (Exception ex)

diff --git a/Source/HarmonyPatches.cs b/Source/HarmonyPatches.cs
@@ -27,7 +27,7 @@ public class HarmonyPatches
          * IL_004E: ldsfld    string [mscorlib]System.String::Empty
          * IL_0053: callvirt  instance void HandReticle::SetInteractText(string, string)
          * Last IL index we snip, folding the IL nicely on itself ---> IL_0058: ldsfld    class HandReticle HandReticle::main */
-        internal static IEnumerable<CodeInstruction> Patch_StorageContainer_OnHandHover_Transpiler(IEnumerable<CodeInstruction> instructions)
+        private static IEnumerable<CodeInstruction> Patch_StorageContainer_OnHandHover_Transpiler(IEnumerable<CodeInstruction> instructions)
         {
             FieldInfo handleReticleMain = AccessTools.Field(typeof(HandReticle), nameof(HandReticle.main));
             MethodInfo setInteractText = AccessTools.Method(typeof(HandReticle), nameof(HandReticle.SetInteractText), new Type[] { typeof(string), typeof(string) });
@@ -94,6 +94,37 @@ internal static IEnumerable<CodeInstruction> Patch_StorageContainer_OnHandHover_
             return instructions;
         }
 
+        private static void Patch_SetCurrentLanguage_Postfix()
+        {
+            Translation.ClearCache();
+        }
+
+        internal static void InitializeHarmony()
+        {
+            HarmonyInstance harmony = HarmonyInstance.Create("dingo.storageinfo");
+
+#if DEBUG
+            HarmonyInstance.DEBUG = true;
+#endif
+
+            MethodInfo containerOnHandHover = AccessTools.Method(typeof(StorageContainer), nameof(StorageContainer.OnHandHover));
+            MethodInfo setLanguage = AccessTools.Method(typeof(Language), nameof(Language.SetCurrentLanguage));
+
+            // Remove original SetInteractText and inject SetCustomInteractText
+            harmony.Patch(
+                original: containerOnHandHover,
+                prefix: null,
+                postfix: null,
+                transpiler: new HarmonyMethod(typeof(HarmonyPatches), nameof(HarmonyPatches.Patch_StorageContainer_OnHandHover_Transpiler)));
+
+            // Reset language cache upon language change
+            harmony.Patch(
+                original: setLanguage,
+                prefix: null,
+                postfix: new HarmonyMethod(typeof(HarmonyPatches), nameof(HarmonyPatches.Patch_SetCurrentLanguage_Postfix)),
+                transpiler: null);
+        }
+
         public static void SetCustomInteractText(StorageContainer _storage)
         {
             if (_storage != null)

diff --git a/Source/Languages/English.json b/Source/Languages/English.json
@@ -1,6 +1,6 @@
 {
   "ContainerEmpty": "empty",
   "ContainerOneItem": "1 item (not full)",
-  "ContainerFull": "completely full",
+  "ContainerFull": "full",
   "ContainerNonempty": "{0} items (not full)"
 }
diff --git a/Source/Languages/German.json b/Source/Languages/German.json
@@ -0,0 +1,6 @@
+{
+  "ContainerEmpty": "Leer",
+  "ContainerOneItem": "1 Gegenstand",
+  "ContainerFull": "Voll",
+  "ContainerNonempty": "{0} Gegenstände"
+}
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.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
diff --git a/Source/StorageInfo.csproj b/Source/StorageInfo.csproj
@@ -69,6 +69,9 @@
     <None Include="Languages\English.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Languages\German.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="mod.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/Source/Translation.cs b/Source/Translation.cs
@@ -121,5 +121,10 @@ internal static string FormatSingle(this string source, string arg0)
 
             return basic;
         }
+
+        internal static void ClearCache()
+        {
+            languageStrings.Clear();
+        }
     }
 }
diff --git a/Source/mod.json b/Source/mod.json
@@ -2,7 +2,7 @@
   "Id": "StorageInfo",
   "DisplayName": "Storage Info",
   "Author": "Dingo",
-  "Version": "1.0.1",
+  "Version": "1.0.2",
   "Enable": true,
   "Game": "Subnautica",
   "AssemblyName": "StorageInfo.dll",