Command api v2

src/main/java/meteordevelopment/meteorclient/commands/Command.java

@@ -9,6 +9,7 @@
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.tree.LiteralCommandNode;
 import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.systems.config.Config;
 import meteordevelopment.meteorclient.utils.Utils;
@@ -23,7 +24,7 @@
 import java.util.List;
 
 public abstract class Command {
-    protected static final CommandRegistryAccess REGISTRY_ACCESS = CommandManager.createRegistryAccess(BuiltinRegistries.createWrapperLookup());
+    protected static CommandRegistryAccess REGISTRY_ACCESS = CommandManager.createRegistryAccess(BuiltinRegistries.createWrapperLookup());
     protected static final int SINGLE_SUCCESS = com.mojang.brigadier.Command.SINGLE_SUCCESS;
     protected static final MinecraftClient mc = MeteorClient.mc;
 
@@ -49,14 +50,21 @@ protected static LiteralArgumentBuilder<CommandSource> literal(final String name
     }
 
     public final void registerTo(CommandDispatcher<CommandSource> dispatcher) {
-        register(dispatcher, name);
-        for (String alias : aliases) register(dispatcher, alias);
+        LiteralArgumentBuilder<CommandSource> builder = literal(name);
+        build(builder);
+        LiteralCommandNode<CommandSource> node = dispatcher.register(builder);
+
+        for (String alias : aliases) registerAlias(dispatcher, node, alias);
     }
 
-    public void register(CommandDispatcher<CommandSource> dispatcher, String name) {
-        LiteralArgumentBuilder<CommandSource> builder = LiteralArgumentBuilder.literal(name);
-        build(builder);
-        dispatcher.register(builder);
+    private void registerAlias(CommandDispatcher<CommandSource> dispatcher, LiteralCommandNode<CommandSource> node, String alias) {
+        LiteralArgumentBuilder<CommandSource> aliasBuilder = literal(alias);
+        if (node.getChildren().isEmpty()) { // apparently redirect nodes break when the target node has no children :/
+            build(aliasBuilder);
+        } else {
+            aliasBuilder.redirect(node);
+        }
+        dispatcher.register(aliasBuilder);
     }
 
     public abstract void build(LiteralArgumentBuilder<CommandSource> builder);

src/main/java/meteordevelopment/meteorclient/commands/Commands.java

@@ -7,9 +7,14 @@
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.commands.commands.*;
+import meteordevelopment.meteorclient.events.game.GameJoinedEvent;
 import meteordevelopment.meteorclient.pathing.PathManagers;
 import meteordevelopment.meteorclient.utils.PostInit;
+import meteordevelopment.orbit.EventHandler;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.command.CommandRegistryAccess;
 import net.minecraft.command.CommandSource;
 
 import java.util.ArrayList;
@@ -19,56 +24,61 @@
 import static meteordevelopment.meteorclient.MeteorClient.mc;
 
 public class Commands {
-    public static final CommandDispatcher<CommandSource> DISPATCHER = new CommandDispatcher<>();
     public static final List<Command> COMMANDS = new ArrayList<>();
+    public static CommandDispatcher<CommandSource> DISPATCHER = new CommandDispatcher<>();
 
     @PostInit(dependencies = PathManagers.class)
     public static void init() {
-        add(new VClipCommand());
-        add(new HClipCommand());
-        add(new DismountCommand());
-        add(new DisconnectCommand());
+        add(new BindCommand());
+        add(new BindsCommand());
+        add(new CommandsCommand());
+        add(new ComponentsCommand());
+        add(new ConfigCommand());
         add(new DamageCommand());
+        add(new DisconnectCommand());
+        add(new DismountCommand());
         add(new DropCommand());
         add(new EnchantCommand());
+        add(new EnderChestCommand());
         add(new FakePlayerCommand());
+        add(new FovCommand());
         add(new FriendsCommand());
-        add(new CommandsCommand());
+        add(new GamemodeCommand());
+        add(new GiveCommand());
+        add(new HClipCommand());
+        add(new InputCommand());
         add(new InventoryCommand());
+        add(new LocateCommand());
+        add(new MacroCommand());
+        add(new ModulesCommand());
+        add(new MultitoolCommand());
+        add(new NameHistoryCommand());
         add(new NbtCommand());
         add(new NotebotCommand());
         add(new PeekCommand());
-        add(new EnderChestCommand());
         add(new ProfilesCommand());
         add(new ReloadCommand());
         add(new ResetCommand());
+        add(new RotationCommand());
+        add(new SaveMapCommand());
         add(new SayCommand());
         add(new ServerCommand());
-        add(new SwarmCommand());
-        add(new ToggleCommand());
         add(new SettingCommand());
         add(new SpectateCommand());
-        add(new GamemodeCommand());
-        add(new SaveMapCommand());
-        add(new MacroCommand());
-        add(new ModulesCommand());
-        add(new BindsCommand());
-        add(new GiveCommand());
-        add(new NameHistoryCommand());
-        add(new BindCommand());
-        add(new FovCommand());
-        add(new RotationCommand());
-        add(new WaypointCommand());
-        add(new InputCommand());
+        add(new SwarmCommand());
+        add(new ToggleCommand());
+        add(new TransmogrifyCommand());
+        add(new VClipCommand());
         add(new WaspCommand());
-        add(new LocateCommand());
+        add(new WaypointCommand());
 
         COMMANDS.sort(Comparator.comparing(Command::getName));
+
+        MeteorClient.EVENT_BUS.subscribe(Commands.class);
     }
 
     public static void add(Command command) {
         COMMANDS.removeIf(existing -> existing.getName().equals(command.getName()));
-        command.registerTo(DISPATCHER);
         COMMANDS.add(command);
     }
 
@@ -85,4 +95,38 @@ public static Command get(String name) {
 
         return null;
     }
+
+    /**
+     * Argument types that rely on Minecraft registries access those registries through a {@link CommandRegistryAccess}
+     * object.
+     * Since dynamic registries are specific to each server, we need to make a new {@link CommandRegistryAccess} object
+     * every time we join a server.
+     * <p>
+     * Annoyingly, we also have to create a new {@link CommandDispatcher} because the command tree needs to be rebuilt
+     * from scratch. This is mainly due to two reasons:
+     * <ol>
+     *     <li>Argument types that access registries do so through a registry wrapper object that is created and cached
+     *         when the argument type objects are created, that is to say when the command tree is built.
+     *         This would cause the registry wrapper objects to become stale after joining another server.
+     *     <li>We can't re-register command nodes to the same {@link CommandDispatcher}, because the node merging that
+     *         happens only registers missing children, it doesn't replace existing ones so the stale argument type
+     *         objects wouldn't get replaced.
+     * </ol>
+     * <p>
+     * Ensuring dynamic registry entries match up perfectly is important, because even if a stale registry has identical
+     * contents to an up-to-date one, registry entries and keys are compared using referential equality, so their
+     * contents would not match.
+     *
+     * @author Crosby
+     */
+    @EventHandler
+    private static void onJoin(GameJoinedEvent event) {
+        ClientPlayNetworkHandler networkHandler = mc.getNetworkHandler();
+        Command.REGISTRY_ACCESS = CommandRegistryAccess.of(networkHandler.getRegistryManager(), networkHandler.getEnabledFeatures());
+
+        DISPATCHER = new CommandDispatcher<>();
+        for (Command command : COMMANDS) {
+            command.registerTo(DISPATCHER);
+        }
+    }
 }