diff --git a/pom.xml b/pom.xml index b276ad1..eefe7d0 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,8 @@ UNOFFICIAL - 1.8 - 1.8 + 17 + 17 UTF-8 @@ -58,7 +58,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.4 + 3.3.0 @@ -97,14 +97,14 @@ org.spigotmc spigot-api - 1.16.5-R0.1-SNAPSHOT + 1.21.4-R0.1-SNAPSHOT provided com.github.TheBusyBiscuit Slimefun4 - RC-27 + experimental-SNAPSHOT provided @@ -117,7 +117,7 @@ org.bstats bstats-bukkit - 2.2.1 + 3.1.0 compile diff --git a/src/main/java/io/github/thebusybiscuit/souljars/SoulJars.java b/src/main/java/io/github/thebusybiscuit/souljars/SoulJars.java index a5af68d..32dc021 100644 --- a/src/main/java/io/github/thebusybiscuit/souljars/SoulJars.java +++ b/src/main/java/io/github/thebusybiscuit/souljars/SoulJars.java @@ -47,10 +47,10 @@ public void onEnable() { } emptyJar = new SlimefunItemStack("SOUL_JAR", JAR_TEXTURE, "&bSoul Jar &7(Empty)", "", "&rKill a Mob while having this", "&rItem in your Inventory to bind", "&rtheir Soul to this Jar"); - itemGroup = new ItemGroup(new NamespacedKey(this, "soul_jars"), new CustomItemStack(emptyJar, "&bSoul Jars", "", "&a> Click to open")); - recipeType = new RecipeType(new NamespacedKey(this, "mob_killing"), new CustomItemStack(Material.DIAMOND_SWORD, "&cKill the specified Mob", "&cwhile having an empty Soul Jar", "&cin your Inventory")); + itemGroup = new ItemGroup(new NamespacedKey(this, "soul_jars"), CustomItemStack.create(emptyJar.item(), "&bSoul Jars", "", "&a> Click to open")); + recipeType = new RecipeType(new NamespacedKey(this, "mob_killing"), CustomItemStack.create(Material.DIAMOND_SWORD, "&cKill the specified Mob", "&cwhile having an empty Soul Jar", "&cin your Inventory")); - new SlimefunItem(itemGroup, emptyJar, RecipeType.ANCIENT_ALTAR, new ItemStack[] { SlimefunItems.EARTH_RUNE, new ItemStack(Material.SOUL_SAND), SlimefunItems.WATER_RUNE, new ItemStack(Material.SOUL_SAND), SlimefunItems.NECROTIC_SKULL, new ItemStack(Material.SOUL_SAND), SlimefunItems.AIR_RUNE, new ItemStack(Material.SOUL_SAND), SlimefunItems.FIRE_RUNE }, new CustomItemStack(emptyJar, 3)).register(this); + new SlimefunItem(itemGroup, emptyJar, RecipeType.ANCIENT_ALTAR, new ItemStack[] { SlimefunItems.EARTH_RUNE.item(), new ItemStack(Material.SOUL_SAND), SlimefunItems.WATER_RUNE.item(), new ItemStack(Material.SOUL_SAND), SlimefunItems.NECROTIC_SKULL.item(), new ItemStack(Material.SOUL_SAND), SlimefunItems.AIR_RUNE.item(), new ItemStack(Material.SOUL_SAND), SlimefunItems.FIRE_RUNE.item() }, CustomItemStack.create(emptyJar.item(), 3)).register(this); new JarsListener(this); for (String mob : cfg.getStringList("mobs")) { @@ -80,19 +80,19 @@ private void registerSoul(EntityType type) { // @formatter:off SlimefunItemStack jarItem = new SlimefunItemStack(type.name() + "_SOUL_JAR", JAR_TEXTURE, "&cSoul Jar &7(" + name + ")", "", "&7Infused Souls: &e1"); SlimefunItem jar = new UnplaceableBlock(itemGroup, jarItem, recipeType, - new ItemStack[] { null, null, null, emptyJar, null, new CustomItemStack(mobEgg, "&rKill " + souls + "x " + name), null, null, null }); + new ItemStack[] { null, null, null, emptyJar.item(), null, CustomItemStack.create(mobEgg, "&rKill " + souls + "x " + name), null, null, null }); jar.register(this); SlimefunItemStack filledJarItem = new SlimefunItemStack("FILLED_" + type.name() + "_SOUL_JAR", JAR_TEXTURE, "&cFilled Soul Jar &7(" + name + ")", "", "&7Infused Souls: &e" + souls); SlimefunItem filledJar = new FilledJar(itemGroup, filledJarItem, recipeType, - new ItemStack[] { null, null, null, emptyJar, null, new CustomItemStack(mobEgg, "&rKill " + souls + "x " + name), null, null, null }); + new ItemStack[] { null, null, null, emptyJar.item(), null, CustomItemStack.create(mobEgg, "&rKill " + souls + "x " + name), null, null, null }); filledJar.register(this); BrokenSpawner brokenSpawner = SlimefunItems.BROKEN_SPAWNER.getItem(BrokenSpawner.class); SlimefunItemStack spawnerItem = new SlimefunItemStack(type.toString() + "_BROKEN_SPAWNER", Material.SPAWNER, "&cBroken Spawner &7(" + name + ")"); new SlimefunItem(itemGroup, spawnerItem, RecipeType.ANCIENT_ALTAR, - new ItemStack[] { new ItemStack(Material.IRON_BARS), SlimefunItems.EARTH_RUNE, new ItemStack(Material.IRON_BARS), SlimefunItems.EARTH_RUNE, filledJarItem, SlimefunItems.EARTH_RUNE, new ItemStack(Material.IRON_BARS), SlimefunItems.EARTH_RUNE, new ItemStack(Material.IRON_BARS) }, + new ItemStack[] { new ItemStack(Material.IRON_BARS), SlimefunItems.EARTH_RUNE.item(), new ItemStack(Material.IRON_BARS), SlimefunItems.EARTH_RUNE.item(), filledJarItem.item(), SlimefunItems.EARTH_RUNE.item(), new ItemStack(Material.IRON_BARS), SlimefunItems.EARTH_RUNE.item(), new ItemStack(Material.IRON_BARS) }, brokenSpawner.getItemForEntityType(type)).register(this); // @formatter:on }