DynamicCommands: Add helper method for getting the dispatcher root node

ChatTriggers · Dec 1, 2023 · 4faf510 · 4faf510
1 parent f4abb20
commit 4faf510
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/api/ctjs.api b/api/ctjs.api
@@ -645,6 +645,7 @@ public final class com/chattriggers/ctjs/api/commands/DynamicCommands : com/chat
 	public static final fun floatRange ()Lnet/minecraft/command/argument/NumberRangeArgumentType$FloatRangeArgumentType;
 	public static final fun gameMode ()Lnet/minecraft/command/argument/GameModeArgumentType;
 	public static final fun gameProfile ()Lcom/mojang/brigadier/arguments/ArgumentType;
+	public static final fun getDispatcherRoot ()Lcom/mojang/brigadier/tree/RootCommandNode;
 	public static final fun greedyString ()Lcom/mojang/brigadier/arguments/StringArgumentType;
 	public static final fun intRange ()Lnet/minecraft/command/argument/NumberRangeArgumentType$IntRangeArgumentType;
 	public static final fun integer ()Lcom/mojang/brigadier/arguments/IntegerArgumentType;

diff --git a/src/main/kotlin/com/chattriggers/ctjs/api/commands/DynamicCommands.kt b/src/main/kotlin/com/chattriggers/ctjs/api/commands/DynamicCommands.kt
@@ -224,6 +224,16 @@ object DynamicCommands : CommandCollection() {
         currentNode!!.method = method
     }
 
+    /**
+     * A helper method for getting Fabric's client CommandDispatcher root node. This allows user
+     * commands to be redirected to the root node in the same way that "/execute run ..." does.
+     *
+     * As the result is a CommandNode, `.getChild(name)` can be used to access sub-command nodes
+     * to, for example, redirect to just `/advancement` instead of `/`.
+     */
+    @JvmStatic
+    fun getDispatcherRoot() = Client.getConnection()?.commandDispatcher?.root
+
     /////////////////////////
     // Brigadier Arg Types //
     /////////////////////////