From 4c1b2197d770e300f663364487426960de8828ad Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Mar 2026 19:43:05 +0000 Subject: [PATCH 1/3] Initial plan From 7b534ca547b6040a7fac078ede9bf3460f81a6bd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Mar 2026 19:47:10 +0000 Subject: [PATCH 2/3] feat: add built-in players app var Co-authored-by: milutinke <441903+milutinke@users.noreply.github.com> Agent-Logs-Url: https://github.com/MCCTeam/Minecraft-Console-Client/sessions/c9f7aa87-50b7-4725-aa39-613eba1a07fd --- .../ConfigComments/ConfigComments.resx | 4 +- MinecraftClient/Settings.cs | 70 ++++++++++++------- docs/guide/configuration.md | 2 +- docs/guide/creating-text-script.md | 2 +- 4 files changed, 50 insertions(+), 28 deletions(-) diff --git a/MinecraftClient/Resources/ConfigComments/ConfigComments.resx b/MinecraftClient/Resources/ConfigComments/ConfigComments.resx index 454f78de..6735295a 100644 --- a/MinecraftClient/Resources/ConfigComments/ConfigComments.resx +++ b/MinecraftClient/Resources/ConfigComments/ConfigComments.resx @@ -119,7 +119,7 @@ can be used in some other fields as %yourvar% -%username% and %serverip% are reserved variables. +%username%, %login%, %serverip%, %serverport%, %datetime% and %players% are reserved read-only variables. =============================== # @@ -930,4 +930,4 @@ Note: This does NOT require a Bot Token, only an Application ID. Discord must be Yggdrasil authlib multi-user selection. - \ No newline at end of file + diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index 5dd1f4c5..a956e1df 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -1024,6 +1024,34 @@ namespace MinecraftClient [NonSerialized] readonly Lock varLock = new(); + private static bool TryGetReadOnlyVar(string varName, [NotNullWhen(true)] out object? varData) + { + switch (Settings.ToLowerIfNeed(varName)) + { + case "username": + varData = InternalConfig.Username; + return true; + case "login": + varData = InternalConfig.Account.Login; + return true; + case "serverip": + varData = InternalConfig.ServerIP; + return true; + case "serverport": + varData = InternalConfig.ServerPort; + return true; + case "datetime": + varData = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + return true; + case "players": + varData = string.Join(", ", McClient.Instance?.GetOnlinePlayers() ?? []); + return true; + default: + varData = null; + return false; + } + } + /// /// Set a custom %variable% which will be available through expandVars() /// @@ -1066,6 +1094,8 @@ namespace MinecraftClient /// The value or null if the variable does not exists public object? GetVar(string varName) { + if (TryGetReadOnlyVar(varName, out object? readOnlyVar)) + return readOnlyVar; if (VarStirng.TryGetValue(varName, out string? valueString)) return valueString; else if (VarObject.TryGetValue(varName, out object? valueObject)) @@ -1081,6 +1111,8 @@ namespace MinecraftClient /// The value or null if the variable does not exists public bool TryGetVar(string varName, [NotNullWhen(true)] out object? varData) { + if (TryGetReadOnlyVar(varName, out varData)) + return true; if (VarStirng.TryGetValue(varName, out string? valueString)) { varData = valueString; @@ -1143,31 +1175,21 @@ namespace MinecraftClient string varname_lower = Settings.ToLowerIfNeed(varname); i = i + varname.Length + 1; - switch (varname_lower) + if (TryGetReadOnlyVar(varname_lower, out object? readOnlyVar)) { - case "username": result.Append(InternalConfig.Username); 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": - DateTime time = DateTime.Now; - result.Append(String.Format("{0}-{1}-{2} {3}:{4}:{5}", - time.Year.ToString("0000"), - time.Month.ToString("00"), - time.Day.ToString("00"), - time.Hour.ToString("00"), - time.Minute.ToString("00"), - time.Second.ToString("00"))); - - break; - default: - if (localVars is not null && localVars.ContainsKey(varname_lower)) - result.Append(localVars[varname_lower].ToString()); - else if (TryGetVar(varname_lower, out object? var_value)) - result.Append(var_value.ToString()); - else - result.Append("%" + varname + '%'); - break; + result.Append(readOnlyVar?.ToString()); + } + else if (localVars is not null && localVars.ContainsKey(varname_lower)) + { + result.Append(localVars[varname_lower].ToString()); + } + else if (TryGetVar(varname_lower, out object? var_value)) + { + result.Append(var_value.ToString()); + } + else + { + result.Append("%" + varname + '%'); } } else result.Append(str[i]); diff --git a/docs/guide/configuration.md b/docs/guide/configuration.md index 10d0f7e7..222c43ea 100644 --- a/docs/guide/configuration.md +++ b/docs/guide/configuration.md @@ -1066,7 +1066,7 @@ Coordinate = { x = 145, y = 64, z = 2045 }

Tip

- **`%username%`, `%serverip%`, `%datetime%` are reserved variables** + **`%username%`, `%login%`, `%serverip%`, `%serverport%`, `%datetime%`, `%players%` are reserved read-only variables**
diff --git a/docs/guide/creating-text-script.md b/docs/guide/creating-text-script.md index 7b5178be..9ae2a6fb 100644 --- a/docs/guide/creating-text-script.md +++ b/docs/guide/creating-text-script.md @@ -6,7 +6,7 @@ title: Creating Simple Script A simple script is a text file with one command per line. See the [Internal Commands](usage.md#internal-commands) section, or type `/help` in the console to see the available commands. Any line beginning with `#` is ignored and treated as a comment. -Application variables defined with the `set` command or in the `[AppVars]` config section can be used. The following read-only variables are also available: `%username%`, `%login%`, `%serverip%`, `%serverport%`, `%datetime%`. +Application variables defined with the `set` command or in the `[AppVars]` config section can be used. The following read-only variables are also available: `%username%`, `%login%`, `%serverip%`, `%serverport%`, `%datetime%`, `%players%` (`%players%` expands to the current online player names separated by commas). ## Example From 461be9f36876d3d23534d057189de33ed7197b00 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Mar 2026 19:51:46 +0000 Subject: [PATCH 3/3] docs: clarify players app var behavior Co-authored-by: milutinke <441903+milutinke@users.noreply.github.com> Agent-Logs-Url: https://github.com/MCCTeam/Minecraft-Console-Client/sessions/c9f7aa87-50b7-4725-aa39-613eba1a07fd --- MinecraftClient/Settings.cs | 4 ++-- docs/guide/creating-text-script.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index a956e1df..0c25adb8 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -1174,10 +1174,10 @@ namespace MinecraftClient string varname = var_name.ToString(); string varname_lower = Settings.ToLowerIfNeed(varname); i = i + varname.Length + 1; - + if (TryGetReadOnlyVar(varname_lower, out object? readOnlyVar)) { - result.Append(readOnlyVar?.ToString()); + result.Append(readOnlyVar.ToString()); } else if (localVars is not null && localVars.ContainsKey(varname_lower)) { diff --git a/docs/guide/creating-text-script.md b/docs/guide/creating-text-script.md index 9ae2a6fb..ff07b67d 100644 --- a/docs/guide/creating-text-script.md +++ b/docs/guide/creating-text-script.md @@ -6,7 +6,7 @@ title: Creating Simple Script A simple script is a text file with one command per line. See the [Internal Commands](usage.md#internal-commands) section, or type `/help` in the console to see the available commands. Any line beginning with `#` is ignored and treated as a comment. -Application variables defined with the `set` command or in the `[AppVars]` config section can be used. The following read-only variables are also available: `%username%`, `%login%`, `%serverip%`, `%serverport%`, `%datetime%`, `%players%` (`%players%` expands to the current online player names separated by commas). +Application variables defined with the `set` command or in the `[AppVars]` config section can be used. The following read-only variables are also available: `%username%`, `%login%`, `%serverip%`, `%serverport%`, `%datetime%`, `%players%` (`%players%` expands to the current online player names separated by commas, or an empty string when not connected). ## Example