Misc 23w16a mappings (#3546)

* Map /return command and related changes

* Map recipe_crafted advancement criterion

* Map new datafixers in 23w16a

* Add package to Schema3448
This commit is contained in:
Matias Koivikko 2023-04-20 18:57:54 +03:00 committed by GitHub
parent 3d7de5d857
commit eaf51bdb7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 68 additions and 0 deletions

View File

@ -51,6 +51,7 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria
FIELD field_38700 THROWN_ITEM_PICKED_UP_BY_PLAYER Lnet/minecraft/class_5279;
FIELD field_38701 ALLAY_DROP_ITEM_ON_BLOCK Lnet/minecraft/class_4711;
FIELD field_38838 AVOID_VIBRATION Lnet/minecraft/class_2135;
FIELD field_44587 RECIPE_CRAFTED Lnet/minecraft/class_8508;
METHOD method_765 getById (Lnet/minecraft/class_2960;)Lnet/minecraft/class_179;
ARG 0 id
METHOD method_766 getCriteria ()Ljava/lang/Iterable;

View File

@ -0,0 +1,23 @@
CLASS net/minecraft/class_8508 net/minecraft/advancement/criterion/RecipeCraftedCriterion
FIELD field_44604 ID Lnet/minecraft/class_2960;
METHOD method_51349 (Lnet/minecraft/class_2960;Ljava/util/List;Lnet/minecraft/class_8508$class_8509;)Z
ARG 2 conditions
METHOD method_51350 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2960;Ljava/util/List;)V
ARG 1 player
ARG 2 recipe
ARG 3 items
CLASS class_8509 Conditions
FIELD field_44605 recipe Lnet/minecraft/class_2960;
FIELD field_44606 items Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2960;Ljava/util/List;)V
ARG 1 player
ARG 2 recipe
ARG 3 items
METHOD method_51352 of (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8508$class_8509;
ARG 0 recipe
METHOD method_51353 of (Lnet/minecraft/class_2960;Ljava/util/List;)Lnet/minecraft/class_8508$class_8509;
ARG 0 recipe
ARG 1 items
METHOD method_51354 matches (Lnet/minecraft/class_2960;Ljava/util/List;)Z
ARG 1 recipe
ARG 2 items

View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_8504 net/minecraft/datafixer/fix/DecoratedPotFieldRenameFix
FIELD field_44593 id Ljava/lang/String;
METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
ARG 1 schema

View File

@ -0,0 +1,9 @@
CLASS net/minecraft/class_8505 net/minecraft/datafixer/fix/RenameChunkStatusFix
FIELD field_44594 name Ljava/lang/String;
FIELD field_44595 mapper Ljava/util/function/UnaryOperator;
METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V
ARG 1 schema
ARG 2 name
ARG 3 mapper
METHOD method_51291 updateStatus (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 1 status

View File

@ -0,0 +1,3 @@
CLASS net/minecraft/class_8506 net/minecraft/datafixer/schema/Schema3448
METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map;
ARG 1 schema

View File

@ -12,3 +12,5 @@ CLASS net/minecraft/class_3062 net/minecraft/server/command/FunctionCommand
ARG 0 context
METHOD method_13384 (Lnet/minecraft/class_2168;)Z
ARG 0 source
METHOD method_51276 (Lorg/apache/commons/lang3/mutable/MutableObject;I)V
ARG 1 value

View File

@ -0,0 +1,10 @@
CLASS net/minecraft/class_8503 net/minecraft/server/command/ReturnCommand
METHOD method_51277 register (Lcom/mojang/brigadier/CommandDispatcher;)V
ARG 0 dispatcher
METHOD method_51278 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_51279 (Lnet/minecraft/class_2168;)Z
ARG 0 source
METHOD method_51280 execute (Lnet/minecraft/class_2168;I)I
ARG 0 source
ARG 1 value

View File

@ -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_44647 returnValueConsumer Ljava/util/function/IntConsumer;
FIELD field_9815 level I
FIELD field_9816 entityAnchor Lnet/minecraft/class_2183$class_2184;
FIELD field_9817 position Lnet/minecraft/class_243;
@ -44,6 +45,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
ARG 12 entityAnchor
ARG 13 signedArguments
ARG 14 messageChainTaskQueue
ARG 15 returnValueConsumer
METHOD method_36321 withOutput (Lnet/minecraft/class_2165;)Lnet/minecraft/class_2168;
ARG 1 output
METHOD method_41212 (Lnet/minecraft/class_2172$class_7078;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
@ -74,6 +76,9 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
COMMENT Sends {@code message} as the feedback to the command's executor, or to the server's log
COMMENT if the command is not executed by a player.
ARG 1 message
METHOD method_51411 withReturnValueConsumer (Ljava/util/function/IntConsumer;)Lnet/minecraft/class_2168;
ARG 1 returnValueConsumer
METHOD method_51413 getReturnValueConsumer ()Ljava/util/function/IntConsumer;
METHOD method_9206 withLevel (I)Lnet/minecraft/class_2168;
ARG 1 level
METHOD method_9207 getPlayerOrThrow ()Lnet/minecraft/class_3222;

View File

@ -103,6 +103,9 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana
FIELD field_33546 tracer Lnet/minecraft/class_2991$class_6346;
FIELD field_33547 queue Ljava/util/Deque;
FIELD field_33548 waitlist Ljava/util/List;
FIELD field_44584 returned Z
METHOD <init> (Lnet/minecraft/class_2991;Lnet/minecraft/class_2991$class_6346;)V
ARG 2 tracer
METHOD method_36343 recursiveRun (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)V
COMMENT Handles a recursive case in {@link CommandFunctionManager#execute(CommandFunction,
COMMENT ServerCommandSource, CommandFunctionManager.Tracer)}.
@ -125,6 +128,14 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana
COMMENT the function
ARG 2 source
COMMENT the command source
METHOD method_51275 addReturnConsumer (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2168;
ARG 1 source
CLASS class_8502 ReturnValueConsumer
FIELD field_44586 delegate Ljava/util/function/IntConsumer;
METHOD <init> (Lnet/minecraft/class_2991$class_6345;Ljava/util/function/IntConsumer;)V
ARG 2 delegate
METHOD accept (I)V
ARG 1 value
CLASS class_6346 Tracer
COMMENT A tree-visitor-like tracer, useful for gaining insights on function execution.
METHOD method_36349 traceCommandStart (ILjava/lang/String;)V