Improved enchantment arg parser

Auxilor · Jul 21, 2024 · cd232e8 · cd232e8
1 parent 7cf2fa4
commit cd232e8
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/items/ArgParserEnchantment.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/items/ArgParserEnchantment.kt
@@ -2,7 +2,7 @@ package com.willfp.eco.internal.items
 
 import com.willfp.eco.core.fast.fast
 import com.willfp.eco.core.items.args.LookupArgParser
-import com.willfp.eco.util.NamespacedKeyUtils
+import org.bukkit.NamespacedKey
 import org.bukkit.enchantments.Enchantment
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.EnchantmentStorageMeta
@@ -16,17 +16,10 @@ object ArgParserEnchantment : LookupArgParser {
         for (arg in args) {
             val argSplit = arg.split(":")
 
-            if (argSplit.size < 2) {
-                continue
-            }
-
-            @Suppress("DEPRECATION")
-            val enchant = Enchantment.getByKey(NamespacedKeyUtils.create("minecraft", argSplit[0]))
-            val level = argSplit[1].toIntOrNull()
+            val enchant = Enchantment.getByKey(NamespacedKey.minecraft(argSplit[0])) ?: continue
+            val level = argSplit.getOrNull(1)?.toIntOrNull() ?: enchant.maxLevel
 
-            if (enchant != null && level != null) {
-                enchants[enchant] = level
-            }
+            enchants[enchant] = level
         }
 
         if (enchants.isEmpty()) {