bring more of the old SkullModifier

Author: HSGamer

src/main/java/me/hsgamer/bettergui/modifier/SkullModifier.java

@@ -2,7 +2,6 @@
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
-import me.hsgamer.hscore.bukkit.item.modifier.ItemMetaComparator;
 import me.hsgamer.hscore.bukkit.item.modifier.ItemMetaModifier;
 import me.hsgamer.hscore.bukkit.utils.VersionUtils;
 import me.hsgamer.hscore.common.StringReplacer;
@@ -13,6 +12,8 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
+import org.bukkit.profile.PlayerProfile;
+import org.bukkit.profile.PlayerTextures;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -28,13 +29,13 @@
  * I decide to keep it here for compatibility.
  */
 @SuppressWarnings("deprecation")
-public class SkullModifier implements ItemMetaModifier, ItemMetaComparator {
+public class SkullModifier implements ItemMetaModifier {
   /**
    * <a href="https://github.com/CryptoMorin/XSeries/blob/b633d00608435701f1045a566b98a81edd5f923c/src/main/java/com/cryptomorin/xseries/profiles/objects/ProfileInputType.java#L29C35-L29C50">...</a>
    */
   private static final Pattern MOJANG_SHA256_APPROX = Pattern.compile("[0-9a-z]{55,70}");
   private static final SkullMeta delegateSkullMeta;
-  private static final SkullHandler skullHandler = new SkullHandler();
+  private static final SkullHandler skullHandler = getSkullHandler();
   private static final Map<String, GameProfile> cache = new ConcurrentHashMap<>();
 
   static {
@@ -50,6 +51,15 @@ public class SkullModifier implements ItemMetaModifier, ItemMetaComparator {
 
   private String skullString = "";
 
+  private static SkullHandler getSkullHandler() {
+    try {
+      Class.forName("org.bukkit.profile.PlayerProfile");
+      return new NewSkullHandler();
+    } catch (ClassNotFoundException e) {
+      return new OldSkullHandler();
+    }
+  }
+
   private static void setSkull(SkullMeta meta, String skull) {
     Optional<URL> url = Validate.getURL(skull);
     if (url.isPresent()) {
@@ -95,17 +105,6 @@ public boolean loadFromItemMeta(ItemMeta meta) {
     return false;
   }
 
-  @Override
-  public boolean compare(@NotNull ItemMeta meta, @Nullable UUID uuid, @NotNull StringReplacer stringReplacer) {
-    if (!(meta instanceof SkullMeta)) {
-      return false;
-    }
-    return skullHandler.compareSkull(
-      getSkullMeta(stringReplacer.replaceOrOriginal(skullString, uuid)),
-      (SkullMeta) meta
-    );
-  }
-
   @Override
   public Object toObject() {
     return skullString;
@@ -116,10 +115,35 @@ public void loadFromObject(Object object) {
     this.skullString = String.valueOf(object);
   }
 
-  private static class SkullHandler {
+  private interface SkullHandler {
+    @SuppressWarnings("deprecation")
+    default void setSkullByName(SkullMeta meta, String name) {
+      setSkullByPlayer(meta, Bukkit.getOfflinePlayer(name));
+    }
+
+    default void setSkullByUUID(SkullMeta meta, UUID uuid) {
+      setSkullByPlayer(meta, Bukkit.getOfflinePlayer(uuid));
+    }
+
+    void setSkullByPlayer(SkullMeta meta, OfflinePlayer player);
+
+    void setSkullByURL(SkullMeta meta, URL url);
+
+    default void setSkullByURL(SkullMeta meta, String url) {
+      try {
+        setSkullByURL(meta, new URL(url));
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    }
+
+    String getSkullValue(SkullMeta meta);
+  }
+
+  private static class OldSkullHandler implements SkullHandler {
     private final Method getProfileMethod;
 
-    private SkullHandler() {
+    private OldSkullHandler() {
       Method method = null;
       try {
         //noinspection JavaReflectionMemberAccess
@@ -135,23 +159,8 @@ private SkullHandler() {
       getProfileMethod = method;
     }
 
-    public void setSkullByName(SkullMeta meta, String name) {
-      setSkullByPlayer(meta, Bukkit.getOfflinePlayer(name));
-    }
-
-    public void setSkullByUUID(SkullMeta meta, UUID uuid) {
-      setSkullByPlayer(meta, Bukkit.getOfflinePlayer(uuid));
-    }
-
-    public void setSkullByURL(SkullMeta meta, String url) {
-      try {
-        setSkullByURL(meta, new URL(url));
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    }
-
     @SuppressWarnings("deprecation")
+    @Override
     public void setSkullByPlayer(SkullMeta meta, OfflinePlayer player) {
       if (VersionUtils.isAtLeast(12)) {
         meta.setOwningPlayer(player);
@@ -160,6 +169,7 @@ public void setSkullByPlayer(SkullMeta meta, OfflinePlayer player) {
       }
     }
 
+    @Override
     public void setSkullByURL(SkullMeta meta, URL url) {
       GameProfile profile = cache.computeIfAbsent(url.toString(), s -> {
         GameProfile gameProfile = new GameProfile(UUID.randomUUID(), "");
@@ -182,6 +192,7 @@ public void setSkullByURL(SkullMeta meta, URL url) {
       }
     }
 
+    @Override
     public String getSkullValue(SkullMeta meta) {
       GameProfile profile;
       try {
@@ -211,9 +222,41 @@ public String getSkullValue(SkullMeta meta) {
       }
       return "";
     }
+  }
+
+  private static class NewSkullHandler implements SkullHandler {
+    private final Map<URL, PlayerProfile> profileMap = new HashMap<>();
+
+    @Override
+    public void setSkullByPlayer(SkullMeta meta, OfflinePlayer player) {
+      meta.setOwningPlayer(player);
+    }
+
+    @Override
+    public void setSkullByURL(SkullMeta meta, URL url) {
+      PlayerProfile profile = profileMap.computeIfAbsent(url, url1 -> {
+        PlayerProfile newProfile = Bukkit.createPlayerProfile(UUID.randomUUID(), "");
+        PlayerTextures textures = newProfile.getTextures();
+        textures.setSkin(url1);
+        return newProfile;
+      });
+      meta.setOwnerProfile(profile);
+    }
+
+    @Override
+    public String getSkullValue(SkullMeta meta) {
+      PlayerProfile profile = meta.getOwnerProfile();
+      if (profile == null) {
+        return "";
+      }
+
+      PlayerTextures textures = profile.getTextures();
+      URL url = textures.getSkin();
+      if (url == null) {
+        return "";
+      }
 
-    public boolean compareSkull(SkullMeta meta1, SkullMeta meta2) {
-      return getSkullValue(meta1).equals(getSkullValue(meta2));
+      return url.toString();
     }
   }
 }