build.gradle.kts

@@ -69,10 +69,10 @@ dependencies {
     compileOnly(files("libs/EnchantsSquared.jar"))
 
     // EcoEnchants & item
-    compileOnly("com.willfp:libreforge:2026.32:all")
+    compileOnly("com.willfp:libreforge:4.79.0:all")
-    compileOnly("com.willfp:eco:2026.32")
+    compileOnly("com.willfp:eco:6.74.5")
 
-    compileOnly("com.willfp:EcoEnchants:2026.32:all")
+    compileOnly("com.willfp:EcoEnchants:12.11.1")
     compileOnly(project(":impl:LegacyEcoEnchant"))
 
     compileOnly("com.willfp:EcoItems:5.66.0")

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt

@@ -42,7 +42,6 @@ object DependencyManager {
 
     var enchantmentSquaredCompatibility: EnchantmentSquaredDependency? = null
     var ecoEnchantCompatibility: EcoEnchantDependency? = null
-    var hasEcoItem: Boolean = false
     var excellentEnchantsCompatibility: ExcellentEnchantsDependency? = null
 
     var disenchantmentCompatibility: DisenchantmentDependency? = null
@@ -79,10 +78,6 @@ object DependencyManager {
             ecoEnchantCompatibility = EcoEnchantDependency(pluginManager.getPlugin("EcoEnchants")!!)
             ecoEnchantCompatibility!!.disableAnvilListener()
         }
-        // EcoItem check
-        if (pluginManager.isPluginEnabled("EcoItems")) {
-            hasEcoItem = true
-        }
 
         // Excellent Enchants dependency
         if (pluginManager.isPluginEnabled("ExcellentEnchants")) {

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackDependency.kt

@@ -223,11 +223,7 @@ object DataPackDependency {
 
     private fun setEnchantAsAll(ench: String) {
         // We assume current is not null and of type CABukkitEnchantment
-        val current = EnchantmentApi.getByKey(NamespacedKey.fromString(ench)!!) as? CABukkitEnchantment
+        val current = EnchantmentApi.getByKey(NamespacedKey.fromString(ench)!!) as CABukkitEnchantment
-        if(current == null) {
-            CustomAnvil.instance.logger.warning("Could not find enchant $ench")
-            return
-        }
 
         // We need to replace current wrapped enchantment with the all conflict wrapper
         EnchantmentApi.unregisterEnchantment(current)

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/EcoEnchantDependency.kt

@@ -3,7 +3,7 @@ package xyz.alexcrea.cuanvil.dependency.plugins
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.ecoenchants.enchant.EcoEnchant
 import com.willfp.ecoenchants.enchant.EcoEnchants
-import com.willfp.ecoenchants.enchant.UtilKt
+import com.willfp.ecoenchants.mechanics.infiniteIfNegative
 import io.delilaheve.CustomAnvil
 import org.bukkit.event.inventory.PrepareAnvilEvent
 import org.bukkit.plugin.Plugin
@@ -35,7 +35,7 @@ class EcoEnchantDependency(private val ecoEnchantPlugin: Plugin) {
     }
 
     public fun getEcoLevelLimit(): Int {
-        return UtilKt.infiniteIfNegative((ecoEnchantPlugin as EcoPlugin).configYml.getInt("anvil.enchant-limit"))
+        return (ecoEnchantPlugin as EcoPlugin).configYml.getInt("anvil.enchant-limit").infiniteIfNegative()
     }
 
     fun disableAnvilListener() {
@@ -51,7 +51,7 @@ class EcoEnchantDependency(private val ecoEnchantPlugin: Plugin) {
             return
         }
 
-        val enchantments = EcoEnchants.INSTANCE.values()
+        val enchantments = EcoEnchants.values()
         for (ecoEnchant in enchantments) {
             EnchantmentApi.unregisterEnchantment(ecoEnchant.enchantment) // As eco enchants is loaded before custom anvil and register enchantment to registry, we need to unregister old "vanilla" enchant.
             EnchantmentApi.registerEnchantment(CAEcoEnchant(ecoEnchant))
@@ -71,7 +71,7 @@ class EcoEnchantDependency(private val ecoEnchantPlugin: Plugin) {
         // Should not happen in known case.
         if (this.ecoEnchantOldEnchantments == null) return
 
-        val newEnchantments = EcoEnchants.INSTANCE.values()
+        val newEnchantments = EcoEnchants.values()
 
         // Add new enchantments
         for (ecoEnchant in newEnchantments)

src/main/kotlin/xyz/alexcrea/cuanvil/util/MaterialUtil.kt

@@ -21,7 +21,7 @@ object MaterialUtil {
 
     val ItemStack.customType: NamespacedKey
         get() {
-            if(DependencyManager.hasEcoItem) {
+            if(DependencyManager.ecoEnchantCompatibility != null) {
                 val result = EcoItemDependencyUtil.ecoItemNamespace(this)
                 if(result != null) return result
             }
@@ -43,7 +43,7 @@ object MaterialUtil {
 
     @Nullable
     fun getMatFromKey(key: NamespacedKey): Material? {
-        if(DependencyManager.hasEcoItem) {
+        if(DependencyManager.ecoEnchantCompatibility != null) {
             val result = EcoItemDependencyUtil.ecoItemMaterialFromKey(key)
             if(result != null) return result
         }
@@ -58,7 +58,7 @@ object MaterialUtil {
     }
 
     fun itemFromKey(key: NamespacedKey): ItemStack {
-        if(DependencyManager.hasEcoItem) {
+        if(DependencyManager.ecoEnchantCompatibility != null) {
             val result = EcoItemDependencyUtil.newEcoItemstack(key)
             if(result != null) return result
         }
@@ -78,7 +78,7 @@ object MaterialUtil {
 
     fun getMaterialCount(): Int {
         var count = Material.entries.size
-        if(DependencyManager.hasEcoItem) {
+        if(DependencyManager.ecoEnchantCompatibility != null) {
             count += EcoItemDependencyUtil.getItems().size
         }
 
@@ -92,7 +92,7 @@ object MaterialUtil {
 
     fun getMaterials(): MutableList<NamespacedKey> {
         val all = ArrayList(Material.entries.map { it.key })
-        if(DependencyManager.hasEcoItem) {
+        if(DependencyManager.ecoEnchantCompatibility != null) {
             all.addAll(EcoItemDependencyUtil.getItems())
         }
 

src/main/resources/plugin.yml

@@ -68,7 +68,6 @@ softdepend:
   - Disenchantment
   - EnchantsSquared
   - EcoEnchants
-  - EcoItems
   - eco
   - ExcellentEnchants
   - HavenBags