From 126e82b4d7fdd845b80a44b21363518cdb269671 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 3 Nov 2023 00:42:25 +0900 Subject: [PATCH] 23w44a commands --- .../minecraft/command/CommandAction.mapping | 1 + .../command/CommandExecutionContext.mapping | 10 +++++ .../command/CommandFunctionAction.mapping | 7 +++ .../command/ControlFlowAware.mapping | 3 ++ .../command/ExecutionControl.mapping | 4 ++ .../minecraft/command/ExecutionFlags.mapping | 10 +++++ .../command/FixedCommandAction.mapping | 2 + .../net/minecraft/command/Forkable.mapping | 5 +++ mappings/net/minecraft/command/Frame.mapping | 6 +++ .../command/ReturnValueConsumer.mapping | 13 ++++++ .../command/SingleCommandAction.mapping | 12 +++++ .../command/SourcedCommandAction.mapping | 2 + .../command/SteppedCommandAction.mapping | 3 ++ .../AbstractServerCommandSource.mapping | 6 ++- .../server/command/DebugCommand.mapping | 2 + .../server/command/ExecuteCommand.mapping | 23 ++++++++++ .../server/command/FunctionCommand.mapping | 44 +++++++++++++++++++ .../server/command/ReturnCommand.mapping | 3 +- .../command/ServerCommandSource.mapping | 5 ++- .../server/command/TestCommand.mapping | 6 +++ .../server/command/TickCommand.mapping | 2 + 21 files changed, 164 insertions(+), 5 deletions(-) create mode 100644 mappings/net/minecraft/command/ExecutionFlags.mapping create mode 100644 mappings/net/minecraft/command/Frame.mapping create mode 100644 mappings/net/minecraft/command/ReturnValueConsumer.mapping diff --git a/mappings/net/minecraft/command/CommandAction.mapping b/mappings/net/minecraft/command/CommandAction.mapping index afbee6b5dd..6b16b24e5e 100644 --- a/mappings/net/minecraft/command/CommandAction.mapping +++ b/mappings/net/minecraft/command/CommandAction.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_8853 net/minecraft/command/CommandAction METHOD execute (Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;)V ARG 1 context + ARG 2 frame diff --git a/mappings/net/minecraft/command/CommandExecutionContext.mapping b/mappings/net/minecraft/command/CommandExecutionContext.mapping index 9ae7980ac5..e3c2d949c1 100644 --- a/mappings/net/minecraft/command/CommandExecutionContext.mapping +++ b/mappings/net/minecraft/command/CommandExecutionContext.mapping @@ -21,13 +21,23 @@ CLASS net/minecraft/class_8854 net/minecraft/command/CommandExecutionContext METHOD method_54393 enqueueCommand (Lnet/minecraft/class_8854;Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8839;Lnet/minecraft/class_8935;)V ARG 0 context ARG 1 command + ARG 2 contextChain ARG 3 source + ARG 4 returnValueConsumer METHOD method_54394 setTracer (Lnet/minecraft/class_6346;)V ARG 1 tracer METHOD method_54395 enqueueProcedureCall (Lnet/minecraft/class_8854;Lnet/minecraft/class_8868;Lnet/minecraft/class_8839;Lnet/minecraft/class_8935;)V + ARG 0 context ARG 1 procedure + ARG 2 source + ARG 3 returnValueConsumer METHOD method_54396 getTracer ()Lnet/minecraft/class_6346; METHOD method_54397 getProfiler ()Lnet/minecraft/class_3695; METHOD method_54398 getForkLimit ()I METHOD method_54399 decrementCommandQuota ()V METHOD method_54400 markQueueOverflowed ()V + METHOD method_54889 frame (Lnet/minecraft/class_8854;Lnet/minecraft/class_8935;)Lnet/minecraft/class_8937; + ARG 0 context + ARG 1 returnValueConsumer + METHOD method_54890 getEscapeControl (I)Lnet/minecraft/class_8937$class_8938; + ARG 1 depth diff --git a/mappings/net/minecraft/command/CommandFunctionAction.mapping b/mappings/net/minecraft/command/CommandFunctionAction.mapping index f81dec1e1f..53a9c2dc60 100644 --- a/mappings/net/minecraft/command/CommandFunctionAction.mapping +++ b/mappings/net/minecraft/command/CommandFunctionAction.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_8862 net/minecraft/command/CommandFunctionAction FIELD field_46747 function Lnet/minecraft/class_8868; + FIELD field_47166 returnValueConsumer Lnet/minecraft/class_8935; + FIELD field_47167 propagateReturn Z METHOD (Lnet/minecraft/class_8868;Lnet/minecraft/class_8935;Z)V ARG 1 function + ARG 2 returnValueConsumer + ARG 3 propagateReturn + METHOD method_54898 (Lnet/minecraft/class_8839;Lnet/minecraft/class_8937;Lnet/minecraft/class_8856;)Lnet/minecraft/class_8847; + ARG 1 frame + ARG 2 action diff --git a/mappings/net/minecraft/command/ControlFlowAware.mapping b/mappings/net/minecraft/command/ControlFlowAware.mapping index 8882d032da..7a11e134f3 100644 --- a/mappings/net/minecraft/command/ControlFlowAware.mapping +++ b/mappings/net/minecraft/command/ControlFlowAware.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_8848 net/minecraft/command/ControlFlowAware METHOD method_54290 execute (Ljava/lang/Object;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8936;Lnet/minecraft/class_8855;)V ARG 1 source ARG 2 contextChain + ARG 3 flags ARG 4 control CLASS class_8849 Command METHOD run (Lcom/mojang/brigadier/context/CommandContext;)I @@ -10,8 +11,10 @@ CLASS net/minecraft/class_8848 net/minecraft/command/ControlFlowAware METHOD method_54255 sendError (Lcom/mojang/brigadier/exceptions/CommandSyntaxException;Lnet/minecraft/class_8839;Lnet/minecraft/class_8936;Lnet/minecraft/class_6346;)V ARG 1 exception ARG 2 source + ARG 3 flags ARG 4 tracer METHOD method_54259 executeInner (Lnet/minecraft/class_8839;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8936;Lnet/minecraft/class_8855;)V ARG 1 source ARG 2 contextChain + ARG 3 flags ARG 4 control diff --git a/mappings/net/minecraft/command/ExecutionControl.mapping b/mappings/net/minecraft/command/ExecutionControl.mapping index de18b4354f..16d38b7ac3 100644 --- a/mappings/net/minecraft/command/ExecutionControl.mapping +++ b/mappings/net/minecraft/command/ExecutionControl.mapping @@ -4,3 +4,7 @@ CLASS net/minecraft/class_8855 net/minecraft/command/ExecutionControl METHOD method_54403 setTracer (Lnet/minecraft/class_6346;)V ARG 1 tracer METHOD method_54404 getTracer ()Lnet/minecraft/class_6346; + METHOD method_54892 of (Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;)Lnet/minecraft/class_8855; + ARG 0 context + ARG 1 frame + METHOD method_54893 getFrame ()Lnet/minecraft/class_8937; diff --git a/mappings/net/minecraft/command/ExecutionFlags.mapping b/mappings/net/minecraft/command/ExecutionFlags.mapping new file mode 100644 index 0000000000..fe6cff31d4 --- /dev/null +++ b/mappings/net/minecraft/command/ExecutionFlags.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_8936 net/minecraft/command/ExecutionFlags + FIELD field_47160 NONE Lnet/minecraft/class_8936; + FIELD field_47161 SILENT B + FIELD field_47162 INSIDE_RETURN_RUN B + METHOD method_54884 isSilent ()Z + METHOD method_54885 set (B)Lnet/minecraft/class_8936; + ARG 1 flag + METHOD method_54886 setSilent ()Lnet/minecraft/class_8936; + METHOD method_54887 isInsideReturnRun ()Z + METHOD method_54888 setInsideReturnRun ()Lnet/minecraft/class_8936; diff --git a/mappings/net/minecraft/command/FixedCommandAction.mapping b/mappings/net/minecraft/command/FixedCommandAction.mapping index 47fab20eca..0100a95057 100644 --- a/mappings/net/minecraft/command/FixedCommandAction.mapping +++ b/mappings/net/minecraft/command/FixedCommandAction.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_8865 net/minecraft/command/FixedCommandAction FIELD field_46752 command Ljava/lang/String; FIELD field_46754 context Lcom/mojang/brigadier/context/CommandContext; + FIELD field_47168 flags Lnet/minecraft/class_8936; METHOD (Ljava/lang/String;Lnet/minecraft/class_8936;Lcom/mojang/brigadier/context/CommandContext;)V ARG 1 command + ARG 2 flags ARG 3 context diff --git a/mappings/net/minecraft/command/Forkable.mapping b/mappings/net/minecraft/command/Forkable.mapping index 2bc4652572..00f7f98573 100644 --- a/mappings/net/minecraft/command/Forkable.mapping +++ b/mappings/net/minecraft/command/Forkable.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_8851 net/minecraft/command/Forkable METHOD method_54270 execute (Ljava/lang/Object;Ljava/util/List;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8936;Lnet/minecraft/class_8855;)V + ARG 1 baseSource + ARG 2 sources + ARG 3 contextChain + ARG 4 flags + ARG 5 control CLASS class_8852 RedirectModifier METHOD apply (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; ARG 1 context diff --git a/mappings/net/minecraft/command/Frame.mapping b/mappings/net/minecraft/command/Frame.mapping new file mode 100644 index 0000000000..8a2ba772fe --- /dev/null +++ b/mappings/net/minecraft/command/Frame.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8937 net/minecraft/command/Frame + METHOD method_54894 fail ()V + METHOD method_54895 succeed (I)V + ARG 1 returnValue + METHOD method_54896 doReturn ()V + CLASS class_8938 Control diff --git a/mappings/net/minecraft/command/ReturnValueConsumer.mapping b/mappings/net/minecraft/command/ReturnValueConsumer.mapping new file mode 100644 index 0000000000..8b4b70f05f --- /dev/null +++ b/mappings/net/minecraft/command/ReturnValueConsumer.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8935 net/minecraft/command/ReturnValueConsumer + FIELD field_47158 EMPTY Lnet/minecraft/class_8935; + METHOD chain (Lnet/minecraft/class_8935;Lnet/minecraft/class_8935;)Lnet/minecraft/class_8935; + ARG 0 a + ARG 1 b + METHOD method_54880 (Lnet/minecraft/class_8935;Lnet/minecraft/class_8935;ZI)V + ARG 2 successful + ARG 3 returnValue + METHOD onResult (ZI)V + ARG 1 successful + ARG 2 returnValue + METHOD onSuccess (I)V + ARG 1 successful diff --git a/mappings/net/minecraft/command/SingleCommandAction.mapping b/mappings/net/minecraft/command/SingleCommandAction.mapping index 665f22fbbc..5487cb146e 100644 --- a/mappings/net/minecraft/command/SingleCommandAction.mapping +++ b/mappings/net/minecraft/command/SingleCommandAction.mapping @@ -7,16 +7,28 @@ CLASS net/minecraft/class_8858 net/minecraft/command/SingleCommandAction ARG 2 contextChain METHOD method_54407 traceCommandStart (Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;)V ARG 1 context + ARG 2 frame METHOD method_54408 (Lnet/minecraft/class_8865;Lnet/minecraft/class_8937;Lnet/minecraft/class_8839;)Lnet/minecraft/class_8847; + ARG 1 frame ARG 2 source METHOD method_54409 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 count METHOD method_54410 execute (Lnet/minecraft/class_8839;Ljava/util/List;Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;Lnet/minecraft/class_8936;)V + ARG 1 baseSource + ARG 2 sources + ARG 3 context + ARG 4 frame + ARG 5 flags CLASS class_8859 MultiSource FIELD field_46745 sources Ljava/util/List; + FIELD field_47164 flags Lnet/minecraft/class_8936; + FIELD field_47165 baseSource Lnet/minecraft/class_8839; METHOD (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8936;Lnet/minecraft/class_8839;Ljava/util/List;)V ARG 1 command ARG 2 contextChain + ARG 3 flags + ARG 4 baseSource + ARG 5 sources CLASS class_8860 SingleSource FIELD field_46746 source Lnet/minecraft/class_8839; METHOD (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8839;)V diff --git a/mappings/net/minecraft/command/SourcedCommandAction.mapping b/mappings/net/minecraft/command/SourcedCommandAction.mapping index 685d3bc074..9dc0a5ec10 100644 --- a/mappings/net/minecraft/command/SourcedCommandAction.mapping +++ b/mappings/net/minecraft/command/SourcedCommandAction.mapping @@ -4,5 +4,7 @@ CLASS net/minecraft/class_8856 net/minecraft/command/SourcedCommandAction METHOD execute (Ljava/lang/Object;Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;)V ARG 1 source ARG 2 context + ARG 3 frame METHOD method_54405 (Ljava/lang/Object;Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;)V ARG 2 context + ARG 3 frame diff --git a/mappings/net/minecraft/command/SteppedCommandAction.mapping b/mappings/net/minecraft/command/SteppedCommandAction.mapping index 2c7ba0a09c..14e8d7e09b 100644 --- a/mappings/net/minecraft/command/SteppedCommandAction.mapping +++ b/mappings/net/minecraft/command/SteppedCommandAction.mapping @@ -6,10 +6,13 @@ CLASS net/minecraft/class_8863 net/minecraft/command/SteppedCommandAction METHOD (Lnet/minecraft/class_8863$class_8864;Ljava/util/List;Lnet/minecraft/class_8937;)V ARG 1 wrapper ARG 2 actions + ARG 3 frame METHOD method_54414 enqueueCommands (Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;Ljava/util/List;Lnet/minecraft/class_8863$class_8864;)V ARG 0 context + ARG 1 frame ARG 2 actions ARG 3 wrapper CLASS class_8864 ActionWrapper METHOD create (Lnet/minecraft/class_8937;Ljava/lang/Object;)Lnet/minecraft/class_8847; + ARG 1 frame ARG 2 action diff --git a/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping b/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping index afa9b6854f..d79f2c5b22 100644 --- a/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8839 net/minecraft/server/command/AbstractServerCommandSource - METHOD method_54307 withResultStorer (Lnet/minecraft/class_8935;)Lnet/minecraft/class_8839; - ARG 1 resultStorer + METHOD method_54307 withReturnValueConsumers (Lnet/minecraft/class_8935;)Lnet/minecraft/class_8839; + ARG 1 returnValueConsumer METHOD method_54310 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; METHOD method_54311 withDummyResultStorer ()Lnet/minecraft/class_8839; METHOD method_54316 (Lcom/mojang/brigadier/context/CommandContext;ZI)V @@ -17,5 +17,7 @@ CLASS net/minecraft/class_8839 net/minecraft/server/command/AbstractServerComman ARG 1 exception ARG 2 silent ARG 3 tracer + METHOD method_54881 getReturnValueConsumer ()Lnet/minecraft/class_8935; + METHOD method_54882 isSilent ()Z METHOD method_9259 hasPermissionLevel (I)Z ARG 1 level diff --git a/mappings/net/minecraft/server/command/DebugCommand.mapping b/mappings/net/minecraft/server/command/DebugCommand.mapping index 4e1eab6f0c..4e7a165d29 100644 --- a/mappings/net/minecraft/server/command/DebugCommand.mapping +++ b/mappings/net/minecraft/server/command/DebugCommand.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand FIELD field_13597 NOT_RUNNING_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_20283 LOGGER Lorg/slf4j/Logger; FIELD field_46638 NO_RECURSION_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_47151 NO_RETURN_RUN_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD method_13154 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13156 register (Lcom/mojang/brigadier/CommandDispatcher;)V @@ -32,3 +33,4 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand CLASS class_8829 Command METHOD method_54257 (Ljava/util/Collection;Lnet/minecraft/class_2168;ILjava/lang/String;Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;)V ARG 4 context + ARG 5 frame diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 0882f8f11a..fdafe2231f 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -29,6 +29,9 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 3 builder METHOD method_13259 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; ARG 0 context + METHOD method_13260 (Ljava/util/Collection;Lnet/minecraft/class_269;Lnet/minecraft/class_266;ZZI)V + ARG 4 successful + ARG 5 returnValue METHOD method_13261 testBlocksCondition (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Z)Ljava/util/OptionalInt; ARG 0 world ARG 1 start @@ -72,6 +75,9 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 1 result METHOD method_13276 (Lcom/mojang/brigadier/context/CommandContext;I)Lnet/minecraft/class_2520; ARG 1 result + METHOD method_13277 (ZZLnet/minecraft/class_3002;ZI)V + ARG 3 successful + ARG 4 returnValue METHOD method_13280 (Lcom/mojang/brigadier/context/CommandContext;)Z ARG 0 context METHOD method_13281 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; @@ -105,6 +111,9 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 context METHOD method_13293 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; ARG 0 context + METHOD method_13294 (Lnet/minecraft/class_3162;ZLnet/minecraft/class_2203$class_2209;Ljava/util/function/IntFunction;ZI)V + ARG 4 successful + ARG 5 returnValue METHOD method_13295 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; ARG 0 context METHOD method_13296 (Lnet/minecraft/class_3050$class_3051;Lcom/mojang/brigadier/context/CommandContext;)I @@ -246,6 +255,20 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 function ARG 1 message METHOD method_54264 enqueueExecutions (Lnet/minecraft/class_8839;Ljava/util/List;Ljava/util/function/Function;Ljava/util/function/IntPredicate;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_2487;Lnet/minecraft/class_8855;Lnet/minecraft/class_3050$class_8830;Lnet/minecraft/class_8936;)V + ARG 0 baseSource + ARG 1 sources + ARG 2 functionSourceGetter + ARG 3 predicate + ARG 4 contextChain + ARG 5 args + ARG 6 control + ARG 7 arg4 + ARG 8 flags + METHOD method_54852 (Ljava/util/List;Lnet/minecraft/class_8839;Lnet/minecraft/class_8855;)V + ARG 2 newControl + METHOD method_54853 (Ljava/util/function/IntPredicate;Ljava/util/List;Lnet/minecraft/class_8839;ZI)V + ARG 3 successful + ARG 4 returnValue CLASS class_3051 ExistsCondition METHOD test (Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context diff --git a/mappings/net/minecraft/server/command/FunctionCommand.mapping b/mappings/net/minecraft/server/command/FunctionCommand.mapping index 9656e1efb2..22b6fe5ea6 100644 --- a/mappings/net/minecraft/server/command/FunctionCommand.mapping +++ b/mappings/net/minecraft/server/command/FunctionCommand.mapping @@ -28,6 +28,45 @@ CLASS net/minecraft/class_3062 net/minecraft/server/command/FunctionCommand METHOD method_54275 enqueueAction (Ljava/util/Collection;Lnet/minecraft/class_2487;Lnet/minecraft/class_8839;Lnet/minecraft/class_8839;Lnet/minecraft/class_8855;Lnet/minecraft/class_3062$class_8832;Lnet/minecraft/class_8936;)V ARG 0 commandFunctions ARG 1 args + ARG 2 parentSource + ARG 3 functionSource + ARG 4 control + ARG 5 resultConsumer + ARG 6 flags + METHOD method_54855 (Lnet/minecraft/class_3062$class_8932;Lnet/minecraft/class_8935;Lnet/minecraft/class_8854;Lnet/minecraft/class_8937;)V + ARG 2 context + ARG 3 frame + METHOD method_54856 (Lnet/minecraft/class_3062$class_8932;ZI)V + ARG 1 successful + ARG 2 returnValue + METHOD method_54857 (Lnet/minecraft/class_3062$class_8832;Lnet/minecraft/class_8839;Lnet/minecraft/class_2960;Lnet/minecraft/class_8935;ZI)V + ARG 4 successful + ARG 5 returnValue + METHOD method_54858 wrapReturnValueConsumer (Lnet/minecraft/class_8839;Lnet/minecraft/class_3062$class_8832;Lnet/minecraft/class_2960;Lnet/minecraft/class_8935;)Lnet/minecraft/class_8935; + ARG 0 flags + ARG 1 resultConsumer + ARG 2 id + ARG 3 wrapped + METHOD method_54859 enqueueInReturnRun (Ljava/util/Collection;Lnet/minecraft/class_2487;Lnet/minecraft/class_8839;Lnet/minecraft/class_8839;Lnet/minecraft/class_8855;Lnet/minecraft/class_3062$class_8832;)V + ARG 0 functions + ARG 1 args + ARG 2 parentSource + ARG 3 functionSource + ARG 4 control + ARG 5 resultConsumer + METHOD method_54860 enqueueFunction (Lnet/minecraft/class_2487;Lnet/minecraft/class_8855;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;Lnet/minecraft/class_2158;Lnet/minecraft/class_2960;Lnet/minecraft/class_8935;Z)V + ARG 0 args + ARG 1 control + ARG 2 dispatcher + ARG 3 source + ARG 4 function + ARG 5 id + ARG 6 returnValueConsumer + ARG 7 propagateReturn + METHOD method_54861 enqueueOutsideReturnRun (Ljava/util/Collection;Lnet/minecraft/class_2487;Lnet/minecraft/class_8839;Lnet/minecraft/class_8839;Lnet/minecraft/class_8855;Lnet/minecraft/class_3062$class_8832;)V + ARG 0 functions + ARG 1 args + ARG 2 parentSource ARG 3 functionSource ARG 4 control ARG 5 resultConsumer @@ -41,3 +80,8 @@ CLASS net/minecraft/class_3062 net/minecraft/server/command/FunctionCommand ARG 1 context METHOD method_54282 (Lcom/mojang/datafixers/util/Either;)Ljava/util/Collection; ARG 0 functionOrTag + CLASS class_8932 ReturnValueCounter + FIELD field_47152 successful Z + FIELD field_47153 returnValue I + METHOD method_54862 onSuccess (I)V + ARG 1 returnValue diff --git a/mappings/net/minecraft/server/command/ReturnCommand.mapping b/mappings/net/minecraft/server/command/ReturnCommand.mapping index 8dcbaeb383..3c03bee366 100644 --- a/mappings/net/minecraft/server/command/ReturnCommand.mapping +++ b/mappings/net/minecraft/server/command/ReturnCommand.mapping @@ -4,4 +4,5 @@ CLASS net/minecraft/class_8503 net/minecraft/server/command/ReturnCommand METHOD method_54286 (Lnet/minecraft/class_8839;)Z ARG 0 source CLASS class_8834 ReturnRunRedirector - CLASS class_8835 Command + CLASS class_8835 ValueCommand + CLASS class_8933 FailCommand diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index d864ea9efc..7597a8dc27 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource COMMENT @see Entity#getCommandSource() FIELD field_39183 signedArguments Lnet/minecraft/class_7448; FIELD field_39834 messageChainTaskQueue Lnet/minecraft/class_7620; + FIELD field_47159 returnValueConsumer Lnet/minecraft/class_8935; FIELD field_9815 level I FIELD field_9816 entityAnchor Lnet/minecraft/class_2183$class_2184; FIELD field_9817 position Lnet/minecraft/class_243; @@ -80,8 +81,8 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource COMMENT @throws CommandSyntaxException if this command source is not a player METHOD method_9208 withPosition (Lnet/minecraft/class_243;)Lnet/minecraft/class_2168; ARG 1 position - METHOD method_9209 mergeStorers (Lnet/minecraft/class_8935;Ljava/util/function/BinaryOperator;)Lnet/minecraft/class_2168; - ARG 1 resultStorer + METHOD method_9209 mergeReturnValueConsumers (Lnet/minecraft/class_8935;Ljava/util/function/BinaryOperator;)Lnet/minecraft/class_2168; + ARG 1 returnValueConsumer ARG 2 merger METHOD method_9210 getRotation ()Lnet/minecraft/class_241; METHOD method_9211 getServer ()Lnet/minecraft/server/MinecraftServer; diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 6b06f336e7..f426a27d83 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -133,6 +133,12 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 0 context METHOD method_54850 getStructurePos (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2338; ARG 0 source + METHOD method_54904 checkStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_4517;)Z + ARG 0 world + ARG 1 state + METHOD method_54905 export (Lnet/minecraft/class_2168;Lnet/minecraft/class_2633;)I + ARG 0 source + ARG 1 blockEntity CLASS class_4528 Listener FIELD field_20581 world Lnet/minecraft/class_3218; FIELD field_20582 tests Lnet/minecraft/class_4524; diff --git a/mappings/net/minecraft/server/command/TickCommand.mapping b/mappings/net/minecraft/server/command/TickCommand.mapping index d68e288ef4..86c1ee7ee1 100644 --- a/mappings/net/minecraft/server/command/TickCommand.mapping +++ b/mappings/net/minecraft/server/command/TickCommand.mapping @@ -50,3 +50,5 @@ CLASS net/minecraft/class_8916 net/minecraft/server/command/TickCommand ARG 0 context METHOD method_54717 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_54865 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context