diff --git a/pom.xml b/pom.xml index 642caac..2acd95f 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 @@ -128,4 +128,4 @@ provided - \ No newline at end of file + diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPets.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPets.java index e7da0fd..08053f0 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPets.java +++ b/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); diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/BossMobs.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/BossMobs.java index 074584d..6fc105d 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/BossMobs.java +++ b/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 } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/FarmAnimals.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/FarmAnimals.java index b59b113..7b3aee1 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/FarmAnimals.java +++ b/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 diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/HostileMobs.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/HostileMobs.java index 1b71fc2..939509f 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/HostileMobs.java +++ b/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 } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/PassiveMobs.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/PassiveMobs.java index 7a97ec3..64eb59a 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/PassiveMobs.java +++ b/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 } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/PeacefulAnimals.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/PeacefulAnimals.java index ca8a828..0846392 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/PeacefulAnimals.java +++ b/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[] { diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/SpecialPets.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/SpecialPets.java index aa8dd3c..a92c0a8 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/SpecialPets.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/SpecialPets.java @@ -30,31 +30,31 @@ public void load(HotbarPets plugin) { new PurpliciousCowPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_PURPLICIOUS_COW", PetTexture.PURPLICIOUS_COW_PET.getHash(), "&5Purplicious Cow Pet", getName(), "&7Favourite Food: Golden Apples", "", "&fRight-Click: &7Gives you Health Regeneration"), new ItemStack(Material.GOLDEN_APPLE), new ItemStack[] { new ItemStack(Material.COOKED_BEEF), new ItemStack(Material.DIAMOND), new ItemStack(Material.COOKED_BEEF), new ItemStack(Material.DIAMOND), new ItemStack(Material.EMERALD), new ItemStack(Material.DIAMOND), - SlimefunItems.GOLD_20K, SlimefunItems.GOLD_20K, SlimefunItems.GOLD_20K + SlimefunItems.GOLD_20K.item(), SlimefunItems.GOLD_20K.item(), SlimefunItems.GOLD_20K.item() }).register(plugin); new CookieSlimePet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_MRCOOKIESLIME", PetTexture.MR_COOKIE_SLIME_PET.getHash(), "&amrCookieSlime Pet", getName(), "&7Favourite Food: Cookies", "", "&fImmune to Fall Damage", "&fRight-Click: &7Gives you Health Regeneration"), new ItemStack(Material.COOKIE), new ItemStack[] { new ItemStack(Material.COOKIE), new ItemStack(Material.DIAMOND), new ItemStack(Material.COOKIE), new ItemStack(Material.DIAMOND), new ItemStack(Material.EMERALD), new ItemStack(Material.DIAMOND), - SlimefunItems.GOLD_20K, SlimefunItems.GOLD_20K, SlimefunItems.GOLD_20K + SlimefunItems.GOLD_20K.item(), SlimefunItems.GOLD_20K.item(), SlimefunItems.GOLD_20K.item() }).register(plugin); new PatriotPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_PATRIOT", PetTexture.PATRIOT_PET.getHash(), "&5Patriot Pet", getName(), "&7Favourite Food: Nether Wart", "", "&fGives Resistance, Regeneration, Strength, ", "&fand Saturation"), new ItemStack(Material.NETHER_WART), new ItemStack[] { - new ItemStack(Material.REDSTONE), SlimefunItems.MAGIC_LUMP_1, new ItemStack(Material.REDSTONE), - SlimefunItems.MAGIC_LUMP_1, SlimefunItems.RAW_CARBONADO, SlimefunItems.MAGIC_LUMP_1, - SlimefunItems.GOLD_4K, new ItemStack(Material.REDSTONE), SlimefunItems.GOLD_4K + new ItemStack(Material.REDSTONE), SlimefunItems.MAGIC_LUMP_1.item(), new ItemStack(Material.REDSTONE), + SlimefunItems.MAGIC_LUMP_1.item(), SlimefunItems.RAW_CARBONADO.item(), SlimefunItems.MAGIC_LUMP_1.item(), + SlimefunItems.GOLD_4K.item(), new ItemStack(Material.REDSTONE), SlimefunItems.GOLD_4K.item() }).register(plugin); new HotbarPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_WALSHRUS", PetTexture.WALSHRUS_PET.getHash(), "&bWalshrus Pet", getName(), "&7Favourite Food: Raw Cod", "", "&fCannot drown"), new ItemStack(Material.COD), new ItemStack[] { new ItemStack(Material.COD), new ItemStack(Material.DIAMOND), new ItemStack(Material.COD), new ItemStack(Material.DIAMOND), new ItemStack(Material.EMERALD), new ItemStack(Material.DIAMOND), - 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_EYAMAZ", PetTexture.EYAMAZ_PET.getHash(), "&4Eyamaz Pet", getName(), "&7Favourite Food: Souls", "", "&fBeware! Eyamaz makes a Soul Pie", "&fout of the Souls of everything you kill"), new ItemStack(Material.SOUL_SAND), new ItemStack[] { new ItemStack(Material.SOUL_SAND), new ItemStack(Material.DIAMOND), new ItemStack(Material.SOUL_SAND), new ItemStack(Material.DIAMOND), new ItemStack(Material.EMERALD), new ItemStack(Material.DIAMOND), - 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 } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/UtilityPets.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/UtilityPets.java index b2e2804..4f58035 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/UtilityPets.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/UtilityPets.java @@ -29,19 +29,19 @@ public void load(HotbarPets plugin) { new BedPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_BED", Material.RED_BED, "&fBed Pet", getName(), "&7Favourite Food: Wool", "", "&fRight-Click: &7Sleep"), new ItemStack(Material.WHITE_WOOL), new ItemStack[] { new ItemStack(Material.IRON_INGOT), new ItemStack(Material.RED_BED), new ItemStack(Material.IRON_INGOT), new ItemStack(Material.WHITE_WOOL), new ItemStack(Material.DIAMOND), new ItemStack(Material.WHITE_WOOL), - new ItemStack(Material.OAK_PLANKS), SlimefunItems.GOLD_14K, new ItemStack(Material.OAK_PLANKS) + new ItemStack(Material.OAK_PLANKS), SlimefunItems.GOLD_14K.item(), new ItemStack(Material.OAK_PLANKS) }).register(plugin); new EnderChestPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_ENDER_CHEST", PetTexture.ENDER_CHEST_PET.getHash(), "&5Ender Chest Pet", getName(), "&7Favourite Food: Ender Pearls", "", "&fRight-Click: &7Open"), new ItemStack(Material.ENDER_PEARL), new ItemStack[] { new ItemStack(Material.OBSIDIAN), new ItemStack(Material.ENDER_EYE), new ItemStack(Material.OBSIDIAN), new ItemStack(Material.ENDER_PEARL), new ItemStack(Material.EMERALD), new ItemStack(Material.ENDER_PEARL), - new ItemStack(Material.OBSIDIAN), SlimefunItems.GOLD_16K, new ItemStack(Material.OBSIDIAN) + new ItemStack(Material.OBSIDIAN), SlimefunItems.GOLD_16K.item(), new ItemStack(Material.OBSIDIAN) }).register(plugin); new WorkbenchPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_WORKBENCH", PetTexture.WORKBENCH_PET.getHash(), "&6Workbench Pet", getName(), "&7Favourite Food: Wooden Planks", "", "&fRight-Click: &7Open"), new ItemStack(Material.OAK_PLANKS), new ItemStack[] { new ItemStack(Material.OAK_PLANKS), new ItemStack(Material.CRAFTING_TABLE), new ItemStack(Material.OAK_PLANKS), new ItemStack(Material.OAK_PLANKS), new ItemStack(Material.IRON_INGOT), new ItemStack(Material.OAK_PLANKS), - new ItemStack(Material.OAK_PLANKS), SlimefunItems.GOLD_16K, new ItemStack(Material.OAK_PLANKS) + new ItemStack(Material.OAK_PLANKS), SlimefunItems.GOLD_16K.item(), new ItemStack(Material.OAK_PLANKS) }).register(plugin); // @formatter:on } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/SoulPieListener.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/SoulPieListener.java index 0ecc433..436046e 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/SoulPieListener.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/SoulPieListener.java @@ -32,7 +32,7 @@ public void onSoulHarvest(EntityDeathEvent e) { ItemStack item = p.getInventory().getItem(i); if (eyamaz != null && SlimefunUtils.isItemSimilar(item, eyamaz.getItem(), true)) { - e.getEntity().getLocation().getWorld().dropItemNaturally(e.getEntity().getLocation(), new CustomItemStack(new ItemStack(Material.PUMPKIN_PIE), "&bSoul Pie")); + e.getEntity().getLocation().getWorld().dropItemNaturally(e.getEntity().getLocation(), CustomItemStack.create(new ItemStack(Material.PUMPKIN_PIE), "&bSoul Pie")); } } } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/TNTListener.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/TNTListener.java index e26b81f..9d97e61 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/TNTListener.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/TNTListener.java @@ -48,7 +48,7 @@ public void onTNTDamage(EntityDamageByEntityEvent e) { @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onTNTExplode(EntityExplodeEvent e) { - if (e.getEntityType() == EntityType.PRIMED_TNT && e.getEntity().hasMetadata(METADATA_KEY)) { + if (e.getEntityType() == EntityType.TNT && e.getEntity().hasMetadata(METADATA_KEY)) { OfflinePlayer player = Bukkit.getOfflinePlayer((UUID) e.getEntity().getMetadata(METADATA_KEY).get(0).value()); plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> e.getEntity().removeMetadata(METADATA_KEY, plugin), 4); diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/CowPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/CowPet.java index 9cbc3c7..931866b 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/CowPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/CowPet.java @@ -18,11 +18,11 @@ public CowPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemS @Override public void onUseItem(Player p) { p.removePotionEffect(PotionEffectType.BLINDNESS); - p.removePotionEffect(PotionEffectType.CONFUSION); + p.removePotionEffect(PotionEffectType.NAUSEA); p.removePotionEffect(PotionEffectType.HUNGER); p.removePotionEffect(PotionEffectType.POISON); - p.removePotionEffect(PotionEffectType.SLOW); - p.removePotionEffect(PotionEffectType.SLOW_DIGGING); + p.removePotionEffect(PotionEffectType.SLOWNESS); + p.removePotionEffect(PotionEffectType.MINING_FATIGUE); p.removePotionEffect(PotionEffectType.WEAKNESS); p.removePotionEffect(PotionEffectType.WITHER); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_COW_AMBIENT, 1.0F, 2.0F); diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/CreeperPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/CreeperPet.java index 8a3332f..540db2d 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/CreeperPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/CreeperPet.java @@ -9,7 +9,6 @@ import io.github.thebusybiscuit.hotbarpets.HotbarPets; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class CreeperPet extends SimpleBasePet { @@ -24,7 +23,7 @@ public CreeperPet(HotbarPets plugin, SlimefunItemStack item, ItemStack food, Ite @Override public void onUseItem(Player p) { - TNTPrimed tnt = (TNTPrimed) p.getWorld().spawnEntity(p.getLocation(), EntityType.PRIMED_TNT); + TNTPrimed tnt = (TNTPrimed) p.getWorld().spawnEntity(p.getLocation(), EntityType.TNT); tnt.setMetadata("hotbarpets_player", new FixedMetadataValue(plugin, p.getUniqueId())); tnt.setFuseTicks(0); diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EnderDragonPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EnderDragonPet.java index 3365eff..19a3825 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EnderDragonPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EnderDragonPet.java @@ -19,7 +19,7 @@ public EnderDragonPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack foo @Override public void onUseItem(Player p) { - p.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 500, 0)); + p.addPotionEffect(new PotionEffect(PotionEffectType.RESISTANCE, 500, 0)); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ENDER_DRAGON_AMBIENT, 1.0F, 2.0F); p.launchProjectile(DragonFireball.class); } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/IronGolemPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/IronGolemPet.java index 3ed474b..f4274a0 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/IronGolemPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/IronGolemPet.java @@ -18,7 +18,7 @@ public IronGolemPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, @Override public void onUseItem(Player p) { - p.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 500, 0)); + p.addPotionEffect(new PotionEffect(PotionEffectType.RESISTANCE, 500, 0)); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_IRON_GOLEM_STEP, 1.0F, 2.0F); } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/SpiderPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/SpiderPet.java index 6f230a6..0ba36e2 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/SpiderPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/SpiderPet.java @@ -18,7 +18,7 @@ public SpiderPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, It @Override public void onUseItem(Player p) { - p.addPotionEffect(new PotionEffect(PotionEffectType.JUMP, 1200, 3)); + p.addPotionEffect(new PotionEffect(PotionEffectType.JUMP_BOOST, 1200, 3)); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_SPIDER_AMBIENT, 1.0F, 2.0F); } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/special/PatriotPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/special/PatriotPet.java index b939732..35109c5 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/special/PatriotPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/special/PatriotPet.java @@ -19,8 +19,8 @@ public PatriotPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, I @Override public void onUseItem(Player p) { p.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 200, 0)); - p.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 200, 0)); - p.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, 200, 0)); + p.addPotionEffect(new PotionEffect(PotionEffectType.RESISTANCE, 200, 0)); + p.addPotionEffect(new PotionEffect(PotionEffectType.STRENGTH, 200, 0)); p.addPotionEffect(new PotionEffect(PotionEffectType.SATURATION, 100, 0)); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ZOMBIE_CONVERTED_TO_DROWNED, 1.0F, 2.0F); }