From 4e381f9d601e854c5f5c74dd3d78a4b87411ffff Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 11 Apr 2014 11:54:56 +1200 Subject: [PATCH] Remove the UUID fetcher code. Its useless now --- .../disguise/utilities/DisguiseUtilities.java | 41 --------- .../disguise/utilities/UUIDFetcher.java | 83 ------------------- 2 files changed, 124 deletions(-) delete mode 100644 src/me/libraryaddict/disguise/utilities/UUIDFetcher.java diff --git a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java index 464da0a2..cf7290ae 100644 --- a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java +++ b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java @@ -4,7 +4,6 @@ import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -41,7 +40,6 @@ import com.comphenix.protocol.wrappers.WrappedDataWatcher; public class DisguiseUtilities { private static HashMap> futureDisguises = new HashMap>(); private static LibsDisguises libsDisguises; - private static HashMap namesUuids = new HashMap(); // A internal storage of fake entity ID's I can use. // Realistically I could probably use a ID like "4" for everyone, seeing as no one shares the ID private static HashMap selfDisguisesIds = new HashMap(); @@ -312,45 +310,6 @@ public class DisguiseUtilities { e.printStackTrace(); } } - /*else if (disguise != null) { - if (namesUuids.containsKey(playerName)) { - if (namesUuids.get(playerName) != null) { - return UUID.fromString(namesUuids.get(playerName)); - } - } else { - // Add null so that if this is called again. I already know I'm doing something about it - namesUuids.put(playerName, null); - Bukkit.getScheduler().scheduleAsyncDelayedTask(libsDisguises, new Runnable() { - public void run() { - UUIDFetcher fetcher = new UUIDFetcher(Arrays.asList(playerName)); - try { - final HashMap map = fetcher.call(); - Bukkit.getScheduler().scheduleSyncDelayedTask(libsDisguises, new Runnable() { - public void run() { - if (map.containsKey(playerName)) { - if (namesUuids.containsKey(playerName) && namesUuids.get(playerName) == null) { - namesUuids.put(playerName, map.get(playerName).toString()); - } - if (DisguiseUtilities.isDisguiseInUse(disguise)) { - DisguiseUtilities.refreshTrackers((TargetedDisguise) disguise); - if (disguise.getEntity() instanceof Player && disguise.isSelfDisguiseVisible()) { - DisguiseUtilities.sendSelfDisguise((Player) disguise.getEntity()); - } - } - } - } - }); - } catch (Exception e) { - if (namesUuids.containsKey(playerName) && namesUuids.get(playerName) == null) { - namesUuids.remove(playerName); - } - System.out.print("[LibsDisguises] Error when fetching " + playerName + "'s uuid from mojang: " - + e.getMessage()); - } - } - }); - } - }*/ } return null; } diff --git a/src/me/libraryaddict/disguise/utilities/UUIDFetcher.java b/src/me/libraryaddict/disguise/utilities/UUIDFetcher.java deleted file mode 100644 index 5ef6596d..00000000 --- a/src/me/libraryaddict/disguise/utilities/UUIDFetcher.java +++ /dev/null @@ -1,83 +0,0 @@ -package me.libraryaddict.disguise.utilities; - -import com.google.common.collect.ImmutableList; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.json.simple.JSONValue; -import org.json.simple.parser.JSONParser; - -import java.io.DataOutputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.Callable; - -public class UUIDFetcher implements Callable> { - private static final String AGENT = "minecraft"; - private static final int MAX_SEARCH = 100; - private static final String PROFILE_URL = "https://api.mojang.com/profiles/page/"; - @SuppressWarnings("unchecked") - private static String buildBody(List names) { - List lookups = new ArrayList(); - for (String name : names) { - JSONObject obj = new JSONObject(); - obj.put("name", name); - obj.put("agent", AGENT); - lookups.add(obj); - } - return JSONValue.toJSONString(lookups); - } - private static HttpURLConnection createConnection(int page) throws Exception { - URL url = new URL(PROFILE_URL + page); - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.setRequestMethod("POST"); - connection.setRequestProperty("Content-Type", "application/json"); - connection.setUseCaches(false); - connection.setDoInput(true); - connection.setDoOutput(true); - return connection; - } - - private static void writeBody(HttpURLConnection connection, String body) throws Exception { - DataOutputStream writer = new DataOutputStream(connection.getOutputStream()); - writer.write(body.getBytes()); - writer.flush(); - writer.close(); - } - - private final JSONParser jsonParser = new JSONParser(); - - private final List names; - - public UUIDFetcher(List names) { - this.names = ImmutableList.copyOf(names); - } - - public HashMap call() throws Exception { - HashMap uuidMap = new HashMap(); - String body = buildBody(names); - for (int i = 1; i < MAX_SEARCH; i++) { - HttpURLConnection connection = createConnection(i); - writeBody(connection, body); - JSONObject jsonObject = (JSONObject) jsonParser.parse(new InputStreamReader(connection.getInputStream())); - JSONArray array = (JSONArray) jsonObject.get("profiles"); - Number count = (Number) jsonObject.get("size"); - if (count.intValue() == 0) { - break; - } - for (Object profile : array) { - JSONObject jsonProfile = (JSONObject) profile; - String id = (String) jsonProfile.get("id"); - String name = (String) jsonProfile.get("name"); - UUID uuid = UUID.fromString(id.substring(0, 8) + "-" + id.substring(8, 12) + "-" + id.substring(12, 16) + "-" - + id.substring(16, 20) + "-" + id.substring(20, 32)); - uuidMap.put(name, uuid); - } - } - return uuidMap; - } -} \ No newline at end of file