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

Support for unicode chars in JSON strings: \u0123

Browse source 
+ Small change in str2filter (case insensitive)
+ Commented debug instruction for RAW data
This commit is contained in:
ORelio 2013-08-08 10:51:59 +02:00
parent df4a9cd7b7
commit 551c152c7c
3 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MinecraftClient/Bots.cs
View file

@ -710,7 +710,7 @@ namespace MinecraftClient
public static MessageFilter str2filter(string filtername)
{
switch (filtername)
switch (filtername.ToLower())
{
case "all": return MessageFilter.AllText;
case "messages": return MessageFilter.AllMessages;

30
MinecraftClient/ChatParser.cs
View file

@ -21,7 +21,7 @@ namespace MinecraftClient
{
int cursorpos = 0;
JSONData jsonData = String2Data(json, ref cursorpos);
return JSONData2String(jsonData).Replace("u0027", "'");
return JSONData2String(jsonData);
}
/// <summary>
@ -213,7 +213,25 @@ namespace MinecraftClient
cursorpos++;
while (toparse[cursorpos] != '"')
{
if (toparse[cursorpos] == '\\') { cursorpos++; }
if (toparse[cursorpos] == '\\')
{
try //Unicode character \u0123
{
if (toparse[cursorpos + 1] == 'u'
&& isHex(toparse[cursorpos + 2])
&& isHex(toparse[cursorpos + 3])
&& isHex(toparse[cursorpos + 4])
&& isHex(toparse[cursorpos + 5]))
{
//"abc\u0123abc" => "0123" => 0123 => Unicode char n°0123 => Add char to string
data.StringValue += char.ConvertFromUtf32(int.Parse(toparse.Substring(cursorpos + 2, 4), System.Globalization.NumberStyles.HexNumber));
cursorpos += 6; continue;
}
else cursorpos++; //Normal character escapement \"
}
catch (IndexOutOfRangeException) { cursorpos++; } // \u01<end of string>
catch (ArgumentOutOfRangeException) { cursorpos++; } // Unicode index 0123 was invalid
}
data.StringValue += toparse[cursorpos];
cursorpos++;
}
@ -301,5 +319,13 @@ namespace MinecraftClient
return "";
}
/// <summary>
/// Small function for checking if a char is an hexadecimal char (0-9 A-F a-f)
/// </summary>
/// <param name="c">Char to test</param>
/// <returns>True if hexadecimal</returns>
private static bool isHex(char c) { return ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f')); }
}
}

2
MinecraftClient/MinecraftCom.cs
View file

@ -182,7 +182,7 @@ namespace MinecraftClient
string message = readNextString();
if (protocolversion >= 72)
{
//printstring("§8" + message, false); //Debug
//printstring("§8" + message, false); //Debug : Show the RAW JSON data
message = ChatParser.ParseText(message);
printstring(message, false);
}