diff --git a/pom.xml b/pom.xml index df98b81..b0e4df1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 at.pcgamingfreaks MinePacks - 1.2.2 + 1.2.3 in-project @@ -35,36 +35,9 @@ 1.7 - - org.apache.maven.plugins - maven-shade-plugin - 2.3 - - - package - - shade - - - false - true - - - com.google.code.gson:gson - - - - - - - - com.google.code.gson - gson - 2.3.1 - org.bukkit bukkit diff --git a/src/at/pcgamingfreaks/georgh/MinePacks/Database/UUIDConverter.java b/src/at/pcgamingfreaks/georgh/MinePacks/Database/UUIDConverter.java index 0f2f0ae..137ea03 100644 --- a/src/at/pcgamingfreaks/georgh/MinePacks/Database/UUIDConverter.java +++ b/src/at/pcgamingfreaks/georgh/MinePacks/Database/UUIDConverter.java @@ -23,9 +23,10 @@ import java.util.Scanner; import java.util.UUID; +import org.json.simple.JSONObject; +import org.json.simple.parser.JSONParser; + import com.google.common.base.Charsets; -import com.google.gson.JsonParser; -import com.google.gson.JsonObject; public class UUIDConverter { @@ -37,7 +38,7 @@ public static String getNameFromUUID(String uuid) URL url = new URL("https://sessionserver.mojang.com/session/minecraft/profile/" + uuid.replaceAll("-", "")); Scanner jsonScanner = new Scanner(url.openConnection().getInputStream(), "UTF-8"); String json = jsonScanner.next(); - name = (((JsonObject)new JsonParser().parse(json)).get("name")).toString(); + name = (((JSONObject)new JSONParser().parse(json)).get("name")).toString(); jsonScanner.close(); } catch (Exception e) @@ -60,7 +61,7 @@ public static String getUUIDFromName(String name, boolean onlinemode, boolean wi try { BufferedReader in = new BufferedReader(new InputStreamReader(new URL("https://api.mojang.com/users/profiles/minecraft/" + name).openStream())); - uuid = (((JsonObject)new JsonParser().parse(in)).get("id")).toString().replaceAll("\"", ""); + uuid = (((JSONObject)new JSONParser().parse(in)).get("id")).toString().replaceAll("\"", ""); in.close(); } catch (Exception e)