diff --git a/MinecraftClient/Protocol/Handlers/Json.cs b/MinecraftClient/Json.cs similarity index 99% rename from MinecraftClient/Protocol/Handlers/Json.cs rename to MinecraftClient/Json.cs index c95fdc89..0d6db1d8 100644 --- a/MinecraftClient/Protocol/Handlers/Json.cs +++ b/MinecraftClient/Json.cs @@ -3,19 +3,17 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace MinecraftClient.Protocol.Handlers +namespace MinecraftClient { /// /// This class parses JSON data and returns an object describing that data. /// Really lightweight JSON handling by ORelio - (c) 2013 - 2014 /// - - static class Json + public static class Json { /// /// Parse some JSON and return the corresponding JSON object /// - public static JSONData ParseJson(string json) { int cursorpos = 0; @@ -26,7 +24,6 @@ namespace MinecraftClient.Protocol.Handlers /// The class storing unserialized JSON data /// The data can be an object, an array or a string /// - public class JSONData { public enum DataType { Object, Array, String }; @@ -49,7 +46,6 @@ namespace MinecraftClient.Protocol.Handlers /// /// String to parse /// Cursor start (set to 0 for function init) - private static JSONData String2Data(string toparse, ref int cursorpos) { try @@ -173,7 +169,6 @@ namespace MinecraftClient.Protocol.Handlers /// /// Char to test /// True if hexadecimal - private static bool isHex(char c) { return ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f')); } } } diff --git a/MinecraftClient/MinecraftClient.csproj b/MinecraftClient/MinecraftClient.csproj index 9828e0ba..9559f09c 100644 --- a/MinecraftClient/MinecraftClient.csproj +++ b/MinecraftClient/MinecraftClient.csproj @@ -117,6 +117,7 @@ + @@ -206,7 +207,6 @@ - diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs index bd5a3a89..74775c32 100644 --- a/MinecraftClient/Program.cs +++ b/MinecraftClient/Program.cs @@ -11,7 +11,7 @@ using MinecraftClient.Protocol.SessionCache; namespace MinecraftClient { /// - /// Minecraft Console Client by ORelio and Contributors (c) 2012-2016. + /// Minecraft Console Client by ORelio and Contributors (c) 2012-2017. /// Allows to connect to any Minecraft server, send and receive text, automated scripts. /// This source code is released under the CDDL 1.0 License. ///