diff --git a/pom.xml b/pom.xml index 961be85..642caac 100644 --- a/pom.xml +++ b/pom.xml @@ -104,12 +104,12 @@ com.github.TheBusyBiscuit Slimefun4 - RC-21 + RC-27 provided - io.github.thebusybiscuit - cscorelib2 + io.github.baked-libs + dough-api diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPet.java index a2b050e..e175c95 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPet.java @@ -7,11 +7,11 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin; -import me.mrCookieSlime.Slimefun.Lists.RecipeType; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; public class HotbarPet extends SlimefunItem { @@ -20,8 +20,8 @@ public class HotbarPet extends SlimefunItem { private final ItemStack food; - public HotbarPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, RecipeType.ENHANCED_CRAFTING_TABLE, recipe); + public HotbarPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, RecipeType.ENHANCED_CRAFTING_TABLE, recipe); this.food = food; } @@ -42,7 +42,7 @@ public ItemStack getFavouriteFood() { public boolean checkAndConsumeFood(Player player) { if (!player.getInventory().containsAtLeast(getFavouriteFood(), 1)) { if (messageDelay.getOrDefault(player.getUniqueId(), 0L) <= System.currentTimeMillis()) { - SlimefunPlugin.getLocalization().sendMessage(player, "hotbarpets.neglected-pet", true, msg -> msg.replace("%pet%", getItemName())); + Slimefun.getLocalization().sendMessage(player, "hotbarpets.neglected-pet", true, msg -> msg.replace("%pet%", getItemName())); messageDelay.put(player.getUniqueId(), System.currentTimeMillis() + MESSAGE_DELAY); } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPets.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPets.java index bab46b3..69d1cf2 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPets.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPets.java @@ -20,17 +20,15 @@ import io.github.thebusybiscuit.hotbarpets.listeners.SoulPieListener; import io.github.thebusybiscuit.hotbarpets.listeners.TNTListener; import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.cscorelib2.config.Config; -import me.mrCookieSlime.Slimefun.cscorelib2.item.CustomItem; -import me.mrCookieSlime.Slimefun.cscorelib2.skull.SkullItem; -import me.mrCookieSlime.Slimefun.cscorelib2.updater.GitHubBuildsUpdater; -import me.mrCookieSlime.Slimefun.cscorelib2.updater.Updater; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun4.libraries.dough.config.Config; +import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack; +import io.github.thebusybiscuit.slimefun4.libraries.dough.updater.GitHubBuildsUpdater; public class HotbarPets extends JavaPlugin implements Listener, SlimefunAddon { - private Category category; + private ItemGroup itemGroup; @Override public void onEnable() { @@ -39,16 +37,11 @@ public void onEnable() { // Setting up bStats new Metrics(this, 4859); - if (getDescription().getVersion().startsWith("DEV - ")) { - Updater updater = new GitHubBuildsUpdater(this, getFile(), "TheBusyBiscuit/HotbarPets/master"); - - // Only run the Updater if it has not been disabled - if (cfg.getBoolean("options.auto-update")) { - updater.start(); - } + if (cfg.getBoolean("options.auto-update") && getDescription().getVersion().startsWith("DEV - ")) { + new GitHubBuildsUpdater(this, getFile(), "TheBusyBiscuit/HotbarPets/master").start(); } - category = new Category(new NamespacedKey(this, "pets"), new CustomItem(PetTexture.CATEGORY.getAsItem(), "&dHotbar Pets", "", "&a> Click to open")); + itemGroup = new ItemGroup(new NamespacedKey(this, "pets"), new CustomItemStack(PetTexture.CATEGORY.getAsItem(), "&dHotbar Pets", "", "&a> Click to open")); // Add all the Pets via their Group class new FarmAnimals(this); @@ -59,8 +52,8 @@ public void onEnable() { new UtilityPets(this); new SpecialPets(this); - SlimefunPlugin.getLocalization().setDefaultMessage("hotbarpets.neglected-pet", "&9Your %pet% &9would have helped you if you did not neglect it by not feeding it :("); - SlimefunPlugin.getLocalization().save(); + Slimefun.getLocalization().setDefaultMessage("hotbarpets.neglected-pet", "&9Your %pet% &9would have helped you if you did not neglect it by not feeding it :("); + Slimefun.getLocalization().save(); // Registering the Listeners new DamageListener(this); @@ -75,8 +68,8 @@ public void onEnable() { getServer().getScheduler().scheduleSyncRepeatingTask(this, new HotbarPetsRunnable(), 0L, 2000L); } - public Category getCategory() { - return category; + public ItemGroup getItemGroup() { + return itemGroup; } @Override diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPetsRunnable.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPetsRunnable.java index a4a6b1f..5db234e 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPetsRunnable.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/HotbarPetsRunnable.java @@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; public class HotbarPetsRunnable implements Runnable { @@ -17,10 +17,10 @@ public class HotbarPetsRunnable implements Runnable { private final HotbarPet goldenCow; protected HotbarPetsRunnable() { - chicken = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_CHICKEN"); - mooshroom = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_MOOSHROOM"); - fish = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_FISH"); - goldenCow = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_GOLDEN_COW"); + chicken = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_CHICKEN"); + mooshroom = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_MOOSHROOM"); + fish = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_FISH"); + goldenCow = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_GOLDEN_COW"); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/PetTexture.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/PetTexture.java index 259fed2..745771b 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/PetTexture.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/PetTexture.java @@ -1,6 +1,7 @@ package io.github.thebusybiscuit.hotbarpets; -import me.mrCookieSlime.Slimefun.cscorelib2.skull.SkullItem; +import io.github.thebusybiscuit.slimefun4.libraries.dough.skins.PlayerHead; +import io.github.thebusybiscuit.slimefun4.libraries.dough.skins.PlayerSkin; import org.bukkit.inventory.ItemStack; import javax.annotation.Nonnull; @@ -75,6 +76,6 @@ public String toString() { @Nonnull public ItemStack getAsItem() { - return SkullItem.fromHash(getHash()); + return PlayerHead.getItemStack(PlayerSkin.fromHashCode(getHash())); } } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/SimpleBasePet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/SimpleBasePet.java index 769553b..bb2abdf 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/SimpleBasePet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/SimpleBasePet.java @@ -4,13 +4,13 @@ import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public abstract class SimpleBasePet extends HotbarPet { - public SimpleBasePet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public SimpleBasePet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } public abstract void onUseItem(Player p); 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 010aac3..074584d 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/BossMobs.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/BossMobs.java @@ -1,15 +1,15 @@ package io.github.thebusybiscuit.hotbarpets.groups; -import io.github.thebusybiscuit.hotbarpets.PetTexture; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.hotbarpets.HotbarPet; import io.github.thebusybiscuit.hotbarpets.HotbarPets; import io.github.thebusybiscuit.hotbarpets.PetGroup; +import io.github.thebusybiscuit.hotbarpets.PetTexture; import io.github.thebusybiscuit.hotbarpets.pets.EnderDragonPet; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public final class BossMobs implements PetGroup { @@ -25,13 +25,13 @@ public String getName() { @Override public void load(HotbarPets plugin) { // @formatter:off - new EnderDragonPet(plugin.getCategory(), 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 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, new ItemStack(Material.PRISMARINE_CRYSTALS), new ItemStack(Material.DRAGON_BREATH), new ItemStack(Material.PRISMARINE_CRYSTALS) }).register(plugin); - new HotbarPet(plugin.getCategory(), 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 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) 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 36d0787..b59b113 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/FarmAnimals.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/FarmAnimals.java @@ -1,15 +1,15 @@ package io.github.thebusybiscuit.hotbarpets.groups; -import io.github.thebusybiscuit.hotbarpets.PetTexture; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.hotbarpets.HotbarPet; import io.github.thebusybiscuit.hotbarpets.HotbarPets; import io.github.thebusybiscuit.hotbarpets.PetGroup; +import io.github.thebusybiscuit.hotbarpets.PetTexture; import io.github.thebusybiscuit.hotbarpets.pets.CowPet; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public final class FarmAnimals implements PetGroup { @@ -27,31 +27,31 @@ public void load(HotbarPets plugin) { // @formatter:off SlimefunItemStack cow = new SlimefunItemStack("HOTBAR_PET_COW", PetTexture.COW_PET.getHash(), "&6Cow Pet", getName(), "&7Favourite Food: Wheat", "", "&fRight-Click: &7Removes negative Potion Effects"); - new HotbarPet(plugin.getCategory(), 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 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) }).register(plugin); - new HotbarPet(plugin.getCategory(), 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 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) }).register(plugin); - new HotbarPet(plugin.getCategory(), 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 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) }).register(plugin); - new CowPet(plugin.getCategory(), cow, new ItemStack(Material.WHEAT), new ItemStack[] { + 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) }).register(plugin); - new HotbarPet(plugin.getCategory(), 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 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.GOLDEN_CARROT), new ItemStack(Material.GOLD_NUGGET), new ItemStack(Material.GOLDEN_CARROT) 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 2a73c12..1b71fc2 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/HostileMobs.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/HostileMobs.java @@ -14,7 +14,7 @@ import io.github.thebusybiscuit.hotbarpets.pets.ShulkerPet; import io.github.thebusybiscuit.hotbarpets.pets.SpiderPet; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public final class HostileMobs implements PetGroup { @@ -30,13 +30,13 @@ public String getName() { @Override public void load(HotbarPets plugin) { // @formatter:off - new SpiderPet(plugin.getCategory(), 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 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) }).register(plugin); - new GhastPet(plugin.getCategory(), 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 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 @@ -48,13 +48,13 @@ SlimefunItems.GOLD_24K, new ItemStack(Material.TNT), SlimefunItems.GOLD_24K new ItemStack(Material.FEATHER), new ItemStack(Material.SHULKER_SHELL), new ItemStack(Material.FEATHER) }).register(plugin); - new PhantomPet(plugin.getCategory(), 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 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.PHANTOM_MEMBRANE), new ItemStack(Material.RABBIT_FOOT), new ItemStack(Material.PHANTOM_MEMBRANE) }).register(plugin); - new EndermanPet(plugin.getCategory(), 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 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) @@ -66,19 +66,19 @@ SlimefunItems.GOLD_24K, new ItemStack(Material.TNT), SlimefunItems.GOLD_24K new ItemStack(Material.DIAMOND), SlimefunItems.GOLD_20K, new ItemStack(Material.DIAMOND) }).register(plugin); - new HotbarPet(plugin.getCategory(), 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 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) }).register(plugin); - new HotbarPet(plugin.getCategory(), 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 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 }).register(plugin); - new HotbarPet(plugin.getCategory(), 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 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) 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 1aa2622..7a97ec3 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/PassiveMobs.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/PassiveMobs.java @@ -9,7 +9,7 @@ import io.github.thebusybiscuit.hotbarpets.PetGroup; import io.github.thebusybiscuit.hotbarpets.pets.IronGolemPet; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public final class PassiveMobs implements PetGroup { @@ -25,13 +25,13 @@ public String getName() { @Override public void load(HotbarPets plugin) { // @formatter:off - new IronGolemPet(plugin.getCategory(), 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 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) }).register(plugin); - new HotbarPet(plugin.getCategory(), 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 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 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 8f1c03b..ca8a828 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/PeacefulAnimals.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/PeacefulAnimals.java @@ -11,7 +11,7 @@ import io.github.thebusybiscuit.hotbarpets.pets.RabbitPet; import io.github.thebusybiscuit.hotbarpets.pets.SquidPet; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public final class PeacefulAnimals implements PetGroup { @@ -27,31 +27,31 @@ public String getName() { @Override public void load(HotbarPets plugin) { // @formatter:off - new HotbarPet(plugin.getCategory(), 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 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) }).register(plugin); - new SquidPet(plugin.getCategory(), 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 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) }).register(plugin); - new RabbitPet(plugin.getCategory(), 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[] { + 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[] { new ItemStack(Material.GOLDEN_CARROT), new ItemStack(Material.RABBIT_HIDE), new ItemStack(Material.GOLDEN_CARROT), new ItemStack(Material.RABBIT_HIDE), new ItemStack(Material.DIAMOND), new ItemStack(Material.RABBIT_HIDE), new ItemStack(Material.GOLDEN_CARROT), new ItemStack(Material.RABBIT_FOOT), new ItemStack(Material.GOLDEN_CARROT) }).register(plugin); - new DolphinPet(plugin.getCategory(), new SlimefunItemStack("HOTBAR_PET_DOLPHIN", PetTexture.DOLPHIN_PET.getHash(), "&bDolphin Pet", getName(), "&7Favourite Food: Ink Sacks", "", "&fRight-Click: &7Dolphin's Grace"), new ItemStack(Material.INK_SAC), new ItemStack[] { + new DolphinPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_DOLPHIN", PetTexture.DOLPHIN_PET.getHash(), "&bDolphin Pet", getName(), "&7Favourite Food: Ink Sacks", "", "&fRight-Click: &7Dolphin's Grace"), new ItemStack(Material.INK_SAC), new ItemStack[] { new ItemStack(Material.LAPIS_LAZULI), new ItemStack(Material.COD), new ItemStack(Material.LAPIS_LAZULI), new ItemStack(Material.SALMON), new ItemStack(Material.EMERALD), new ItemStack(Material.SALMON), new ItemStack(Material.LAPIS_LAZULI), new ItemStack(Material.COD), new ItemStack(Material.LAPIS_LAZULI) }).register(plugin); - new HotbarPet(plugin.getCategory(), new SlimefunItemStack("HOTBAR_PET_PANDA", PetTexture.PANDA_PET.getHash(), "&8Panda &fPet", getName(),"&7Favorite Food: Bamboo", "", "&fThis sleepy Panda protects you from Insomnia", "&fPhantoms will no longer chase you at night"), new ItemStack(Material.BAMBOO), new ItemStack[] { + new HotbarPet(plugin.getItemGroup(), new SlimefunItemStack("HOTBAR_PET_PANDA", PetTexture.PANDA_PET.getHash(), "&8Panda &fPet", getName(),"&7Favorite Food: Bamboo", "", "&fThis sleepy Panda protects you from Insomnia", "&fPhantoms will no longer chase you at night"), new ItemStack(Material.BAMBOO), new ItemStack[] { new ItemStack(Material.BAMBOO), new ItemStack(Material.DIAMOND), new ItemStack(Material.BAMBOO), new ItemStack(Material.DIAMOND), new ItemStack(Material.EMERALD), new ItemStack(Material.DIAMOND), new ItemStack(Material.ACACIA_LEAVES), new ItemStack(Material.BAMBOO), new ItemStack(Material.ACACIA_LEAVES) 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 2eacbbf..aa8dd3c 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/SpecialPets.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/SpecialPets.java @@ -11,7 +11,7 @@ import io.github.thebusybiscuit.hotbarpets.pets.special.PatriotPet; import io.github.thebusybiscuit.hotbarpets.pets.special.PurpliciousCowPet; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public final class SpecialPets implements PetGroup { @@ -27,31 +27,31 @@ public String getName() { @Override public void load(HotbarPets plugin) { // @formatter:off - new PurpliciousCowPet(plugin.getCategory(), 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 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 }).register(plugin); - new CookieSlimePet(plugin.getCategory(), 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 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 }).register(plugin); - new PatriotPet(plugin.getCategory(), 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 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 }).register(plugin); - new HotbarPet(plugin.getCategory(), 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 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 }).register(plugin); - new HotbarPet(plugin.getCategory(), 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 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 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 8016bbe..b2e2804 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/UtilityPets.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/groups/UtilityPets.java @@ -10,7 +10,7 @@ import io.github.thebusybiscuit.hotbarpets.pets.EnderChestPet; import io.github.thebusybiscuit.hotbarpets.pets.WorkbenchPet; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public final class UtilityPets implements PetGroup { @@ -26,19 +26,19 @@ public String getName() { @Override public void load(HotbarPets plugin) { // @formatter:off - new BedPet(plugin.getCategory(), 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 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) }).register(plugin); - new EnderChestPet(plugin.getCategory(), 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 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) }).register(plugin); - new WorkbenchPet(plugin.getCategory(), 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 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) diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/DamageListener.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/DamageListener.java index 5f9e7bc..02420e6 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/DamageListener.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/DamageListener.java @@ -14,7 +14,7 @@ import io.github.thebusybiscuit.hotbarpets.HotbarPet; import io.github.thebusybiscuit.hotbarpets.HotbarPets; import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; public class DamageListener implements Listener { @@ -27,13 +27,13 @@ public class DamageListener implements Listener { private final HotbarPet blaze; public DamageListener(HotbarPets plugin) { - creeper = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_CREEPER"); - magmacube = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_MAGMA_CUBE"); - slime = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_SLIME"); - mrCookieSlime = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_MRCOOKIESLIME"); - wither = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_WITHER"); - walshrus = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_WALSHRUS"); - blaze = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_BLAZE"); + creeper = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_CREEPER"); + magmacube = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_MAGMA_CUBE"); + slime = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_SLIME"); + mrCookieSlime = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_MRCOOKIESLIME"); + wither = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_WITHER"); + walshrus = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_WALSHRUS"); + blaze = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_BLAZE"); plugin.getServer().getPluginManager().registerEvents(this, plugin); } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/FoodListener.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/FoodListener.java index 76337fe..1a595ca 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/FoodListener.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/FoodListener.java @@ -13,7 +13,7 @@ import io.github.thebusybiscuit.hotbarpets.HotbarPet; import io.github.thebusybiscuit.hotbarpets.HotbarPets; import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; public class FoodListener implements Listener { @@ -24,8 +24,8 @@ public class FoodListener implements Listener { public FoodListener(HotbarPets plugin) { this.plugin = plugin; - pig = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_PIG"); - zombie = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_ZOMBIE"); + pig = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_PIG"); + zombie = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_ZOMBIE"); } @EventHandler diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/GeneralListener.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/GeneralListener.java index 058a34d..6942fe8 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/GeneralListener.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/GeneralListener.java @@ -10,7 +10,7 @@ import io.github.thebusybiscuit.hotbarpets.HotbarPet; import io.github.thebusybiscuit.hotbarpets.HotbarPets; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; public class GeneralListener implements Listener { diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/PhantomListener.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/PhantomListener.java index eadeeb8..0fbc2e4 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/PhantomListener.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/PhantomListener.java @@ -9,14 +9,14 @@ import io.github.thebusybiscuit.hotbarpets.HotbarPet; import io.github.thebusybiscuit.hotbarpets.HotbarPets; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; public class PhantomListener implements Listener { private final HotbarPet panda; public PhantomListener(HotbarPets plugin) { - panda = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_PANDA"); + panda = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_PANDA"); plugin.getServer().getPluginManager().registerEvents(this, plugin); } 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 a7ffba7..0ecc433 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/SoulPieListener.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/SoulPieListener.java @@ -10,15 +10,15 @@ import io.github.thebusybiscuit.hotbarpets.HotbarPet; import io.github.thebusybiscuit.hotbarpets.HotbarPets; import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; -import me.mrCookieSlime.Slimefun.cscorelib2.item.CustomItem; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack; public class SoulPieListener implements Listener { private final HotbarPet eyamaz; public SoulPieListener(HotbarPets plugin) { - eyamaz = (HotbarPet) SlimefunItem.getByID("HOTBAR_PET_EYAMAZ"); + eyamaz = (HotbarPet) SlimefunItem.getById("HOTBAR_PET_EYAMAZ"); plugin.getServer().getPluginManager().registerEvents(this, plugin); } @@ -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 CustomItem(new ItemStack(Material.PUMPKIN_PIE), "&bSoul Pie")); + e.getEntity().getLocation().getWorld().dropItemNaturally(e.getEntity().getLocation(), new CustomItemStack(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 c3d5162..e26b81f 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/TNTListener.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/listeners/TNTListener.java @@ -17,8 +17,8 @@ import org.bukkit.event.entity.EntityExplodeEvent; import io.github.thebusybiscuit.hotbarpets.HotbarPets; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin; -import me.mrCookieSlime.Slimefun.cscorelib2.protection.ProtectableAction; +import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; +import io.github.thebusybiscuit.slimefun4.libraries.dough.protection.Interaction; public class TNTListener implements Listener { @@ -39,7 +39,7 @@ public void onTNTDamage(EntityDamageByEntityEvent e) { if (attacker == null) { e.setCancelled(true); - } else if (!SlimefunPlugin.getProtectionManager().hasPermission(attacker, e.getEntity().getLocation(), ProtectableAction.ATTACK_PLAYER)) { + } else if (!Slimefun.getProtectionManager().hasPermission(attacker, e.getEntity().getLocation(), Interaction.ATTACK_PLAYER)) { e.setCancelled(true); attacker.sendMessage(ChatColor.DARK_RED + "You cannot harm Players in here!"); } @@ -58,7 +58,7 @@ public void onTNTExplode(EntityExplodeEvent e) { while (blocks.hasNext()) { Block b = blocks.next(); - if (!SlimefunPlugin.getProtectionManager().hasPermission(player, b, ProtectableAction.BREAK_BLOCK)) { + if (!Slimefun.getProtectionManager().hasPermission(player, b, Interaction.BREAK_BLOCK)) { blocks.remove(); } } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/BedPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/BedPet.java index abe9cb1..e4698c7 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/BedPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/BedPet.java @@ -6,13 +6,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class BedPet extends SimpleBasePet { - public BedPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public BedPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override 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 53e6268..9cbc3c7 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/CowPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/CowPet.java @@ -6,13 +6,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class CowPet extends SimpleBasePet { - public CowPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public CowPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override 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 2941014..8a3332f 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/CreeperPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/CreeperPet.java @@ -9,14 +9,15 @@ import io.github.thebusybiscuit.hotbarpets.HotbarPets; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class CreeperPet extends SimpleBasePet { private final HotbarPets plugin; public CreeperPet(HotbarPets plugin, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(plugin.getCategory(), item, food, recipe); + super(plugin.getItemGroup(), item, food, recipe); this.plugin = plugin; } diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/DolphinPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/DolphinPet.java index ade6174..54a85f9 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/DolphinPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/DolphinPet.java @@ -6,13 +6,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class DolphinPet extends SimpleBasePet { - public DolphinPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public DolphinPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EnderChestPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EnderChestPet.java index 163c550..b4ec1fb 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EnderChestPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EnderChestPet.java @@ -5,13 +5,13 @@ import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class EnderChestPet extends SimpleBasePet { - public EnderChestPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public EnderChestPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override 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 d02fe09..3365eff 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EnderDragonPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EnderDragonPet.java @@ -8,13 +8,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class EnderDragonPet extends SimpleBasePet { - public EnderDragonPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public EnderDragonPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EndermanPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EndermanPet.java index 18a2c65..f4f2cdc 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EndermanPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/EndermanPet.java @@ -6,13 +6,13 @@ import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class EndermanPet extends SimpleBasePet { - public EndermanPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public EndermanPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/GhastPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/GhastPet.java index d948825..41e0ea0 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/GhastPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/GhastPet.java @@ -7,13 +7,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class GhastPet extends SimpleBasePet { - public GhastPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public GhastPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override 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 0b1ad73..3ed474b 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/IronGolemPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/IronGolemPet.java @@ -7,13 +7,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class IronGolemPet extends SimpleBasePet { - public IronGolemPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public IronGolemPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/PhantomPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/PhantomPet.java index f69ba9f..e43fb59 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/PhantomPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/PhantomPet.java @@ -7,13 +7,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class PhantomPet extends SimpleBasePet { - public PhantomPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public PhantomPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/RabbitPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/RabbitPet.java index 48ef2f0..d161663 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/RabbitPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/RabbitPet.java @@ -6,13 +6,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class RabbitPet extends SimpleBasePet { - public RabbitPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public RabbitPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/ShulkerPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/ShulkerPet.java index 309450a..0beaef5 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/ShulkerPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/ShulkerPet.java @@ -10,14 +10,14 @@ import io.github.thebusybiscuit.hotbarpets.HotbarPets; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class ShulkerPet extends SimpleBasePet { private final HotbarPets plugin; public ShulkerPet(HotbarPets plugin, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(plugin.getCategory(), item, food, recipe); + super(plugin.getItemGroup(), item, food, recipe); this.plugin = plugin; } 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 4349661..6f230a6 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/SpiderPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/SpiderPet.java @@ -7,13 +7,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class SpiderPet extends SimpleBasePet { - public SpiderPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public SpiderPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/SquidPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/SquidPet.java index 06f3c12..33395cc 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/SquidPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/SquidPet.java @@ -6,13 +6,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class SquidPet extends SimpleBasePet { - public SquidPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public SquidPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/WorkbenchPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/WorkbenchPet.java index 5281743..0961ea3 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/WorkbenchPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/WorkbenchPet.java @@ -5,13 +5,13 @@ import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class WorkbenchPet extends SimpleBasePet { - public WorkbenchPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public WorkbenchPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/special/CookieSlimePet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/special/CookieSlimePet.java index 1315928..a31db5a 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/special/CookieSlimePet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/special/CookieSlimePet.java @@ -7,13 +7,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class CookieSlimePet extends SimpleBasePet { - public CookieSlimePet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public CookieSlimePet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override 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 654c7f0..b939732 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 @@ -7,13 +7,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class PatriotPet extends SimpleBasePet { - public PatriotPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public PatriotPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/special/PurpliciousCowPet.java b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/special/PurpliciousCowPet.java index 011c3c3..249fbaa 100644 --- a/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/special/PurpliciousCowPet.java +++ b/src/main/java/io/github/thebusybiscuit/hotbarpets/pets/special/PurpliciousCowPet.java @@ -7,13 +7,13 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.hotbarpets.SimpleBasePet; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; public class PurpliciousCowPet extends SimpleBasePet { - public PurpliciousCowPet(Category category, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { - super(category, item, food, recipe); + public PurpliciousCowPet(ItemGroup itemGroup, SlimefunItemStack item, ItemStack food, ItemStack[] recipe) { + super(itemGroup, item, food, recipe); } @Override