From 9c8afb7d3c20e98225d5c9583a865d92e244dc00 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Mon, 2 Jan 2023 18:52:49 +0800 Subject: [PATCH] Bug fix --- MinecraftClient/McClient.cs | 2 +- MinecraftClient/Program.cs | 6 +++--- MinecraftClient/Scripting/CSharpRunner.cs | 1 + MinecraftClient/Scripting/ChatBot.cs | 5 ----- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs index 80defaf6..003dcbc2 100644 --- a/MinecraftClient/McClient.cs +++ b/MinecraftClient/McClient.cs @@ -203,7 +203,7 @@ namespace MinecraftClient Log.Info(string.Format(Translations.mcc_joined, Config.Main.Advanced.InternalCmdChar.ToLogString())); cmdprompt = new CancellationTokenSource(); - ConsoleInteractive.ConsoleReader.BeginReadThread(cmdprompt); + ConsoleInteractive.ConsoleReader.BeginReadThread(); ConsoleInteractive.ConsoleReader.MessageReceived += ConsoleReaderOnMessageReceived; ConsoleInteractive.ConsoleReader.OnInputChange += ConsoleIO.AutocompleteHandler; } diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs index 503f4f40..7eaaafa8 100644 --- a/MinecraftClient/Program.cs +++ b/MinecraftClient/Program.cs @@ -287,7 +287,7 @@ namespace MinecraftClient } } - if (!string.IsNullOrWhiteSpace(Config.Main.Advanced.ConsoleTitle)) + if (OperatingSystem.IsWindows() && !string.IsNullOrWhiteSpace(Config.Main.Advanced.ConsoleTitle)) { InternalConfig.Username = "New Window"; Console.Title = Config.AppVar.ExpandVars(Config.Main.Advanced.ConsoleTitle); @@ -463,7 +463,7 @@ namespace MinecraftClient InternalConfig.Username = session.PlayerName; bool isRealms = false; - if (Config.Main.Advanced.ConsoleTitle != "") + if (OperatingSystem.IsWindows() && !string.IsNullOrWhiteSpace(Config.Main.Advanced.ConsoleTitle)) Console.Title = Config.AppVar.ExpandVars(Config.Main.Advanced.ConsoleTitle); if (Config.Main.Advanced.PlayerHeadAsIcon && OperatingSystem.IsWindows()) @@ -614,7 +614,7 @@ namespace MinecraftClient client = new McClient(session, playerKeyPair, InternalConfig.ServerIP, InternalConfig.ServerPort, protocolversion, forgeInfo); //Update console title - if (Config.Main.Advanced.ConsoleTitle != "") + if (OperatingSystem.IsWindows() && !string.IsNullOrWhiteSpace(Config.Main.Advanced.ConsoleTitle)) Console.Title = Config.AppVar.ExpandVars(Config.Main.Advanced.ConsoleTitle); } catch (NotSupportedException) diff --git a/MinecraftClient/Scripting/CSharpRunner.cs b/MinecraftClient/Scripting/CSharpRunner.cs index e6587440..d056a9a4 100644 --- a/MinecraftClient/Scripting/CSharpRunner.cs +++ b/MinecraftClient/Scripting/CSharpRunner.cs @@ -88,6 +88,7 @@ namespace MinecraftClient.Scripting "using System.Net;", "using System.Threading;", "using MinecraftClient;", + "using MinecraftClient.Scripting;", "using MinecraftClient.Mapping;", "using MinecraftClient.Inventory;", string.Join("\n", libs), diff --git a/MinecraftClient/Scripting/ChatBot.cs b/MinecraftClient/Scripting/ChatBot.cs index d73f0884..67bc3cb5 100644 --- a/MinecraftClient/Scripting/ChatBot.cs +++ b/MinecraftClient/Scripting/ChatBot.cs @@ -1672,11 +1672,6 @@ namespace MinecraftClient.Scripting } - public string Run(McClient handler, string command, Dictionary? localVars) - { - return Runner(command, GetArgs(command)); - } - /// /// ChatBotCommand Constructor ///