Use Bulk operation object for bukkit and enchantment² enchants.

src/main/java/xyz/alexcrea/cuanvil/api/EnchantmentApi.java

@@ -11,6 +11,8 @@ import xyz.alexcrea.cuanvil.config.ConfigHolder;
 import xyz.alexcrea.cuanvil.enchant.CAEnchantment;
 import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry;
 import xyz.alexcrea.cuanvil.enchant.EnchantmentRarity;
+import xyz.alexcrea.cuanvil.enchant.bulk.BulkCleanEnchantOperation;
+import xyz.alexcrea.cuanvil.enchant.bulk.BulkGetEnchantOperation;
 import xyz.alexcrea.cuanvil.enchant.wrapped.CAVanillaEnchantment;
 import xyz.alexcrea.cuanvil.gui.config.global.EnchantCostConfigGui;
 import xyz.alexcrea.cuanvil.gui.config.global.EnchantLimitConfigGui;
@@ -186,5 +188,20 @@ public class EnchantmentApi {
         }, 0L);
     }
 
+    /**
+     * Add a bulk get operator.
+     * @param operation An optimised get enchantments operation
+     */
+    public static void addBulkGet(@NotNull BulkGetEnchantOperation operation){
+        CAEnchantmentRegistry.getInstance().getOptimisedGetOperators().add(operation);
+    }
+
+    /**
+     * Add a bulk clean operator.
+     * @param operation An optimised clean enchantments operation
+     */
+    public static void addBulkClean(@NotNull BulkCleanEnchantOperation operation){
+        CAEnchantmentRegistry.getInstance().getOptimisedCleanOperators().add(operation);
+    }
 
 }

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

@@ -1,15 +1,13 @@
 package xyz.alexcrea.cuanvil.enchant;
 
-import io.delilaheve.util.ItemUtil;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import xyz.alexcrea.cuanvil.dependency.DependencyManager;
+import xyz.alexcrea.cuanvil.enchant.bulk.BulkCleanEnchantOperation;
-import xyz.alexcrea.cuanvil.dependency.EnchantmentSquaredDependency;
+import xyz.alexcrea.cuanvil.enchant.bulk.BulkGetEnchantOperation;
 import xyz.alexcrea.cuanvil.group.EnchantConflictGroup;
 
 import java.util.Collection;
@@ -148,26 +146,20 @@ public interface CAEnchantment {
      * @param item Item to be cleared from enchantments.
      */
     static void clearEnchants(@NotNull ItemStack item){
+        // Optimised enchantment clean using item stack
+        for (BulkCleanEnchantOperation cleanOperator : CAEnchantmentRegistry.getInstance().getOptimisedCleanOperators()) {
+            cleanOperator.bulkClear(item);
+        }
+
         ItemMeta meta = item.getItemMeta();
         if(meta == null) return;
 
-        // Clean Vanilla enchants
+        // Optimised enchantment clean using item meta
-        if (ItemUtil.INSTANCE.isEnchantedBook(item)) {
+        for (BulkCleanEnchantOperation cleanOperator : CAEnchantmentRegistry.getInstance().getOptimisedCleanOperators()) {
-            EnchantmentStorageMeta bookMeta = (EnchantmentStorageMeta) meta;
+            cleanOperator.bulkClear(item, meta);
-            bookMeta.getStoredEnchants().forEach(
-                    (enchantment, leve) -> bookMeta.removeStoredEnchant(enchantment)
-            );
-        } else {
-            item.getEnchantments().forEach(
-                    (enchantment, leve) -> item.removeEnchantment(enchantment)
-            );
         }
 
-        // Clean Enchant Squared enchants
+        item.setItemMeta(meta);
-        EnchantmentSquaredDependency enchantmentSquared = DependencyManager.INSTANCE.getEnchantmentSquaredCompatibility();
-        if(enchantmentSquared != null){
-            enchantmentSquared.clearEnchantments(item);
-        }
 
         // Clean unoptimised enchants
         for (CAEnchantment enchant : CAEnchantmentRegistry.getInstance().unoptimisedCleanValues()) {
@@ -190,21 +182,9 @@ public interface CAEnchantment {
         ItemMeta meta = item.getItemMeta();
         if(meta == null) return enchantments;
 
-        // Vanilla optimised get
+        // Optimised enchantment get
-        if (ItemUtil.INSTANCE.isEnchantedBook(item)) {
+        for (BulkGetEnchantOperation getOperator : CAEnchantmentRegistry.getInstance().getOptimisedGetOperators()) {
-            ((EnchantmentStorageMeta)meta).getStoredEnchants().forEach(
+            getOperator.bulkGet(enchantments, item, meta);
-                    (enchantment, level) -> enchantments.put(registry.getByKey(enchantment.getKey()), level)
-            );
-        } else {
-            item.getEnchantments().forEach(
-                    (enchantment, level) -> enchantments.put(registry.getByKey(enchantment.getKey()), level)
-            );
-        }
-
-        // Enchants Squared get
-        EnchantmentSquaredDependency enchantmentSquared = DependencyManager.INSTANCE.getEnchantmentSquaredCompatibility();
-        if(enchantmentSquared != null){
-            enchantmentSquared.getEnchantmentsSquared(item, enchantments);
         }
 
         // Unoptimised enchantment get

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

@@ -5,6 +5,9 @@ import org.bukkit.NamespacedKey;
 import org.bukkit.enchantments.Enchantment;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import xyz.alexcrea.cuanvil.enchant.bulk.BukkitEnchantBulkOperation;
+import xyz.alexcrea.cuanvil.enchant.bulk.BulkCleanEnchantOperation;
+import xyz.alexcrea.cuanvil.enchant.bulk.BulkGetEnchantOperation;
 import xyz.alexcrea.cuanvil.enchant.wrapped.CAVanillaEnchantment;
 
 import java.util.*;
@@ -20,25 +23,39 @@ public class CAEnchantmentRegistry {
     // Register enchantment functions
     private final HashMap<NamespacedKey, CAEnchantment> byKeyMap;
     private final HashMap<String, CAEnchantment> byNameMap;
+
     private final List<CAEnchantment> unoptimisedGetValues;
     private final List<CAEnchantment> unoptimisedCleanValues;
 
+    private final List<BulkGetEnchantOperation> optimisedGetOperators;
+    private final List<BulkCleanEnchantOperation> optimisedCleanOperators;
+
     private CAEnchantmentRegistry() {
         byKeyMap = new HashMap<>();
         byNameMap = new HashMap<>();
+
         unoptimisedGetValues = new ArrayList<>();
         unoptimisedCleanValues = new ArrayList<>();
+
+        optimisedGetOperators = new ArrayList<>();
+        optimisedCleanOperators = new ArrayList<>();
     }
 
     /**
      * This should only be called on main of custom anvil.
      * If called more than one time, chance of thing being broken will be high.
      */
-    public void registerStartupEnchantments(){
+    public void registerBukkit(){
+        // Register enchantment
         for (Enchantment enchantment : Enchantment.values()) {
             register(new CAVanillaEnchantment(enchantment));
         }
 
+        // Add bukkit enchantment bulk operation
+        BukkitEnchantBulkOperation bukkitOperation = new BukkitEnchantBulkOperation();
+        optimisedGetOperators.add(bukkitOperation);
+        optimisedCleanOperators.add(bukkitOperation);
+
     }
 
     /**
@@ -152,5 +169,20 @@ public class CAEnchantmentRegistry {
         return unoptimisedCleanValues;
     }
 
+    /**
+     * Get "clean optimised operation" for get enchantments.
+     * @return Get mutable "clean enchantments optimised operation" list.
+     */
+    public List<BulkCleanEnchantOperation> getOptimisedCleanOperators() {
+        return optimisedCleanOperators;
+    }
+
+    /**
+     * Get "get optimised operation" for get enchantments.
+     * @return Get mutable "get enchantments optimised operation" list.
+     */
+    public List<BulkGetEnchantOperation> getOptimisedGetOperators() {
+        return optimisedGetOperators;
+    }
 
 }

src/main/kotlin/io/delilaheve/CustomAnvil.kt

@@ -116,7 +116,7 @@ class CustomAnvil : JavaPlugin() {
         if (!ConfigHolder.loadDefaultConfig()) return
 
         // Register enchantments
-        CAEnchantmentRegistry.getInstance().registerStartupEnchantments()
+        CAEnchantmentRegistry.getInstance().registerBukkit()
         DependencyManager.registerEnchantments()
 
         val enchantReadyEvent = CAEnchantRegistryReadyEvent()

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

@@ -13,6 +13,7 @@ import xyz.alexcrea.cuanvil.api.EnchantmentApi
 import xyz.alexcrea.cuanvil.api.MaterialGroupApi
 import xyz.alexcrea.cuanvil.enchant.CAEnchantment
 import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry
+import xyz.alexcrea.cuanvil.enchant.bulk.EnchantSquaredBulkOperation
 import xyz.alexcrea.cuanvil.enchant.wrapped.CAEnchantSquaredEnchantment
 import xyz.alexcrea.cuanvil.group.IncludeGroup
 import java.util.*
@@ -36,10 +37,17 @@ class EnchantmentSquaredDependency(private val enchantmentSquaredPlugin: Plugin)
 
     fun registerEnchantments(){
         CustomAnvil.instance.logger.info("Preparing Enchantment Squared compatibility...")
+
+        // Register enchantments
         for (enchant in CustomEnchantManager.getInstance().allEnchants.values) {
             EnchantmentApi.registerEnchantment(CAEnchantSquaredEnchantment(enchant))
         }
 
+        // Register bulk operation
+        val bulkOpperations = EnchantSquaredBulkOperation()
+        EnchantmentApi.addBulkGet(bulkOpperations)
+        EnchantmentApi.addBulkClean(bulkOpperations)
+
     }
 
     fun getEnchantmentsSquared(item: ItemStack, enchantments: MutableMap<CAEnchantment, Int>) {
@@ -51,10 +59,6 @@ class EnchantmentSquaredDependency(private val enchantmentSquaredPlugin: Plugin)
 
     }
 
-    fun clearEnchantments(item: ItemStack) {
-        CustomEnchantManager.getInstance().removeAllEnchants(item)
-    }
-
     fun getKeyFromEnchant(enchant: CustomEnchant): NamespacedKey{
         return NamespacedKey.fromString(enchant.type.lowercase(Locale.getDefault()), this.enchantmentSquaredPlugin)!!
     }