From 99941c733f33ae64877e954821b0623afdbecd9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Voort?= Date: Tue, 18 Jul 2023 02:48:20 +0200 Subject: [PATCH] Use PlayerDB.co for name lookups (#82) I noticed that currently name lookups for UUIDs that are not cached, are not supported in RedisBungee due to Mojang removing name history. When looking at the usages, RedisBungee internally only uses the current name (So no need for full name history), so I moved name lookups to [PlayerDB](https://playerdb.co/), which does not have API rate limits unlike Mojang's API. closes #59 --- .../api/util/uuid/NameFetcher.java | 69 +++++++++---------- .../api/util/uuid/UUIDTranslator.java | 12 +--- .../minecraft/redisbungee/RedisBungee.java | 2 +- .../RedisBungeeVelocityPlugin.java | 2 +- 4 files changed, 39 insertions(+), 46 deletions(-) diff --git a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/uuid/NameFetcher.java b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/uuid/NameFetcher.java index 2080a27..69eb689 100644 --- a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/uuid/NameFetcher.java +++ b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/uuid/NameFetcher.java @@ -11,50 +11,49 @@ package com.imaginarycode.minecraft.redisbungee.api.util.uuid; import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.google.gson.JsonObject; import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.Request; import com.squareup.okhttp.ResponseBody; + import java.io.IOException; -import java.lang.reflect.Type; -import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.UUID; -@Deprecated public class NameFetcher { - private static OkHttpClient httpClient; - private static final Gson gson = new Gson(); + private static OkHttpClient httpClient; + private static final Gson gson = new Gson(); - @Deprecated - public static void setHttpClient(OkHttpClient httpClient) { - throw new UnsupportedOperationException("Due mojang disabled the Names API NameFetcher no longer functions and has been disabled"); - // NameFetcher.httpClient = httpClient; - } + public static void setHttpClient(OkHttpClient httpClient) { + NameFetcher.httpClient = httpClient; + } - @Deprecated - public static List nameHistoryFromUuid(UUID uuid) throws IOException { - throw new UnsupportedOperationException("Due mojang disabled the Names API NameFetcher no longer functions and has been disabled"); -// String url = "https://api.mojang.com/user/profiles/" + uuid.toString().replace("-", "") + "/names"; -// Request request = new Request.Builder().url(url).get().build(); -// ResponseBody body = httpClient.newCall(request).execute().body(); -// String response = body.string(); -// body.close(); -// -// Type listType = new TypeToken>() { -// }.getType(); -// List names = gson.fromJson(response, listType); -// -// List humanNames = new ArrayList<>(); -// for (Name name : names) { -// humanNames.add(name.name); -// } -// return humanNames; - } + public static List nameHistoryFromUuid(UUID uuid) throws IOException { + String name = getName(uuid); + if (name == null) return Collections.emptyList(); + return Collections.singletonList(name); + } - @Deprecated - public static class Name { - private String name; - private long changedToAt; - } + public static String getName(UUID uuid) throws IOException { + String url = "https://playerdb.co/api/player/minecraft/" + uuid.toString(); + Request request = new Request.Builder() + .addHeader("User-Agent", "RedisBungee-ProxioDev") + .url(url) + .get() + .build(); + ResponseBody body = httpClient.newCall(request).execute().body(); + String response = body.string(); + body.close(); + + JsonObject json = gson.fromJson(response, JsonObject.class); + if (!json.has("success") || !json.get("success").getAsBoolean()) return null; + if (!json.has("data")) return null; + JsonObject data = json.getAsJsonObject("data"); + if (!data.has("player")) return null; + JsonObject player = data.getAsJsonObject("player"); + if (!player.has("username")) return null; + + return player.get("username").getAsString(); + } } \ No newline at end of file diff --git a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/uuid/UUIDTranslator.java b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/uuid/UUIDTranslator.java index 663d1cf..7453074 100644 --- a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/uuid/UUIDTranslator.java +++ b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/uuid/UUIDTranslator.java @@ -12,7 +12,6 @@ package com.imaginarycode.minecraft.redisbungee.api.util.uuid; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; import com.google.gson.Gson; import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin; @@ -169,17 +168,12 @@ public final class UUIDTranslator { if (!expensiveLookups || !plugin.isOnlineMode()) return null; - // That didn't work. Let's ask Mojang. This call may fail, because Mojang is insane. - // - // UPDATE: Mojang has removed the API somewhere in september/2022 due privacy issues - // this is expected to fail now, so we will keep logging it until we figure out something or remove name fetching completely - // Name fetching class was deprecated as result + // That didn't work. Let's ask PlayerDB. String name; try { - plugin.logFatal("Due Mojang removing the naming API, we were unable to fetch player names."); - name = Iterables.getLast(NameFetcher.nameHistoryFromUuid(player)); + name = NameFetcher.getName(player); } catch (Exception e) { - plugin.logFatal("Unable to fetch name from Mojang for " + player); + plugin.logFatal("Unable to fetch name from PlayerDB for " + player); return null; } diff --git a/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java b/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java index 8131b41..f540ab6 100644 --- a/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java +++ b/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java @@ -223,7 +223,7 @@ public class RedisBungee extends Plugin implements RedisBungeePlugin, Con this.httpClient = new OkHttpClient(); Dispatcher dispatcher = new Dispatcher(Executors.newFixedThreadPool(6)); this.httpClient.setDispatcher(dispatcher); - //NameFetcher.setHttpClient(httpClient); + NameFetcher.setHttpClient(httpClient); UUIDFetcher.setHttpClient(httpClient); }