From eeff628da651fcf6942abb58fc77c5974e0670ba Mon Sep 17 00:00:00 2001 From: alexcrea Date: Wed, 8 Jul 2026 03:58:03 +0200 Subject: [PATCH] update from v1.x.x --- .../xyz/alexcrea/cuanvil/command/CASubCommand.kt | 2 +- .../cuanvil/command/EditConfigExecutor.kt | 15 +++++---------- .../alexcrea/cuanvil/command/EnchantExecutor.kt | 6 +++--- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt index 67613335..ede87e9a 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt @@ -23,7 +23,7 @@ interface CASubCommand { fun description(): String - protected fun allEnchantmentsByName(): Collection { + fun allEnchantmentsByName(): Collection { val names = mutableSetOf() for (enchantment in CAEnchantmentRegistry.getInstance().values()) { names.add(enchantment.name) diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt index a4eb99a0..79151cd3 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt @@ -20,6 +20,10 @@ class EditConfigExecutor : CASubCommand { return sender.hasPermission(CustomAnvil.editConfigPermission) } + override fun description(): String { + return "Gui to edit the plugin's config" + } + override fun executeCommand( sender: CommandSender, cmd: Command, @@ -68,7 +72,7 @@ class EditConfigExecutor : CASubCommand { return } } else { - enchantToFilter = HashSet(EnchantmentApi.getListByName(args[1].lowercase())) + enchantToFilter = HashSet(EnchantmentApi.getByName(args[1].lowercase())) if (enchantToFilter.isEmpty()) { sender.sendMessage("No enchantment found with the name \"${args[1]}\"") @@ -112,15 +116,6 @@ class EditConfigExecutor : CASubCommand { else -> listOf() } ) - override fun tabCompleter( - sender: CommandSender, - args: Array, - list: MutableList - ) { - } - - override fun description(): String { - return "Gui to edit the plugin's config" } } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EnchantExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EnchantExecutor.kt index dd2957fa..fdae6b04 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EnchantExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EnchantExecutor.kt @@ -8,7 +8,7 @@ import org.bukkit.entity.HumanEntity import xyz.alexcrea.cuanvil.api.EnchantmentApi import xyz.alexcrea.cuanvil.util.MaterialUtil.isAir -class EnchantExecutor : CASubCommand() { +class EnchantExecutor : CASubCommand { override fun allowed(sender: CommandSender): Boolean { @@ -44,7 +44,7 @@ class EnchantExecutor : CASubCommand() { } } - val enchants = EnchantmentApi.getListByName(args[0].lowercase()) + val enchants = EnchantmentApi.getByName(args[0].lowercase()) if (enchants.isEmpty()) { sender.sendMessage("Enchantment not found: ${args[0]}") return true @@ -92,7 +92,7 @@ class EnchantExecutor : CASubCommand() { sender: HumanEntity, name: String ): Collection { - val enchants = EnchantmentApi.getListByName(name.lowercase()) + val enchants = EnchantmentApi.getByName(name.lowercase()) if (enchants.isEmpty()) return listOf() val enchant = enchants.iterator().next()