diff --git a/mappings/net/minecraft/class_8839.mapping b/mappings/net/minecraft/class_8839.mapping deleted file mode 100644 index 0923cb2017..0000000000 --- a/mappings/net/minecraft/class_8839.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_8839 - METHOD method_9259 hasPermissionLevel (I)Z diff --git a/mappings/net/minecraft/class_8858.mapping b/mappings/net/minecraft/class_8858.mapping new file mode 100644 index 0000000000..b2dec130c0 --- /dev/null +++ b/mappings/net/minecraft/class_8858.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8858 + FIELD field_46739 FORK_LIMIT_REACHED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + METHOD method_54409 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 limit diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 945aa92bf2..dc2a656d7a 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand FIELD field_13637 CONDITIONAL_FAIL_COUNT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_20852 LOOT_CONDITIONS Lcom/mojang/brigadier/suggestion/SuggestionProvider; FIELD field_33390 MAX_BLOCKS I + FIELD field_46642 FUNCTION_INSTANTIATION_FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; METHOD method_13249 (Lcom/mojang/brigadier/context/CommandContext;)Z ARG 0 context METHOD method_13250 (Ljava/lang/Integer;Ljava/lang/Integer;)Z @@ -251,6 +252,14 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 context METHOD method_49419 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; ARG 0 context + METHOD method_54261 (Lnet/minecraft/class_8838;Lnet/minecraft/class_8838;)Lnet/minecraft/class_8838; + ARG 0 consumer1 + ARG 1 consumer2 + METHOD method_54262 (Lnet/minecraft/class_8838;Lnet/minecraft/class_8838;Lnet/minecraft/class_2168;ZI)V + ARG 2 commandSource + METHOD method_54263 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 functionId + ARG 1 message CLASS class_3051 ExistsCondition METHOD test (Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context diff --git a/mappings/net/minecraft/server/command/ExecutionCommandSource.mapping b/mappings/net/minecraft/server/command/ExecutionCommandSource.mapping new file mode 100644 index 0000000000..a393db01d5 --- /dev/null +++ b/mappings/net/minecraft/server/command/ExecutionCommandSource.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_8839 net/minecraft/server/command/ExecutionCommandSource + METHOD method_54306 storeResult (ZI)V + ARG 1 success + ARG 2 result + METHOD method_54307 withResultStoringConsumer (Lnet/minecraft/class_8838;)Lnet/minecraft/class_8839; + ARG 1 resultConsumer + METHOD method_54308 withReturnValueConsumer (Ljava/util/function/IntConsumer;)Lnet/minecraft/class_8839; + ARG 1 returnValueConsumer + METHOD method_54309 storeReturnValue (I)V + ARG 1 returnValue + METHOD method_54310 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; + METHOD method_54311 withEmptyResultStoringConsumer ()Lnet/minecraft/class_8839; + METHOD method_54316 (Lcom/mojang/brigadier/context/CommandContext;ZI)V + ARG 0 context + ARG 1 success + ARG 2 result + METHOD method_54317 createResultConsumer ()Lcom/mojang/brigadier/ResultConsumer; + METHOD method_9259 hasPermissionLevel (I)Z + ARG 1 permissionLevel diff --git a/mappings/net/minecraft/server/command/ResultStoringConsumer.mapping b/mappings/net/minecraft/server/command/ResultStoringConsumer.mapping new file mode 100644 index 0000000000..ecabea677f --- /dev/null +++ b/mappings/net/minecraft/server/command/ResultStoringConsumer.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8838 net/minecraft/server/command/ResultStoringConsumer + METHOD storeResult (Ljava/lang/Object;ZI)V + ARG 1 commandSource + ARG 2 success + ARG 3 result diff --git a/mappings/net/minecraft/server/command/ReturnCommand.mapping b/mappings/net/minecraft/server/command/ReturnCommand.mapping index 07b8dd00d0..ac6ebc646e 100644 --- a/mappings/net/minecraft/server/command/ReturnCommand.mapping +++ b/mappings/net/minecraft/server/command/ReturnCommand.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_8503 net/minecraft/server/command/ReturnCommand METHOD method_51277 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher + CLASS class_8834 ReturnRun + CLASS class_8835 ReturnValue diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 11c8e152e7..d323c50b86 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -6,13 +6,14 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource FIELD field_39183 signedArguments Lnet/minecraft/class_7448; FIELD field_39834 messageChainTaskQueue Lnet/minecraft/class_7620; FIELD field_44647 returnValueConsumer Ljava/util/function/IntConsumer; + FIELD field_46668 EMPTY_RESULT_STORING_CONSUMER Lnet/minecraft/class_8838; FIELD field_9815 level I FIELD field_9816 entityAnchor Lnet/minecraft/class_2183$class_2184; FIELD field_9817 position Lnet/minecraft/class_243; 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 resultStoringConsumer 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; @@ -41,6 +42,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 8 server ARG 9 entity ARG 10 silent + ARG 11 resultStoringConsumer ARG 12 entityAnchor ARG 13 signedArguments ARG 14 messageChainTaskQueue @@ -76,6 +78,10 @@ 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_54305 (Lnet/minecraft/class_2168;ZI)V + ARG 0 commandSource + ARG 1 success + ARG 2 result METHOD method_9206 withLevel (I)Lnet/minecraft/class_2168; ARG 1 level METHOD method_9207 getPlayerOrThrow ()Lnet/minecraft/class_3222; @@ -85,6 +91,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource 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 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/function/Tracer.mapping b/mappings/net/minecraft/server/function/FunctionTracer.mapping similarity index 86% rename from mappings/net/minecraft/server/function/Tracer.mapping rename to mappings/net/minecraft/server/function/FunctionTracer.mapping index 6c1d73e47a..1ca14de2dc 100644 --- a/mappings/net/minecraft/server/function/Tracer.mapping +++ b/mappings/net/minecraft/server/function/FunctionTracer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6346 net/minecraft/server/function/Tracer +CLASS net/minecraft/class_6346 net/minecraft/server/function/FunctionTracer COMMENT A tree-visitor-like tracer, useful for gaining insights on function execution. METHOD method_36349 traceCommandStart (ILjava/lang/String;)V ARG 1 depth diff --git a/mappings/net/minecraft/server/function/LazyContainer.mapping b/mappings/net/minecraft/server/function/LazyFunctionContainer.mapping similarity index 88% rename from mappings/net/minecraft/server/function/LazyContainer.mapping rename to mappings/net/minecraft/server/function/LazyFunctionContainer.mapping index b2cbbc0140..45d9e2d697 100644 --- a/mappings/net/minecraft/server/function/LazyContainer.mapping +++ b/mappings/net/minecraft/server/function/LazyFunctionContainer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2159 net/minecraft/server/function/LazyContainer +CLASS net/minecraft/class_2159 net/minecraft/server/function/LazyFunctionContainer COMMENT A lazy reference to another command function that may or may not exist. COMMENT COMMENT

Notice that such an instance does not refresh upon reloads and may become @@ -7,6 +7,8 @@ CLASS net/minecraft/class_2159 net/minecraft/server/function/LazyContainer FIELD field_9808 function Ljava/util/Optional; FIELD field_9809 EMPTY Lnet/minecraft/class_2159; FIELD field_9810 initialized Z + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_9196 get (Lnet/minecraft/class_2991;)Ljava/util/Optional; ARG 1 manager METHOD method_9197 getId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/server/function/Macro.mapping b/mappings/net/minecraft/server/function/MacroFunction.mapping similarity index 81% rename from mappings/net/minecraft/server/function/Macro.mapping rename to mappings/net/minecraft/server/function/MacroFunction.mapping index 275e70a16c..4bce4a98b0 100644 --- a/mappings/net/minecraft/server/function/Macro.mapping +++ b/mappings/net/minecraft/server/function/MacroFunction.mapping @@ -1,10 +1,14 @@ -CLASS net/minecraft/class_8641 net/minecraft/server/function/Macro +CLASS net/minecraft/class_8641 net/minecraft/server/function/MacroFunction FIELD field_45149 variables Ljava/util/List; FIELD field_45150 CACHE_SIZE I FIELD field_45151 cache Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap; FIELD field_46190 DECIMAL_FORMAT Ljava/text/DecimalFormat; + FIELD field_46758 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;Ljava/util/List;Ljava/util/List;)V ARG 1 id + ARG 3 variables METHOD method_52597 withMacroReplaced (Ljava/util/List;Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;)Lnet/minecraft/class_8868; METHOD method_53840 toString (Lnet/minecraft/class_2520;)Ljava/lang/String; ARG 0 nbt + METHOD method_54423 (Ljava/text/DecimalFormat;)V + ARG 0 format