Wait for Velocity to patch their Brigadier bug 🤷‍

Author: Revxrsal

velocity/build.gradle

@@ -4,7 +4,6 @@ repositories {
 
 dependencies {
     implementation project(':common')
-    implementation project(':brigadier')
     compileOnly 'com.velocitypowered:velocity-api:3.0.0'
 }
 

velocity/src/main/java/revxrsal/commands/velocity/core/DummyVelocityBrigadier.java

@@ -1,16 +1,10 @@
 package revxrsal.commands.velocity.core;
 
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.tree.ArgumentCommandNode;
-import com.mojang.brigadier.tree.CommandNode;
-import com.mojang.brigadier.tree.LiteralCommandNode;
 import com.velocitypowered.api.command.Command;
 import com.velocitypowered.api.command.CommandMeta;
-import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.plugin.PluginContainer;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
-import lombok.SneakyThrows;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import revxrsal.commands.CommandHandler;
@@ -25,19 +19,15 @@
 import revxrsal.commands.velocity.exception.InvalidPlayerException;
 import revxrsal.commands.velocity.exception.VelocityExceptionAdapter;
 
-import java.lang.reflect.Field;
-import java.util.Map;
 import java.util.Optional;
 
-import static com.mojang.brigadier.builder.LiteralArgumentBuilder.literal;
-import static revxrsal.commands.brigadier.BrigadierTreeParser.parse;
 import static revxrsal.commands.util.Preconditions.notNull;
 
 public final class VelocityHandler extends BaseCommandHandler implements VelocityCommandHandler {
 
     private final ProxyServer server;
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType") private final Optional<PluginContainer> plugin;
-    private final DummyVelocityBrigadier brigadier = new DummyVelocityBrigadier(this);
+//    private final DummyVelocityBrigadier brigadier = new DummyVelocityBrigadier(this);
 
     public VelocityHandler(@Nullable Object plugin, @NotNull ProxyServer server) {
         super();
@@ -81,33 +71,33 @@ private void createPluginCommand(Object commandComponent) {
         Command command = new VelocitySimpleCommand(this);
         if (commandComponent instanceof CommandCategory) {
             CommandCategory category = ((CommandCategory) commandComponent);
-            LiteralArgumentBuilder<CommandSource> builder = parse(brigadier, literal(category.getName()), category);
-            registerNode(command, parse(brigadier, literal(category.getName()), category));
+//            registerNode(command, parse(brigadier, literal(category.getName()), category));
+            registerNode(category.getName(), command);
             if (getNamespace() != null)
-                registerNode(command, parse(brigadier, literal(getNamespace() + ":" + category.getName()), category));
-//            registerNode(category.getName(), command);
+//                registerNode(command, parse(brigadier, literal(getNamespace() + ":" + category.getName()), category));
+                registerNode(getNamespace() + ":" + category.getName(), command);
         } else if (commandComponent instanceof ExecutableCommand) {
             ExecutableCommand executable = ((ExecutableCommand) commandComponent);
-            LiteralArgumentBuilder<CommandSource> builder = parse(brigadier, literal(executable.getName()), executable);
-            registerNode(command, parse(brigadier, literal(executable.getName()), executable));
+//            registerNode(command, parse(brigadier, literal(executable.getName()), executable));
+            registerNode(executable.getName(), command);
             if (getNamespace() != null)
-                registerNode(command, parse(brigadier, literal(getNamespace() + ":" + executable.getName()), executable));
-//            registerNode(executable.getName(), command);
+//                registerNode(command, parse(brigadier, literal(getNamespace() + ":" + executable.getName()), executable));
+                registerNode(getNamespace() + ":" + executable.getName(), command);
         }
     }
 
-    private void registerNode(Command command, LiteralArgumentBuilder<CommandSource> builder) {
-        CommandMeta.Builder metaBuilder = metaBuilder(builder.getLiteral());
-        LiteralCommandNode<CommandSource> node = builder.build();
-        node.getChildren().forEach(metaBuilder::hint);
-        getArguments(node).values().forEach(metaBuilder::hint);
-        server.getCommandManager().register(metaBuilder.build(), command);
-    }
-
-//    private void registerNode(String alias, Command command) {
-//        server.getCommandManager().register(alias, command);
+//    private void registerNode(Command command, LiteralArgumentBuilder<CommandSource> builder) {
+//        CommandMeta.Builder metaBuilder = metaBuilder(builder.getLiteral());
+//        LiteralCommandNode<CommandSource> node = builder.build();
+//        node.getChildren().forEach(metaBuilder::hint);
+//        getArguments(node).values().forEach(metaBuilder::hint);
+//        server.getCommandManager().register(metaBuilder.build(), command);
 //    }
 
+    private void registerNode(String alias, Command command) {
+        server.getCommandManager().register(alias, command);
+    }
+
     private @Nullable String getNamespace() {
         return plugin.map(p -> p.getDescription().getId()).orElse(null);
     }
@@ -120,22 +110,4 @@ private CommandMeta.Builder metaBuilder(String alias) {
         return server;
     }
 
-    private static final Field ARGUMENTS;
-
-    static {
-        Field arguments = null;
-        try {
-            arguments = CommandNode.class.getDeclaredField("arguments");
-            arguments.setAccessible(true);
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-        ARGUMENTS = arguments;
-    }
-
-    @SneakyThrows
-    private static <S> Map<String, ArgumentCommandNode<S, ?>> getArguments(CommandNode<S> node) {
-        return (Map<String, ArgumentCommandNode<S, ?>>) ARGUMENTS.get(node);
-    }
-
 }

velocity/src/main/java/revxrsal/commands/velocity/core/VelocityHandler.java

@@ -24,14 +24,14 @@ public VelocitySimpleCommand(VelocityHandler handler) {
         handler.dispatch(actor, arguments);
     }
 
-//    @Override public List<String> suggest(Invocation invocation) {
-//        VelocityCommandActor actor = new VelocityActor(invocation.source(), handler.getServer());
-//        ArgumentStack arguments;
-//        if (invocation.arguments().length == 0)
-//            arguments = ArgumentStack.forAutoCompletion("");
-//        else
-//            arguments = ArgumentStack.forAutoCompletion(invocation.arguments());
-//        arguments.addFirst(invocation.alias());
-//        return handler.getAutoCompleter().complete(actor, arguments);
-//    }
+    @Override public List<String> suggest(Invocation invocation) {
+        VelocityCommandActor actor = new VelocityActor(invocation.source(), handler.getServer());
+        ArgumentStack arguments;
+        if (invocation.arguments().length == 0)
+            arguments = ArgumentStack.forAutoCompletion("");
+        else
+            arguments = ArgumentStack.forAutoCompletion(invocation.arguments());
+        arguments.addFirst(invocation.alias());
+        return handler.getAutoCompleter().complete(actor, arguments);
+    }
 }