helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
breadbyte 2024-04-19 15:44:27 +08:00 • committed by GitHub
commit 8037794601
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MinecraftClient/Commands/Connect.cs
View file

@ -45,7 +45,7 @@ namespace MinecraftClient.Commands
if (!string.IsNullOrWhiteSpace(account) && !Settings.Config.Main.Advanced.SetAccount(account)) if (!string.IsNullOrWhiteSpace(account) && !Settings.Config.Main.Advanced.SetAccount(account))
return r.SetAndReturn(Status.Fail, string.Format(Translations.cmd_connect_unknown, 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); Program.Restart(keepAccountAndServerSettings: true);
return r.SetAndReturn(Status.Done); return r.SetAndReturn(Status.Done);
@ -62,7 +62,7 @@ namespace MinecraftClient.Commands
if (args.Length > 1 && !Settings.Config.Main.Advanced.SetAccount(args[1])) if (args.Length > 1 && !Settings.Config.Main.Advanced.SetAccount(args[1]))
return string.Format(Translations.cmd_connect_unknown, 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); Program.Restart(keepAccountAndServerSettings: true);
return string.Empty; return string.Empty;

4
MinecraftClient/ConsoleIO.cs
View file

@ -203,9 +203,9 @@ namespace MinecraftClient
} }
var InternalCmdChar = Config.Main.Advanced.InternalCmdChar; 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) if (buffer.CursorPosition - offset < 0)
{ {
ConsoleInteractive.ConsoleSuggestion.ClearSuggestions(); ConsoleInteractive.ConsoleSuggestion.ClearSuggestions();

6
MinecraftClient/McClient.cs
View file

@ -643,13 +643,13 @@ namespace MinecraftClient
text = text.Trim(); text = text.Trim();
if (text.Length > 1 if (text.Length > 1
&& Config.Main.Advanced.InternalCmdChar == MainConfigHealper.MainConfig.AdvancedConfig.InternalCmdCharType.none && Config.Main.Advanced.InternalCmdChar == MainConfigHelper.MainConfig.AdvancedConfig.InternalCmdCharType.none
&& text[0] == '/') && text[0] == '/')
{ {
SendText(text); SendText(text);
} }
else if (text.Length > 2 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[0] == Config.Main.Advanced.InternalCmdChar.ToChar()
&& text[1] == '/') && text[1] == '/')
{ {
@ -657,7 +657,7 @@ namespace MinecraftClient
} }
else if (text.Length > 0) 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()) || text[0] == Config.Main.Advanced.InternalCmdChar.ToChar())
{ {
CmdResult result = new(); CmdResult result = new();

6
MinecraftClient/Program.cs
View file

@ -19,8 +19,8 @@ using MinecraftClient.WinAPI;
using Tomlet; using Tomlet;
using static MinecraftClient.Settings; using static MinecraftClient.Settings;
using static MinecraftClient.Settings.ConsoleConfigHealper.ConsoleConfig; using static MinecraftClient.Settings.ConsoleConfigHealper.ConsoleConfig;
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.AdvancedConfig; using static MinecraftClient.Settings.MainConfigHelper.MainConfig.AdvancedConfig;
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig; using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
namespace MinecraftClient namespace MinecraftClient
{ {
@ -524,7 +524,7 @@ namespace MinecraftClient
return; return;
} }
} }
Config.Main.SetServerIP(new MainConfigHealper.MainConfig.ServerInfoConfig(addressInput), true); Config.Main.SetServerIP(new MainConfigHelper.MainConfig.ServerInfoConfig(addressInput), true);
} }
//Get server version //Get server version

2
MinecraftClient/Protocol/Handlers/Protocol16.cs
View file

@ -15,7 +15,7 @@ using MinecraftClient.Protocol.Session;
using MinecraftClient.Proxy; using MinecraftClient.Proxy;
using MinecraftClient.Scripting; using MinecraftClient.Scripting;
using static MinecraftClient.Settings; using static MinecraftClient.Settings;
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig; using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
namespace MinecraftClient.Protocol.Handlers namespace MinecraftClient.Protocol.Handlers
{ {

2
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -25,7 +25,7 @@ using MinecraftClient.Protocol.Session;
using MinecraftClient.Proxy; using MinecraftClient.Proxy;
using MinecraftClient.Scripting; using MinecraftClient.Scripting;
using static MinecraftClient.Settings; using static MinecraftClient.Settings;
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig; using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
namespace MinecraftClient.Protocol.Handlers namespace MinecraftClient.Protocol.Handlers
{ {

2
MinecraftClient/Protocol/MicrosoftAuthentication.cs
View file

@ -7,7 +7,7 @@ using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using static MinecraftClient.Settings; using static MinecraftClient.Settings;
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig; using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
namespace MinecraftClient.Protocol namespace MinecraftClient.Protocol
{ {

2
MinecraftClient/Protocol/ProfileKey/KeysCache.cs
View file

@ -4,7 +4,7 @@ using System.IO;
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
using System.Timers; using System.Timers;
using static MinecraftClient.Settings; using static MinecraftClient.Settings;
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.AdvancedConfig; using static MinecraftClient.Settings.MainConfigHelper.MainConfig.AdvancedConfig;
namespace MinecraftClient.Protocol.ProfileKey namespace MinecraftClient.Protocol.ProfileKey
{ {

6
MinecraftClient/Protocol/ProtocolHandler.cs
View file

@ -13,7 +13,7 @@ using MinecraftClient.Protocol.Handlers.Forge;
using MinecraftClient.Protocol.Session; using MinecraftClient.Protocol.Session;
using MinecraftClient.Proxy; using MinecraftClient.Proxy;
using static MinecraftClient.Settings; using static MinecraftClient.Settings;
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig; using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
namespace MinecraftClient.Protocol namespace MinecraftClient.Protocol
{ {
@ -72,7 +72,7 @@ namespace MinecraftClient.Protocol
} }
}, },
TimeSpan.FromSeconds(Config.Main.Advanced.ResolveSrvRecords == TimeSpan.FromSeconds(Config.Main.Advanced.ResolveSrvRecords ==
MainConfigHealper.MainConfig.AdvancedConfig.ResolveSrvRecordType.fast MainConfigHelper.MainConfig.AdvancedConfig.ResolveSrvRecordType.fast
? 10 ? 10
: 30)); : 30));
} }
@ -114,7 +114,7 @@ namespace MinecraftClient.Protocol
} }
}, },
TimeSpan.FromSeconds(Config.Main.Advanced.ResolveSrvRecords == TimeSpan.FromSeconds(Config.Main.Advanced.ResolveSrvRecords ==
MainConfigHealper.MainConfig.AdvancedConfig.ResolveSrvRecordType.fast MainConfigHelper.MainConfig.AdvancedConfig.ResolveSrvRecordType.fast
? 10 ? 10
: 30))) : 30)))
{ {

2
MinecraftClient/Protocol/Session/SessionCache.cs
View file

@ -5,7 +5,7 @@ using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
using System.Timers; using System.Timers;
using static MinecraftClient.Settings; using static MinecraftClient.Settings;
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.AdvancedConfig; using static MinecraftClient.Settings.MainConfigHelper.MainConfig.AdvancedConfig;
namespace MinecraftClient.Protocol.Session namespace MinecraftClient.Protocol.Session
{ {

2
MinecraftClient/Protocol/Session/SessionToken.cs
View file

@ -3,7 +3,7 @@ using System.IO;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using MinecraftClient.Scripting; using MinecraftClient.Scripting;
using static MinecraftClient.Settings.MainConfigHealper.MainConfig.GeneralConfig; using static MinecraftClient.Settings.MainConfigHelper.MainConfig.GeneralConfig;
namespace MinecraftClient.Protocol.Session namespace MinecraftClient.Protocol.Session
{ {

2
MinecraftClient/Scripting/CSharpRunner.cs
View file

@ -375,7 +375,7 @@ namespace MinecraftClient.Scripting
/// <returns>True if the server IP was valid and loaded, false otherwise</returns> /// <returns>True if the server IP was valid and loaded, false otherwise</returns>
public bool SetServer(string server, bool andReconnect = false) 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) if (result && andReconnect)
ReconnectToTheServer(keepAccountAndServerSettings: true); ReconnectToTheServer(keepAccountAndServerSettings: true);
return result; return result;

12
MinecraftClient/Settings.cs
View file

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