Use nms to get the uuid

This commit is contained in:
libraryaddict 2014-04-15 02:54:04 +12:00
parent 8511911e7e
commit 1a10b6a774
3 changed files with 24 additions and 89 deletions

View File

@ -4,7 +4,6 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
@ -285,10 +284,9 @@ public class DisguiseUtilities {
Bukkit.getScheduler().scheduleAsyncDelayedTask(libsDisguises, new Runnable() { Bukkit.getScheduler().scheduleAsyncDelayedTask(libsDisguises, new Runnable() {
public void run() { public void run() {
try { try {
UUIDFetcher fetcher = new UUIDFetcher(Arrays.asList(playerName)); Object gameprofile = ReflectionManager.grabUUID(ReflectionManager.getGameProfile(null, playerName,
HashMap<String, UUID> map = fetcher.call(); false));
if (map.containsKey(playerName)) { if (gameprofile != null) {
Object gameprofile = ReflectionManager.getGameProfile(map.get(playerName), playerName);
final Object gameProfile = ReflectionManager.grabSkullBlob(gameprofile); final Object gameProfile = ReflectionManager.grabSkullBlob(gameprofile);
Bukkit.getScheduler().scheduleSyncDelayedTask(libsDisguises, new Runnable() { Bukkit.getScheduler().scheduleSyncDelayedTask(libsDisguises, new Runnable() {
public void run() { public void run() {

View File

@ -218,11 +218,15 @@ public class ReflectionManager {
} }
public static Object getGameProfile(UUID uuid, String playerName) { public static Object getGameProfile(UUID uuid, String playerName) {
return getGameProfile(uuid, playerName, true);
}
public static Object getGameProfile(UUID uuid, String playerName, boolean createUuid) {
try { try {
try { try {
return Class.forName("net.minecraft.util.com.mojang.authlib.GameProfile") return Class.forName("net.minecraft.util.com.mojang.authlib.GameProfile")
.getConstructor(UUID.class, String.class) .getConstructor(UUID.class, String.class)
.newInstance(uuid != null ? uuid : UUID.randomUUID(), playerName); .newInstance(uuid != null || !createUuid ? uuid : UUID.randomUUID(), playerName);
} catch (NoSuchMethodException ex) { } catch (NoSuchMethodException ex) {
return Class.forName("net.minecraft.util.com.mojang.authlib.GameProfile") return Class.forName("net.minecraft.util.com.mojang.authlib.GameProfile")
.getConstructor(String.class, String.class).newInstance(uuid != null ? uuid.toString() : "", playerName); .getConstructor(String.class, String.class).newInstance(uuid != null ? uuid.toString() : "", playerName);
@ -315,6 +319,22 @@ public class ReflectionManager {
return null; return null;
} }
public static Object grabUUID(Object gameProfile) {
try {
Object minecraftServer = getNmsClass("MinecraftServer").getMethod("getServer").invoke(null);
for (Method method : getNmsClass("MinecraftServer").getMethods()) {
if (method.getReturnType().getSimpleName().equals("MinecraftSessionService")) {
Object session = method.invoke(minecraftServer);
return session.getClass().getMethod("hasJoinedServer", gameProfile.getClass(), String.class)
.invoke(session, gameProfile, null);
}
}
} catch (Exception ex) {
ex.printStackTrace();
}
return null;
}
public static void setAllowSleep(Player player) { public static void setAllowSleep(Player player) {
try { try {
Object nmsEntity = getNmsEntity(player); Object nmsEntity = getNmsEntity(player);

View File

@ -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<HashMap<String, UUID>> {
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<String> names) {
List<JSONObject> lookups = new ArrayList<JSONObject>();
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<String> names;
public UUIDFetcher(List<String> names) {
this.names = ImmutableList.copyOf(names);
}
public HashMap<String, UUID> call() throws Exception {
HashMap<String, UUID> uuidMap = new HashMap<String, UUID>();
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;
}
}