diff --git a/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping b/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping index 546756bee6..0c84bb16d2 100644 --- a/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping @@ -2,14 +2,14 @@ CLASS net/minecraft/class_8839 net/minecraft/server/command/AbstractServerComman METHOD method_54306 consumeResult (ZI)V ARG 1 success ARG 2 result - METHOD method_54307 withResultConsumer (Lnet/minecraft/class_8838;)Lnet/minecraft/class_8839; - ARG 1 resultConsumer + METHOD method_54307 withResultStorer (Lnet/minecraft/class_8838;)Lnet/minecraft/class_8839; + ARG 1 resultStorer METHOD method_54308 withReturnValueConsumer (Ljava/util/function/IntConsumer;)Lnet/minecraft/class_8839; ARG 1 returnValueConsumer METHOD method_54309 consumeResult (I)V ARG 1 result METHOD method_54310 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; - METHOD method_54311 withDummyResultConsumer ()Lnet/minecraft/class_8839; + METHOD method_54311 withDummyResultStorer ()Lnet/minecraft/class_8839; METHOD method_54316 (Lcom/mojang/brigadier/context/CommandContext;ZI)V ARG 0 context ARG 1 success diff --git a/mappings/net/minecraft/server/command/DebugCommand.mapping b/mappings/net/minecraft/server/command/DebugCommand.mapping index 2adc19c16b..74404bc39e 100644 --- a/mappings/net/minecraft/server/command/DebugCommand.mapping +++ b/mappings/net/minecraft/server/command/DebugCommand.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand ARG 0 source METHOD method_13159 executeStart (Lnet/minecraft/class_2168;)I ARG 0 source + METHOD method_13161 (Lnet/minecraft/class_2168;)Z + ARG 0 source METHOD method_36353 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context CLASS class_6347 Tracer diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 799dd3ff06..6cfa45cecf 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand 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;ZLnet/minecraft/class_2168;ZI)V + ARG 4 context ARG 5 success ARG 6 result METHOD method_13261 testBlocksCondition (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Z)Ljava/util/OptionalInt; @@ -77,6 +78,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand METHOD method_13276 (Lcom/mojang/brigadier/context/CommandContext;I)Lnet/minecraft/class_2520; ARG 1 result METHOD method_13277 (ZZLnet/minecraft/class_3002;Lnet/minecraft/class_2168;ZI)V + ARG 3 context ARG 4 success ARG 5 result METHOD method_13280 (Lcom/mojang/brigadier/context/CommandContext;)Z @@ -113,6 +115,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand 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;Lnet/minecraft/class_2168;ZI)V + ARG 4 context ARG 5 success ARG 6 result METHOD method_13295 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; @@ -266,9 +269,10 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 sources ARG 1 sourceTransformer ARG 2 resultPredicate + ARG 3 contextChain ARG 4 arguments ARG 5 control - ARG 6 getFunctionNames + ARG 6 functionNamesGetter ARG 7 silent METHOD method_54265 createExecutionSource (Ljava/util/function/Function;Ljava/util/function/IntPredicate;Ljava/util/List;Lnet/minecraft/class_8839;Z)Lnet/minecraft/class_8839; ARG 0 sourceTransformer @@ -286,10 +290,16 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand CLASS class_3052 Condition METHOD test (Lcom/mojang/brigadier/context/CommandContext;)Z ARG 1 context - CLASS class_8830 + CLASS class_8830 FunctionNamesGetter METHOD get (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; ARG 1 context CLASS class_8831 IfUnlessRedirector FIELD field_46643 predicate Ljava/util/function/IntPredicate; METHOD (Z)V - ARG 1 positive + ARG 1 success + METHOD method_54268 (I)Z + ARG 0 result + METHOD method_54269 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; + ARG 0 context + METHOD method_54271 (I)Z + ARG 0 result diff --git a/mappings/net/minecraft/server/command/ReturnCommand.mapping b/mappings/net/minecraft/server/command/ReturnCommand.mapping index 1a2bfbeaa5..fbc96fc755 100644 --- a/mappings/net/minecraft/server/command/ReturnCommand.mapping +++ b/mappings/net/minecraft/server/command/ReturnCommand.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_8503 net/minecraft/server/command/ReturnCommand METHOD method_51277 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher + METHOD method_54286 (Lnet/minecraft/class_8839;)Z + ARG 0 source CLASS class_8834 ReturnRunRedirector METHOD method_54287 (Lnet/minecraft/class_8855;Lnet/minecraft/class_8839;)Lnet/minecraft/class_8839; ARG 1 source diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 009d1883c8..902d895c5e 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource FIELD field_9818 server Lnet/minecraft/server/MinecraftServer; FIELD field_9819 output Lnet/minecraft/class_2165; FIELD field_9820 entity Lnet/minecraft/class_1297; - FIELD field_9821 resultConsumer Lnet/minecraft/class_8838; + FIELD field_9821 resultStorer Lnet/minecraft/class_8838; FIELD field_9822 rotation Lnet/minecraft/class_241; FIELD field_9823 silent Z FIELD field_9824 REQUIRES_PLAYER_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; @@ -42,7 +42,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 8 server ARG 9 entity ARG 10 silent - ARG 11 resultConsumer + ARG 11 resultStorer ARG 12 entityAnchor ARG 13 signedArguments ARG 14 messageChainTaskQueue @@ -78,6 +78,8 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 1 message METHOD method_51411 withReturnValueConsumer (Ljava/util/function/IntConsumer;)Lnet/minecraft/class_2168; ARG 1 returnValueConsumer + METHOD method_51412 (I)V + ARG 0 returnValue METHOD method_54305 (Lnet/minecraft/class_2168;ZI)V ARG 0 context ARG 1 success @@ -90,8 +92,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 mergeConsumers (Lnet/minecraft/class_8838;Ljava/util/function/BinaryOperator;)Lnet/minecraft/class_2168; - ARG 1 resultConsumer + METHOD method_9209 mergeStorers (Lnet/minecraft/class_8838;Ljava/util/function/BinaryOperator;)Lnet/minecraft/class_2168; + ARG 1 resultStorer ARG 2 merger METHOD method_9210 getRotation ()Lnet/minecraft/class_241; METHOD method_9211 getServer ()Lnet/minecraft/server/MinecraftServer; @@ -125,6 +127,5 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource COMMENT Gets the entity from this command source or throws a command syntax exception if this command source is not an entity. METHOD method_9230 withMaxLevel (I)Lnet/minecraft/class_2168; ARG 1 level - METHOD method_9231 withConsumer (Lnet/minecraft/class_8838;)Lnet/minecraft/class_2168; METHOD method_9232 withEntity (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2168; ARG 1 entity diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index 686632c1c9..ef59bf4589 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -7,7 +7,9 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction ARG 2 dispatcher ARG 3 source METHOD method_54417 parse (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_8856; + ARG 0 dispatcher ARG 1 source + ARG 2 reader METHOD method_9195 create (Lnet/minecraft/class_2960;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;Ljava/util/List;)Lnet/minecraft/class_2158; COMMENT Parses a function in the context of {@code source}. COMMENT diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index 4156229a78..7d4d0a8974 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -28,12 +28,6 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana METHOD method_12900 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; METHOD method_12904 execute (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)V COMMENT Executes a function. - COMMENT - COMMENT

This is same as calling {@link #execute(CommandFunction, ServerCommandSource, - COMMENT Tracer, NbtCompound) execute(function, source, null, null)}. - COMMENT - COMMENT @return the command output value - COMMENT @see #execute(CommandFunction, ServerCommandSource, Tracer, NbtCompound) ARG 1 function COMMENT the function ARG 2 source diff --git a/mappings/net/minecraft/server/function/Macro.mapping b/mappings/net/minecraft/server/function/Macro.mapping index 173c8a106a..252a9fbd0a 100644 --- a/mappings/net/minecraft/server/function/Macro.mapping +++ b/mappings/net/minecraft/server/function/Macro.mapping @@ -12,9 +12,12 @@ CLASS net/minecraft/class_8641 net/minecraft/server/function/Macro METHOD method_52597 withMacroReplaced (Ljava/util/List;Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;)Lnet/minecraft/class_8868; ARG 1 varNames ARG 2 arguments + ARG 3 dispatcher ARG 4 source METHOD method_53840 toString (Lnet/minecraft/class_2520;)Ljava/lang/String; ARG 0 nbt + METHOD method_54423 (Ljava/text/DecimalFormat;)V + ARG 0 format METHOD method_54424 addArgumentsByIndices (Ljava/util/List;Lit/unimi/dsi/fastutil/ints/IntList;Ljava/util/List;)V ARG 0 arguments ARG 1 indices