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

Show server ping json in debug messages (#1184)

Browse source
This commit is contained in:
ORelio 2020-08-08 14:13:59 +02:00
parent 1485612f29
commit 24b3dac2a3
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
MinecraftClient/Protocol/Handlers/Protocol16.cs
View file

@ -802,12 +802,21 @@ namespace MinecraftClient.Protocol.Handlers
tcp.ReceiveTimeout = 5000; //MC 1.7.2+ SpigotMC servers won't respond, so we need a reasonable timeout. tcp.ReceiveTimeout = 5000; //MC 1.7.2+ SpigotMC servers won't respond, so we need a reasonable timeout.
byte[] ping = new byte[2] { 0xfe, 0x01 }; byte[] ping = new byte[2] { 0xfe, 0x01 };
tcp.Client.Send(ping, SocketFlags.None); tcp.Client.Send(ping, SocketFlags.None);
tcp.Client.Receive(ping, 0, 1, SocketFlags.None); tcp.Client.Receive(ping, 0, 1, SocketFlags.None);
if (ping[0] == 0xff) if (ping[0] == 0xff)
{ {
Protocol16Handler ComTmp = new Protocol16Handler(tcp); Protocol16Handler ComTmp = new Protocol16Handler(tcp);
string result = ComTmp.readNextString(); string result = ComTmp.readNextString();
if (Settings.DebugMessages)
{
// May contain formatting codes, cannot use WriteLineFormatted
Console.ForegroundColor = ConsoleColor.DarkGray;
ConsoleIO.WriteLine(result);
Console.ForegroundColor = ConsoleColor.Gray;
}
if (result.Length > 2 && result[0] == '§' && result[1] == '1') if (result.Length > 2 && result[0] == '§' && result[1] == '1')
{ {
string[] tmp = result.Split((char)0x00); string[] tmp = result.Split((char)0x00);
@ -822,7 +831,9 @@ namespace MinecraftClient.Protocol.Handlers
protocolversion = (byte)39; protocolversion = (byte)39;
version = "B1.8.1 - 1.3.2"; version = "B1.8.1 - 1.3.2";
} }
ConsoleIO.WriteLineFormatted("§8Server version : MC " + version + " (protocol v" + protocolversion + ")."); ConsoleIO.WriteLineFormatted("§8Server version : MC " + version + " (protocol v" + protocolversion + ").");
return true; return true;
} }
else return false; else return false;

8
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -1216,6 +1216,14 @@ namespace MinecraftClient.Protocol.Handlers
{ {
string result = dataTypes.ReadNextString(packetData); //Get the Json data string result = dataTypes.ReadNextString(packetData); //Get the Json data
if (Settings.DebugMessages)
{
// May contain formatting codes, cannot use WriteLineFormatted
Console.ForegroundColor = ConsoleColor.DarkGray;
ConsoleIO.WriteLine(result);
Console.ForegroundColor = ConsoleColor.Gray;
}
if (!String.IsNullOrEmpty(result) && result.StartsWith("{") && result.EndsWith("}")) if (!String.IsNullOrEmpty(result) && result.StartsWith("{") && result.EndsWith("}"))
{ {
Json.JSONData jsonData = Json.ParseJson(result); Json.JSONData jsonData = Json.ParseJson(result);