From 2a6922ccbaf286968fe88df7009dfa6f15b8b2d4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 20 Mar 2026 21:26:23 +0000 Subject: [PATCH] Cherry-pick PR #2781 changes: add Yggdrasil authlib multi-user selection Co-authored-by: milutinke <441903+milutinke@users.noreply.github.com> Agent-Logs-Url: https://github.com/MCCTeam/Minecraft-Console-Client/sessions/729c8f37-946e-459d-b1e3-e4da4f4fddd1 --- MinecraftClient/Protocol/ProtocolHandler.cs | 19 +++++++++++++++++-- .../ConfigComments/ConfigComments.Designer.cs | 9 +++++++++ .../ConfigComments/ConfigComments.resx | 3 +++ MinecraftClient/Settings.cs | 3 +++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/MinecraftClient/Protocol/ProtocolHandler.cs b/MinecraftClient/Protocol/ProtocolHandler.cs index 684e351b..875ac84f 100644 --- a/MinecraftClient/Protocol/ProtocolHandler.cs +++ b/MinecraftClient/Protocol/ProtocolHandler.cs @@ -657,9 +657,24 @@ namespace MinecraftClient.Protocol ConsoleIO.WriteLine(Translations.mcc_avaliable_profiles + availableProfiles); - ConsoleIO.WriteLine(Translations.mcc_select_profile); - string selectedProfileName = ConsoleIO.ReadLine(); + string selectedProfileName; + + if (Config.Main.General.AuthUser == "") + { + ConsoleIO.WriteLine(Translations.mcc_select_profile); + selectedProfileName = ConsoleIO.ReadLine(); + } + else + { + selectedProfileName = Config.Main.General.AuthUser; + + } + ConsoleIO.WriteLine(Translations.mcc_selected_profile + " " + selectedProfileName); + + // ConsoleIO.WriteLine(Translations.mcc_select_profile); + // string selectedProfileName = ConsoleIO.ReadLine(); + // ConsoleIO.WriteLine(Translations.mcc_selected_profile + " " + selectedProfileName); Json.JSONData? selectedProfile = null; foreach (Json.JSONData profile in loginResponse.Properties["availableProfiles"] .DataArray) diff --git a/MinecraftClient/Resources/ConfigComments/ConfigComments.Designer.cs b/MinecraftClient/Resources/ConfigComments/ConfigComments.Designer.cs index 65bb9a0b..4dcf11cd 100644 --- a/MinecraftClient/Resources/ConfigComments/ConfigComments.Designer.cs +++ b/MinecraftClient/Resources/ConfigComments/ConfigComments.Designer.cs @@ -1748,6 +1748,15 @@ namespace MinecraftClient { } } + /// + /// Looks up a localized string similar to Yggdrasil authlib multi-user selection.. + /// + internal static string Main_General_AuthlibUser { + get { + return ResourceManager.GetString("Main.General.AuthlibUser", resourceCulture); + } + } + /// /// Looks up a localized string similar to The address of the game server, "Host" can be filled in with domain name or IP address. (The "Port" field can be deleted, it will be resolved automatically). /// diff --git a/MinecraftClient/Resources/ConfigComments/ConfigComments.resx b/MinecraftClient/Resources/ConfigComments/ConfigComments.resx index ca440314..5908d88c 100644 --- a/MinecraftClient/Resources/ConfigComments/ConfigComments.resx +++ b/MinecraftClient/Resources/ConfigComments/ConfigComments.resx @@ -855,4 +855,7 @@ If the connection to the Minecraft game server is blocked by the firewall, set E Set to false to opt-out of Sentry error logging. + + Yggdrasil authlib multi-user selection. + \ No newline at end of file diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index 684e5a98..cbecf64b 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -496,6 +496,9 @@ namespace MinecraftClient public LoginMethod Method = LoginMethod.mcc; [TomlInlineComment("$Main.General.AuthlibServer$")] public AuthlibServer AuthServer = new(string.Empty); + + [TomlInlineComment("$Main.General.AuthlibUser$")] + public string AuthUser = ""; public enum LoginType { mojang, microsoft,yggdrasil };