Update Oraxen and fix durability application

WolfyScript · Mar 14, 2024 · 9c372b1 · 9c372b1
1 parent b43dc97
commit 9c372b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,6 +35,7 @@ repositories {
     maven(url = "https://repo.dmulloy2.net/repository/public/")
     maven(url = "https://repo.maven.apache.org/maven2/")
     maven(url = "https://mvn.lumine.io/repository/maven-public/")
+    maven(url = "https://repo.oraxen.com/releases")
 }
 
 dependencies {
@@ -46,7 +47,7 @@ dependencies {
     compileOnly("org.jetbrains:annotations:23.0.0")
     compileOnly("io.netty:netty-all:4.1.85.Final")
     compileOnly("me.clip:placeholderapi:2.10.4")
-    compileOnly("com.github.oraxen:oraxen:1.156.0")
+    compileOnly("io.th0rgal:oraxen:1.170.0")
     compileOnly("com.wolfyscript.wolfyutils.spigot:wolfyutils-spigot:4.16.15-beta.12-SNAPSHOT")
 }
 
@@ -136,7 +137,7 @@ minecraftServers {
         }
         // Paper test servers
         register("paper_1_20") {
-            version.set("1.20.2")
+            version.set("1.20.4")
             type.set("PAPER")
             ports.set(setOf(debugPortMapping, "25569:25565"))
         }

diff --git a/.../java/me/wolfyscript/customcrafting/recipes/items/target/adapters/DamageMergeAdapter.java b/.../java/me/wolfyscript/customcrafting/recipes/items/target/adapters/DamageMergeAdapter.java
@@ -25,7 +25,6 @@
 import com.wolfyscript.utilities.bukkit.world.items.reference.StackReference;
 import io.th0rgal.oraxen.OraxenPlugin;
 import io.th0rgal.oraxen.api.OraxenItems;
-import io.th0rgal.oraxen.mechanics.provided.gameplay.durability.DurabilityMechanic;
 import io.th0rgal.oraxen.mechanics.provided.gameplay.durability.DurabilityMechanicFactory;
 import java.util.ArrayList;
 import java.util.List;
@@ -35,7 +34,6 @@
 import me.wolfyscript.customcrafting.recipes.items.target.MergeAdapter;
 import me.wolfyscript.customcrafting.utils.NamespacedKeyUtils;
 import me.wolfyscript.utilities.api.WolfyUtilCore;
-import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem;
 import me.wolfyscript.utilities.compatibility.plugins.ItemsAdderIntegration;
 import me.wolfyscript.utilities.util.NamespacedKey;
 import org.bukkit.block.Block;
@@ -167,15 +165,17 @@ private class OraxenAdapter implements DamagePluginAdapter {
         public Optional<Integer> getDamage(ItemStack stack) {
             PersistentDataContainer persistentDataContainer = stack.getItemMeta().getPersistentDataContainer();
             Integer dur = persistentDataContainer.get(DURABILITY_KEY, PersistentDataType.INTEGER);
-            if (dur != null && DurabilityMechanicFactory.get().getMechanic(OraxenItems.getIdByItem(stack)) instanceof DurabilityMechanic durabilityMechanic) {
+            var durabilityMechanic = DurabilityMechanicFactory.get().getMechanic(OraxenItems.getIdByItem(stack));
+            if (dur != null && durabilityMechanic != null) {
                 return Optional.of(durabilityMechanic.getItemMaxDurability() - dur);
             }
             return Optional.empty();
         }
 
         @Override
         public Optional<ItemStack> tryToApplyDamage(RecipeData<?> recipeData, ItemStack result) {
-            if (DurabilityMechanicFactory.get().getMechanic(OraxenItems.getIdByItem(result)) instanceof DurabilityMechanic durabilityMechanic) {
+            var durabilityMechanic = DurabilityMechanicFactory.get().getMechanic(OraxenItems.getIdByItem(result));
+            if (durabilityMechanic != null) {
                 durabilityMechanic.changeDurability(result, calculateDamage(recipeData, durabilityMechanic.getItemMaxDurability()));
                 return Optional.of(result);
             }