add support for 1.21.4, fix slimefun api breaking changes

pom.xml

@@ -8,8 +8,8 @@
     <version>UNOFFICIAL</version>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -58,7 +58,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.3.0</version>
 
                 <configuration>
 
@@ -97,14 +97,14 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <version>1.21.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.github.TheBusyBiscuit</groupId>
             <artifactId>Slimefun4</artifactId>
-            <version>RC-27</version>
+            <version>experimental-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -117,7 +117,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>2.2.1</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
 
@@ -128,4 +128,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-</project>
+</project>

src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPets.java

@@ -40,7 +40,7 @@ public void onEnable() {
             new GitHubBuildsUpdater(this, getFile(), "TheBusyBiscuit/HotbarPets/master").start();
         }
 
-        itemGroup = new ItemGroup(new NamespacedKey(this, "pets"), new CustomItemStack(PetTexture.CATEGORY.getAsItem(), "&dHotbar Pets", "", "&a> Click to open"));
+        itemGroup = new ItemGroup(new NamespacedKey(this, "pets"), CustomItemStack.create(PetTexture.CATEGORY.getAsItem(), "&dHotbar Pets", "", "&a> Click to open"));
 
         // Add all the Pets via their Group class
         new FarmAnimals(this);

src/main/java/io/github/thebusybiscuit/hotbarpets/groups/BossMobs.java

@@ -27,14 +27,14 @@ public void load(HotbarPets plugin) {
         // @formatter:off
         new EnderDragonPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_DRAGON", Material.DRAGON_HEAD, "&5Ender Dragon Pet", getName(), "&7Favourite Food: Eyes Of Ender", "", "&fRight-Click: &7Shoots Dragon Fireball & Gives Resistance"), new ItemStack(Material.ENDER_EYE), new ItemStack[]{
                 new ItemStack(Material.PRISMARINE_CRYSTALS), new ItemStack(Material.DRAGON_BREATH), new ItemStack(Material.PRISMARINE_CRYSTALS),
-                SlimefunItems.ENDER_LUMP_3, new ItemStack(Material.DRAGON_HEAD), SlimefunItems.ENDER_LUMP_3,
+                SlimefunItems.ENDER_LUMP_3.item(), new ItemStack(Material.DRAGON_HEAD), SlimefunItems.ENDER_LUMP_3.item(),
                 new ItemStack(Material.PRISMARINE_CRYSTALS), new ItemStack(Material.DRAGON_BREATH), new ItemStack(Material.PRISMARINE_CRYSTALS)
         }).register(plugin);
 
         new HotbarPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_WITHER", PetTexture.WITHER_PET.getHash(), "&8Wither Pet", getName(), "&7Favourite Food: Soul Sand", "", "&fImmune to Wither Effect"), new ItemStack(Material.SOUL_SAND), new ItemStack[]{
                 new ItemStack(Material.COAL), new ItemStack(Material.WITHER_SKELETON_SKULL), new ItemStack(Material.COAL),
                 new ItemStack(Material.SOUL_SAND), new ItemStack(Material.NETHER_STAR), new ItemStack(Material.SOUL_SAND),
-                new ItemStack(Material.SOUL_SAND), SlimefunItems.GOLD_24K, new ItemStack(Material.SOUL_SAND)
+                new ItemStack(Material.SOUL_SAND), SlimefunItems.GOLD_24K.item(), new ItemStack(Material.SOUL_SAND)
         }).register(plugin);
         // @formatter:on
     }

src/main/java/io/github/thebusybiscuit/hotbarpets/groups/FarmAnimals.java

@@ -30,30 +30,30 @@ public void load(HotbarPets plugin) {
         new HotbarPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_PIG", PetTexture.PIG_PET.getHash(), "&dPig Pet", getName(), "&7Favourite Food: Carrots", "", "&fBonus Saturation when eating", "&fAllows you to eat poisonous Food"), new ItemStack(Material.CARROT), new ItemStack[] {
                 new ItemStack(Material.REDSTONE), new ItemStack(Material.CARROT), new ItemStack(Material.REDSTONE),
                 new ItemStack(Material.PORKCHOP), new ItemStack(Material.DIAMOND), new ItemStack(Material.PORKCHOP),
-                new ItemStack(Material.REDSTONE), SlimefunItems.GOLD_16K, new ItemStack(Material.REDSTONE)
+                new ItemStack(Material.REDSTONE), SlimefunItems.GOLD_16K.item(), new ItemStack(Material.REDSTONE)
         }).register(plugin);
 
         new HotbarPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_CHICKEN", PetTexture.CHICKEN_PET.getHash(), "&fChicken Pet", getName(), "&7Favourite Food: Seeds", "", "&fGives you Eggs over time..."), new ItemStack(Material.WHEAT_SEEDS), new ItemStack[] {
                 new ItemStack(Material.REDSTONE), new ItemStack(Material.FEATHER), new ItemStack(Material.REDSTONE),
                 new ItemStack(Material.COOKED_CHICKEN), new ItemStack(Material.DIAMOND), new ItemStack(Material.COOKED_CHICKEN),
-                new ItemStack(Material.REDSTONE), SlimefunItems.GOLD_16K, new ItemStack(Material.REDSTONE)
+                new ItemStack(Material.REDSTONE), SlimefunItems.GOLD_16K.item(), new ItemStack(Material.REDSTONE)
         }).register(plugin);
 
         new HotbarPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_MOOSHROOM", PetTexture.MOOSHROOM_PET.getHash(), "&dMooshroom Pet", getName(), "&7Favourite Food: Red Mushrooms", "", "&fGives you Mushroom Stew over time..."), new ItemStack(Material.RED_MUSHROOM), new ItemStack[] {
                 new ItemStack(Material.LAPIS_LAZULI), new ItemStack(Material.COOKED_BEEF), new ItemStack(Material.LAPIS_LAZULI),
                 new ItemStack(Material.RED_MUSHROOM), new ItemStack(Material.DIAMOND), new ItemStack(Material.BROWN_MUSHROOM),
-                new ItemStack(Material.LAPIS_LAZULI), SlimefunItems.GOLD_16K, new ItemStack(Material.LAPIS_LAZULI)
+                new ItemStack(Material.LAPIS_LAZULI), SlimefunItems.GOLD_16K.item(), new ItemStack(Material.LAPIS_LAZULI)
         }).register(plugin);
 
         new CowPet(plugin.getItemGroup(), cow, new ItemStack(Material.WHEAT), new ItemStack[] {
                 new ItemStack(Material.COAL), new ItemStack(Material.WHEAT), new ItemStack(Material.COAL),
                 new ItemStack(Material.COOKED_BEEF), new ItemStack(Material.DIAMOND), new ItemStack(Material.COOKED_BEEF),
-                new ItemStack(Material.COAL), SlimefunItems.GOLD_16K, new ItemStack(Material.COAL)
+                new ItemStack(Material.COAL), SlimefunItems.GOLD_16K.item(), new ItemStack(Material.COAL)
         }).register(plugin);
 
         new HotbarPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_GOLDEN_COW", PetTexture.GOLDEN_COW_PET.getHash(), "&6Golden Cow Pet", getName(), "&7Favourite Food: Golden Carrots", "", "&fGives you Golden Ingots over time...", "&f(That means you have a net gain of 1 golden nugget)"), new ItemStack(Material.GOLDEN_CARROT), new ItemStack[] {
                 new ItemStack(Material.GOLDEN_CARROT), new ItemStack(Material.GOLD_NUGGET), new ItemStack(Material.GOLDEN_CARROT),
-                new ItemStack(Material.GOLD_NUGGET), cow, new ItemStack(Material.GOLD_NUGGET),
+                new ItemStack(Material.GOLD_NUGGET), cow.item(), new ItemStack(Material.GOLD_NUGGET),
                 new ItemStack(Material.GOLDEN_CARROT), new ItemStack(Material.GOLD_NUGGET), new ItemStack(Material.GOLDEN_CARROT)
         }).register(plugin);
         // @formatter:on

src/main/java/io/github/thebusybiscuit/hotbarpets/groups/HostileMobs.java

@@ -33,13 +33,13 @@ public void load(HotbarPets plugin) {
         new SpiderPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_SPIDER", PetTexture.SPIDER_PET.getHash(), "&8Spider Pet", getName(), "&7Favourite Food: Rotten Flesh", "", "&fRight-Click: &7Gives you Jump Boost"), new ItemStack(Material.ROTTEN_FLESH), new ItemStack[]{
                 new ItemStack(Material.COAL), new ItemStack(Material.STRING), new ItemStack(Material.COAL),
                 new ItemStack(Material.SPIDER_EYE), new ItemStack(Material.EMERALD), new ItemStack(Material.SPIDER_EYE),
-                new ItemStack(Material.STRING), SlimefunItems.GOLD_16K, new ItemStack(Material.STRING)
+                new ItemStack(Material.STRING), SlimefunItems.GOLD_16K.item(), new ItemStack(Material.STRING)
         }).register(plugin);
 
         new GhastPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_GHAST", PetTexture.GHAST_PET.getHash(), "&fGhast Pet", getName(), "&7Favourite Food: Fire Charge", "", "&fRight-Click: &7Launches Fireballs"), new ItemStack(Material.FIRE_CHARGE), new ItemStack[]{
                 new ItemStack(Material.GHAST_TEAR), new ItemStack(Material.DIAMOND), new ItemStack(Material.GHAST_TEAR),
                 new ItemStack(Material.QUARTZ_BLOCK), new ItemStack(Material.BLAZE_POWDER), new ItemStack(Material.QUARTZ_BLOCK),
-                SlimefunItems.GOLD_24K, new ItemStack(Material.TNT), SlimefunItems.GOLD_24K
+                SlimefunItems.GOLD_24K.item(), new ItemStack(Material.TNT), SlimefunItems.GOLD_24K.item()
         }).register(plugin);
 
         new ShulkerPet(plugin, new SlimefunItemStack("HOTBAR_PET_SHULKER", PetTexture.SHULKER_PET.getHash(), "&dShulker Pet", getName(), "&7Favourite Food: Chorus Fruit", "", "&fRight-Click: &7Shoots arrows tipped with levitation"), new ItemStack(Material.CHORUS_FRUIT), new ItemStack[]{
@@ -50,38 +50,38 @@ SlimefunItems.GOLD_24K, new ItemStack(Material.TNT), SlimefunItems.GOLD_24K
 
         new PhantomPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_PHANTOM", PetTexture.PHANTOM_PET.getHash(), "&7Phantom Pet", getName(), "&7Favourite Food: Beetroot", "", "&fRight-Click: &7Gives Slow Falling"), new ItemStack(Material.BEETROOT), new ItemStack[]{
                 new ItemStack(Material.PHANTOM_MEMBRANE), new ItemStack(Material.RABBIT_FOOT), new ItemStack(Material.PHANTOM_MEMBRANE),
-                new ItemStack(Material.DIAMOND), SlimefunItems.GOLD_6K, new ItemStack(Material.DIAMOND),
+                new ItemStack(Material.DIAMOND), SlimefunItems.GOLD_6K.item(), new ItemStack(Material.DIAMOND),
                 new ItemStack(Material.PHANTOM_MEMBRANE), new ItemStack(Material.RABBIT_FOOT), new ItemStack(Material.PHANTOM_MEMBRANE)
         }).register(plugin);
 
         new EndermanPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_ENDER_MAN", PetTexture.ENDERMAN_PET.getHash(), "&8Enderman Pet", getName(), "&7Favourite Food: End Stone", "", "&fRight-Click: &7Shoots an Ender Pearl"), new ItemStack(Material.END_STONE), new ItemStack[]{
                 new ItemStack(Material.OBSIDIAN), new ItemStack(Material.ENDER_PEARL), new ItemStack(Material.OBSIDIAN),
                 new ItemStack(Material.ENDER_EYE), new ItemStack(Material.EMERALD), new ItemStack(Material.ENDER_EYE),
-                new ItemStack(Material.ENDER_PEARL), SlimefunItems.GOLD_16K, new ItemStack(Material.ENDER_PEARL)
+                new ItemStack(Material.ENDER_PEARL), SlimefunItems.GOLD_16K.item(), new ItemStack(Material.ENDER_PEARL)
         }).register(plugin);
 
         new CreeperPet(plugin, new SlimefunItemStack("HOTBAR_PET_CREEPER", Material.CREEPER_HEAD, "&2Creeper Pet", getName(), "&7Favourite Food: Gunpowder", "", "&fImmune to Explosions", "&fRight-Click: &7Explode"), new ItemStack(Material.GUNPOWDER), new ItemStack[]{
                 new ItemStack(Material.DIAMOND), new ItemStack(Material.CREEPER_HEAD), new ItemStack(Material.DIAMOND),
                 new ItemStack(Material.GUNPOWDER), new ItemStack(Material.EMERALD), new ItemStack(Material.GUNPOWDER),
-                new ItemStack(Material.DIAMOND), SlimefunItems.GOLD_20K, new ItemStack(Material.DIAMOND)
+                new ItemStack(Material.DIAMOND), SlimefunItems.GOLD_20K.item(), new ItemStack(Material.DIAMOND)
         }).register(plugin);
 
         new HotbarPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_MAGMA_CUBE", PetTexture.MAGMA_CUBE_PET.getHash(), "&4Magma Cube Pet", getName(), "&7Favourite Food: Nether Quartz", "", "&fImmune to Lava", "&fQuite hungry"), new ItemStack(Material.QUARTZ), new ItemStack[]{
                 new ItemStack(Material.REDSTONE), new ItemStack(Material.MAGMA_CREAM), new ItemStack(Material.REDSTONE),
                 new ItemStack(Material.BLAZE_POWDER), new ItemStack(Material.EMERALD), new ItemStack(Material.BLAZE_POWDER),
-                new ItemStack(Material.NETHERRACK), SlimefunItems.GOLD_20K, new ItemStack(Material.NETHERRACK)
+                new ItemStack(Material.NETHERRACK), SlimefunItems.GOLD_20K.item(), new ItemStack(Material.NETHERRACK)
         }).register(plugin);
 
         new HotbarPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_BLAZE", PetTexture.BLAZE_PET.getHash(), "&6Blaze Pet", getName(), "&7Favourite Food: Nether Quartz", "", "&fImmune to Fire"), new ItemStack(Material.QUARTZ), new ItemStack[]{
                 new ItemStack(Material.GLOWSTONE_DUST), new ItemStack(Material.BLAZE_ROD), new ItemStack(Material.GLOWSTONE_DUST),
                 new ItemStack(Material.BLAZE_POWDER), new ItemStack(Material.EMERALD), new ItemStack(Material.BLAZE_POWDER),
-                SlimefunItems.GOLD_20K, SlimefunItems.GOLD_20K, SlimefunItems.GOLD_20K
+                SlimefunItems.GOLD_20K.item(), SlimefunItems.GOLD_20K.item(), SlimefunItems.GOLD_20K.item()
         }).register(plugin);
 
         new HotbarPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_ZOMBIE", Material.ZOMBIE_HEAD, "&2Zombie Pet", getName(), "", "&fAllows you to eat Rotten Flesh", "&fwithout getting Hunger"), new ItemStack(Material.ROTTEN_FLESH), new ItemStack[] {
                 new ItemStack(Material.DIAMOND), new ItemStack(Material.ZOMBIE_HEAD), new ItemStack(Material.DIAMOND),
                 new ItemStack(Material.MOSSY_COBBLESTONE), new ItemStack(Material.EMERALD), new ItemStack(Material.MOSSY_COBBLESTONE),
-                new ItemStack(Material.ROTTEN_FLESH), SlimefunItems.NECROTIC_SKULL, new ItemStack(Material.ROTTEN_FLESH)
+                new ItemStack(Material.ROTTEN_FLESH), SlimefunItems.NECROTIC_SKULL.item(), new ItemStack(Material.ROTTEN_FLESH)
         }).register(plugin);
         // @formatter:on
     }

src/main/java/io/github/thebusybiscuit/hotbarpets/groups/PassiveMobs.java

@@ -28,13 +28,13 @@ public void load(HotbarPets plugin) {
         new IronGolemPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_IRON_GOLEM", PetTexture.IRON_GOLEM_PET.getHash(), "&7Iron Golem Pet", getName(), "&7Favourite Food: Iron Ingots", "", "&fRight-Click: &7Gives you Resistance"), new ItemStack(Material.IRON_INGOT), new ItemStack[]{
                 new ItemStack(Material.IRON_BLOCK), new ItemStack(Material.PUMPKIN), new ItemStack(Material.IRON_BLOCK),
                 new ItemStack(Material.IRON_INGOT), new ItemStack(Material.EMERALD), new ItemStack(Material.IRON_INGOT),
-                new ItemStack(Material.IRON_INGOT), SlimefunItems.GOLD_16K, new ItemStack(Material.IRON_INGOT)
+                new ItemStack(Material.IRON_INGOT), SlimefunItems.GOLD_16K.item(), new ItemStack(Material.IRON_INGOT)
         }).register(plugin);
 
         new HotbarPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_SLIME", PetTexture.SLIME_PET.getHash(), "&aSlime Pet", getName(), "&7Favourite Food: Glowstone Dust", "", "&fImmune to Fall Damage"), new ItemStack(Material.GLOWSTONE_DUST), new ItemStack[]{
                 new ItemStack(Material.SLIME_BALL), new ItemStack(Material.DIAMOND), new ItemStack(Material.SLIME_BALL),
                 new ItemStack(Material.SLIME_BALL), new ItemStack(Material.EMERALD), new ItemStack(Material.SLIME_BALL),
-                SlimefunItems.GOLD_20K, SlimefunItems.GOLD_20K, SlimefunItems.GOLD_20K
+                SlimefunItems.GOLD_20K.item(), SlimefunItems.GOLD_20K.item(), SlimefunItems.GOLD_20K.item()
         }).register(plugin);
         // @formatter:on
     }

src/main/java/io/github/thebusybiscuit/hotbarpets/groups/PeacefulAnimals.java

@@ -30,13 +30,13 @@ public void load(HotbarPets plugin) {
         new HotbarPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_FISH", PetTexture.FISH_PET.getHash(), "&3Fish Pet", getName(), "&7Favourite Food: Seeds", "", "&fGives you Fish over time..."), new ItemStack(Material.WHEAT_SEEDS), new ItemStack[] {
                 new ItemStack(Material.IRON_INGOT), new ItemStack(Material.COD), new ItemStack(Material.IRON_INGOT),
                 new ItemStack(Material.COD), new ItemStack(Material.DIAMOND), new ItemStack(Material.COD),
-                new ItemStack(Material.WATER_BUCKET), SlimefunItems.GOLD_18K, new ItemStack(Material.WATER_BUCKET)
+                new ItemStack(Material.WATER_BUCKET), SlimefunItems.GOLD_18K.item(), new ItemStack(Material.WATER_BUCKET)
         }).register(plugin);
 
         new SquidPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_SQUID", PetTexture.SQUID_PET.getHash(), "&bSquid Pet", getName(), "&7Favourite Food: Raw Cod", "", "&fRight-Click: &7Gives you Water Breathing"), new ItemStack(Material.COD), new ItemStack[] {
                 new ItemStack(Material.COAL), new ItemStack(Material.COD), new ItemStack(Material.COAL),
                 new ItemStack(Material.WATER_BUCKET), new ItemStack(Material.DIAMOND), new ItemStack(Material.WATER_BUCKET),
-                new ItemStack(Material.COD), SlimefunItems.GOLD_16K, new ItemStack(Material.COD)
+                new ItemStack(Material.COD), SlimefunItems.GOLD_16K.item(), new ItemStack(Material.COD)
         }).register(plugin);
 
         new RabbitPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_RABBIT", PetTexture.RABBIT_PET.getHash(), "&eRabbit Pet", getName(), "&7Favourite Food: Carrots", "", "&fRight-Click: &7Gives you 30 seconds of Luck"), new ItemStack(Material.CARROT), new ItemStack[] {