From 6f2b15a0bc5090046777a3e6d092c77e3fa1494b Mon Sep 17 00:00:00 2001
From: alexcrea <42614139+alexcrea@users.noreply.github.com>
Date: Wed, 4 Dec 2024 17:37:14 +0100
Subject: [PATCH] upgrade mockbukkit to 4.9.3 and fix some broken test

---
 build.gradle.kts                                |  2 +-
 .../alexcrea/cuanvil/anvil/AnvilFuseTests.java  | 17 ++++++++++++++---
 .../alexcrea/cuanvil/api/ConflictApiTests.java  |  2 +-
 .../cuanvil/api/UnitRepairApiTests.java         |  2 ++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 60fb3a9..d1ab663 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -66,7 +66,7 @@ dependencies {
     implementation(kotlin("stdlib"))
 
     // Test dependency
-    testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.5.0")
+    testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.9.3") //lower bound: 4.9.2  upper bound: 4.9.3
     testRuntimeOnly("commons-lang:commons-lang:2.6")
 }
 
diff --git a/src/test/java/xyz/alexcrea/cuanvil/anvil/AnvilFuseTests.java b/src/test/java/xyz/alexcrea/cuanvil/anvil/AnvilFuseTests.java
index 4d540ec..fde2a68 100644
--- a/src/test/java/xyz/alexcrea/cuanvil/anvil/AnvilFuseTests.java
+++ b/src/test/java/xyz/alexcrea/cuanvil/anvil/AnvilFuseTests.java
@@ -4,6 +4,8 @@
 import org.bukkit.inventory.AnvilInventory;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.Repairable;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -49,11 +51,15 @@ public static void tearDown() {
     public void mergeFuseTest(){
         // Literally just test a sharpness 4 + sharpness 4
         ItemStack sharpness4 = CommonItemUtil.sharpness(4);
-        ItemStack sharpness5 = CommonItemUtil.sharpness(5);
+
+        ItemStack sharpness5Result = CommonItemUtil.sharpness(5);
+        Repairable meta = (Repairable) sharpness5Result.getItemMeta();
+        meta.setRepairCost(1);
+        sharpness5Result.setItemMeta(meta);
 
         AnvilFuseTestData data = new AnvilFuseTestData(
                 sharpness4, sharpness4,
-                sharpness5
+                sharpness5Result
                 // TODO add expected price
         );
 
@@ -66,9 +72,14 @@ public void overFuseTest(){
         ItemStack sharpness4 = CommonItemUtil.sharpness(4);
         ItemStack sharpness5 = CommonItemUtil.sharpness(5);
 
+        ItemStack sharpness5Result = CommonItemUtil.sharpness(5);
+        Repairable meta = (Repairable) sharpness5Result.getItemMeta();
+        meta.setRepairCost(1);
+        sharpness5Result.setItemMeta(meta);
+
         AnvilFuseTestData data = new AnvilFuseTestData(
                 sharpness4, sharpness5,
-                sharpness5
+                sharpness5Result
                 // TODO add expected price
         );
 
diff --git a/src/test/java/xyz/alexcrea/cuanvil/api/ConflictApiTests.java b/src/test/java/xyz/alexcrea/cuanvil/api/ConflictApiTests.java
index 4b43624..bc758b6 100644
--- a/src/test/java/xyz/alexcrea/cuanvil/api/ConflictApiTests.java
+++ b/src/test/java/xyz/alexcrea/cuanvil/api/ConflictApiTests.java
@@ -51,7 +51,7 @@ public void testConflict() {
         ItemStack sharpness1 = CommonItemUtil.sharpness(1);
         ItemStack arthropods1 = CommonItemUtil.bane_of_arthropods(1);
         ItemStack illegalResult = AnvilFuseTestUtil.prepareItem(
-                Material.DIAMOND_SWORD,
+                Material.DIAMOND_SWORD, 1,
                 List.of("bane_of_arthropods", "sharpness"),
                 1, 1
         );
diff --git a/src/test/java/xyz/alexcrea/cuanvil/api/UnitRepairApiTests.java b/src/test/java/xyz/alexcrea/cuanvil/api/UnitRepairApiTests.java
index 730aed8..71a27d1 100644
--- a/src/test/java/xyz/alexcrea/cuanvil/api/UnitRepairApiTests.java
+++ b/src/test/java/xyz/alexcrea/cuanvil/api/UnitRepairApiTests.java
@@ -48,6 +48,7 @@ void vanillaUnitRepair(){
         resultPickaxe.setDurability((short) (Material.DIAMOND_PICKAXE.getMaxDurability()/2));
         ItemMeta meta = resultPickaxe.getItemMeta();
         ((Repairable) meta).setRepairCost(1);
+        resultPickaxe.setItemMeta(meta);
 
         ItemStack diamond2 = new ItemStackMock(Material.DIAMOND, 2);
 
@@ -93,6 +94,7 @@ void addUnitRepair(){
         resultPickaxe.setDurability((short) (Material.DIAMOND_PICKAXE.getMaxDurability()/2));
         ItemMeta meta = resultPickaxe.getItemMeta();
         ((Repairable) meta).setRepairCost(1);
+        resultPickaxe.setItemMeta(meta);
 
         ItemStack stick2 = new ItemStackMock(Material.STICK, 2);