Fix enchantment being applied to the left item when trying to combine.

Fix conflict not being applied on some situation.

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

@@ -0,0 +1,34 @@
+package xyz.alexcrea.cuanvil.enchant;
+
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+
+public interface AdditionalTestEnchantment {
+
+    /**
+     * Test if the provided enchantments can be compatible with this enchantment. only non-Custom Anvil conflict.
+     * @param enchantments Immutable map of validated enchantments for the item.
+     * @param itemMat Material of the tested item.
+     * @return If there is a conflict with the enchantments.
+     */
+    boolean isEnchantConflict(
+            @NotNull Map<CAEnchantment, Integer> enchantments,
+            @NotNull Material itemMat);
+
+
+    /**
+     * Test if the provided item can be compatible with this enchantment. only non-Custom Anvil conflict.
+     * @param enchantments Immutable map of validated enchantments for the item.
+     * @param itemMat Material of the tested item.
+     * @param item Provide a new instance of the used item stack with the partial enchantment applied.
+     * @return If there is a conflict with the enchantment and the item.
+     */
+    boolean isItemConflict(
+            @NotNull Map<CAEnchantment, Integer> enchantments,
+            @NotNull Material itemMat,
+            @NotNull ItemStack item);
+
+}

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

@@ -89,19 +89,6 @@ public interface CAEnchantment {
      */
     @NotNull Collection<EnchantConflictGroup> getConflicts();
 
-    /**
-     * Test if the provided item can be compatible with this enchantment. only non-Custom Anvil conflict.
-     * @param baseEnchantments Validated enchantments for the item.
-     * @param itemMat Material of the tested item.
-     * @param itemSupply Provide a new instance of used item stack but with baseEnchantments as enchantments.
-     * @return Type of conflict this enchantment has with the provided item.
-     */
-    @NotNull
-    ConflictType testOtherConflicts(
-            @NotNull Map<CAEnchantment, Integer> baseEnchantments,
-            @NotNull Material itemMat,
-            @NotNull Supplier<ItemStack> itemSupply);
-
     /**
      * Get current level of the enchantment.
      * @param item Item to search the level for.

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

@@ -112,12 +112,4 @@ public abstract class CAEnchantmentBase implements CAEnchantment {
         return conflicts;
     }
 
-    @Override
-    public @NotNull ConflictType testOtherConflicts(
-            @NotNull Map<CAEnchantment, Integer> baseEnchantments,
-            @NotNull Material itemMat,
-            @NotNull Supplier<ItemStack> itemSupply) {
-        return ConflictType.NO_CONFLICT;
-    }
-
 }

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

@@ -7,12 +7,13 @@ import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import xyz.alexcrea.cuanvil.enchant.CAEnchantment;
 import xyz.alexcrea.cuanvil.enchant.EnchantmentRarity;
+import xyz.alexcrea.cuanvil.enchant.AdditionalTestEnchantment;
 import xyz.alexcrea.cuanvil.group.ConflictType;
 
 import java.util.Map;
 import java.util.function.Supplier;
 
-public class CAEcoEnchant extends CAVanillaEnchantment {
+public class CAEcoEnchant extends CAVanillaEnchantment implements AdditionalTestEnchantment {
 
     private final @NotNull EcoEnchant ecoEnchant;
 
@@ -22,36 +23,37 @@ public class CAEcoEnchant extends CAVanillaEnchantment {
     }
 
     @Override
-    public @NotNull ConflictType testOtherConflicts(
+    public boolean isEnchantConflict(@NotNull Map<CAEnchantment, Integer> enchantments, @NotNull Material itemMat) {
-            @NotNull Map<CAEnchantment, Integer> baseEnchantments,
+        if(!enchantments.isEmpty()) {
-            @NotNull Material itemMat,
-            @NotNull Supplier<ItemStack> itemSupply) {
-
-        if(!baseEnchantments.isEmpty()){
             if (this.ecoEnchant.getConflictsWithEverything()) {
-                return ConflictType.ENCHANTMENT_CONFLICT;
+                return true;
             }
 
-            for (CAEnchantment other : baseEnchantments.keySet()) {
+            for (CAEnchantment other : enchantments.keySet()) {
-                if(other instanceof CAVanillaEnchantment otherVanilla  //TODO ISSUE FOUND: if vanilla is applied first conflcit is ignored. maybe export only enchantment conflict but keep target from ecoEnchant.
+                if(other instanceof CAVanillaEnchantment otherVanilla
                         && this.ecoEnchant.conflictsWith(otherVanilla.getEnchant())){
-                    return ConflictType.ENCHANTMENT_CONFLICT;
+                    return true;
                 }
             }
 
         }
+        return false;
+    }
 
-        // Allow enchanted book
+    @Override
+    public boolean isItemConflict(@NotNull Map<CAEnchantment, Integer> enchantments,
+                                  @NotNull Material itemMat,
+                                  @NotNull ItemStack item) {
         if(Material.ENCHANTED_BOOK.equals(itemMat)){
-            return ConflictType.NO_CONFLICT;
+            return false;
         }
 
-        ItemStack item = itemSupply.get();
         for (EnchantmentTarget target : this.ecoEnchant.getTargets()) {
             if(target.matches(item)){
-                return ConflictType.NO_CONFLICT;
+                return false;
             }
         }
-        return ConflictType.ITEM_CONFLICT;
+
+        return true;
     }
 }

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

@@ -5,9 +5,11 @@ import org.bukkit.NamespacedKey
 import org.bukkit.configuration.ConfigurationSection
 import org.bukkit.enchantments.Enchantment
 import org.bukkit.inventory.ItemStack
+import xyz.alexcrea.cuanvil.enchant.AdditionalTestEnchantment
 import xyz.alexcrea.cuanvil.enchant.CAEnchantment
 import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry
-import java.util.function.Supplier
+import java.util.*
+import kotlin.collections.ArrayList
 
 class EnchantConflictManager {
 
@@ -166,23 +168,38 @@ class EnchantConflictManager {
             }
         }
 
-        // Test conflict with other conflict system.
+        val immutableEnchants = Collections.unmodifiableMap(appliedEnchants)
-        val otherConflict = newEnchant.testOtherConflicts(appliedEnchants, mat, reEnchantSupplier(item, appliedEnchants))
+        for (appliedEnchant in appliedEnchants) {
-
+            if(appliedEnchant is AdditionalTestEnchantment){
-        return result.getWorstConflict(otherConflict)
+                val doConflict = appliedEnchant.isEnchantConflict(immutableEnchants, mat)
+                if(doConflict){
+                    return ConflictType.ENCHANTMENT_CONFLICT
+                }
+;
+            }
         }
 
-    private fun reEnchantSupplier(item: ItemStack, enchantments: Map<CAEnchantment, Int>): Supplier<ItemStack> {
+        if((result != ConflictType.ITEM_CONFLICT) && (newEnchant is AdditionalTestEnchantment)){
-       return Supplier {
+            val partialItem = createPartialResult(item, immutableEnchants)
+
+            if(newEnchant.isItemConflict(immutableEnchants, mat, partialItem)){
+                return ConflictType.ITEM_CONFLICT
+            }
+
+        }
+
+        return result;
+    }
+
+    private fun createPartialResult(item: ItemStack, enchantments: Map<CAEnchantment, Int>): ItemStack {
        val newItem = item.clone()
 
        CAEnchantment.clearEnchants(newItem)
        enchantments.forEach{//TODO maybe bulk add if possible
-               enchantment -> enchantment.key.addEnchantmentUnsafe(item, enchantment.value)
+           enchantment -> enchantment.key.addEnchantmentUnsafe(newItem, enchantment.value)
        }
 
-           return@Supplier newItem
+       return newItem
-       }
     }
 
 }