Add more encoding options

sgkoishi · Nov 27, 2023 · 58f7601 · 58f7601
1 parent 9a4c2d7
commit 58f7601
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Core/Config.cs b/Core/Config.cs
@@ -627,9 +627,10 @@ public record class MitigationSettings
         /// </para>
         /// <para>
         /// This will try to reset the encoding.
+        /// Default: -1, use Encoding.Default when Win32NT && Version <= 10
         /// </para>
         /// </summary>
-        public Optional<bool> UseDefaultEncoding = Optional.Default(Environment.OSVersion.Platform == PlatformID.Win32NT && Environment.OSVersion.Version.Major < 10);
+        public Optional<int> UseDefaultEncoding = Optional.Default(Environment.OSVersion.Platform == PlatformID.Win32NT && Environment.OSVersion.Version.Major < 10 ? -1 : 65001);
 
         public enum DisabledDamageAction
         {

diff --git a/Core/Plugin.cs b/Core/Plugin.cs
@@ -21,19 +21,28 @@ public partial class Plugin : TerrariaPlugin
     public string ConfigPath = Path.Combine(TShockAPI.TShock.SavePath, DefinedConsts.Misc.ConfigFile);
     private const BindingFlags _bfany = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static;
 
-    public Config config;
+    public Config config = new Config();
 
     public Plugin(Main game) : base(game)
     {
         AppDomain.CurrentDomain.FirstChanceException += this.FirstChanceExceptionHandler;
         this.Order = int.MinValue;
-        this.config = new Config();
         this.LoadConfig(Utils.ConsolePlayer.Instance);
         {
             var mitigation = this.config.Mitigation.Value;
-            if (!mitigation.DisableAllMitigation && mitigation.UseDefaultEncoding)
+            if (!mitigation.DisableAllMitigation)
             {
-                Console.OutputEncoding = System.Text.Encoding.Default;
+                var encoding = mitigation.UseDefaultEncoding.Value;
+                if (encoding == -1)
+                {
+                    Console.OutputEncoding = System.Text.Encoding.Default;
+                    Console.WriteLine($"Console encoding set to default ({Console.OutputEncoding})");
+                }
+                else if (encoding != 0)
+                {
+                    Console.OutputEncoding = System.Text.Encoding.GetEncoding(encoding);
+                    Console.WriteLine($"Console encoding set to {Console.OutputEncoding}");
+                }
             }
         }
         this.Detour(