From 71dd823d3e3de42909f512713130d056120273aa Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Sun, 24 Nov 2024 23:27:45 +0100 Subject: [PATCH] update MockBukkit to 4.5.0 --- build.gradle.kts | 2 +- .../cuanvil/mock/EnchantedItemStackMock.java | 57 ------------------- .../cuanvil/util/AnvilFuseTestUtil.java | 3 +- 3 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 src/test/java/xyz/alexcrea/cuanvil/mock/EnchantedItemStackMock.java diff --git a/build.gradle.kts b/build.gradle.kts index 5831d44..d2769e7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -65,7 +65,7 @@ dependencies { implementation(kotlin("stdlib")) // Test dependency - testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.3.1") + testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.5.0") testRuntimeOnly("commons-lang:commons-lang:2.6") } diff --git a/src/test/java/xyz/alexcrea/cuanvil/mock/EnchantedItemStackMock.java b/src/test/java/xyz/alexcrea/cuanvil/mock/EnchantedItemStackMock.java deleted file mode 100644 index e7383f3..0000000 --- a/src/test/java/xyz/alexcrea/cuanvil/mock/EnchantedItemStackMock.java +++ /dev/null @@ -1,57 +0,0 @@ -package xyz.alexcrea.cuanvil.mock; - -import org.bukkit.Material; -import org.bukkit.enchantments.Enchantment; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; -import org.mockbukkit.mockbukkit.inventory.ItemStackMock; - -public class EnchantedItemStackMock extends ItemStackMock { - - public EnchantedItemStackMock(@NotNull Material type, int amount) { - super(type, amount); - } - - public EnchantedItemStackMock(@NotNull Material type) { - this(type, 1); - } - - public EnchantedItemStackMock(@NotNull ItemStack stack) { - super(stack); - } - - @Override - public int removeEnchantment(@NotNull Enchantment ench) { - if(!this.hasItemMeta()) return 0; - - int level = this.getEnchantmentLevel(ench); - this.getItemMeta().removeEnchant(ench); - - return level; - } - - @Override - public void removeEnchantments() { - if(!this.hasItemMeta()) return; - - this.getItemMeta().removeEnchantments(); - } - - @Override - public boolean equals(Object obj) { - if(!super.equals(obj)) return false; - - return getItemMeta().equals(((ItemStack)obj).getItemMeta()); - } - - @Override - public @NotNull ItemStack clone() { - EnchantedItemStackMock clone = new EnchantedItemStackMock(this.getType()); - - clone.setAmount(this.getAmount()); - clone.setItemMeta(this.getItemMeta()); - clone.setDurability(this.getDurability()); - return clone; - } - -} diff --git a/src/test/java/xyz/alexcrea/cuanvil/util/AnvilFuseTestUtil.java b/src/test/java/xyz/alexcrea/cuanvil/util/AnvilFuseTestUtil.java index de8a706..6f77e52 100644 --- a/src/test/java/xyz/alexcrea/cuanvil/util/AnvilFuseTestUtil.java +++ b/src/test/java/xyz/alexcrea/cuanvil/util/AnvilFuseTestUtil.java @@ -14,7 +14,6 @@ import org.junit.jupiter.api.Assertions; import xyz.alexcrea.cuanvil.enchant.CAEnchantment; import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener; import xyz.alexcrea.cuanvil.mock.AnvilViewMock; -import xyz.alexcrea.cuanvil.mock.EnchantedItemStackMock; import java.util.ArrayList; import java.util.HashMap; @@ -39,7 +38,7 @@ public class AnvilFuseTestUtil { enchantmentMap.put(enchantments.get(i), level.get(i)); } - ItemStack item = new EnchantedItemStackMock(material); + ItemStack item = new ItemStack(material); ItemUtil.INSTANCE.setEnchantmentsUnsafe(item, enchantmentMap); ItemMeta meta = item.getItemMeta();