feat: initial work on porting xseries to 11.0.0

Author: darbyjack

build.gradle.kts

@@ -58,17 +58,18 @@ dependencies {
     implementation("org.codemc.worldguardwrapper:worldguardwrapper:1.1.9-SNAPSHOT")
     implementation("ch.jalu:configme:1.3.0")
     implementation("com.dumptruckman.minecraft:JsonConfiguration:1.1")
-    implementation("com.github.cryptomorin:XSeries:11.0.0-beta")
+    implementation("com.github.cryptomorin:XSeries:11.0.0")
     implementation("net.kyori:adventure-platform-bukkit:4.3.3")
     implementation("dev.triumphteam:triumph-gui:3.1.7")
     implementation("com.zaxxer:HikariCP:4.0.3")
     implementation("org.jdbi:jdbi3-core:3.8.2")
     implementation("org.jdbi:jdbi3-sqlobject:3.8.2")
     implementation("org.mariadb.jdbc:mariadb-java-client:2.7.2")
 
-    compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
     compileOnly("net.milkbowl:vault:1.7")
     compileOnly("me.clip:placeholderapi:2.11.6")
+    compileOnly("com.mojang:authlib:1.5.21")
 
     slim("org.jetbrains.kotlin:kotlin-stdlib")
 }
@@ -169,6 +170,7 @@ tasks {
             "org.mariadb.jdbc",
             "dev.triumphteam.gui",
             "net.kyori",
+            "com.cryptomorin.xseries",
             "kotlin"
         )
     }

src/main/java/me/glaremasters/guilds/guild/GuildSkull.java

@@ -23,12 +23,11 @@
  */
 package me.glaremasters.guilds.guild;
 
-import com.cryptomorin.xseries.XMaterial;
 import com.cryptomorin.xseries.XSkull;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.SkullMeta;
 
+import java.util.Base64;
 import java.util.Objects;
 
 /**
@@ -44,7 +43,10 @@ public class GuildSkull {
      * @param player the player whose head will be used for the guild skull
      */
     public GuildSkull(Player player) {
-        itemStack = XSkull.getSkull(player.getUniqueId());
+        final XSkull.SkullInstruction<ItemStack> skullInstruction = XSkull.create();
+        final XSkull.SkullAction<ItemStack> skullAction = skullInstruction.profile(player);
+
+        itemStack = skullAction.apply();
         serialized = XSkull.getSkinValue(Objects.requireNonNull(itemStack.getItemMeta()));
     }
 
@@ -54,8 +56,10 @@ public GuildSkull(Player player) {
      * @param texture the texture string, which should be a Minecraft resource location string
      */
     public GuildSkull(String texture) {
-        serialized = XSkull.encodeTexturesURL(texture);
-        itemStack = createSkull();
+        final String encoded = Base64.getEncoder().encodeToString(texture.getBytes());
+        this.serialized = encoded;
+
+        this.itemStack = createSkull();
     }
 
     /**
@@ -64,11 +68,10 @@ public GuildSkull(String texture) {
      * @return the guild skull
      */
     public ItemStack createSkull() {
-        final ItemStack head = XMaterial.PLAYER_HEAD.parseItem();
-        SkullMeta meta = (SkullMeta) head.getItemMeta();
-        meta = XSkull.applySkin(meta, serialized);
-        head.setItemMeta(meta);
-        return head;
+        final XSkull.SkullInstruction<ItemStack> skullInstruction = XSkull.create();
+        final XSkull.SkullAction<ItemStack> skullAction = skullInstruction.profile(serialized);
+
+        return skullAction.apply();
     }
 
     /**

src/main/java/me/glaremasters/guilds/listeners/EntityListener.java

@@ -24,6 +24,7 @@
 package me.glaremasters.guilds.listeners;
 
 import ch.jalu.configme.SettingsManager;
+import com.cryptomorin.xseries.XPotion;
 import me.glaremasters.guilds.challenges.ChallengeHandler;
 import me.glaremasters.guilds.configuration.sections.GuildSettings;
 import me.glaremasters.guilds.guild.Guild;
@@ -43,11 +44,6 @@
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.PotionSplashEvent;
 import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
 
 /**
  * Created by GlareMasters
@@ -59,7 +55,6 @@ public class EntityListener implements Listener {
     private final GuildHandler guildHandler;
     private final SettingsManager settingsManager;
     private final ChallengeHandler challengeHandler;
-    private final Set<PotionEffectType> bad = new HashSet<>(Arrays.asList(PotionEffectType.BLINDNESS, PotionEffectType.WITHER, PotionEffectType.SLOW_DIGGING, PotionEffectType.WEAKNESS, PotionEffectType.SLOW, PotionEffectType.POISON));
 
     public EntityListener(GuildHandler guildHandler, SettingsManager settingsManager, ChallengeHandler challengeHandler) {
         this.guildHandler = guildHandler;
@@ -262,7 +257,7 @@ public void onSplash(PotionSplashEvent event) {
      */
     private boolean isHarmfulPotion(final ThrownPotion potion) {
         for (final PotionEffect effect : potion.getEffects()) {
-            if (bad.contains(effect.getType())) {
+            if (XPotion.DEBUFFS.contains(XPotion.matchXPotion(effect.getType()))) {
                 return true;
             }
         }

src/main/java/me/glaremasters/guilds/utils/GuiUtils.java

@@ -73,15 +73,20 @@ public static ItemStack createItem(String material, String name, List<String> lo
      * @return the skull item
      */
     public static ItemStack createSkullItem(final GuildMember member, final String name, final List<String> lore) {
-        final ItemStack skull = XSkull.getSkull(member.getUuid());
-        final ItemMeta meta = skull.getItemMeta();
+        final XSkull.SkullInstruction<ItemStack> skullInstruction = XSkull.create();
+        final XSkull.SkullAction<ItemStack> skullAction = skullInstruction.profile(member.getUuid());
+
+        final ItemStack itemStack = skullAction.apply();
+        final ItemMeta meta = itemStack.getItemMeta();
 
         meta.setDisplayName(StringUtils.color(name));
         if (!lore.isEmpty()) {
             meta.setLore(lore.stream().map(StringUtils::color).collect(Collectors.toList()));
         }
+
         meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
-        skull.setItemMeta(meta);
-        return skull;
+        itemStack.setItemMeta(meta);
+
+        return itemStack;
     }
 }