determine Minecraft enchantment by ConfiEnchantment name

Author: zefir-git

src/main/java/pro/cloudnode/smp/enchantbookplus/ConfigEnchantmentEntry.java

@@ -1,5 +1,6 @@
 package pro.cloudnode.smp.enchantbookplus;
 
+import org.bukkit.NamespacedKey;
 import org.bukkit.enchantments.Enchantment;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -46,11 +47,10 @@ public final class ConfigEnchantmentEntry {
 
     /**
      * Maximum level of the enchantment.
-     * @param enchantment The enchantment
      */
-    public @NotNull Optional<Integer> getMaxLevel(final @NotNull Enchantment enchantment) {
+    public @NotNull Optional<Integer> getMaxLevel() {
         if (Optional.ofNullable(maxLevel).isEmpty()) return Optional.empty();
-        if (maxLevelRelative) return Optional.of(enchantment.getMaxLevel() + maxLevel);
+        if (maxLevelRelative) return Optional.of(getEnchantment().getMaxLevel() + maxLevel);
         return Optional.of(maxLevel);
     }
 
@@ -69,10 +69,26 @@ public boolean getMultiplyCostByLevel() {
     }
 
     /**
-     * @param name Name of the enchantment.
-     * @param maxLevel Maximum level of the enchantment.
-     * @param maxLevelRelative Max level relative
-     * @param cost Cost of the enchantment.
+     * Get enchantment
+     */
+    public Enchantment getEnchantment() {
+        return Enchantment.getByKey(NamespacedKey.minecraft(name));
+    }
+
+    /**
+     * Is enchantment
+     *
+     * @param enchantment The enchantment
+     */
+    public boolean isEnchantment(final @NotNull Enchantment enchantment) {
+        return name.equalsIgnoreCase(enchantment.getKey().getKey());
+    }
+
+    /**
+     * @param name                Name of the enchantment.
+     * @param maxLevel            Maximum level of the enchantment.
+     * @param maxLevelRelative    Max level relative
+     * @param cost                Cost of the enchantment.
      * @param multiplyCostByLevel Multiply cost by level.
      */
     public ConfigEnchantmentEntry(final @NotNull String name, final @Nullable Integer maxLevel, final boolean maxLevelRelative, final int cost, final boolean multiplyCostByLevel) {
@@ -159,8 +175,10 @@ private static boolean isValidConfigValue(final @Nullable Object configValue) {
             if (!(object instanceof final @NotNull HashMap<?, ?> hashMap)) return false;
             if (!hashMap.containsKey("name")) return false;
             if (!(hashMap.get("name") instanceof String)) return false;
-            if (hashMap.containsKey("max-level") && !(hashMap.get("max-level") instanceof String) && !(hashMap.get("max-level") instanceof Integer)) return false;
-            if (hashMap.containsKey("cost") && !(hashMap.get("cost") instanceof String) && !(hashMap.get("cost") instanceof Integer)) return false;
+            if (hashMap.containsKey("max-level") && !(hashMap.get("max-level") instanceof String) && !(hashMap.get("max-level") instanceof Integer))
+                return false;
+            if (hashMap.containsKey("cost") && !(hashMap.get("cost") instanceof String) && !(hashMap.get("cost") instanceof Integer))
+                return false;
         }
         return true;
     }

src/main/java/pro/cloudnode/smp/enchantbookplus/EnchantBookPlus.java

@@ -1,5 +1,6 @@
 package pro.cloudnode.smp.enchantbookplus;
 
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import pro.cloudnode.smp.enchantbookplus.event.PrepareAnvil;
@@ -40,10 +41,10 @@ private void registerEvents() {
     /**
      * Get enchantment from cache
      *
-     * @param name Name of the enchantment
+     * @param enchantment The Minecraft enchantment
      */
-    public @NotNull Optional<@NotNull ConfigEnchantmentEntry> getConfigEnchantment(final @NotNull String name) {
-        return getConfigEnchantments().stream().filter(enchantment -> enchantment.getName().equalsIgnoreCase(name) || enchantment.getName().equalsIgnoreCase("ALL")).findFirst();
+    public @NotNull Optional<@NotNull ConfigEnchantmentEntry> getConfigEnchantment(final @NotNull Enchantment enchantment) {
+        return getConfigEnchantments().stream().filter(c -> c.isEnchantment(enchantment)).findFirst();
     }
 
     /**

src/main/java/pro/cloudnode/smp/enchantbookplus/event/PrepareAnvil.java

@@ -37,7 +37,7 @@ public void onPrepareAnvil(final @NotNull PrepareAnvilEvent event) {
         for (final @NotNull Map.Entry<@NotNull Enchantment, @NotNull Integer> entry : upgradeEnchants.entrySet()) {
             final @NotNull Enchantment enchantment = entry.getKey();
             if (enchantment.getMaxLevel() == 1) continue;
-            final @NotNull Optional<@NotNull ConfigEnchantmentEntry> configEnchantment = EnchantBookPlus.getInstance().getConfigEnchantment(enchantment.getKey().getKey());
+            final @NotNull Optional<@NotNull ConfigEnchantmentEntry> configEnchantment = EnchantBookPlus.getInstance().getConfigEnchantment(enchantment);
             if (configEnchantment.isEmpty()) continue;
             final int upgradeLevel = entry.getValue();
             final int finalLevel;