🐛 Fix Bukkit alias command suggestions without Brigadier

CHANGELOG.md

@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  
 ### Fixed
  - Use the correct default range for Double and Float parsers in the StandardParserRegistry
+ - Fix Bukkit alias command suggestions without Brigadier
 
 ## [1.1.0] - 2020-10-24
 

cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java

@@ -42,7 +42,7 @@ public class CommandSuggestionsTest {
     @BeforeAll
     static void setupManager() {
         manager = new TestCommandManager();
-        manager.command(manager.commandBuilder("test").literal("one").build());
+        manager.command(manager.commandBuilder("test", "testalias").literal("one").build());
         manager.command(manager.commandBuilder("test").literal("two").build());
         manager.command(manager.commandBuilder("test")
                 .literal("var")
@@ -92,6 +92,15 @@ public class CommandSuggestionsTest {
                 .argument(IntegerArgument.<TestCommandSender>newBuilder("num").withMin(5).withMax(100)));
     }
 
+    @Test
+    void testRootAliases() {
+        final String input = "test ";
+        final List<String> suggestions = manager.suggest(new TestCommandSender(), input);
+        final String input2 = "testalias ";
+        final List<String> suggestions2 = manager.suggest(new TestCommandSender(), input2);
+        Assertions.assertEquals(suggestions, suggestions2);
+    }
+
     @Test
     void testSimple() {
         final String input = "test";

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java

@@ -88,6 +88,29 @@ public class BukkitPluginRegistrationHandler<C> implements CommandRegistrationHa
                 (CommandArgument<C, ?>) commandArgument,
                 this.bukkitCommandManager
         );
+
+        for (final String alias : aliases) {
+            this.recognizedAliases.add(getNamespacedLabel(alias));
+            if (!this.bukkitCommands.containsKey(alias)) {
+                this.recognizedAliases.add(alias);
+                if (this.bukkitCommandManager.getSplitAliases()) {
+                    @SuppressWarnings("unchecked") final BukkitCommand<C> aliasCommand = new BukkitCommand<>(
+                            alias,
+                            Collections.emptyList(),
+                            (Command<C>) command,
+                            (CommandArgument<C, ?>) commandArgument,
+                            this.bukkitCommandManager
+                    );
+                    this.commandMap.register(
+                            alias,
+                            this.bukkitCommandManager.getOwningPlugin().getName().toLowerCase(),
+                            bukkitCommand
+                    );
+                    this.registerExternal(alias, command, aliasCommand);
+                }
+            }
+        }
+
         this.registeredCommands.put(commandArgument, bukkitCommand);
         if (!this.bukkitCommands.containsKey(label)) {
             this.recognizedAliases.add(label);
@@ -100,30 +123,6 @@ public class BukkitPluginRegistrationHandler<C> implements CommandRegistrationHa
         );
         this.registerExternal(label, command, bukkitCommand);
 
-        if (this.bukkitCommandManager.getSplitAliases()) {
-            for (final String alias : aliases) {
-                if (!this.bukkitCommands.containsKey(alias)) {
-                    @SuppressWarnings("unchecked") final BukkitCommand<C> aliasCommand = new BukkitCommand<>(
-                            alias,
-                            Collections.emptyList(),
-                            (Command<C>) command,
-                            (CommandArgument<C, ?>) commandArgument,
-                            this.bukkitCommandManager
-                    );
-                    if (!this.bukkitCommands.containsKey(alias)) {
-                        this.recognizedAliases.add(alias);
-                    }
-                    this.recognizedAliases.add(getNamespacedLabel(alias));
-                    this.commandMap.register(
-                            alias,
-                            this.bukkitCommandManager.getOwningPlugin().getName().toLowerCase(),
-                            bukkitCommand
-                    );
-                    this.registerExternal(alias, command, aliasCommand);
-                }
-            }
-        }
-
         return true;
     }
 

cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftHelp.java

@@ -642,7 +642,7 @@ public final class MinecraftHelp<C> {
          * @param accent             The color used for accents and symbols
          * @return A new {@link HelpColors} instance
          */
-        public static HelpColors of(
+        public static @NonNull HelpColors of(
                 final @NonNull TextColor primary,
                 final @NonNull TextColor highlight,
                 final @NonNull TextColor alternateHighlight,