Language detect Pryaxis/TShock#2957

sgkoishi · Jun 13, 2023 · 4d21ce1 · 4d21ce1
1 parent 20b48dc
commit 4d21ce1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/AltCmd.cs b/src/AltCmd.cs
@@ -73,9 +73,9 @@ private bool HandleCommandCatched(Func<TShockAPI.TSPlayer, string, bool> orig, T
         return orig(player, text);
     }
 
-    private static MethodInfo _uncatchedHandleCommand = Utils.Method(() =>
+    private static readonly MethodInfo _uncatchedHandleCommand = Utils.Method(() =>
             new Plugin(null!).HandleCommandUncatched(null!, null!, null!))!;
-    private static MethodInfo _catchedHandleCommand = Utils.Method(() =>
+    private static readonly MethodInfo _catchedHandleCommand = Utils.Method(() =>
             new Plugin(null!).HandleCommandCatched(null!, null!, null!))!;
 
     private bool Detour_Command_Run(Func<Command, string, bool, TSPlayer, List<string>, bool> orig, Command instance, string msg, bool silent, TSPlayer ply, List<string> parms)

diff --git a/src/Backport.cs b/src/Backport.cs
@@ -38,7 +38,7 @@ public void Run()
     }
     #endregion
 
-private void Detour_Backport_2934(Action orig)
+    private void Detour_Backport_2934(Action orig)
     {
         orig();
         if (!Terraria.Netplay.HasClients)

diff --git a/src/Config.cs b/src/Config.cs
@@ -99,6 +99,12 @@ public class EnhancementsSettings
         /// </summary>
         public Optional<bool> SyncVersion = Optional.Default(false);
 
+        /// <summary>
+        /// Fix the broken default language detect.
+        /// <see href="https://github.com/Pryaxis/TShock/issues/2957" />
+        /// </summary>
+        public Optional<bool> DefaultLanguageDetect = Optional.Default(true);
+
         /// <summary>
         /// Action for TShock's update
         /// </summary>
@@ -672,4 +678,4 @@ public Optional(T value)
     }
 
     public static implicit operator T(Optional<T> self) => self.Value;
-}
+}
diff --git a/src/Plugin.cs b/src/Plugin.cs
@@ -94,6 +94,11 @@ public Plugin(Main game) : base(game)
             typeof(Rests.Rest)
                 .GetMethod("OnRequest", _bfany)!,
             this.ILHook_Mitigation_KeepRestAlive);
+
+        if (this.config.Enhancements.Value.DefaultLanguageDetect)
+        {
+            typeof(System.Globalization.CultureInfo).GetField("s_currentThreadUICulture", _bfany)?.SetValue(null, null);
+        }
     }
 
     private void LoadConfig(TSPlayer? initiator)