From 723c961753323d48d2537ae7a3f1c58dfef9b55e Mon Sep 17 00:00:00 2001 From: ORelio Date: Sun, 3 Nov 2013 23:20:26 +0100 Subject: [PATCH 1/3] Added credit to contributors instead of email adress --- MinecraftClient/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs index 9602e4c498..c7a682080e 100644 --- a/MinecraftClient/Program.cs +++ b/MinecraftClient/Program.cs @@ -23,7 +23,7 @@ class Program static void Main(string[] args) { - Console.WriteLine("Console Client for MC 1.4.6 to 1.6.4 - v" + Version + " - By ORelio (or3L1o@live.fr)"); + Console.WriteLine("Console Client for MC 1.4.6 to 1.6.4 - v" + Version + " - By ORelio & Contributors"); //Basic Input/Output ? if (args.Length >= 1 && args[args.Length - 1] == "BasicIO") From 07ac3268cc5d5de5449b35182b2c4a96ab842ef2 Mon Sep 17 00:00:00 2001 From: bearbear12345 Date: Mon, 4 Nov 2013 18:48:48 +1100 Subject: [PATCH 2/3] BouncyCastle reference is still there --- MinecraftClient/.gitignore | 2 ++ MinecraftClient/MinecraftClient.csproj | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/MinecraftClient/.gitignore b/MinecraftClient/.gitignore index 4ded7c4c7a..3cd7bb3879 100644 --- a/MinecraftClient/.gitignore +++ b/MinecraftClient/.gitignore @@ -1,2 +1,4 @@ /bin/ /obj/ +MinecraftClient.sln +MinecraftClient.v11.suo \ No newline at end of file diff --git a/MinecraftClient/MinecraftClient.csproj b/MinecraftClient/MinecraftClient.csproj index aba910f0ae..78e2c47e73 100644 --- a/MinecraftClient/MinecraftClient.csproj +++ b/MinecraftClient/MinecraftClient.csproj @@ -60,10 +60,6 @@ - - False - .\BouncyCastle.Crypto.dll - False .\IKVM.OpenJDK.Core.dll From 6340feaa52a6c5394a7f685287e2f52b4b2c08e5 Mon Sep 17 00:00:00 2001 From: bearbear12345 Date: Mon, 4 Nov 2013 19:48:29 +1100 Subject: [PATCH 3/3] + Made MCC commands ignore case. + Started executing script when called with "/exec " --- MinecraftClient/McTcpClient.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/MinecraftClient/McTcpClient.cs b/MinecraftClient/McTcpClient.cs index e009f35a27..4b7628c4bc 100644 --- a/MinecraftClient/McTcpClient.cs +++ b/MinecraftClient/McTcpClient.cs @@ -171,7 +171,7 @@ private void StartTalk() } else { - if (text == "/quit" || text == "/reco" || text == "/reconnect") { break; } + if (text.ToLower() == "/quit" || text.ToLower().StartsWith("/exec ") || text.ToLower() == "/reco" || text.ToLower() == "/reconnect") { break; } while (text.Length > 0 && text[0] == ' ') { text = text.Substring(1); } if (text != "") { @@ -200,13 +200,18 @@ private void StartTalk() } } - if (text == "/quit") + if (text.ToLower() == "/quit") { ConsoleIO.WriteLine("You have left the server."); Disconnect(); } - else if (text == "/reco" || text == "/reconnect") + else if (text.ToLower().StartsWith("/exec ")) { + handler.BotLoad(new Bots.Scripting("config/" + text.Split()[1])); + } + + + else if (text.ToLower() == "/reco" || text.ToLower() == "/reconnect") { ConsoleIO.WriteLine("You have left the server."); handler.SendRespawnPacket();