From da3620df029eea4b9b0fe3d80565707965e07ef0 Mon Sep 17 00:00:00 2001 From: Archy-X <63976867+Archy-X@users.noreply.github.com> Date: Fri, 6 Sep 2024 12:05:56 -0400 Subject: [PATCH] Fix error loading menu on Spigot 1.21 --- api-bukkit/build.gradle.kts | 4 +- .../bukkit/util/ConfigurateItemParser.java | 1 + .../auraskills/bukkit/util/SkullCreator.java | 329 ------------------ 3 files changed, 3 insertions(+), 331 deletions(-) delete mode 100644 bukkit/src/main/java/dev/aurelium/auraskills/bukkit/util/SkullCreator.java diff --git a/api-bukkit/build.gradle.kts b/api-bukkit/build.gradle.kts index 35e1a9ebc..13cfdbed5 100644 --- a/api-bukkit/build.gradle.kts +++ b/api-bukkit/build.gradle.kts @@ -15,11 +15,11 @@ repositories { dependencies { api(project(":api")) - api("dev.aurelium:slate:1.1.7") { + api("dev.aurelium:slate:1.1.8") { exclude("org.yaml", "snakeyaml") exclude("org.spongepowered", "configurate-yaml") } - // api(files("../../Slate/build/libs/Slate-1.1.7.jar")) + // api(files("../../Slate/build/libs/Slate-1.1.8-all.jar")) compileOnly("org.jetbrains:annotations:24.1.0") compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT") } diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/util/ConfigurateItemParser.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/util/ConfigurateItemParser.java index 9456f49cf..4c598d351 100644 --- a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/util/ConfigurateItemParser.java +++ b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/util/ConfigurateItemParser.java @@ -16,6 +16,7 @@ import dev.aurelium.slate.position.FixedPosition; import dev.aurelium.slate.position.GroupPosition; import dev.aurelium.slate.position.PositionProvider; +import dev.aurelium.slate.util.SkullCreator; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.NamespacedKey; diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/util/SkullCreator.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/util/SkullCreator.java deleted file mode 100644 index 6d2176286..000000000 --- a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/util/SkullCreator.java +++ /dev/null @@ -1,329 +0,0 @@ -package dev.aurelium.auraskills.bukkit.util; - -// Copyright (c) 2017 deanveloper (see LICENSE.md for more info) - -import com.mojang.authlib.GameProfile; -import com.mojang.authlib.properties.Property; -import org.bukkit.Bukkit; -import org.bukkit.Material; -import org.bukkit.SkullType; -import org.bukkit.block.Block; -import org.bukkit.block.Skull; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.SkullMeta; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Base64; -import java.util.UUID; - -/** - * A library for the Bukkit API to create player skulls - * from names, base64 strings, and texture URLs. - *

- * Does not use any NMS code, and should work across all versions. - * - * @author deanveloper on 12/28/2016. - */ -public class SkullCreator { - - private SkullCreator() {} - - private static boolean warningPosted = false; - - // some reflection stuff to be used when setting a skull's profile - private static Field blockProfileField; - private static Method metaSetProfileMethod; - private static Field metaProfileField; - - /** - * Creates a player skull, should work in both legacy and new Bukkit APIs. - */ - @SuppressWarnings("deprecation") - public static ItemStack createSkull() { - checkLegacy(); - - try { - return new ItemStack(Material.valueOf("PLAYER_HEAD")); - } catch (IllegalArgumentException e) { - return new ItemStack(Material.valueOf("SKULL_ITEM"), 1, (byte) 3); - } - } - - /** - * Creates a player skull item with the skin based on a player's name. - * - * @param name The Player's name. - * @return The head of the Player. - * @deprecated names don't make for good identifiers. - */ - @Deprecated - public static ItemStack itemFromName(String name) { - return itemWithName(createSkull(), name); - } - - /** - * Creates a player skull item with the skin based on a player's UUID. - * - * @param id The Player's UUID. - * @return The head of the Player. - */ - public static ItemStack itemFromUuid(UUID id) { - return itemWithUuid(createSkull(), id); - } - - /** - * Creates a player skull item with the skin at a Mojang URL. - * - * @param url The Mojang URL. - * @return The head of the Player. - */ - public static ItemStack itemFromUrl(String url) { - return itemWithUrl(createSkull(), url); - } - - /** - * Creates a player skull item with the skin based on a base64 string. - * - * @param base64 The Base64 string. - * @return The head of the Player. - */ - public static ItemStack itemFromBase64(String base64) { - return itemWithBase64(createSkull(), base64); - } - - /** - * Modifies a skull to use the skin of the player with a given name. - * - * @param item The item to apply the name to. Must be a player skull. - * @param name The Player's name. - * @return The head of the Player. - * @deprecated names don't make for good identifiers. - */ - @Deprecated - public static ItemStack itemWithName(ItemStack item, String name) { - notNull(item, "item"); - notNull(name, "name"); - - SkullMeta meta = (SkullMeta) item.getItemMeta(); - if (meta != null) { - meta.setOwner(name); - item.setItemMeta(meta); - } - - return item; - } - - /** - * Modifies a skull to use the skin of the player with a given UUID. - * - * @param item The item to apply the name to. Must be a player skull. - * @param id The Player's UUID. - * @return The head of the Player. - */ - public static ItemStack itemWithUuid(ItemStack item, UUID id) { - notNull(item, "item"); - notNull(id, "id"); - - SkullMeta meta = (SkullMeta) item.getItemMeta(); - if (meta != null) { - meta.setOwningPlayer(Bukkit.getOfflinePlayer(id)); - item.setItemMeta(meta); - } - - return item; - } - - /** - * Modifies a skull to use the skin at the given Mojang URL. - * - * @param item The item to apply the skin to. Must be a player skull. - * @param url The URL of the Mojang skin. - * @return The head associated with the URL. - */ - public static ItemStack itemWithUrl(ItemStack item, String url) { - notNull(item, "item"); - notNull(url, "url"); - - return itemWithBase64(item, urlToBase64(url)); - } - - /** - * Modifies a skull to use the skin based on the given base64 string. - * - * @param item The ItemStack to put the base64 onto. Must be a player skull. - * @param base64 The base64 string containing the texture. - * @return The head with a custom texture. - */ - public static ItemStack itemWithBase64(ItemStack item, String base64) { - notNull(item, "item"); - notNull(base64, "base64"); - - if (!(item.getItemMeta() instanceof SkullMeta meta)) { - return null; - } - mutateItemMeta(meta, base64); - item.setItemMeta(meta); - - return item; - } - - /** - * Sets the block to a skull with the given name. - * - * @param block The block to set. - * @param name The player to set it to. - * @deprecated names don't make for good identifiers. - */ - @Deprecated - public static void blockWithName(Block block, String name) { - notNull(block, "block"); - notNull(name, "name"); - - Skull state = (Skull) block.getState(); - state.setOwningPlayer(Bukkit.getOfflinePlayer(name)); - state.update(false, false); - } - - /** - * Sets the block to a skull with the given UUID. - * - * @param block The block to set. - * @param id The player to set it to. - */ - public static void blockWithUuid(Block block, UUID id) { - notNull(block, "block"); - notNull(id, "id"); - - setToSkull(block); - Skull state = (Skull) block.getState(); - state.setOwningPlayer(Bukkit.getOfflinePlayer(id)); - state.update(false, false); - } - - /** - * Sets the block to a skull with the skin found at the provided mojang URL. - * - * @param block The block to set. - * @param url The mojang URL to set it to use. - */ - public static void blockWithUrl(Block block, String url) { - notNull(block, "block"); - notNull(url, "url"); - - blockWithBase64(block, urlToBase64(url)); - } - - /** - * Sets the block to a skull with the skin for the base64 string. - * - * @param block The block to set. - * @param base64 The base64 to set it to use. - */ - public static void blockWithBase64(Block block, String base64) { - notNull(block, "block"); - notNull(base64, "base64"); - - setToSkull(block); - Skull state = (Skull) block.getState(); - mutateBlockState(state, base64); - state.update(false, false); - } - - @SuppressWarnings("deprecation") - private static void setToSkull(Block block) { - checkLegacy(); - - try { - block.setType(Material.valueOf("PLAYER_HEAD"), false); - } catch (IllegalArgumentException e) { - block.setType(Material.valueOf("SKULL"), false); - Skull state = (Skull) block.getState(); - state.setSkullType(SkullType.PLAYER); - state.update(false, false); - } - } - - private static void notNull(Object o, String name) { - if (o == null) { - throw new NullPointerException(name + " should not be null!"); - } - } - - private static String urlToBase64(String url) { - - URI actualUrl; - try { - actualUrl = new URI(url); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } - String toEncode = "{\"textures\":{\"SKIN\":{\"url\":\"" + actualUrl + "\"}}}"; - return Base64.getEncoder().encodeToString(toEncode.getBytes()); - } - - private static GameProfile makeProfile(String b64) { - // random uuid based on the b64 string - UUID id = new UUID( - b64.substring(b64.length() - 20).hashCode(), - b64.substring(b64.length() - 10).hashCode() - ); - GameProfile profile = new GameProfile(id, "Player"); - profile.getProperties().put("textures", new Property("textures", b64)); - return profile; - } - - private static void mutateBlockState(Skull block, String b64) { - try { - if (blockProfileField == null) { - blockProfileField = block.getClass().getDeclaredField("profile"); - blockProfileField.setAccessible(true); - } - blockProfileField.set(block, makeProfile(b64)); - } catch (NoSuchFieldException | IllegalAccessException e) { - e.printStackTrace(); - } - } - - private static void mutateItemMeta(SkullMeta meta, String b64) { - try { - if (metaSetProfileMethod == null) { - metaSetProfileMethod = meta.getClass().getDeclaredMethod("setProfile", GameProfile.class); - metaSetProfileMethod.setAccessible(true); - } - metaSetProfileMethod.invoke(meta, makeProfile(b64)); - } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { - // if in an older API where there is no setProfile method, - // we set the profile field directly. - try { - if (metaProfileField == null) { - metaProfileField = meta.getClass().getDeclaredField("profile"); - metaProfileField.setAccessible(true); - } - metaProfileField.set(meta, makeProfile(b64)); - - } catch (NoSuchFieldException | IllegalAccessException ex2) { - ex2.printStackTrace(); - } - } - } - - // suppress warning since PLAYER_HEAD doesn't exist in 1.12.2, - // but we expect this and catch the error at runtime. - private static void checkLegacy() { - try { - // if both of these succeed, then we are running - // in a legacy api, but on a modern (1.13+) server. - Material.class.getDeclaredField("PLAYER_HEAD"); - Material.valueOf("SKULL"); - - if (!warningPosted) { - Bukkit.getLogger().warning("SKULLCREATOR API - Using the legacy bukkit API with 1.13+ bukkit versions is not supported!"); - warningPosted = true; - } - } catch (NoSuchFieldException | IllegalArgumentException ignored) {} - } -} \ No newline at end of file