diff --git a/MinecraftClient/McTcpClient.cs b/MinecraftClient/McTcpClient.cs index 604cb9fb..743632ad 100644 --- a/MinecraftClient/McTcpClient.cs +++ b/MinecraftClient/McTcpClient.cs @@ -124,7 +124,9 @@ namespace MinecraftClient { foreach (ChatBot bot in scripts_on_hold) { bots.Add(bot); } scripts_on_hold.Clear(); - Console.WriteLine("Server was successfully joined.\nType '/quit' to leave the server."); + Console.WriteLine("Server was successfully joined.\nType '" + + (Settings.internalCmdChar == ' ' ? "" : "" + Settings.internalCmdChar) + + "quit' to leave the server."); StartTalk(); } } @@ -173,17 +175,17 @@ namespace MinecraftClient text = text.Trim(); if (text.Length > 0) { - if (text[0] == '/') + if (Settings.internalCmdChar == ' ' || text[0] == Settings.internalCmdChar) { string response_msg = ""; - string command = text.Substring(1); - if (!performInternalCommand(Settings.expandVars(command), ref response_msg)) + string command = Settings.internalCmdChar == ' ' ? text : text.Substring(1); + if (!performInternalCommand(Settings.expandVars(command), ref response_msg) && Settings.internalCmdChar == '/') { SendChatMessage(text); } else if (response_msg.Length > 0) { - ConsoleIO.WriteLineFormatted("§8" + response_msg); + ConsoleIO.WriteLineFormatted("§8MCC: " + response_msg); } } else SendChatMessage(text); @@ -235,7 +237,7 @@ namespace MinecraftClient case "set": if (command.Length > 3) { - string[] temp = command.Substring(3).Split('='); + string[] temp = command.Substring(4).Split('='); if (temp.Length > 1) { if (!Settings.setVar(temp[0], command.Substring(temp[0].Length + 5))) diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index e6841202..653e730e 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -41,6 +41,7 @@ namespace MinecraftClient public static string Language = "en_GB"; public static bool chatTimeStamps = false; public static bool exitOnFailure = false; + public static char internalCmdChar = '/'; //AntiAFK Settings public static bool AntiAFK_Enabled = false; @@ -119,6 +120,7 @@ namespace MinecraftClient case "scriptscheduler": pMode = ParseMode.ScriptScheduler; break; case "remotecontrol": pMode = ParseMode.RemoteControl; break; case "proxy": pMode = ParseMode.Proxy; break; + case "appvars": pMode = ParseMode.AppVars; break; default: pMode = ParseMode.Default; break; } } @@ -147,6 +149,15 @@ namespace MinecraftClient foreach (string name in argValue.ToLower().Replace(" ", "").Split(',')) Bots_Owners.Add(name); break; + case "internalcmdchar": + switch (argValue.ToLower()) + { + case "none": internalCmdChar = ' '; break; + case "slash": internalCmdChar = '/'; break; + case "backslash": internalCmdChar = '\\'; break; + } + break; + } break; @@ -270,6 +281,7 @@ namespace MinecraftClient + "language=en_GB\r\n" + "botowners=Player1,Player2,Player3\r\n" + "consoletitle=%username% - Minecraft Console Client\r\n" + + "internalcmdchar=slash #use 'none', 'slash' or 'backslash'\r\n" + "mcversion=auto #use 'auto' or '1.X.X' values\r\n" + "exitonfailure=false\r\n" + "timestamps=false\r\n"