[skip ci] Merge pull request #2724 from yaggod/master

MCCTeam · Apr 19, 2024 · 8037794 · 8037794
2 parents 4146897 + d0caf4c
commit 8037794
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 26 deletions.
diff --git a/MinecraftClient/Commands/Connect.cs b/MinecraftClient/Commands/Connect.cs
@@ -45,7 +45,7 @@ private int DoConnect(CmdResult r, string server, string account)
             if (!string.IsNullOrWhiteSpace(account) && !Settings.Config.Main.Advanced.SetAccount(account))
                 return r.SetAndReturn(Status.Fail, string.Format(Translations.cmd_connect_unknown, account));
 
-            if (Settings.Config.Main.SetServerIP(new Settings.MainConfigHealper.MainConfig.ServerInfoConfig(server), true))
+            if (Settings.Config.Main.SetServerIP(new Settings.MainConfigHelper.MainConfig.ServerInfoConfig(server), true))
             {
                 Program.Restart(keepAccountAndServerSettings: true);
                 return r.SetAndReturn(Status.Done);
@@ -62,7 +62,7 @@ internal static string DoConnect(string command)
             if (args.Length > 1 && !Settings.Config.Main.Advanced.SetAccount(args[1]))
                 return string.Format(Translations.cmd_connect_unknown, args[1]);
 
-            if (Settings.Config.Main.SetServerIP(new Settings.MainConfigHealper.MainConfig.ServerInfoConfig(args[0]), true))
+            if (Settings.Config.Main.SetServerIP(new Settings.MainConfigHelper.MainConfig.ServerInfoConfig(args[0]), true))
             {
                 Program.Restart(keepAccountAndServerSettings: true);
                 return string.Empty;

diff --git a/MinecraftClient/ConsoleIO.cs b/MinecraftClient/ConsoleIO.cs
@@ -203,9 +203,9 @@ private static void MccAutocompleteHandler(ConsoleInteractive.ConsoleReader.Buff
             }
 
             var InternalCmdChar = Config.Main.Advanced.InternalCmdChar;
-            if (InternalCmdChar == MainConfigHealper.MainConfig.AdvancedConfig.InternalCmdCharType.none || fullCommand[0] == InternalCmdChar.ToChar())
+            if (InternalCmdChar == MainConfigHelper.MainConfig.AdvancedConfig.InternalCmdCharType.none || fullCommand[0] == InternalCmdChar.ToChar())
             {
-                int offset = InternalCmdChar == MainConfigHealper.MainConfig.AdvancedConfig.InternalCmdCharType.none ? 0 : 1;
+                int offset = InternalCmdChar == MainConfigHelper.MainConfig.AdvancedConfig.InternalCmdCharType.none ? 0 : 1;
                 if (buffer.CursorPosition - offset < 0)
                 {
                     ConsoleInteractive.ConsoleSuggestion.ClearSuggestions();

diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs
@@ -643,21 +643,21 @@ private void HandleCommandPromptText(string text)
                 text = text.Trim();
 
                 if (text.Length > 1
-                    && Config.Main.Advanced.InternalCmdChar == MainConfigHealper.MainConfig.AdvancedConfig.InternalCmdCharType.none
+                    && Config.Main.Advanced.InternalCmdChar == MainConfigHelper.MainConfig.AdvancedConfig.InternalCmdCharType.none
                     && text[0] == '/')
                 {
                     SendText(text);
                 }
                 else if (text.Length > 2
-                    && Config.Main.Advanced.InternalCmdChar != MainConfigHealper.MainConfig.AdvancedConfig.InternalCmdCharType.none
+                    && Config.Main.Advanced.InternalCmdChar != MainConfigHelper.MainConfig.AdvancedConfig.InternalCmdCharType.none
                     && text[0] == Config.Main.Advanced.InternalCmdChar.ToChar()
                     && text[1] == '/')
                 {
                     SendText(text[1..]);
                 }
                 else if (text.Length > 0)
                 {
-                    if (Config.Main.Advanced.InternalCmdChar == MainConfigHealper.MainConfig.AdvancedConfig.InternalCmdCharType.none
+                    if (Config.Main.Advanced.InternalCmdChar == MainConfigHelper.MainConfig.AdvancedConfig.InternalCmdCharType.none
                         || text[0] == Config.Main.Advanced.InternalCmdChar.ToChar())
                     {
                         CmdResult result = new();

diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs
@@ -19,8 +19,8 @@
 using Tomlet;
 using static MinecraftClient.Settings;
 using static MinecraftClient.Settings.ConsoleConfigHealper.ConsoleConfig;
-using static MinecraftClient.Settings.MainConfigHealper.MainConfig.AdvancedConfig;
-using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig;
+using static MinecraftClient.Settings.MainConfigHelper.MainConfig.AdvancedConfig;
+using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
 
 namespace MinecraftClient
 {
@@ -524,7 +524,7 @@ private static void InitializeClient()
                             return;
                         }
                     }
-                    Config.Main.SetServerIP(new MainConfigHealper.MainConfig.ServerInfoConfig(addressInput), true);
+                    Config.Main.SetServerIP(new MainConfigHelper.MainConfig.ServerInfoConfig(addressInput), true);
                 }
 
                 //Get server version

diff --git a/MinecraftClient/Protocol/Handlers/Protocol16.cs b/MinecraftClient/Protocol/Handlers/Protocol16.cs
@@ -15,7 +15,7 @@
 using MinecraftClient.Proxy;
 using MinecraftClient.Scripting;
 using static MinecraftClient.Settings;
-using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig;
+using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
 
 namespace MinecraftClient.Protocol.Handlers
 {

diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs
@@ -25,7 +25,7 @@
 using MinecraftClient.Proxy;
 using MinecraftClient.Scripting;
 using static MinecraftClient.Settings;
-using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig;
+using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
 
 namespace MinecraftClient.Protocol.Handlers
 {

diff --git a/MinecraftClient/Protocol/MicrosoftAuthentication.cs b/MinecraftClient/Protocol/MicrosoftAuthentication.cs
@@ -7,7 +7,7 @@
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using static MinecraftClient.Settings;
-using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig;
+using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
 
 namespace MinecraftClient.Protocol
 {

diff --git a/MinecraftClient/Protocol/ProfileKey/KeysCache.cs b/MinecraftClient/Protocol/ProfileKey/KeysCache.cs
@@ -4,7 +4,7 @@
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Timers;
 using static MinecraftClient.Settings;
-using static MinecraftClient.Settings.MainConfigHealper.MainConfig.AdvancedConfig;
+using static MinecraftClient.Settings.MainConfigHelper.MainConfig.AdvancedConfig;
 
 namespace MinecraftClient.Protocol.ProfileKey
 {

diff --git a/MinecraftClient/Protocol/ProtocolHandler.cs b/MinecraftClient/Protocol/ProtocolHandler.cs
@@ -13,7 +13,7 @@
 using MinecraftClient.Protocol.Session;
 using MinecraftClient.Proxy;
 using static MinecraftClient.Settings;
-using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig;
+using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
 
 namespace MinecraftClient.Protocol
 {
@@ -72,7 +72,7 @@ public static bool MinecraftServiceLookup(ref string domain, ref ushort port)
                         }
                     },
                     TimeSpan.FromSeconds(Config.Main.Advanced.ResolveSrvRecords ==
-                                         MainConfigHealper.MainConfig.AdvancedConfig.ResolveSrvRecordType.fast
+                                         MainConfigHelper.MainConfig.AdvancedConfig.ResolveSrvRecordType.fast
                         ? 10
                         : 30));
             }
@@ -114,7 +114,7 @@ public static bool GetServerInfo(string serverIP, ushort serverPort, ref int pro
                         }
                     },
                     TimeSpan.FromSeconds(Config.Main.Advanced.ResolveSrvRecords ==
-                                         MainConfigHealper.MainConfig.AdvancedConfig.ResolveSrvRecordType.fast
+                                         MainConfigHelper.MainConfig.AdvancedConfig.ResolveSrvRecordType.fast
                         ? 10
                         : 30)))
             {

diff --git a/MinecraftClient/Protocol/Session/SessionCache.cs b/MinecraftClient/Protocol/Session/SessionCache.cs
@@ -5,7 +5,7 @@
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Timers;
 using static MinecraftClient.Settings;
-using static MinecraftClient.Settings.MainConfigHealper.MainConfig.AdvancedConfig;
+using static MinecraftClient.Settings.MainConfigHelper.MainConfig.AdvancedConfig;
 
 namespace MinecraftClient.Protocol.Session
 {

diff --git a/MinecraftClient/Protocol/Session/SessionToken.cs b/MinecraftClient/Protocol/Session/SessionToken.cs
@@ -3,7 +3,7 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using MinecraftClient.Scripting;
-using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig;
+using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
 
 namespace MinecraftClient.Protocol.Session
 {

diff --git a/MinecraftClient/Scripting/CSharpRunner.cs b/MinecraftClient/Scripting/CSharpRunner.cs
@@ -375,7 +375,7 @@ public bool SetAccount(string accountAlias, bool andReconnect = false)
         /// <returns>True if the server IP was valid and loaded, false otherwise</returns>
         public bool SetServer(string server, bool andReconnect = false)
         {
-            bool result = Config.Main.SetServerIP(new MainConfigHealper.MainConfig.ServerInfoConfig(server), true);
+            bool result = Config.Main.SetServerIP(new MainConfigHelper.MainConfig.ServerInfoConfig(server), true);
             if (result && andReconnect)
                 ReconnectToTheServer(keepAccountAndServerSettings: true);
             return result;

diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs
@@ -19,9 +19,9 @@
 using static MinecraftClient.Settings.ConsoleConfigHealper;
 using static MinecraftClient.Settings.HeadCommentHealper;
 using static MinecraftClient.Settings.LoggingConfigHealper;
-using static MinecraftClient.Settings.MainConfigHealper;
-using static MinecraftClient.Settings.MainConfigHealper.MainConfig;
-using static MinecraftClient.Settings.MainConfigHealper.MainConfig.AdvancedConfig;
+using static MinecraftClient.Settings.MainConfigHelper;
+using static MinecraftClient.Settings.MainConfigHelper.MainConfig;
+using static MinecraftClient.Settings.MainConfigHelper.MainConfig.AdvancedConfig;
 using static MinecraftClient.Settings.MCSettingsConfigHealper;
 using static MinecraftClient.Settings.SignatureConfigHelper;
 
@@ -73,8 +73,8 @@ public HeadComment Head
 
             public MainConfig Main
             {
-                get { return MainConfigHealper.Config; }
-                set { MainConfigHealper.Config = value; MainConfigHealper.Config.OnSettingUpdate(); }
+                get { return MainConfigHelper.Config; }
+                set { MainConfigHelper.Config = value; MainConfigHelper.Config.OnSettingUpdate(); }
             }
 
             [TomlPrecedingComment("$Signature$")]
@@ -326,7 +326,7 @@ public void OnSettingUpdate()
             }
         }
 
-        public static class MainConfigHealper
+        public static class MainConfigHelper
         {
             public static MainConfig Config = new();