Fixed dynamic command registration

eco-api/src/main/java/com/willfp/eco/core/Eco.java

@@ -1,5 +1,6 @@
 package com.willfp.eco.core;
 
+import com.willfp.eco.core.command.impl.PluginCommand;
 import com.willfp.eco.core.config.ConfigType;
 import com.willfp.eco.core.config.interfaces.Config;
 import com.willfp.eco.core.config.interfaces.LoadableConfig;
@@ -29,6 +30,7 @@ import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
+import org.bukkit.command.CommandMap;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Mob;
@@ -510,6 +512,20 @@ public interface Eco {
      */
     void syncCommands();
 
+    /**
+     * Get the command map.
+     *
+     * @return The command map.
+     */
+    @NotNull CommandMap getCommandMap();
+
+    /**
+     * Unregister a command.
+     *
+     * @param command The command.
+     */
+    void unregisterCommand(@NotNull final PluginCommand command);
+
     /**
      * Get the instance of eco; the bridge between the api frontend
      * and the implementation backend.

eco-api/src/main/java/com/willfp/eco/core/command/impl/PluginCommand.java

@@ -73,10 +73,7 @@ public abstract class PluginCommand extends HandledCommand implements CommandExe
     public final void unregister() {
         CommandMap commandMap = getCommandMap();
 
-        Command found = commandMap.getCommand(this.getName());
-        if (found != null) {
-            found.unregister(commandMap);
-        }
+        Eco.get().unregisterCommand(this);
 
         Eco.get().syncCommands();
     }

eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/BukkitCommands.kt

@@ -0,0 +1,35 @@
+package com.willfp.eco.internal.spigot.proxy.v1_17_R1
+
+import com.willfp.eco.core.command.impl.PluginCommand
+import com.willfp.eco.internal.spigot.proxy.BukkitCommandsProxy
+import org.bukkit.Bukkit
+import org.bukkit.command.Command
+import org.bukkit.command.SimpleCommandMap
+import org.bukkit.craftbukkit.v1_17_R1.CraftServer
+import java.lang.reflect.Field
+
+class BukkitCommands : BukkitCommandsProxy {
+    private val knownCommandsField: Field by lazy {
+        SimpleCommandMap::class.java.getDeclaredField("knownCommands")
+            .apply {
+                isAccessible = true
+            }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private val knownCommands: MutableMap<String, Command>
+        get() = knownCommandsField.get(getCommandMap()) as MutableMap<String, Command>
+
+    override fun getCommandMap(): SimpleCommandMap {
+        return (Bukkit.getServer() as CraftServer).commandMap
+    }
+
+    override fun syncCommands() {
+        (Bukkit.getServer() as CraftServer).syncCommands()
+    }
+
+    override fun unregisterCommand(command: PluginCommand) {
+        knownCommands.remove(command.name)
+        knownCommands.remove("${command.plugin.name.lowercase()}:${command.name}")
+    }
+}

eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/SyncCommands.kt

@@ -1,11 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_17_R1
-
-import com.willfp.eco.internal.spigot.proxy.SyncCommandsProxy
-import org.bukkit.Bukkit
-import org.bukkit.craftbukkit.v1_17_R1.CraftServer
-
-class SyncCommands : SyncCommandsProxy {
-    override fun syncCommands() {
-        (Bukkit.getServer() as CraftServer).syncCommands()
-    }
-}

eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/BukkitCommands.kt

@@ -0,0 +1,35 @@
+package com.willfp.eco.internal.spigot.proxy.v1_18_R1
+
+import com.willfp.eco.core.command.impl.PluginCommand
+import com.willfp.eco.internal.spigot.proxy.BukkitCommandsProxy
+import org.bukkit.Bukkit
+import org.bukkit.command.Command
+import org.bukkit.command.SimpleCommandMap
+import org.bukkit.craftbukkit.v1_18_R1.CraftServer
+import java.lang.reflect.Field
+
+class BukkitCommands : BukkitCommandsProxy {
+    private val knownCommandsField: Field by lazy {
+        SimpleCommandMap::class.java.getDeclaredField("knownCommands")
+            .apply {
+                isAccessible = true
+            }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private val knownCommands: MutableMap<String, Command>
+        get() = knownCommandsField.get(getCommandMap()) as MutableMap<String, Command>
+
+    override fun getCommandMap(): SimpleCommandMap {
+        return (Bukkit.getServer() as CraftServer).commandMap
+    }
+
+    override fun syncCommands() {
+        (Bukkit.getServer() as CraftServer).syncCommands()
+    }
+
+    override fun unregisterCommand(command: PluginCommand) {
+        knownCommands.remove(command.name)
+        knownCommands.remove("${command.plugin.name.lowercase()}:${command.name}")
+    }
+}

eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/SyncCommands.kt

@@ -1,11 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_18_R1
-
-import com.willfp.eco.internal.spigot.proxy.SyncCommandsProxy
-import org.bukkit.Bukkit
-import org.bukkit.craftbukkit.v1_18_R1.CraftServer
-
-class SyncCommands : SyncCommandsProxy {
-    override fun syncCommands() {
-        (Bukkit.getServer() as CraftServer).syncCommands()
-    }
-}

eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/BukkitCommands.kt

@@ -0,0 +1,35 @@
+package com.willfp.eco.internal.spigot.proxy.v1_18_R2
+
+import com.willfp.eco.core.command.impl.PluginCommand
+import com.willfp.eco.internal.spigot.proxy.BukkitCommandsProxy
+import org.bukkit.Bukkit
+import org.bukkit.command.Command
+import org.bukkit.command.SimpleCommandMap
+import org.bukkit.craftbukkit.v1_18_R2.CraftServer
+import java.lang.reflect.Field
+
+class BukkitCommands : BukkitCommandsProxy {
+    private val knownCommandsField: Field by lazy {
+        SimpleCommandMap::class.java.getDeclaredField("knownCommands")
+            .apply {
+                isAccessible = true
+            }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private val knownCommands: MutableMap<String, Command>
+        get() = knownCommandsField.get(getCommandMap()) as MutableMap<String, Command>
+
+    override fun getCommandMap(): SimpleCommandMap {
+        return (Bukkit.getServer() as CraftServer).commandMap
+    }
+
+    override fun syncCommands() {
+        (Bukkit.getServer() as CraftServer).syncCommands()
+    }
+
+    override fun unregisterCommand(command: PluginCommand) {
+        knownCommands.remove(command.name)
+        knownCommands.remove("${command.plugin.name.lowercase()}:${command.name}")
+    }
+}

eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/SyncCommands.kt

@@ -1,11 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_18_R2
-
-import com.willfp.eco.internal.spigot.proxy.SyncCommandsProxy
-import org.bukkit.Bukkit
-import org.bukkit.craftbukkit.v1_18_R2.CraftServer
-
-class SyncCommands : SyncCommandsProxy {
-    override fun syncCommands() {
-        (Bukkit.getServer() as CraftServer).syncCommands()
-    }
-}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/BukkitCommands.kt

@@ -0,0 +1,35 @@
+package com.willfp.eco.internal.spigot.proxy.v1_19_R1
+
+import com.willfp.eco.core.command.impl.PluginCommand
+import com.willfp.eco.internal.spigot.proxy.BukkitCommandsProxy
+import org.bukkit.Bukkit
+import org.bukkit.command.Command
+import org.bukkit.command.SimpleCommandMap
+import org.bukkit.craftbukkit.v1_19_R1.CraftServer
+import java.lang.reflect.Field
+
+class BukkitCommands : BukkitCommandsProxy {
+    private val knownCommandsField: Field by lazy {
+        SimpleCommandMap::class.java.getDeclaredField("knownCommands")
+            .apply {
+                isAccessible = true
+            }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private val knownCommands: MutableMap<String, Command>
+        get() = knownCommandsField.get(getCommandMap()) as MutableMap<String, Command>
+
+    override fun getCommandMap(): SimpleCommandMap {
+        return (Bukkit.getServer() as CraftServer).commandMap
+    }
+
+    override fun syncCommands() {
+        (Bukkit.getServer() as CraftServer).syncCommands()
+    }
+
+    override fun unregisterCommand(command: PluginCommand) {
+        knownCommands.remove(command.name)
+        knownCommands.remove("${command.plugin.name.lowercase()}:${command.name}")
+    }
+}

eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/SyncCommands.kt

@@ -1,11 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy.v1_19_R1
-
-import com.willfp.eco.internal.spigot.proxy.SyncCommandsProxy
-import org.bukkit.Bukkit
-import org.bukkit.craftbukkit.v1_19_R1.CraftServer
-
-class SyncCommands : SyncCommandsProxy {
-    override fun syncCommands() {
-        (Bukkit.getServer() as CraftServer).syncCommands()
-    }
-}

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt

@@ -4,6 +4,7 @@ import com.willfp.eco.core.Eco
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.PluginLike
 import com.willfp.eco.core.PluginProps
+import com.willfp.eco.core.command.impl.PluginCommand
 import com.willfp.eco.core.config.ConfigType
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.core.data.keys.PersistentDataKey
@@ -50,10 +51,12 @@ import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy
 import com.willfp.eco.internal.spigot.proxy.MiniMessageTranslatorProxy
 import com.willfp.eco.internal.spigot.proxy.SNBTConverterProxy
 import com.willfp.eco.internal.spigot.proxy.SkullProxy
-import com.willfp.eco.internal.spigot.proxy.SyncCommandsProxy
+import com.willfp.eco.internal.spigot.proxy.BukkitCommandsProxy
 import com.willfp.eco.internal.spigot.proxy.TPSProxy
 import org.bukkit.Location
 import org.bukkit.NamespacedKey
+import org.bukkit.command.Command
+import org.bukkit.command.CommandMap
 import org.bukkit.configuration.ConfigurationSection
 import org.bukkit.entity.Entity
 import org.bukkit.entity.Mob
@@ -285,5 +288,11 @@ class EcoImpl : EcoSpigotPlugin(), Eco {
         player.renderedInventory?.menu
 
     override fun syncCommands() =
-        this.getProxy(SyncCommandsProxy::class.java).syncCommands()
+        this.getProxy(BukkitCommandsProxy::class.java).syncCommands()
+
+    override fun getCommandMap(): CommandMap =
+        this.getProxy(BukkitCommandsProxy::class.java).getCommandMap()
+
+    override fun unregisterCommand(command: PluginCommand) =
+        this.getProxy(BukkitCommandsProxy::class.java).unregisterCommand(command)
 }

eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/BukkitCommandsProxy.kt

@@ -0,0 +1,12 @@
+package com.willfp.eco.internal.spigot.proxy
+
+import com.willfp.eco.core.command.impl.PluginCommand
+import org.bukkit.command.CommandMap
+
+interface BukkitCommandsProxy {
+    fun getCommandMap(): CommandMap
+
+    fun syncCommands()
+
+    fun unregisterCommand(command: PluginCommand)
+}

eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/SyncCommandsProxy.kt

@@ -1,5 +0,0 @@
-package com.willfp.eco.internal.spigot.proxy
-
-interface SyncCommandsProxy {
-    fun syncCommands()
-}