implement granular un-registration for bukkit

Revxrsal · Sep 21, 2024 · d272003 · d272003
1 parent 138c34c
commit d272003
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 3 deletions.
diff --git a/bukkit/src/main/java/revxrsal/commands/bukkit/hooks/BukkitCommandHooks.java b/bukkit/src/main/java/revxrsal/commands/bukkit/hooks/BukkitCommandHooks.java
@@ -23,6 +23,7 @@
  */
 package revxrsal.commands.bukkit.hooks;
 
+import org.bukkit.Bukkit;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
@@ -33,12 +34,14 @@
 import revxrsal.commands.command.ExecutableCommand;
 import revxrsal.commands.hook.CancelHandle;
 import revxrsal.commands.hook.CommandRegisteredHook;
+import revxrsal.commands.hook.CommandUnregisteredHook;
 
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
-public final class BukkitCommandHooks<A extends BukkitCommandActor> implements CommandRegisteredHook<A> {
+public final class BukkitCommandHooks<A extends BukkitCommandActor> implements CommandRegisteredHook<A>,
+        CommandUnregisteredHook<A> {
 
     private final Set<String> registeredRootNames = new HashSet<>();
 
@@ -70,4 +73,25 @@ public void onRegistered(@NotNull ExecutableCommand<A> command, @NotNull CancelH
                 cmd.setUsage(command.usage());
         }
     }
+
+    @Override public void onUnregistered(@NotNull ExecutableCommand<A> command, @NotNull CancelHandle cancelHandle) {
+        String label = command.firstNode().name();
+        String fallbackPrefix = fallbackPrefix(command);
+        PluginCommand cmd = Bukkit.getServer().getPluginCommand(fallbackPrefix + ':' + label);
+        // check there's no other '/fallback_prefix:label' command. if so, unregister.
+        if (!command.lamp().registry().any(c -> c != command && c.firstNode().name().equals(label) && fallbackPrefix(c).equals(fallbackPrefix)))
+            if (cmd != null)
+                PluginCommands.unregister(cmd, plugin);
+
+        // check there's no other '/label' command. if so, unregister.
+        if (!command.lamp().registry().any(c -> c != command && c.firstNode().name().equals(label))) {
+            cmd = plugin.getCommand(label);
+            if (cmd != null)
+                PluginCommands.unregister(cmd, plugin);
+        }
+    }
+
+    private @NotNull String fallbackPrefix(@NotNull ExecutableCommand<A> command) {
+        return command.annotations().mapOr(FallbackPrefix.class, FallbackPrefix::value, defaultFallbackPrefix);
+    }
 }
diff --git a/common/src/main/java/revxrsal/commands/annotation/list/AnnotationListFromMap.java b/common/src/main/java/revxrsal/commands/annotation/list/AnnotationListFromMap.java
@@ -156,7 +156,6 @@ public <T extends Annotation> boolean contains(@NotNull Class<T> type) {
         }
         if (element instanceof Method method) {
             distributeAnnotations(annotations, method, replacers);
-            System.out.println(annotations);
         }
         return new AnnotationListFromMap(annotations);
     }

diff --git a/common/src/main/java/revxrsal/commands/node/CommandRegistry.java b/common/src/main/java/revxrsal/commands/node/CommandRegistry.java
@@ -23,6 +23,7 @@
  */
 package revxrsal.commands.node;
 
+import org.jetbrains.annotations.CheckReturnValue;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.UnmodifiableView;
@@ -103,7 +104,26 @@ default void execute(@NotNull A actor, @NotNull String input) {
      *
      * @param matches Criteria to test for
      */
-    void unregisterIf(@NotNull Predicate<ExecutableCommand<A>> matches);
+    void unregisterIf(@NotNull Predicate<@NotNull ExecutableCommand<A>> matches);
+
+    /**
+     * Tests whether any of the registered commands matches the
+     * given predicate
+     *
+     * @param matches Criteria to test for
+     * @return if any command matches the predicate
+     */
+    boolean any(@NotNull Predicate<@NotNull ExecutableCommand<A>> matches);
+
+    /**
+     * Returns a new list of all commands that match the
+     * given predicate
+     *
+     * @param filterPredicate Criteria to test for
+     * @return a list of all commands that match the predicate
+     */
+    @NotNull @CheckReturnValue @Contract("_ -> new")
+    List<ExecutableCommand<A>> filter(@NotNull Predicate<@NotNull ExecutableCommand<A>> filterPredicate);
 
     /**
      * Returns an immutable iterator of all entries in this registry.

diff --git a/common/src/main/java/revxrsal/commands/node/parser/BaseCommandRegistry.java b/common/src/main/java/revxrsal/commands/node/parser/BaseCommandRegistry.java
@@ -193,6 +193,15 @@ public void execute(@NotNull A actor, @NotNull StringStream input) {
         children.remove(execution);
     }
 
+    @Override public boolean any(@NotNull Predicate<@NotNull ExecutableCommand<A>> matches) {
+        return revxrsal.commands.util.Collections.any(children, matches);
+    }
+
+    @Override
+    public @NotNull List<ExecutableCommand<A>> filter(@NotNull Predicate<@NotNull ExecutableCommand<A>> filterPredicate) {
+        return revxrsal.commands.util.Collections.filter(children, filterPredicate);
+    }
+
     @Override public void unregisterIf(@NotNull Predicate<ExecutableCommand<A>> matches) {
         children.removeIf(matches);
     }