Skip to content

Commit 8037794

Browse files
authored
[skip ci] Merge pull request #2724 from yaggod/master
2 parents 4146897 + d0caf4c commit 8037794

File tree

13 files changed

+26
-26
lines changed

13 files changed

+26
-26
lines changed

MinecraftClient/Commands/Connect.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ private int DoConnect(CmdResult r, string server, string account)
4545
if (!string.IsNullOrWhiteSpace(account) && !Settings.Config.Main.Advanced.SetAccount(account))
4646
return r.SetAndReturn(Status.Fail, string.Format(Translations.cmd_connect_unknown, account));
4747

48-
if (Settings.Config.Main.SetServerIP(new Settings.MainConfigHealper.MainConfig.ServerInfoConfig(server), true))
48+
if (Settings.Config.Main.SetServerIP(new Settings.MainConfigHelper.MainConfig.ServerInfoConfig(server), true))
4949
{
5050
Program.Restart(keepAccountAndServerSettings: true);
5151
return r.SetAndReturn(Status.Done);
@@ -62,7 +62,7 @@ internal static string DoConnect(string command)
6262
if (args.Length > 1 && !Settings.Config.Main.Advanced.SetAccount(args[1]))
6363
return string.Format(Translations.cmd_connect_unknown, args[1]);
6464

65-
if (Settings.Config.Main.SetServerIP(new Settings.MainConfigHealper.MainConfig.ServerInfoConfig(args[0]), true))
65+
if (Settings.Config.Main.SetServerIP(new Settings.MainConfigHelper.MainConfig.ServerInfoConfig(args[0]), true))
6666
{
6767
Program.Restart(keepAccountAndServerSettings: true);
6868
return string.Empty;

MinecraftClient/ConsoleIO.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@ private static void MccAutocompleteHandler(ConsoleInteractive.ConsoleReader.Buff
203203
}
204204

205205
var InternalCmdChar = Config.Main.Advanced.InternalCmdChar;
206-
if (InternalCmdChar == MainConfigHealper.MainConfig.AdvancedConfig.InternalCmdCharType.none || fullCommand[0] == InternalCmdChar.ToChar())
206+
if (InternalCmdChar == MainConfigHelper.MainConfig.AdvancedConfig.InternalCmdCharType.none || fullCommand[0] == InternalCmdChar.ToChar())
207207
{
208-
int offset = InternalCmdChar == MainConfigHealper.MainConfig.AdvancedConfig.InternalCmdCharType.none ? 0 : 1;
208+
int offset = InternalCmdChar == MainConfigHelper.MainConfig.AdvancedConfig.InternalCmdCharType.none ? 0 : 1;
209209
if (buffer.CursorPosition - offset < 0)
210210
{
211211
ConsoleInteractive.ConsoleSuggestion.ClearSuggestions();

MinecraftClient/McClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -643,21 +643,21 @@ private void HandleCommandPromptText(string text)
643643
text = text.Trim();
644644

645645
if (text.Length > 1
646-
&& Config.Main.Advanced.InternalCmdChar == MainConfigHealper.MainConfig.AdvancedConfig.InternalCmdCharType.none
646+
&& Config.Main.Advanced.InternalCmdChar == MainConfigHelper.MainConfig.AdvancedConfig.InternalCmdCharType.none
647647
&& text[0] == '/')
648648
{
649649
SendText(text);
650650
}
651651
else if (text.Length > 2
652-
&& Config.Main.Advanced.InternalCmdChar != MainConfigHealper.MainConfig.AdvancedConfig.InternalCmdCharType.none
652+
&& Config.Main.Advanced.InternalCmdChar != MainConfigHelper.MainConfig.AdvancedConfig.InternalCmdCharType.none
653653
&& text[0] == Config.Main.Advanced.InternalCmdChar.ToChar()
654654
&& text[1] == '/')
655655
{
656656
SendText(text[1..]);
657657
}
658658
else if (text.Length > 0)
659659
{
660-
if (Config.Main.Advanced.InternalCmdChar == MainConfigHealper.MainConfig.AdvancedConfig.InternalCmdCharType.none
660+
if (Config.Main.Advanced.InternalCmdChar == MainConfigHelper.MainConfig.AdvancedConfig.InternalCmdCharType.none
661661
|| text[0] == Config.Main.Advanced.InternalCmdChar.ToChar())
662662
{
663663
CmdResult result = new();

MinecraftClient/Program.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
using Tomlet;
2020
using static MinecraftClient.Settings;
2121
using static MinecraftClient.Settings.ConsoleConfigHealper.ConsoleConfig;
22-
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.AdvancedConfig;
23-
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig;
22+
using static MinecraftClient.Settings.MainConfigHelper.MainConfig.AdvancedConfig;
23+
using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
2424

2525
namespace MinecraftClient
2626
{
@@ -524,7 +524,7 @@ private static void InitializeClient()
524524
return;
525525
}
526526
}
527-
Config.Main.SetServerIP(new MainConfigHealper.MainConfig.ServerInfoConfig(addressInput), true);
527+
Config.Main.SetServerIP(new MainConfigHelper.MainConfig.ServerInfoConfig(addressInput), true);
528528
}
529529

530530
//Get server version

MinecraftClient/Protocol/Handlers/Protocol16.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using MinecraftClient.Proxy;
1616
using MinecraftClient.Scripting;
1717
using static MinecraftClient.Settings;
18-
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig;
18+
using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
1919

2020
namespace MinecraftClient.Protocol.Handlers
2121
{

MinecraftClient/Protocol/Handlers/Protocol18.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
using MinecraftClient.Proxy;
2626
using MinecraftClient.Scripting;
2727
using static MinecraftClient.Settings;
28-
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig;
28+
using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
2929

3030
namespace MinecraftClient.Protocol.Handlers
3131
{

MinecraftClient/Protocol/MicrosoftAuthentication.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Runtime.InteropServices;
88
using System.Text.RegularExpressions;
99
using static MinecraftClient.Settings;
10-
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig;
10+
using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
1111

1212
namespace MinecraftClient.Protocol
1313
{

MinecraftClient/Protocol/ProfileKey/KeysCache.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Runtime.Serialization.Formatters.Binary;
55
using System.Timers;
66
using static MinecraftClient.Settings;
7-
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.AdvancedConfig;
7+
using static MinecraftClient.Settings.MainConfigHelper.MainConfig.AdvancedConfig;
88

99
namespace MinecraftClient.Protocol.ProfileKey
1010
{

MinecraftClient/Protocol/ProtocolHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
using MinecraftClient.Protocol.Session;
1414
using MinecraftClient.Proxy;
1515
using static MinecraftClient.Settings;
16-
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig;
16+
using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
1717

1818
namespace MinecraftClient.Protocol
1919
{
@@ -72,7 +72,7 @@ public static bool MinecraftServiceLookup(ref string domain, ref ushort port)
7272
}
7373
},
7474
TimeSpan.FromSeconds(Config.Main.Advanced.ResolveSrvRecords ==
75-
MainConfigHealper.MainConfig.AdvancedConfig.ResolveSrvRecordType.fast
75+
MainConfigHelper.MainConfig.AdvancedConfig.ResolveSrvRecordType.fast
7676
? 10
7777
: 30));
7878
}
@@ -114,7 +114,7 @@ public static bool GetServerInfo(string serverIP, ushort serverPort, ref int pro
114114
}
115115
},
116116
TimeSpan.FromSeconds(Config.Main.Advanced.ResolveSrvRecords ==
117-
MainConfigHealper.MainConfig.AdvancedConfig.ResolveSrvRecordType.fast
117+
MainConfigHelper.MainConfig.AdvancedConfig.ResolveSrvRecordType.fast
118118
? 10
119119
: 30)))
120120
{

MinecraftClient/Protocol/Session/SessionCache.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Runtime.Serialization.Formatters.Binary;
66
using System.Timers;
77
using static MinecraftClient.Settings;
8-
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.AdvancedConfig;
8+
using static MinecraftClient.Settings.MainConfigHelper.MainConfig.AdvancedConfig;
99

1010
namespace MinecraftClient.Protocol.Session
1111
{

0 commit comments

Comments
 (0)