Skip to content

Changes for Taggable and MojangProfileAPI #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tecc wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Changes for Taggable and MojangProfileAPI #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
091c216
fix(Taggable): Use both type parameters for Taggable
tecc Jul 24, 2023
3a57677
change(MojangProfileAPI): Clean up MojangProfileAPI
tecc Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/main/java/com/marcusslover/plus/lib/common/Taggable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,12 @@ public boolean hasTag(@NotNull String key, @NotNull PersistentDataType<?, ?> typ
return p.has(n, type);
}

// Alias for setTag()
public @NotNull <K> V tag(@NotNull String key, @NotNull K value, @NotNull PersistentDataType<K, K> type) {
/**
* Alias for {@link #setTag(String, Object, PersistentDataType)}.
*
* @see #setTag(String, Object, PersistentDataType)
*/
public @NotNull <T, Z> V tag(@NotNull String key, @NotNull Z value, @NotNull PersistentDataType<T, Z> type) {
return this.setTag(key, value, type);
}

Expand All @@ -51,10 +55,11 @@ public boolean hasTag(@NotNull String key, @NotNull PersistentDataType<?, ?> typ
* @param key The key of the tag.
* @param value The value of the tag.
* @param type The type of the value. You can use {@link DataType} for all the default types.
* @param <K> The type of the value.
* @param <T> The type that is serialised to NBT.
* @param <Z> The type that's used in code.
* @return The holder.
*/
public @NotNull <K> V setTag(@NotNull String key, @NotNull K value, @NotNull PersistentDataType<K, K> type) {
public @NotNull <T, Z> V setTag(@NotNull String key, @NotNull Z value, @NotNull PersistentDataType<T, Z> type) {
this.holder().meta(itemMeta -> {
PersistentDataContainer p = itemMeta.getPersistentDataContainer();
NamespacedKey n = new NamespacedKey("plus", key);
Expand All @@ -74,10 +79,11 @@ public boolean hasTag(@NotNull String key, @NotNull PersistentDataType<?, ?> typ
*
* @param key The key of the tag.
* @param type The type of the value. You can use {@link DataType} for all the default types.
* @param <K> The type of the value.
* @param <T> The type that is serialised to NBT.
* @param <Z> The type that's used in code.
* @return The optional value of the tag. If the item doesn't have the tag, the optional will be empty.
*/
public @NotNull <K> Optional<K> getTag(@NotNull String key, @NotNull PersistentDataType<K, K> type) {
public @NotNull <T, Z> Optional<Z> getTag(@NotNull String key, @NotNull PersistentDataType<T, Z> type) {
if (this.holder().meta() == null) {
return Optional.empty();
}
Expand Down
130 changes: 109 additions & 21 deletions src/main/java/com/marcusslover/plus/lib/mojang/MojangProfileAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import lombok.Data;
import lombok.SneakyThrows;
import org.bukkit.Bukkit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -43,6 +44,17 @@ private MojangProfileAPI() {
private static @NotNull Optional<MojangProfile> searchByUsername(@NotNull String username) {
return CACHED_PROFILE_MAP.values().stream().filter(mojangProfile -> mojangProfile.getName().equals(username)).findFirst();
}
/**
* Gets the cached profile of a player.
* This function does not call the Mojang API. It only returns the cached profile.
*
* @param uuid The UUID of the player.
* @return The cached profile of the player. If the player is not cached, then an empty optional is returned.
*/
private static @NotNull Optional<MojangProfile> searchByUuid(@NotNull UUID uuid) {
return CACHED_PROFILE_MAP.values().stream().filter(mojangProfile -> mojangProfile.getUuid().equals(uuid)).findFirst();
}


/**
* Cleans the cache of a player.
Expand All @@ -53,21 +65,10 @@ public static void clean(@NotNull UUID uuid) {
CACHED_PROFILE_MAP.remove(uuid);
}

/**
* Gets the UUID of a player from their username.
* This function is asynchronous and will return a {@link CompletableFuture}
* that will be completed when the UUID is retrieved.
*
* @param username The username of the player.
* @return The UUID of the player.
*/
public static @NotNull CompletableFuture<@Nullable MojangProfile> getUniqueId(@NotNull String username) {
// Check if the username is in the cache
Optional<MojangProfile> cachedProfile = searchByUsername(username);
return cachedProfile.map(CompletableFuture::completedFuture).orElseGet(() -> CompletableFuture.supplyAsync(() -> {
private static @NotNull CompletableFuture<@Nullable JsonObject> makeJsonRequest(URL url) {
return CompletableFuture.supplyAsync(() -> {
try {
// Create a connection to the Mojang API
URL url = new URL("https://api.mojang.com/users/profiles/minecraft/" + username + "?at=" + System.currentTimeMillis());
URLConnection urlConnection = url.openConnection();
HttpURLConnection httpURLConnection = (HttpURLConnection) urlConnection;
httpURLConnection.setRequestMethod("GET");
Expand All @@ -84,11 +85,76 @@ public static void clean(@NotNull UUID uuid) {

// Parse the response
JsonElement jsonElement = JsonParser.parseString(content.toString());
if (!jsonElement.isJsonObject()) {
throw new RuntimeException("Invalid response from Mojang API");
}
return jsonElement.getAsJsonObject();
} catch (Throwable t) {
t.printStackTrace();
return null;
}
});
}

/**
* Gets the UUID of a player from their username.
* This function is asynchronous and will return a {@link CompletableFuture}
* that will be completed when the UUID is retrieved.
*
* @param username The username of the player.
* @return The UUID of the player.
*/
public static @NotNull CompletableFuture<@Nullable MojangProfile> getUniqueId(@NotNull String username) {
// Check if the username is in the cache
Optional<MojangProfile> cachedProfile = searchByUsername(username);
return cachedProfile.map(CompletableFuture::completedFuture).orElseGet(() -> fetchProfileByUsername(username));
}

JsonObject json = jsonElement.getAsJsonObject();
/**
* Gets the username of a player based on their UUID.
* This function is asynchronous and will return a {@link CompletableFuture}
* that will be completed when the UUID is retrieved.
*
* @param uuid The UUID of the player.
* @return The username of the player.
*/
public static @NotNull CompletableFuture<@Nullable MojangProfile> getUsername(@NotNull UUID uuid) {
Optional<MojangProfile> cachedProfile = searchByUuid(uuid);
return cachedProfile.map(CompletableFuture::completedFuture).orElseGet(() -> fetchProfileByUuid(uuid));
}

/**
* Fetches the profile of a player from the player's UUID.
* This method bypasses the cache, but it does still update it.
* @param uuid The UUID to fetch the profile for.
* @return The newly-fetched profile.
*/
@SneakyThrows
public static @NotNull CompletableFuture<@Nullable MojangProfile> fetchProfileByUuid(@NotNull UUID uuid) {
URL url = new URL("https://sessionserver.mojang.com/session/minecraft/profile/" + uuidToString(uuid));
return makeJsonRequest(url).thenApply((json) -> {
if (json == null) return null;
try {
String name = json.get("name").getAsString();
MojangProfile mojangProfile = new MojangProfile(uuid, name, System.currentTimeMillis());
CACHED_PROFILE_MAP.put(uuid, mojangProfile);
return mojangProfile;
} catch (Throwable t) {
t.printStackTrace();
return null;
}
});
}

/**
* Fetches the profile of a player from the player's username.
* This method bypasses the cache, but it does still update it.
* @param username The username to fetch the profile for.
* @return The newly-fetched profile.
*/
@SneakyThrows
public static @NotNull CompletableFuture<@Nullable MojangProfile> fetchProfileByUsername(@NotNull String username) {
URL url = new URL("https://api.mojang.com/users/profiles/minecraft/" + username);
return makeJsonRequest(url).thenApply((json) -> {
if (json == null) return null;
try {
if (!json.has("id")) {
throw new RuntimeException("Invalid response from Mojang API");
}
Expand All @@ -97,7 +163,7 @@ public static void clean(@NotNull UUID uuid) {

// Convert the UUID to a UUID object
try {
uuid = UUID.fromString(id.replaceFirst("(\\p{XDigit}{8})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}+)", "$1-$2-$3-$4-$5"));
uuid = parseUuid(id);
} catch (IllegalArgumentException e) {
throw new RuntimeException("Could not parse UUID from Mojang API response", e);
}
Expand All @@ -110,12 +176,34 @@ public static void clean(@NotNull UUID uuid) {

// Return the profile
return mojangProfile;
} catch (Exception e) {
e.printStackTrace();
} catch (Throwable t) {
t.printStackTrace();
return null;
}
}));
});
}


/**
* Translate a UUID from the style used in the Mojang API to the one used by Java.
* @param uuid The UUID to translate. This should be in a dashless form.
* @return The UUID.
* @see UUID#fromString(String)
* @see #uuidToString(UUID)
*/
public static UUID parseUuid(String uuid) {
var translated = uuid.replaceFirst("(\\p{XDigit}{8})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}+)", "$1-$2-$3-$4-$5");
return UUID.fromString(translated);
}

/**
* Translate a UUID from the style used in Java to the one used in the Mojang API.
* @param uuid The UUID to translate.
* @return The dashless UUID.
* @see #parseUuid(String)
*/
public static String uuidToString(UUID uuid) {
return uuid.toString().replace("-", "");
}

/**
Expand Down