v1.7.0 (#45)

Some changes for this version:
- Tried to make compatible with some legacy version of eco enchant (not assumed to work)
- Fix some enchantment test from other plugin not being taken into account. 
Should work as expected now, but that mean it may not work as currently.
- Made Heaven bag works
- Updated Disenchantment, should work with disenchantment version >= 6.1.0. But break support for previous versions

README.md

@@ -64,7 +64,10 @@ Officially supported but still experimental. use ExcellentEnchants item type.
 
 Here is a list of supported anvil mechanic plugins with support status:
 - [Disenchantment](https://www.spigotmc.org/resources/disenchantment-1-21-1-1-20-6-new-book-splitting-mechanics.110741/)
-Officially supported by Custom Anvil but still experimental. Mostly use Custom Anvil basic XP settings. (version >= 5.4.0)
+Officially supported by Custom Anvil but still experimental. Mostly use Custom Anvil basic XP settings. (version >= 6.1.0)
+
+- [HavenBags](https://www.spigotmc.org/resources/havenbags-shulker-like-player-bound-bags-1-17-1-21-4.110420/)
+Officially supported by Custom Anvil. Not really enchantment related but CustomAnvil should not impact bag upgrade and skin via anvil.
 
 If you like Custom Anvil to support a specific plugin (custom enchant or anvil mechanic). 
 You can ask, but please note implementing compatibility will be considered

build.gradle.kts

@@ -3,20 +3,20 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    kotlin("jvm") version "2.0.21"
+    kotlin("jvm") version "2.1.0"
     java
     id("org.jetbrains.dokka").version("1.9.20")
-    id("com.gradleup.shadow").version("8.3.3")
+    id("com.gradleup.shadow").version("8.3.5")
     // Maven publish
     `maven-publish`
     signing
     id("cn.lalaki.central").version("1.2.5")
     // Paper
-    id("io.papermc.paperweight.userdev") version "1.7.3" apply false
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.14" apply false
 }
 
 group = "xyz.alexcrea"
-version = "1.6.13"
+version = "1.7.0"
 
 repositories {
     // EcoEnchants
@@ -37,16 +37,20 @@ dependencies {
     compileOnly(files("libs/EnchantsSquared.jar"))
 
     // EcoEnchants
-    compileOnly("com.willfp:EcoEnchants:12.5.1")
-    compileOnly("com.willfp:eco:6.70.1")
+    compileOnly("com.willfp:EcoEnchants:12.11.1")
+    compileOnly("com.willfp:eco:6.74.5")
+    compileOnly(project(":impl:LegacyEcoEnchant"))
 
     // ExcellentEnchants
-    compileOnly(files("libs/nightcore-2.6.4.jar"))
-    compileOnly(files("libs/ExcellentEnchants-4.2.2.jar"))
-    compileOnly(files("libs/ExcellentEnchants 4.1.0-striped.jar"))
+    compileOnly(files("libs/nightcore-2.7.3.jar"))
+    compileOnly(files("libs/ExcellentEnchants-4.3.1.jar"))
+    compileOnly(files("libs/ExcellentEnchants 4.1.0-striped.jar")) // For legacy excellent enchants
 
     // Disenchantment
-    compileOnly("cz.kominekjan:Disenchantment:v5.4.0")
+    compileOnly(files("libs/Disenchantment-6.1.0.jar"))
+
+    // HavenBags
+    compileOnly(files("libs/HavenBags-1.30.1.1729.jar"))
 
     // Include nms
     implementation(project(":nms:nms-common"))
@@ -62,13 +66,13 @@ dependencies {
     implementation(project(":nms:v1_20R4", configuration = "reobf"))
     implementation(project(":nms:v1_21R1", configuration = "reobf"))
     implementation(project(":nms:v1_21R2", configuration = "reobf"))
-    implementation(project(":nms:v1_21R3"))//, configuration = "reobf")) // TODO add again when paperweigh 1.21.4 update
+    implementation(project(":nms:v1_21R3", configuration = "reobf"))
 
     // include kotlin for the offline jar
     implementation(kotlin("stdlib"))
 
     // Test dependency
-    testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.9.3") //lower bound: 4.9.2  upper bound: 4.9.3
+    testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.21.0")
     testRuntimeOnly("commons-lang:commons-lang:2.6")
 }
 
@@ -150,7 +154,7 @@ tasks {
         filesMatching("plugin.yml") {
             expand(
                 "version" to project.version,
-                "libraries" to " \"org.jetbrains.kotlin:kotlin-stdlib:2.0.21\" "
+                "libraries" to " \"org.jetbrains.kotlin:kotlin-stdlib:2.1.0\" "
             )
         }
 
@@ -159,7 +163,14 @@ tasks {
     }
 
     // Offline jar (include kotlin std in the final jar fine)
-    val offlineJar by creating(ShadowJar::class) {
+    val offlineJar by // Shadow necessary dependency
+    registering(
+
+        // Include all project other dependencies
+        ShadowJar
+
+        // Add custom anvil compiled
+        ::class, fun ShadowJar.() {
             archiveClassifier.set("offline")
 
             // Shadow necessary dependency
@@ -179,7 +190,7 @@ tasks {
             from(sourceSets.main.get().output)
 
             dependsOn(processResources)
-    }
+        })
 
     // Make the online and offline jar on build
     named("build") {
@@ -193,12 +204,12 @@ val sourcesJar by tasks.registering(Jar::class) {
     from(kotlin.sourceSets.main.get().kotlin)
 }
 
-val javadocJar by tasks.creating(Jar::class) {
+val javadocJar by tasks.registering(Jar::class, fun Jar.() {
     group = JavaBasePlugin.DOCUMENTATION_GROUP
     description = "Assembles Javadoc JAR"
     archiveClassifier.set("javadoc")
     from(tasks.named("dokkaHtml"))
-}
+})
 
 signing {
     useGpgCmd()

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

impl/LegacyEcoEnchant/build.gradle.kts

@@ -0,0 +1,15 @@
+group = rootProject.group
+version = rootProject.version
+
+plugins {
+    kotlin("jvm") version "2.1.0"
+}
+
+// Imitate needed class and method to support legacy version of EcoEnchant
+dependencies {
+    // Spigot api
+    compileOnly("org.spigotmc:spigot-api:1.18-R0.1-SNAPSHOT")
+
+
+
+}

impl/LegacyEcoEnchant/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java

@@ -0,0 +1,26 @@
+package com.willfp.ecoenchants.enchantments;
+
+import com.willfp.ecoenchants.enchantments.meta.EnchantmentTarget;
+import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
+import org.bukkit.enchantments.Enchantment;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
+
+/**
+ * Mock class for legacy package of eco enchants
+ */
+public class EcoEnchant {
+
+    public boolean conflictsWith(@NotNull Enchantment enchant) {
+        return false;
+    }
+
+    public Set<EnchantmentTarget> getTargets() {
+        return null;
+    }
+
+    public EnchantmentType getType() {
+        return null;
+    }
+}

impl/LegacyEcoEnchant/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java

@@ -0,0 +1,14 @@
+package com.willfp.ecoenchants.enchantments;
+
+import java.util.List;
+
+/**
+ * Mock class for legacy package of eco enchants
+ */
+public class EcoEnchants {
+
+    public static List<EcoEnchant> values(){
+        return null; // We don't care here.
+    }
+
+}

impl/LegacyEcoEnchant/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentTarget.java

@@ -0,0 +1,16 @@
+package com.willfp.ecoenchants.enchantments.meta;
+
+import org.bukkit.Material;
+
+import java.util.Set;
+
+/**
+ * Mock class for legacy package of eco enchants
+ */
+public class EnchantmentTarget {
+
+    public Set<Material> getMaterials() {
+        return null;
+    }
+
+}

impl/LegacyEcoEnchant/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java

@@ -0,0 +1,9 @@
+package com.willfp.ecoenchants.enchantments.meta;
+
+public class EnchantmentType {
+
+    public boolean isSingular() {
+        return false;
+    }
+
+}

nms/v1_17R1/build.gradle.kts

@@ -24,7 +24,7 @@ repositories {
 // Configure used version of kotlin and java
 java {
     disableAutoTargetJvm()
-    toolchain.languageVersion.set(JavaLanguageVersion.of(16))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }
 
 // Set target version

settings.gradle.kts

@@ -1,14 +1,5 @@
-import java.net.URI
-
 rootProject.name = "CustomAnvil"
 
-// for Disenchantment dependency
-sourceControl {
-    gitRepository(URI.create("https://github.com/H7KZ/Disenchantment.git")) {
-        producesModule("cz.kominekjan:Disenchantment")
-    }
-}
-
 // NMS subproject
 include("nms:nms-common")
 findProject(":nms:nms-common")?.name = "nms-common"
@@ -38,3 +29,6 @@ include("nms:v1_21R2")
 findProject(":nms:v1_21R2")?.name = "v1_21R2"
 include("nms:v1_21R3")
 findProject(":nms:v1_21R3")?.name = "v1_21R3"
+
+include(":impl:LegacyEcoEnchant")
+findProject(":impl:LegacyEcoEnchant")?.name = "LegacyEcoEnchant"

src/main/java/xyz/alexcrea/cuanvil/enchant/CAEnchantmentRegistry.java

@@ -5,6 +5,7 @@ import org.bukkit.NamespacedKey;
 import org.bukkit.enchantments.Enchantment;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import xyz.alexcrea.cuanvil.config.ConfigHolder;
 import xyz.alexcrea.cuanvil.enchant.bulk.BukkitEnchantBulkOperation;
 import xyz.alexcrea.cuanvil.enchant.bulk.BulkCleanEnchantOperation;
 import xyz.alexcrea.cuanvil.enchant.bulk.BulkGetEnchantOperation;
@@ -16,6 +17,7 @@ import java.util.logging.Level;
 public class CAEnchantmentRegistry {
 
     private static final CAEnchantmentRegistry instance = new CAEnchantmentRegistry();
+
     public static CAEnchantmentRegistry getInstance() {
         return instance;
     }
@@ -59,7 +61,6 @@ public class CAEnchantmentRegistry {
         BukkitEnchantBulkOperation bukkitOperation = new BukkitEnchantBulkOperation();
         optimisedGetOperators.add(bukkitOperation);
         optimisedCleanOperators.add(bukkitOperation);
-
     }
 
     private static boolean hasWarnedRegistering = false;
@@ -69,16 +70,26 @@ public class CAEnchantmentRegistry {
      * <p>
      * No guarantee that the enchantment will be present on the config gui if registered late.
      * (By late I mean after custom anvil startup.)
+     *
      * @param enchantment The enchantment to be registered.
      * @return If the operation was successful.
      */
     public boolean register(@NotNull CAEnchantment enchantment) {
         if (byKeyMap.containsKey(enchantment.getKey())) {
+            if (!enchantment.equals(byKeyMap.get(enchantment.getKey()))) {
+                // We are trying to register the exact same enchantment. so we just skip it.
+                return false;
+            }
+
+            if(ConfigHolder.DEFAULT_CONFIG.getConfig().getBoolean("caution_secret_do_not_log_duplicated_registered_key", false)){
+                return false;
+            }
+
             CustomAnvil.instance.getLogger().log(Level.WARNING,
-                    "Duplicate registered enchantment. This should NOT happen any time.\n" +
-                    "If you are a custom anvil developer. You maybe custom anvil detected your enchantment as a bukkit enchantment. " +
-                            "maybe remove enchantment with the same key before registering yours",
-                    new IllegalStateException(enchantment.getKey()+" enchantment was already registered"));
+                    "Duplicate distinct registered enchantment. This should NOT happen any time.\n" +
+                            "If you are a custom anvil developer: Maybe custom anvil detected your enchantment as a bukkit enchantment. " +
+                            "you should maybe remove enchantment with the same key before registering yours",
+                    new IllegalStateException("enchantment " + enchantment.getKey() + " was already registered"));
             return false;
         }
 
@@ -113,6 +124,7 @@ public class CAEnchantmentRegistry {
      * <p>
      * No guarantee that the enchantment will absent if the config guis if unregistered late.
      * (By late I mean after custom anvil startup.)
+     *
      * @param enchantment The enchantment to be unregistered.
      * @return If the operation was successful.
      */
@@ -131,6 +143,7 @@ public class CAEnchantmentRegistry {
 
     /**
      * Gets the enchantment by the provided key.
+     *
      * @param key Key to fetch.
      * @return Registered enchantment. null if absent.
      */
@@ -141,9 +154,9 @@ public class CAEnchantmentRegistry {
 
     /**
      * Gets the enchantment by the provided name.
+     *
      * @param name Name to fetch.
      * @return Registered enchantment. null if absent.
-     *
      * @deprecated use {@link #getListByName(String)}
      */
     @Deprecated(since = "1.6.3")
@@ -157,6 +170,7 @@ public class CAEnchantmentRegistry {
 
     /**
      * Gets list of enchantment using the provided name.
+     *
      * @param name Name to fetch.
      * @return List of registered enchantment.
      */
@@ -167,6 +181,7 @@ public class CAEnchantmentRegistry {
 
     /**
      * Gets an array of all the registered enchantments.
+     *
      * @return Array of enchantments.
      */
     @NotNull
@@ -176,6 +191,7 @@ public class CAEnchantmentRegistry {
 
     /**
      * Gets a map of all the registered enchantments.
+     *
      * @return Immutable map of enchantments.
      */
     public Map<NamespacedKey, CAEnchantment> registeredEnchantments() {
@@ -184,6 +200,7 @@ public class CAEnchantmentRegistry {
 
     /**
      * Gets a list of all the unoptimised get operation enchantments.
+     *
      * @return List of unoptimised enchantments.
      */
     @NotNull
@@ -193,6 +210,7 @@ public class CAEnchantmentRegistry {
 
     /**
      * Gets a list of all the unoptimised clean operation enchantments.
+     *
      * @return List of unoptimised enchantments.
      */
     @NotNull
@@ -202,6 +220,7 @@ public class CAEnchantmentRegistry {
 
     /**
      * Get "clean optimised operation" for get enchantments.
+     *
      * @return Mutable "clean enchantments optimised operation" list.
      */
     public List<BulkCleanEnchantOperation> getOptimisedCleanOperators() {
@@ -210,6 +229,7 @@ public class CAEnchantmentRegistry {
 
     /**
      * Get "get optimised operation" for get enchantments.
+     *
      * @return Mutable "get enchantments optimised operation" list.
      */
     public List<BulkGetEnchantOperation> getOptimisedGetOperators() {
@@ -218,6 +238,7 @@ public class CAEnchantmentRegistry {
 
     /**
      * Get custom anvil enchantment sorted by name.
+     *
      * @return An immutable sorted set of every registered enchantment sorted by name.
      */
     public SortedSet<CAEnchantment> getNameSortedEnchantments() {

src/main/java/xyz/alexcrea/cuanvil/enchant/bulk/BukkitEnchantBulkOperation.java

@@ -1,7 +1,9 @@
 package xyz.alexcrea.cuanvil.enchant.bulk;
 
+import io.delilaheve.CustomAnvil;
 import io.delilaheve.util.ItemUtil;
 import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -14,18 +16,29 @@ import java.util.Map;
 public class BukkitEnchantBulkOperation implements BulkGetEnchantOperation, BulkCleanEnchantOperation {
 
     @Override
-    public void bulkGet(@NotNull Map<CAEnchantment, Integer> enchantmentList, @NotNull ItemStack item, @NotNull ItemMeta meta) {
+    public void bulkGet(@NotNull Map<CAEnchantment, Integer> enchantmentMap, @NotNull ItemStack item, @NotNull ItemMeta meta) {
         if (ItemUtil.INSTANCE.isEnchantedBook(item)) {
             ((EnchantmentStorageMeta) meta).getStoredEnchants().forEach((enchantment, level) ->
-                    enchantmentList.put(EnchantmentApi.getByKey(enchantment.getKey()), level)
+                    addEnchantment(enchantmentMap, enchantment, level)
             );
         } else {
             item.getEnchantments().forEach((enchantment, level) ->
-                    enchantmentList.put(EnchantmentApi.getByKey(enchantment.getKey()), level)
+                    addEnchantment(enchantmentMap, enchantment, level)
             );
         }
     }
 
+    public void addEnchantment(@NotNull Map<CAEnchantment, Integer> enchantmentMap, @NotNull Enchantment enchantment, int level) {
+        CAEnchantment enchant = EnchantmentApi.getByKey(enchantment.getKey());
+        if (enchant == null) {
+            CustomAnvil.instance.getLogger().warning("Enchantment of key " + enchantment.getKey() +
+                    " somehow not found in CustomAnvil ?");
+            return;
+        }
+
+        enchantmentMap.put(enchant, level);
+    }
+
     @Override
     public void bulkClear(@NotNull ItemStack item) {
         if (item.getType() != Material.ENCHANTED_BOOK) {

src/main/java/xyz/alexcrea/cuanvil/enchant/bulk/BulkGetEnchantOperation.java

@@ -14,10 +14,10 @@ public interface BulkGetEnchantOperation {
 
     /**
      * Bulk get part of the stored enchantment of this item.
-     * @param enchantmentList Mutable map of collected enchantment. should b
+     * @param enchantmentMap Mutable map of collected enchantment. should b
      * @param item The item to get enchantment from. Should not get edited.
      * @param meta The item meta to get enchantment from. Should not get edited.
      */
-    void bulkGet(@NotNull Map<CAEnchantment, Integer> enchantmentList, @NotNull ItemStack item, @NotNull ItemMeta meta);
+    void bulkGet(@NotNull Map<CAEnchantment, Integer> enchantmentMap, @NotNull ItemStack item, @NotNull ItemMeta meta);
 
 }

src/main/java/xyz/alexcrea/cuanvil/enchant/bulk/EnchantSquaredBulkOperation.java

@@ -14,10 +14,10 @@ import java.util.Map;
 public class EnchantSquaredBulkOperation implements BulkGetEnchantOperation, BulkCleanEnchantOperation {
 
     @Override
-    public void bulkGet(@NotNull Map<CAEnchantment, Integer> enchantmentList, @NotNull ItemStack item, @NotNull ItemMeta meta) {
+    public void bulkGet(@NotNull Map<CAEnchantment, Integer> enchantmentMap, @NotNull ItemStack item, @NotNull ItemMeta meta) {
         EnchantmentSquaredDependency enchantmentSquared = DependencyManager.INSTANCE.getEnchantmentSquaredCompatibility();
         if(enchantmentSquared != null){
-            enchantmentSquared.getEnchantmentsSquared(item, enchantmentList);
+            enchantmentSquared.getEnchantmentsSquared(item, enchantmentMap);
         }
     }
 

src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CABukkitEnchantment.java

@@ -157,4 +157,13 @@ public class CABukkitEnchantment extends CAEnchantmentBase {
 
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        if(!(obj instanceof CABukkitEnchantment other)){
+            return false;
+        }
+
+        return this.enchantment.equals(other.getEnchant());
+    }
+
 }

src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAEcoEnchant.java

@@ -2,6 +2,7 @@ package xyz.alexcrea.cuanvil.enchant.wrapped;
 
 import com.willfp.ecoenchants.enchant.EcoEnchant;
 import com.willfp.ecoenchants.target.EnchantmentTarget;
+import com.willfp.ecoenchants.type.EnchantmentType;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -9,6 +10,7 @@ import xyz.alexcrea.cuanvil.enchant.AdditionalTestEnchantment;
 import xyz.alexcrea.cuanvil.enchant.CAEnchantment;
 import xyz.alexcrea.cuanvil.enchant.EnchantmentRarity;
 
+import java.util.HashMap;
 import java.util.Map;
 
 public class CAEcoEnchant extends CABukkitEnchantment implements AdditionalTestEnchantment {
@@ -22,19 +24,34 @@ public class CAEcoEnchant extends CABukkitEnchantment implements AdditionalTestE
 
     @Override
     public boolean isEnchantConflict(@NotNull Map<CAEnchantment, Integer> enchantments, @NotNull Material itemMat) {
-        if(!enchantments.isEmpty()) {
+        if (enchantments.isEmpty()) return false;
+
         if (this.ecoEnchant.getConflictsWithEverything()) {
             return true;
         }
 
+        HashMap<EnchantmentType, Integer> typeAmountMap = new HashMap<>();
+
         for (CAEnchantment other : enchantments.keySet()) {
             if (other instanceof CABukkitEnchantment otherVanilla
                     && this.ecoEnchant.conflictsWith(otherVanilla.getEnchant())) {
                 return true;
             }
+
+            if (other instanceof CAEcoEnchant ecoOther) {
+                EnchantmentType type = ecoOther.ecoEnchant.getType();
+                typeAmountMap.putIfAbsent(type, 0);
+
+                int amount = typeAmountMap.get(type) + 1;
+                if (amount > type.getLimit()) {
+                    return true;
+                }
+
+                typeAmountMap.put(type, amount);
             }
 
         }
+
         return false;
     }
 

src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAEnchantSquaredEnchantment.java

@@ -16,6 +16,7 @@ import java.util.Objects;
 public class CAEnchantSquaredEnchantment extends CAEnchantmentBase {
 
     public final @NotNull CustomEnchant enchant;
+
     public CAEnchantSquaredEnchantment(@NotNull CustomEnchant enchant) {
         super(Objects.requireNonNull(
                         Objects.requireNonNull(DependencyManager.INSTANCE.getEnchantmentSquaredCompatibility()).getKeyFromEnchant(enchant)),
@@ -25,6 +26,10 @@ public class CAEnchantSquaredEnchantment extends CAEnchantmentBase {
 
     }
 
+    public @NotNull CustomEnchant getEnchant() {
+        return enchant;
+    }
+
     @Override
     public boolean isGetOptimised() {
         return true;
@@ -61,4 +66,14 @@ public class CAEnchantSquaredEnchantment extends CAEnchantmentBase {
         CustomEnchantManager.getInstance().removeEnchant(item, this.enchant.getType());
     }
 
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof CAEnchantSquaredEnchantment other)) {
+            return false;
+        }
+
+        return this.enchant.equals(other.getEnchant());
+    }
+
 }

src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CALegacyEcoEnchant.java

@@ -0,0 +1,65 @@
+package xyz.alexcrea.cuanvil.enchant.wrapped;
+
+import com.willfp.ecoenchants.enchantments.EcoEnchant;
+import com.willfp.ecoenchants.enchantments.meta.EnchantmentTarget;
+import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
+import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import xyz.alexcrea.cuanvil.enchant.AdditionalTestEnchantment;
+import xyz.alexcrea.cuanvil.enchant.CAEnchantment;
+import xyz.alexcrea.cuanvil.enchant.EnchantmentRarity;
+
+import java.util.Map;
+
+public class CALegacyEcoEnchant extends CABukkitEnchantment implements AdditionalTestEnchantment {
+
+    private final @NotNull EcoEnchant ecoEnchant;
+
+    public CALegacyEcoEnchant(@NotNull EcoEnchant ecoEnchant, @NotNull Enchantment enchantment) {
+        super(enchantment, EnchantmentRarity.COMMON);
+        this.ecoEnchant = ecoEnchant;
+    }
+
+    @Override
+    public boolean isEnchantConflict(@NotNull Map<CAEnchantment, Integer> enchantments, @NotNull Material itemMat) {
+        if (enchantments.isEmpty()) return false;
+
+        EnchantmentType type = this.ecoEnchant.getType();
+        boolean isSingular = type.isSingular();
+
+        for (CAEnchantment other : enchantments.keySet()) {
+            if (other instanceof CABukkitEnchantment otherVanilla
+                    && this.ecoEnchant.conflictsWith(otherVanilla.getEnchant())) {
+                return true;
+            }
+
+            if (isSingular &&
+                    other != this &&
+                    (other instanceof CALegacyEcoEnchant otherEco) &&
+                    type.equals(otherEco.ecoEnchant.getType())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean isItemConflict(@NotNull Map<CAEnchantment, Integer> enchantments,
+                                  @NotNull Material itemMat,
+                                  @NotNull ItemStack item) {
+        if (Material.ENCHANTED_BOOK.equals(itemMat)) {
+            return false;
+        }
+
+        for (EnchantmentTarget target : this.ecoEnchant.getTargets()) {
+            if (target.getMaterials().contains(itemMat)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -28,6 +28,7 @@ object DependencyManager {
     var excellentEnchantsCompatibility: ExcellentEnchantsDependency? = null
 
     var disenchantmentCompatibility: DisenchantmentDependency? = null
+    var havenBagsCompatibility: HavenBagsDependency? = null
 
     fun loadDependency() {
         val pluginManager = Bukkit.getPluginManager()
@@ -69,6 +70,12 @@ object DependencyManager {
             disenchantmentCompatibility!!.redirectListeners()
         }
 
+        // HavenBags dependency
+        if (pluginManager.isPluginEnabled("HavenBags")) {
+            havenBagsCompatibility = HavenBagsDependency()
+            havenBagsCompatibility!!.redirectListeners()
+        }
+
     }
 
     fun handleCompatibilityConfig() {
@@ -95,15 +102,19 @@ object DependencyManager {
     fun tryEventPreAnvilBypass(event: PrepareAnvilEvent, player: HumanEntity): Boolean {
         var bypass = false
 
-        // Test if disenchantment used special prepare anvil
+        // Test if disenchantment used prepare anvil
         if (disenchantmentCompatibility?.testPrepareAnvil(event, player) == true) bypass = true
 
-        // Test excellent enchantments used special prepare anvil
+        // Test heaven bags used prepare anvil
+        if (!bypass && (havenBagsCompatibility?.testPrepareAnvil(event, player) == true)) bypass = true
+
+        // Test excellent enchantments used prepare anvil
         if (!bypass && (excellentEnchantsCompatibility?.testPrepareAnvil(event) == true)) bypass = true
 
         // Test if the inventory is a gui(version specific)
         if (!bypass && (externGuiTester?.testIfGui(event.view) == true)) bypass = true
 
+
         return bypass
     }
 
@@ -114,10 +125,13 @@ object DependencyManager {
     fun tryClickAnvilResultBypass(event: InventoryClickEvent, inventory: AnvilInventory): Boolean {
         var bypass = false
 
-        // Test if disenchantment used special event click
+        // Test if disenchantment used event click
         if (disenchantmentCompatibility?.testAnvilResult(event, inventory) == true) bypass = true
 
-        // Test if disenchantment used special event click
+        // Test if haven bag used event click
+        if (!bypass && (havenBagsCompatibility?.testAnvilResult(event, inventory) == true)) bypass = true
+
+        // Test if disenchantment used event click
         if (!bypass && (excellentEnchantsCompatibility?.testAnvilResult(event) == true)) bypass = true
 
         // Test if the inventory is a gui(version specific)

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

@@ -1,9 +1,9 @@
 package xyz.alexcrea.cuanvil.dependency
 
-import cz.kominekjan.disenchantment.events.DisenchantClickEvent
-import cz.kominekjan.disenchantment.events.DisenchantEvent
-import cz.kominekjan.disenchantment.events.ShatterClickEvent
-import cz.kominekjan.disenchantment.events.ShatterEvent
+import com.jankominek.disenchantment.events.DisenchantClickEvent
+import com.jankominek.disenchantment.events.DisenchantEvent
+import com.jankominek.disenchantment.events.ShatterClickEvent
+import com.jankominek.disenchantment.events.ShatterEvent
 import io.delilaheve.CustomAnvil
 import org.bukkit.entity.HumanEntity
 import org.bukkit.event.inventory.InventoryClickEvent

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

@@ -10,8 +10,26 @@ import xyz.alexcrea.cuanvil.enchant.wrapped.CAEcoEnchant
 
 class EcoEnchantDependency(private val ecoEnchantPlugin: Plugin) {
 
+    private val isLegacy: Boolean
+    private val legacyDependency: LegacyEcoEnchantDependency?
+
     init {
         CustomAnvil.instance.logger.info("Eco Enchant Detected !")
+
+        var isLegacy = true
+        try {
+            Class.forName("com.willfp.ecoenchants.enchant.EcoEnchants")
+            isLegacy = false
+        } catch (_: ClassNotFoundException) {
+        }
+
+        this.isLegacy = isLegacy;
+        if (isLegacy) {
+            this.legacyDependency = LegacyEcoEnchantDependency()
+        } else {
+            this.legacyDependency = null
+        }
+
     }
 
     fun disableAnvilListener() {
@@ -22,6 +40,11 @@ class EcoEnchantDependency(private val ecoEnchantPlugin: Plugin) {
     fun registerEnchantments() {
         CustomAnvil.instance.logger.info("Preparing Eco Enchant compatibility...")
 
+        if (isLegacy) {
+            legacyDependency!!.registerEnchantments();
+            return
+        }
+
         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.
@@ -34,6 +57,11 @@ class EcoEnchantDependency(private val ecoEnchantPlugin: Plugin) {
     }
 
     fun handleConfigReload() {
+        if (isLegacy) {
+            legacyDependency!!.handleConfigReload()
+            return
+        }
+
         // Should not happen in known case.
         if (this.ecoEnchantOldEnchantments == null) return
 

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

@@ -0,0 +1,84 @@
+package xyz.alexcrea.cuanvil.dependency
+
+import io.delilaheve.CustomAnvil
+import org.bukkit.entity.HumanEntity
+import org.bukkit.event.inventory.InventoryClickEvent
+import org.bukkit.event.inventory.PrepareAnvilEvent
+import org.bukkit.inventory.AnvilInventory
+import org.bukkit.plugin.RegisteredListener
+import valorless.havenbags.BagSkin
+import valorless.havenbags.BagUpgrade
+import valorless.havenbags.HavenBags
+import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener
+import xyz.alexcrea.cuanvil.util.AnvilXpUtil
+
+class HavenBagsDependency {
+
+    init {
+        CustomAnvil.instance.logger.info("Heaven Bags Detected !")
+    }
+
+    private lateinit var bagUpgrade: BagUpgrade
+    private lateinit var bagSkin: BagSkin
+
+    fun redirectListeners() {
+        val toUnregister = ArrayList<RegisteredListener>()
+        // get required PrepareAnvilEvent listener
+        for (registeredListener in PrepareAnvilEvent.getHandlerList().registeredListeners) {
+            val listener = registeredListener.listener
+
+            if (listener is BagUpgrade) {
+                bagUpgrade = listener
+                toUnregister.add(registeredListener)
+            }
+
+            if (listener is BagSkin) {
+                bagSkin = listener
+                toUnregister.add(registeredListener)
+            }
+        }
+
+        for (listener in toUnregister) {
+            PrepareAnvilEvent.getHandlerList().unregister(listener)
+            InventoryClickEvent.getHandlerList().unregister(listener)
+        }
+
+    }
+
+    fun testPrepareAnvil(event: PrepareAnvilEvent, player: HumanEntity): Boolean {
+        val previousResult = event.result
+        event.result = null
+
+        // Test if event change the result
+        bagSkin.onPrepareAnvil(event)
+        if (event.result != null) {
+            CustomAnvil.log("Detected pre anvil heaven bag anvil skin.")
+            AnvilXpUtil.setAnvilInvXp(event.inventory, event.view, player, event.inventory.repairCost)
+            return true
+        }
+
+        bagUpgrade.onPrepareAnvil(event)
+        if (event.result != null) {
+            CustomAnvil.log("Detected pre anvil heaven bag anvil upgrade.")
+            AnvilXpUtil.setAnvilInvXp(event.inventory, event.view, player, event.inventory.repairCost)
+            return true
+        }
+
+        event.result = previousResult
+        return false
+    }
+
+    fun testAnvilResult(event: InventoryClickEvent, inventory: AnvilInventory): Boolean {
+        val result = inventory.getItem(PrepareAnvilListener.ANVIL_OUTPUT_SLOT)?.clone()
+
+        if (HavenBags.IsBag(result)) {
+            CustomAnvil.log("Detected anvil click haven bag bypass.")
+            bagUpgrade.onInventoryClick(event)
+            bagSkin.onInventoryClick(event)
+            return true
+        }
+
+        return false
+    }
+
+}

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

@@ -0,0 +1,46 @@
+package xyz.alexcrea.cuanvil.dependency
+
+import com.willfp.ecoenchants.enchantments.EcoEnchant
+import com.willfp.ecoenchants.enchantments.EcoEnchants
+import org.bukkit.enchantments.Enchantment
+import xyz.alexcrea.cuanvil.api.EnchantmentApi
+import xyz.alexcrea.cuanvil.enchant.wrapped.CALegacyEcoEnchant
+
+class LegacyEcoEnchantDependency {
+
+
+    private var ecoEnchantOldEnchantments: MutableSet<EcoEnchant>? = null
+    fun registerEnchantments() {
+        val enchantments = EcoEnchants.values()
+        for (ecoEnchant in enchantments) {
+            ecoEnchant as Enchantment
+
+            EnchantmentApi.unregisterEnchantment(ecoEnchant) // As eco enchants is loaded before custom anvil and register enchantment to registry, we need to unregister old "vanilla" enchant.
+            EnchantmentApi.registerEnchantment(CALegacyEcoEnchant(ecoEnchant, ecoEnchant))
+        }
+
+        ecoEnchantOldEnchantments = HashSet(enchantments)
+    }
+
+    fun handleConfigReload() {
+        // Should not happen in known case.
+        if (this.ecoEnchantOldEnchantments == null) return
+
+        val newEnchantments = EcoEnchants.values()
+
+        // Add new enchantments
+        for (ecoEnchant in newEnchantments)
+            if (!this.ecoEnchantOldEnchantments!!.contains(ecoEnchant))
+                EnchantmentApi.registerEnchantment(CALegacyEcoEnchant(ecoEnchant, ecoEnchant as Enchantment))
+
+
+        // Remove old enchantments that not now currently used
+        this.ecoEnchantOldEnchantments!!.removeAll(newEnchantments)
+        for (oldEnchantment in this.ecoEnchantOldEnchantments!!) {
+            EnchantmentApi.unregisterEnchantment(oldEnchantment as Enchantment)
+        }
+
+        this.ecoEnchantOldEnchantments = HashSet(newEnchantments)
+    }
+
+}

src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictManager.kt

@@ -191,7 +191,7 @@ class EnchantConflictManager {
         }
 
         val immutableEnchants = Collections.unmodifiableMap(appliedEnchants)
-        for (appliedEnchant in appliedEnchants) {
+        for (appliedEnchant in appliedEnchants.keys) {
             if(appliedEnchant is AdditionalTestEnchantment){
                 val doConflict = appliedEnchant.isEnchantConflict(immutableEnchants, mat)
                 if(doConflict){

src/main/resources/plugin.yml

@@ -58,3 +58,4 @@ softdepend:
   - EcoEnchants
   - eco
   - ExcellentEnchants
+  - HavenBags