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_DEPLOY] Support account alias in configs

Browse source
This commit is contained in:
BruceChen 2022-11-06 16:20:38 +08:00
parent c0266685a8
commit 0b5a562f7f
17 changed files with 213 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

31
MinecraftClient/Settings.cs
View file

@ -19,6 +19,7 @@ using static MinecraftClient.Settings.ChatFormatConfigHelper;
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.MCSettingsConfigHealper;
using static MinecraftClient.Settings.SignatureConfigHelper;
@ -47,12 +48,10 @@ namespace MinecraftClient
public static ushort ServerPort = 25565;
public static string Login = string.Empty;
public static AccountInfoConfig Account = new();
public static string Username = string.Empty;
public static string Password = string.Empty;
public static string MinecraftVersion = string.Empty;
public static bool InteractiveMode = true;
@ -252,6 +251,7 @@ namespace MinecraftClient
public static void LoadArguments(string[] args)
{
int positionalIndex = 0;
bool skipPassword = false;
foreach (string argument in args)
{
@ -272,11 +272,20 @@ namespace MinecraftClient
switch (positionalIndex)
{
case 0:
InternalConfig.Login = argument;
if (Config.Main.Advanced.AccountList.TryGetValue(argument, out AccountInfoConfig accountInfo))
{
InternalConfig.Account = accountInfo;
skipPassword = true;
}
else
{
InternalConfig.Account.Login = argument;
}
InternalConfig.KeepAccountSettings = true;
break;
case 1:
InternalConfig.Password = argument;
if (!skipPassword)
InternalConfig.Account.Password = argument;
break;
case 2:
Config.Main.SetServerIP(new MainConfig.ServerInfoConfig(argument), true);
@ -388,7 +397,12 @@ namespace MinecraftClient
General.Account.Login ??= string.Empty;
General.Account.Password ??= string.Empty;
if (!InternalConfig.KeepAccountSettings)
InternalConfig.Login = General.Account.Login;
{
if (Advanced.AccountList.TryGetValue(General.Account.Login, out AccountInfoConfig account))
InternalConfig.Account = account;
else
InternalConfig.Account = General.Account;
}
General.Server.Host ??= string.Empty;
@ -597,8 +611,7 @@ namespace MinecraftClient
{
if (AccountList.TryGetValue(accountAlias, out AccountInfoConfig accountInfo))
{
InternalConfig.Login = accountInfo.Login;
InternalConfig.Password = accountInfo.Password;
InternalConfig.Account = accountInfo;
return true;
}
else
@ -894,7 +907,7 @@ namespace MinecraftClient
switch (varname_lower)
{
case "username": result.Append(InternalConfig.Username); break;
case "login": result.Append(InternalConfig.Login); break;
case "login": result.Append(InternalConfig.Account.Login); break;
case "serverip": result.Append(InternalConfig.ServerIP); break;
case "serverport": result.Append(InternalConfig.ServerPort); break;
case "datetime":