helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various fixes

Browse source 
- Re-add support for MC 1.6 chat color names
- Re-add support for MC 1.5- vanilla whispers in ChatBot
- Add /connect in main chat prompt (reported by TNT-UP)
This commit is contained in:
ORelio 2014-06-03 13:05:53 +02:00
parent 84ba8fd0ae
commit 898a04a843
4 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
MinecraftClient/ChatBot.cs
View file

@ -138,10 +138,15 @@ namespace MinecraftClient
try try
{ {
//Detect vanilla /tell messages //Detect vanilla /tell messages
//Someone whispers to you: message //Someone whispers message (MC 1.5)
//Someone whispers to you: message (MC 1.7)
if (tmp.Length > 2 && tmp[1] == "whispers") if (tmp.Length > 2 && tmp[1] == "whispers")
{ {
message = text.Substring(tmp[0].Length + 18); if (tmp.Length > 4 && tmp[2] == "to" && tmp[3] == "you:")
{
message = text.Substring(tmp[0].Length + 18); //MC 1.7
}
else message = text.Substring(tmp[0].Length + 10); //MC 1.5
sender = tmp[0]; sender = tmp[0];
return isValidName(sender); return isValidName(sender);
} }

5
MinecraftClient/McTcpClient.cs
View file

@ -189,6 +189,11 @@ namespace MinecraftClient
{ {
BotLoad(new ChatBots.Script(text.Substring(8))); BotLoad(new ChatBots.Script(text.Substring(8)));
} }
else if (text.ToLower().StartsWith("/connect "))
{
Settings.ServerIP = text.Substring(9);
Program.Restart();
}
else if (text != "") else if (text != "")
{ {
//Message is too long //Message is too long

33
MinecraftClient/Protocol/Handlers/ChatParser.cs
View file

@ -56,22 +56,23 @@ namespace MinecraftClient.Protocol.Handlers
{ {
switch (colorname.ToLower()) switch (colorname.ToLower())
{ {
case "black": return "§0"; /* MC 1.7+ Name MC 1.6 Name Classic tag */
case "dark_blue": return "§1"; case "black": /* Blank if same */ return "§0";
case "dark_green": return "§2"; case "dark_blue": return "§1";
case "dark_aqua": return "§3"; case "dark_green": return "§2";
case "dark_red": return "§4"; case "dark_aqua": case "dark_cyan": return "§3";
case "dark_purple": return "§5"; case "dark_red": return "§4";
case "gold": return "§6"; case "dark_purple": case "dark_magenta": return "§5";
case "gray": return "§7"; case "gold": case "dark_yellow": return "§6";
case "dark_gray": return "§8"; case "gray": return "§7";
case "blue": return "§9"; case "dark_gray": return "§8";
case "green": return "§a"; case "blue": return "§9";
case "aqua": return "§b"; case "green": return "§a";
case "red": return "§c"; case "aqua": case "cyan": return "§b";
case "light_purple": return "§d"; case "red": return "§c";
case "yellow": return "§e"; case "light_purple": case "magenta": return "§d";
case "white": return "§f"; case "yellow": return "§e";
case "white": return "§f";
default: return ""; default: return "";
} }
} }

2
MinecraftClient/Protocol/ProtocolHandler.cs
View file

@ -148,7 +148,7 @@ namespace MinecraftClient.Protocol
} }
/// <summary> /// <summary>
/// Check session using Mojang's Yggdrasil authentication scheme. Allow to join an online-mode server /// Check session using Mojang's Yggdrasil authentication scheme. Allows to join an online-mode server
/// </summary> /// </summary>
/// <param name="user">Username</param> /// <param name="user">Username</param>
/// <param name="accesstoken">Session ID</param> /// <param name="accesstoken">Session ID</param>