Fix Brigadier commands being registered on 'minecraft' namespace

Author: Revxrsal

brigadier/src/main/java/revxrsal/commands/brigadier/BrigadierTreeParser.java

@@ -79,14 +79,10 @@ public static <T> List<LiteralArgumentBuilder<T>> parse(
         List<LiteralArgumentBuilder<T>> nodes = new ArrayList<>();
         List<CommandCategory> roots = handler.getCategories().values().stream().filter(c -> c.getPath().isRoot()).collect(Collectors.toList());
         List<ExecutableCommand> rootCommands = handler.getCommands().values().stream().filter(c -> c.getPath().isRoot()).collect(Collectors.toList());
-        for (CommandCategory root : roots) {
+        for (CommandCategory root : roots)
             nodes.add(parse(brigadier, literal(root.getName()), root));
-            if (namespace != null) nodes.add(parse(brigadier, literal(namespace + ":" + root.getName()), root));
-        }
-        for (ExecutableCommand root : rootCommands) {
+        for (ExecutableCommand root : rootCommands)
             nodes.add(parse(brigadier, literal(root.getName()), root));
-            if (namespace != null) nodes.add(parse(brigadier, literal(namespace + ":" + root.getName()), root));
-        }
         return nodes;
     }
 

bukkit/src/main/java/revxrsal/commands/bukkit/core/BukkitBrigadier.java

@@ -28,9 +28,11 @@
 import me.lucko.commodore.Commodore;
 import me.lucko.commodore.MinecraftArgumentTypes;
 import org.bukkit.NamespacedKey;
+import org.bukkit.command.Command;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import revxrsal.commands.brigadier.LampBrigadier;
@@ -67,7 +69,11 @@ public BukkitBrigadier(Commodore commodore, BukkitCommandHandler handler) {
     }
 
     @Override public void register(@NotNull LiteralCommandNode<?> node) {
-        commodore.register(node);
+        Command command = ((JavaPlugin) handler.getPlugin()).getCommand(node.getLiteral());
+        if (command == null)
+            commodore.register(node);
+        else
+            commodore.register(command, node);
     }
 
     @Override public @Nullable ArgumentType<?> getArgumentType(@NotNull CommandParameter parameter) {

bukkit/src/main/java/revxrsal/commands/bukkit/core/BukkitHandler.java

@@ -136,7 +136,7 @@ public BukkitHandler(@NotNull Plugin plugin) {
 
     @Override public BukkitCommandHandler registerBrigadier() {
         brigadier.get().ifPresent(brigadier -> BrigadierTreeParser
-                .parse(brigadier, this, plugin.getName().toLowerCase())
+                .parse(brigadier, this, null/*plugin.getName().toLowerCase()*/)
                 .forEach(brigadier::register));
         return this;
     }