Add SuggestionsHook for custom suggestions requests, and make Plugins…

…Command use it
Earthcomputer · Mar 3, 2024 · b4b3ee2 · b4b3ee2
1 parent 9e5a53f
commit b4b3ee2
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 28 deletions.
diff --git a/src/main/java/net/earthcomputer/clientcommands/command/PluginsCommand.java b/src/main/java/net/earthcomputer/clientcommands/command/PluginsCommand.java
@@ -4,22 +4,16 @@
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.suggestion.Suggestion;
 import com.mojang.brigadier.tree.CommandNode;
+import net.earthcomputer.clientcommands.features.SuggestionsHook;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket;
-import net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket;
 
 import java.util.stream.Collectors;
 
 import static com.mojang.brigadier.arguments.StringArgumentType.*;
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.*;
 
 public class PluginsCommand {
-
-    private static boolean awaitingSuggestionsPacket = false;
-
-    private static SuggestionsCallback callback;
-
     public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher) {
         dispatcher.register(literal("cplugins")
             .executes(ctx -> getPlugins(ctx.getSource()))
@@ -35,10 +29,8 @@ private static int getPlugins(FabricClientCommandSource source) {
     }
 
     private static int getPlugins(FabricClientCommandSource source, String partial) {
-        awaitingSuggestionsPacket = true;
-        source.getClient().getConnection().send(new ServerboundCommandSuggestionPacket(1, partial));
-        callback = packet -> {
-            String plugins = packet.getSuggestions().getList().stream()
+        SuggestionsHook.request(partial).whenComplete((suggestions, throwable) -> {
+            String plugins = suggestions.getList().stream()
                 .map(Suggestion::getText)
                 .filter(text -> text.contains(":"))
                 .map(text -> text.substring(0, text.indexOf(":")))
@@ -47,7 +39,7 @@ private static int getPlugins(FabricClientCommandSource source, String partial)
 
             source.sendFeedback(Component.translatable("commands.cplugins.found"));
             source.sendFeedback(Component.literal(plugins));
-        };
+        });
         return Command.SINGLE_SUCCESS;
     }
 
@@ -63,17 +55,4 @@ private static int getPluginsFromDispatcher(FabricClientCommandSource source) {
         source.sendFeedback(Component.literal(plugins));
         return Command.SINGLE_SUCCESS;
     }
-
-    public static void onCommandSuggestions(ClientboundCommandSuggestionsPacket packet) {
-        if (!awaitingSuggestionsPacket) {
-            return;
-        }
-        awaitingSuggestionsPacket = false;
-        callback.apply(packet);
-    }
-}
-
-@FunctionalInterface
-interface SuggestionsCallback {
-    void apply(ClientboundCommandSuggestionsPacket packet);
 }
diff --git a/src/main/java/net/earthcomputer/clientcommands/features/SuggestionsHook.java b/src/main/java/net/earthcomputer/clientcommands/features/SuggestionsHook.java
@@ -0,0 +1,55 @@
+package net.earthcomputer.clientcommands.features;
+
+import com.mojang.brigadier.suggestion.Suggestions;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket;
+import net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket;
+
+import java.util.concurrent.CompletableFuture;
+
+public final class SuggestionsHook {
+    private SuggestionsHook() {
+    }
+
+    private static final int MAGIC_SUGGESTION_ID = -314159265;
+    private static int currentSuggestionId = MAGIC_SUGGESTION_ID;
+    private static final Int2ObjectMap<CompletableFuture<Suggestions>> pendingSuggestions = new Int2ObjectOpenHashMap<>();
+
+    public static CompletableFuture<Suggestions> request(String command) {
+        ClientPacketListener connection = Minecraft.getInstance().getConnection();
+        if (connection == null) {
+            return Suggestions.empty();
+        }
+
+        currentSuggestionId--;
+        CompletableFuture<Suggestions> future = new CompletableFuture<>();
+        pendingSuggestions.put(currentSuggestionId, future);
+        connection.send(new ServerboundCommandSuggestionPacket(currentSuggestionId, command));
+        return future;
+    }
+
+    public static boolean onCompletions(ClientboundCommandSuggestionsPacket packet) {
+        CompletableFuture<Suggestions> future = pendingSuggestions.remove(packet.getId());
+        if (future == null) {
+            return false;
+        }
+
+        if (pendingSuggestions.isEmpty()) {
+            currentSuggestionId = MAGIC_SUGGESTION_ID;
+        }
+
+        future.complete(packet.getSuggestions());
+        return true;
+    }
+
+    public static void onDisconnect() {
+        for (CompletableFuture<Suggestions> future : pendingSuggestions.values()) {
+            future.complete(Suggestions.empty().join());
+        }
+        pendingSuggestions.clear();
+        currentSuggestionId = MAGIC_SUGGESTION_ID;
+    }
+}
diff --git a/src/main/java/net/earthcomputer/clientcommands/mixin/MixinClientPacketListener.java b/src/main/java/net/earthcomputer/clientcommands/mixin/MixinClientPacketListener.java
@@ -4,9 +4,9 @@
 import net.cortex.clientAddon.cracker.SeedCracker;
 import net.earthcomputer.clientcommands.ClientcommandsDataQueryHandler;
 import net.earthcomputer.clientcommands.Configs;
-import net.earthcomputer.clientcommands.command.PluginsCommand;
 import net.earthcomputer.clientcommands.features.FishingCracker;
 import net.earthcomputer.clientcommands.features.PlayerRandCracker;
+import net.earthcomputer.clientcommands.features.SuggestionsHook;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
 import net.minecraft.client.multiplayer.ClientPacketListener;
@@ -101,8 +101,10 @@ public ClientcommandsDataQueryHandler clientcommands_getCCDataQueryHandler() {
         return ccDataQueryHandler;
     }
 
-    @Inject(method = "handleCommandSuggestions", at = @At("TAIL"))
+    @Inject(method = "handleCommandSuggestions", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/PacketUtils;ensureRunningOnSameThread(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketListener;Lnet/minecraft/util/thread/BlockableEventLoop;)V", shift = At.Shift.AFTER), cancellable = true)
     private void onHandleCommandSuggestions(ClientboundCommandSuggestionsPacket packet, CallbackInfo ci) {
-        PluginsCommand.onCommandSuggestions(packet);
+        if (SuggestionsHook.onCompletions(packet)) {
+            ci.cancel();
+        }
     }
 }
diff --git a/src/main/java/net/earthcomputer/clientcommands/mixin/MixinMinecraft.java b/src/main/java/net/earthcomputer/clientcommands/mixin/MixinMinecraft.java
@@ -7,6 +7,7 @@
 import net.earthcomputer.clientcommands.features.PlayerRandCracker;
 import net.earthcomputer.clientcommands.features.Relogger;
 import net.earthcomputer.clientcommands.features.RenderSettings;
+import net.earthcomputer.clientcommands.features.SuggestionsHook;
 import net.earthcomputer.clientcommands.render.RenderQueue;
 import net.earthcomputer.clientcommands.task.TaskManager;
 import net.minecraft.client.Minecraft;
@@ -72,6 +73,7 @@ public void onDisconnect(Screen screen, CallbackInfo ci) {
             BetterConfigAPI.getInstance().getModConfig("clientcommands").resetTemporaryConfigs();
         }
         RenderSettings.clearEntityRenderSelectors();
+        SuggestionsHook.onDisconnect();
     }
 
     // Earth annoying his friends <3 nothing to see here