diff --git a/mappings/com/mojang/blaze3d/systems/RenderCall.mapping b/mappings/com/mojang/blaze3d/systems/RenderCall.mapping new file mode 100644 index 0000000000..152762bf83 --- /dev/null +++ b/mappings/com/mojang/blaze3d/systems/RenderCall.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4573 com/mojang/blaze3d/systems/RenderCall diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping new file mode 100644 index 0000000000..0c95777f6f --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_4558 net/minecraft/advancement/criterion/AbstractCriterion + FIELD field_20735 progressions Ljava/util/Map; + METHOD method_22510 test (Lnet/minecraft/class_2985;Ljava/util/function/Predicate;)V + ARG 1 tracker + ARG 2 tester + METHOD method_22511 grant (Lnet/minecraft/class_2985;)V + ARG 1 tracker diff --git a/mappings/net/minecraft/advancement/criterion/Criterion.mapping b/mappings/net/minecraft/advancement/criterion/Criterion.mapping index 2adf031c6a..de7d7a879f 100644 --- a/mappings/net/minecraft/advancement/criterion/Criterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criterion.mapping @@ -5,12 +5,15 @@ CLASS net/minecraft/class_179 net/minecraft/advancement/criterion/Criterion FIELD field_1223 conditions Lnet/minecraft/class_184; METHOD (Lnet/minecraft/class_184;Lnet/minecraft/class_161;Ljava/lang/String;)V ARG 1 conditions + ARG 2 advancement ARG 3 id METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_796 apply (Lnet/minecraft/class_2985;)V + METHOD method_796 grant (Lnet/minecraft/class_2985;)V + ARG 1 tracker METHOD method_797 getConditions ()Lnet/minecraft/class_184; METHOD method_791 endTracking (Lnet/minecraft/class_2985;)V + ARG 1 tracker METHOD method_792 beginTrackingCondition (Lnet/minecraft/class_2985;Lnet/minecraft/class_179$class_180;)V ARG 1 manager METHOD method_793 endTrackingCondition (Lnet/minecraft/class_2985;Lnet/minecraft/class_179$class_180;)V @@ -18,3 +21,4 @@ CLASS net/minecraft/class_179 net/minecraft/advancement/criterion/Criterion METHOD method_794 getId ()Lnet/minecraft/class_2960; METHOD method_795 conditionsFromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_184; ARG 1 obj + ARG 2 context diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index 12a7666c12..9545f71c5f 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChange ARG 0 effects FIELD field_9558 ID Lnet/minecraft/class_2960; METHOD method_8863 handle (Lnet/minecraft/class_3222;)V + ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping index ab9cedf966..b0e8a8f6d2 100644 --- a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion CLASS class_2137 Conditions FIELD field_9758 ID Lnet/minecraft/class_2960; METHOD method_9141 handle (Lnet/minecraft/class_3222;)V + ARG 1 player diff --git a/mappings/net/minecraft/class_4558.mapping b/mappings/net/minecraft/class_4558.mapping deleted file mode 100644 index 3e9b12eba7..0000000000 --- a/mappings/net/minecraft/class_4558.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4558 diff --git a/mappings/net/minecraft/class_4565.mapping b/mappings/net/minecraft/class_4565.mapping deleted file mode 100644 index 6f39fc9198..0000000000 --- a/mappings/net/minecraft/class_4565.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4565 diff --git a/mappings/net/minecraft/class_4567.mapping b/mappings/net/minecraft/class_4567.mapping deleted file mode 100644 index f8260b808e..0000000000 --- a/mappings/net/minecraft/class_4567.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4567 diff --git a/mappings/net/minecraft/class_4568.mapping b/mappings/net/minecraft/class_4568.mapping deleted file mode 100644 index ec67f680a7..0000000000 --- a/mappings/net/minecraft/class_4568.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4568 diff --git a/mappings/net/minecraft/class_4571.mapping b/mappings/net/minecraft/class_4571.mapping deleted file mode 100644 index ea752a3af4..0000000000 --- a/mappings/net/minecraft/class_4571.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4571 diff --git a/mappings/net/minecraft/class_4580.mapping b/mappings/net/minecraft/class_4580.mapping deleted file mode 100644 index e50241d1b3..0000000000 --- a/mappings/net/minecraft/class_4580.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4580 diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index dc9f82bada..e5dbf95bba 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -86,7 +86,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1775 snooper Lnet/minecraft/class_1276; FIELD field_17763 splashTextLoader Lnet/minecraft/class_4008; FIELD field_18008 paintingManager Lnet/minecraft/class_4044; - FIELD field_18009 voidFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_18009 COMPLETED_UNIT_FUTURE Ljava/util/concurrent/CompletableFuture; FIELD field_18173 statusEffectSpriteManager Lnet/minecraft/class_4074; FIELD field_18174 resourceReloadFuture Ljava/util/concurrent/CompletableFuture; FIELD field_18175 overlay Lnet/minecraft/class_4071; diff --git a/mappings/net/minecraft/command/BlockDataObject.mapping b/mappings/net/minecraft/command/BlockDataObject.mapping index d53763bc60..cc83b3d520 100644 --- a/mappings/net/minecraft/command/BlockDataObject.mapping +++ b/mappings/net/minecraft/command/BlockDataObject.mapping @@ -2,3 +2,7 @@ CLASS net/minecraft/class_3161 net/minecraft/command/BlockDataObject FIELD field_13783 pos Lnet/minecraft/class_2338; FIELD field_13784 blockEntity Lnet/minecraft/class_2586; FIELD field_13785 INVALID_BLOCK_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_13786 TYPE_FACTORY Ljava/util/function/Function; + METHOD (Lnet/minecraft/class_2586;Lnet/minecraft/class_2338;)V + ARG 1 blockEntity + ARG 2 pos diff --git a/mappings/net/minecraft/command/CommandException.mapping b/mappings/net/minecraft/command/CommandException.mapping index b41d076c49..da4e2176c3 100644 --- a/mappings/net/minecraft/command/CommandException.mapping +++ b/mappings/net/minecraft/command/CommandException.mapping @@ -2,4 +2,4 @@ CLASS net/minecraft/class_2164 net/minecraft/command/CommandException FIELD field_9813 message Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2561;)V ARG 1 message - METHOD method_9199 getMessageText ()Lnet/minecraft/class_2561; + METHOD method_9199 getMessage ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/command/DataCommandObject.mapping b/mappings/net/minecraft/command/DataCommandObject.mapping index c3f6d8efa9..42a78f5a80 100644 --- a/mappings/net/minecraft/command/DataCommandObject.mapping +++ b/mappings/net/minecraft/command/DataCommandObject.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_3162 net/minecraft/command/DataCommandObject - METHOD method_13879 getGetFeedback (Lnet/minecraft/class_2203$class_2209;DI)Lnet/minecraft/class_2561; + METHOD method_13879 feedbackGet (Lnet/minecraft/class_2203$class_2209;DI)Lnet/minecraft/class_2561; + ARG 2 scale + ARG 4 result METHOD method_13880 setTag (Lnet/minecraft/class_2487;)V - METHOD method_13881 getTag ()Lnet/minecraft/class_2487; - METHOD method_13882 getQueryFeedback (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2561; ARG 1 tag - METHOD method_13883 getModifiedFeedback ()Lnet/minecraft/class_2561; + METHOD method_13881 getTag ()Lnet/minecraft/class_2487; + METHOD method_13882 feedbackQuery (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2561; + ARG 1 tag + METHOD method_13883 feedbackModify ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/command/DataCommandStorage.mapping b/mappings/net/minecraft/command/DataCommandStorage.mapping new file mode 100644 index 0000000000..2e4a00b5c9 --- /dev/null +++ b/mappings/net/minecraft/command/DataCommandStorage.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage + CLASS class_4566 PersistentState + FIELD field_20749 map Ljava/util/Map; + METHOD method_22550 get (Ljava/lang/String;)Lnet/minecraft/class_2487; + ARG 1 name + METHOD method_22552 set (Ljava/lang/String;Lnet/minecraft/class_2487;)V + ARG 1 name + ARG 2 tag + METHOD method_22554 getIds (Ljava/lang/String;)Ljava/util/stream/Stream; + ARG 1 namespace + FIELD field_20747 storages Ljava/util/Map; + FIELD field_20748 stateManager Lnet/minecraft/class_26; + METHOD (Lnet/minecraft/class_26;)V + ARG 1 stateManager + METHOD method_22542 getIds ()Ljava/util/stream/Stream; + METHOD method_22543 getSaveKey (Ljava/lang/String;)Ljava/lang/String; + ARG 0 namespace + METHOD method_22544 createStorage (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_4565$class_4566; + ARG 1 namespace + ARG 2 saveKey + METHOD method_22546 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2487; + ARG 1 id + METHOD method_22547 set (Lnet/minecraft/class_2960;Lnet/minecraft/class_2487;)V + ARG 1 id + ARG 2 tag diff --git a/mappings/net/minecraft/command/EntityDataObject.mapping b/mappings/net/minecraft/command/EntityDataObject.mapping index 3a0e6494cc..15f76bd778 100644 --- a/mappings/net/minecraft/command/EntityDataObject.mapping +++ b/mappings/net/minecraft/command/EntityDataObject.mapping @@ -1,2 +1,6 @@ CLASS net/minecraft/class_3169 net/minecraft/command/EntityDataObject FIELD field_13799 INVALID_ENTITY_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_13800 TYPE_FACTORY Ljava/util/function/Function; + FIELD field_13801 entity Lnet/minecraft/class_1297; + METHOD (Lnet/minecraft/class_1297;)V + ARG 1 entity diff --git a/mappings/net/minecraft/command/StorageDataObject.mapping b/mappings/net/minecraft/command/StorageDataObject.mapping new file mode 100644 index 0000000000..5b688e5c95 --- /dev/null +++ b/mappings/net/minecraft/command/StorageDataObject.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_4580 net/minecraft/command/StorageDataObject + FIELD field_20855 TYPE_FACTORY Ljava/util/function/Function; + FIELD field_20856 SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD field_20857 storage Lnet/minecraft/class_4565; + FIELD field_20858 id Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_4565;Lnet/minecraft/class_2960;)V + ARG 1 storage + ARG 2 id + METHOD method_22842 of (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_4565; diff --git a/mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping b/mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping index 54189b26c5..e11f7479cb 100644 --- a/mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping @@ -1,22 +1,26 @@ CLASS net/minecraft/class_2203 net/minecraft/command/arguments/NbtPathArgumentType - CLASS class_2204 AllListElementsNode + CLASS class_2204 AllListElementNode FIELD field_9901 INSTANCE Lnet/minecraft/class_2203$class_2204; - CLASS class_2205 CompoundChildNode + CLASS class_2205 NamedNode FIELD field_9902 name Ljava/lang/String; - CLASS class_2206 ListIndexNode + METHOD (Ljava/lang/String;)V + ARG 1 name + CLASS class_2206 IndexedListElementNode FIELD field_9903 index I METHOD (I)V ARG 1 index - CLASS class_2207 EqualListElementNode - FIELD field_9904 tag Lnet/minecraft/class_2487; + CLASS class_2207 FilteredListElementNode + FIELD field_9904 filter Lnet/minecraft/class_2487; FIELD field_9905 predicate Ljava/util/function/Predicate; - CLASS class_2208 EqualCompundChildNode + METHOD (Lnet/minecraft/class_2487;)V + ARG 1 filter + CLASS class_2208 FilteredNamedNode FIELD field_9906 name Ljava/lang/String; - FIELD field_9907 tag Lnet/minecraft/class_2487; + FIELD field_9907 filter Lnet/minecraft/class_2487; FIELD field_9908 predicate Ljava/util/function/Predicate; METHOD (Ljava/lang/String;Lnet/minecraft/class_2487;)V ARG 1 name - ARG 2 tag + ARG 2 filter CLASS class_2209 NbtPath FIELD field_9909 string Ljava/lang/String; FIELD field_9910 nodeEndIndices Lit/unimi/dsi/fastutil/objects/Object2IntMap; @@ -27,49 +31,52 @@ CLASS net/minecraft/class_2203 net/minecraft/command/arguments/NbtPathArgumentTy ARG 3 nodeEndIndices METHOD method_9366 get (Lnet/minecraft/class_2520;)Ljava/util/List; ARG 1 tag - METHOD method_9367 putIfAbsent (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)Ljava/util/List; + METHOD method_9367 getOrInit (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)Ljava/util/List; ARG 1 tag - ARG 2 supplier + ARG 2 source METHOD method_9368 put (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)I ARG 1 tag - ARG 2 supplier - METHOD method_9369 getParents (Lnet/minecraft/class_2520;)Ljava/util/List; - ARG 1 tag + ARG 2 source + METHOD method_9369 getTerminals (Lnet/minecraft/class_2520;)Ljava/util/List; + ARG 1 start METHOD method_9371 forEach (Ljava/util/List;Ljava/util/function/Function;)I ARG 0 tags - ARG 1 function + ARG 1 operation METHOD method_9372 remove (Lnet/minecraft/class_2520;)I ARG 1 tag METHOD method_9374 count (Lnet/minecraft/class_2520;)I ARG 1 tag METHOD method_9375 createNothingFoundException (Lnet/minecraft/class_2203$class_2210;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; ARG 1 node - CLASS class_2210 NbtPathNode - METHOD method_9376 put (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)I - ARG 1 tag - ARG 2 supplier - METHOD method_9377 putIfAbsent (Ljava/util/List;Ljava/util/function/Supplier;)Ljava/util/List; + CLASS class_2210 PathNode + METHOD method_9376 set (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)I + ARG 1 current + ARG 2 source + METHOD method_9377 getOrInit (Ljava/util/List;Ljava/util/function/Supplier;)Ljava/util/List; ARG 1 tags ARG 2 supplier METHOD method_9378 get (Lnet/minecraft/class_2520;Ljava/util/List;)V - ARG 1 tag + ARG 1 current ARG 2 results - METHOD method_9380 putIfAbsent (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;Ljava/util/List;)V - ARG 1 tag - ARG 2 supplier + METHOD method_9379 (Ljava/util/function/Supplier;Lnet/minecraft/class_2520;Ljava/util/List;)V + ARG 2 current + ARG 3 results + METHOD method_9380 getOrInit (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;Ljava/util/List;)V + ARG 1 current + ARG 2 source ARG 3 results METHOD method_9381 get (Ljava/util/List;)Ljava/util/List; ARG 1 tags - METHOD method_9382 createParent ()Lnet/minecraft/class_2520; - METHOD method_9383 remove (Lnet/minecraft/class_2520;)I - ARG 1 tag - METHOD method_9384 get (Ljava/util/List;Ljava/util/function/BiConsumer;)Ljava/util/List; + METHOD method_9382 init ()Lnet/minecraft/class_2520; + METHOD method_9383 clear (Lnet/minecraft/class_2520;)I + ARG 1 current + METHOD method_9384 process (Ljava/util/List;Ljava/util/function/BiConsumer;)Ljava/util/List; ARG 1 tags - ARG 2 getter - CLASS class_3707 EqualCompoundNode - FIELD field_16319 predicate Ljava/util/function/Predicate; + ARG 2 action + CLASS class_3707 FilteredRootNode + FIELD field_16319 matcher Ljava/util/function/Predicate; METHOD (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 filter FIELD field_9898 EXAMPLES Ljava/util/Collection; FIELD field_9899 NOTHING_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_9900 INVALID_PATH_NODE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; @@ -83,9 +90,11 @@ CLASS net/minecraft/class_2203 net/minecraft/command/arguments/NbtPathArgumentTy METHOD method_9358 getNbtPath (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2203$class_2209; ARG 0 context ARG 1 name - METHOD method_9359 getEqualityPredicate (Lnet/minecraft/class_2487;)Ljava/util/function/Predicate; - ARG 0 tag + METHOD method_9359 getPredicate (Lnet/minecraft/class_2487;)Ljava/util/function/Predicate; + ARG 0 filter METHOD method_9360 nbtPath ()Lnet/minecraft/class_2203; METHOD method_9361 parseNode (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/class_2203$class_2210; ARG 0 reader - ARG 1 first + ARG 1 root + METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; + ARG 1 reader diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping new file mode 100644 index 0000000000..d062df0b2d --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtHelper.mapping @@ -0,0 +1,43 @@ +CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper + FIELD field_11582 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD method_10681 toBlockState (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2680; + ARG 0 tag + METHOD method_10682 withProperty (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2688; + ARG 0 state + ARG 1 property + ARG 2 key + ARG 3 propertiesTag + ARG 4 mainTag + METHOD method_10683 toGameProfile (Lnet/minecraft/class_2487;)Lcom/mojang/authlib/GameProfile; + ARG 0 tag + METHOD method_10684 fromGameProfile (Lnet/minecraft/class_2487;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2487; + ARG 0 tag + ARG 1 profile + METHOD method_10685 nameValue (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; + ARG 0 property + ARG 1 value + METHOD method_10686 fromBlockState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2487; + ARG 0 state + METHOD method_10687 matches (Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;Z)Z + ARG 0 standard + ARG 1 subject + ARG 2 equalValue + METHOD method_10688 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2487; + ARG 0 fixer + ARG 1 fixTypes + ARG 2 tag + ARG 3 oldVersion + METHOD method_10689 fromUuid (Ljava/util/UUID;)Lnet/minecraft/class_2487; + ARG 0 uuid + METHOD method_10690 toUuid (Lnet/minecraft/class_2487;)Ljava/util/UUID; + ARG 0 tag + METHOD method_10691 toBlockPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2338; + ARG 0 tag + METHOD method_10692 fromBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; + ARG 0 pos + METHOD method_10693 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Lnet/minecraft/class_2487;II)Lnet/minecraft/class_2487; + ARG 0 fixer + ARG 1 fixTypes + ARG 2 tag + ARG 3 oldVersion + ARG 4 currentVersion diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping new file mode 100644 index 0000000000..c3b124fe7f --- /dev/null +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate + FIELD field_20692 ANY Lnet/minecraft/class_4550; + FIELD field_20693 tag Lnet/minecraft/class_3494; + FIELD field_20694 block Lnet/minecraft/class_2248; + FIELD field_20695 state Lnet/minecraft/class_4559; + FIELD field_20696 nbt Lnet/minecraft/class_2105; + METHOD (Lnet/minecraft/class_3494;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;Lnet/minecraft/class_2105;)V + ARG 1 tag + ARG 2 block + ARG 3 state + ARG 4 nbt + METHOD method_22452 toJson ()Lcom/google/gson/JsonElement; + METHOD method_22453 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4550; + ARG 0 json + METHOD method_22454 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/predicate/DamagePredicate.mapping b/mappings/net/minecraft/predicate/DamagePredicate.mapping index af282dc137..c787d327c8 100644 --- a/mappings/net/minecraft/predicate/DamagePredicate.mapping +++ b/mappings/net/minecraft/predicate/DamagePredicate.mapping @@ -21,6 +21,7 @@ CLASS net/minecraft/class_2019 net/minecraft/predicate/DamagePredicate ARG 2 taken ARG 3 sourceEntity ARG 4 blocked + ARG 5 type METHOD method_8838 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)Z ARG 1 player ARG 2 source diff --git a/mappings/net/minecraft/predicate/FluidPredicate.mapping b/mappings/net/minecraft/predicate/FluidPredicate.mapping new file mode 100644 index 0000000000..510ac93c47 --- /dev/null +++ b/mappings/net/minecraft/predicate/FluidPredicate.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_4551 net/minecraft/predicate/FluidPredicate + FIELD field_20708 ANY Lnet/minecraft/class_4551; + FIELD field_20709 tag Lnet/minecraft/class_3494; + FIELD field_20710 fluid Lnet/minecraft/class_3611; + FIELD field_20711 state Lnet/minecraft/class_4559; + METHOD (Lnet/minecraft/class_3494;Lnet/minecraft/class_3611;Lnet/minecraft/class_4559;)V + ARG 1 tag + ARG 2 fluid + ARG 3 state + METHOD method_22473 toJson ()Lcom/google/gson/JsonElement; + METHOD method_22474 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4551; + ARG 0 json + METHOD method_22475 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/predicate/LightPredicate.mapping b/mappings/net/minecraft/predicate/LightPredicate.mapping new file mode 100644 index 0000000000..c051d4559c --- /dev/null +++ b/mappings/net/minecraft/predicate/LightPredicate.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_4552 net/minecraft/predicate/LightPredicate + FIELD field_20712 ANY Lnet/minecraft/class_4552; + FIELD field_20713 range Lnet/minecraft/class_2096$class_2100; + METHOD method_22481 toJson ()Lcom/google/gson/JsonElement; + METHOD method_22482 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4552; + ARG 0 json + METHOD method_22483 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/predicate/NbtPredicate.mapping b/mappings/net/minecraft/predicate/NbtPredicate.mapping index eaa97e0164..896b967b3d 100644 --- a/mappings/net/minecraft/predicate/NbtPredicate.mapping +++ b/mappings/net/minecraft/predicate/NbtPredicate.mapping @@ -1,11 +1,16 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate FIELD field_9715 tag Lnet/minecraft/class_2487; FIELD field_9716 ANY Lnet/minecraft/class_2105; + METHOD (Lnet/minecraft/class_2487;)V + ARG 1 tag METHOD method_9072 test (Lnet/minecraft/class_1297;)Z - METHOD method_9073 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2105; - ARG 0 element + ARG 1 entity + METHOD method_9073 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2105; + ARG 0 json METHOD method_9074 test (Lnet/minecraft/class_1799;)Z - METHOD method_9075 serialize ()Lcom/google/gson/JsonElement; + ARG 1 stack + METHOD method_9075 toJson ()Lcom/google/gson/JsonElement; METHOD method_9076 entityToTag (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2487; ARG 0 entity METHOD method_9077 test (Lnet/minecraft/class_2520;)Z + ARG 1 tag diff --git a/mappings/net/minecraft/util/NumberRange.mapping b/mappings/net/minecraft/predicate/NumberRange.mapping similarity index 73% rename from mappings/net/minecraft/util/NumberRange.mapping rename to mappings/net/minecraft/predicate/NumberRange.mapping index f1d960cd5b..e90fd49124 100644 --- a/mappings/net/minecraft/util/NumberRange.mapping +++ b/mappings/net/minecraft/predicate/NumberRange.mapping @@ -1,21 +1,33 @@ -CLASS net/minecraft/class_2096 net/minecraft/util/NumberRange +CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange CLASS class_2097 Factory + METHOD create (Ljava/lang/Number;Ljava/lang/Number;)Lnet/minecraft/class_2096; + ARG 1 min + ARG 2 max + CLASS class_2098 CommandFactory + METHOD create (Lcom/mojang/brigadier/StringReader;Ljava/lang/Number;Ljava/lang/Number;)Lnet/minecraft/class_2096; + ARG 1 reader + ARG 2 min + ARG 3 max CLASS class_2099 FloatRange - FIELD field_9703 minSquared Ljava/lang/Double; - FIELD field_9704 maxSquared Ljava/lang/Double; + FIELD field_9703 squaredMin Ljava/lang/Double; + FIELD field_9704 squaredMax Ljava/lang/Double; FIELD field_9705 ANY Lnet/minecraft/class_2096$class_2099; METHOD (Ljava/lang/Float;Ljava/lang/Float;)V - ARG 1 max - METHOD method_9044 squared (Ljava/lang/Float;)Ljava/lang/Double; + ARG 1 min + ARG 2 max + METHOD method_9044 square (Ljava/lang/Float;)Ljava/lang/Double; ARG 0 value - METHOD method_9045 matchesSquared (D)Z + METHOD method_9045 testSqrt (D)Z + ARG 1 value METHOD method_9046 create (Lcom/mojang/brigadier/StringReader;Ljava/lang/Float;Ljava/lang/Float;)Lnet/minecraft/class_2096$class_2099; ARG 0 reader ARG 1 min ARG 2 max - METHOD method_9047 matches (F)Z + METHOD method_9047 test (F)Z + ARG 1 value METHOD method_9048 parse (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lnet/minecraft/class_2096$class_2099; ARG 0 reader + ARG 1 mapper METHOD method_9049 parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2096$class_2099; ARG 0 reader METHOD method_9050 atLeast (F)Lnet/minecraft/class_2096$class_2099; @@ -27,10 +39,12 @@ CLASS net/minecraft/class_2096 net/minecraft/util/NumberRange FIELD field_9707 maxSquared Ljava/lang/Long; FIELD field_9708 ANY Lnet/minecraft/class_2096$class_2100; METHOD (Ljava/lang/Integer;Ljava/lang/Integer;)V - ARG 1 max + ARG 1 min + ARG 2 max METHOD method_9053 atLeast (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value METHOD method_9054 test (I)Z + ARG 1 value METHOD method_9055 parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/class_2096$class_2100; ARG 0 reader ARG 1 min @@ -38,11 +52,14 @@ CLASS net/minecraft/class_2096 net/minecraft/util/NumberRange METHOD method_9056 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2096$class_2100; ARG 0 element METHOD method_9057 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lnet/minecraft/class_2096$class_2100; + ARG 0 reader + ARG 1 converter METHOD method_9058 exactly (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value METHOD method_9059 squared (Ljava/lang/Integer;)Ljava/lang/Long; ARG 0 value METHOD method_9060 parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2096$class_2100; + ARG 0 reader FIELD field_9699 max Ljava/lang/Number; FIELD field_9700 EXCEPTION_EMPTY Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_9701 EXCEPTION_SWAPPED Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; @@ -50,18 +67,26 @@ CLASS net/minecraft/class_2096 net/minecraft/util/NumberRange METHOD (Ljava/lang/Number;Ljava/lang/Number;)V ARG 1 min ARG 2 max - METHOD method_9035 applyIfNonNull (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; + METHOD method_9035 map (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; ARG 0 object ARG 1 function - METHOD method_9036 serialize ()Lcom/google/gson/JsonElement; + METHOD method_9036 toJson ()Lcom/google/gson/JsonElement; METHOD method_9037 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/lang/Number; + ARG 0 reader + ARG 1 converter + ARG 2 exceptionTypeSupplier METHOD method_9038 getMin ()Ljava/lang/Number; METHOD method_9039 fromJson (Lcom/google/gson/JsonElement;Lnet/minecraft/class_2096;Ljava/util/function/BiFunction;Lnet/minecraft/class_2096$class_2097;)Lnet/minecraft/class_2096; ARG 0 json - ARG 1 defaultValue + ARG 1 fallback + ARG 2 asNumber ARG 3 factory METHOD method_9040 isNextCharValid (Lcom/mojang/brigadier/StringReader;)Z ARG 0 reader METHOD method_9041 isDummy ()Z METHOD method_9042 getMax ()Ljava/lang/Number; METHOD method_9043 parse (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2096$class_2098;Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/util/function/Function;)Lnet/minecraft/class_2096; + ARG 0 commandReader + ARG 2 converter + ARG 3 exceptionTypeSupplier + ARG 4 mapper diff --git a/mappings/net/minecraft/predicate/PlayerPredicate.mapping b/mappings/net/minecraft/predicate/PlayerPredicate.mapping new file mode 100644 index 0000000000..461da6e5a2 --- /dev/null +++ b/mappings/net/minecraft/predicate/PlayerPredicate.mapping @@ -0,0 +1,45 @@ +CLASS net/minecraft/class_4553 net/minecraft/predicate/PlayerPredicate + CLASS class_4554 AdvancementCriteriaPredicate + FIELD field_20728 criteria Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; + METHOD (Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;)V + ARG 1 criteria + METHOD test (Ljava/lang/Object;)Z + ARG 1 progress + CLASS class_4555 CompletedAdvancementPredicate + FIELD field_20729 done Z + METHOD (Z)V + ARG 1 done + METHOD test (Ljava/lang/Object;)Z + ARG 1 progress + CLASS class_4556 AdvancementPredicate + METHOD method_22506 toJson ()Lcom/google/gson/JsonElement; + CLASS class_4557 Builder + FIELD field_20730 experienceLevel Lnet/minecraft/class_2096$class_2100; + FIELD field_20731 gamemode Lnet/minecraft/class_1934; + FIELD field_20732 stats Ljava/util/Map; + FIELD field_20733 recipes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; + FIELD field_20734 advancements Ljava/util/Map; + METHOD method_22507 build ()Lnet/minecraft/class_4553; + FIELD field_20722 ANY Lnet/minecraft/class_4553; + FIELD field_20723 experienceLevel Lnet/minecraft/class_2096$class_2100; + FIELD field_20724 gamemode Lnet/minecraft/class_1934; + FIELD field_20725 stats Ljava/util/Map; + FIELD field_20726 recipes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; + FIELD field_20727 advancements Ljava/util/Map; + METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1934;Ljava/util/Map;Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;Ljava/util/Map;)V + ARG 2 gamemode + ARG 3 stats + ARG 4 recipes + ARG 5 advancements + METHOD method_22494 toJson ()Lcom/google/gson/JsonElement; + METHOD method_22495 getStatId (Lnet/minecraft/class_3445;)Lnet/minecraft/class_2960; + ARG 0 stat + METHOD method_22496 getStat (Lnet/minecraft/class_3448;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3445; + ARG 0 type + ARG 1 id + METHOD method_22497 test (Lnet/minecraft/class_1297;)Z + ARG 1 entity + METHOD method_22499 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4553; + ARG 0 json + METHOD method_22503 criterionFromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4553$class_4556; + ARG 0 json diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping new file mode 100644 index 0000000000..e416f915ee --- /dev/null +++ b/mappings/net/minecraft/predicate/StatePredicate.mapping @@ -0,0 +1,66 @@ +CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate + CLASS class_4560 Builder + FIELD field_20738 conditons Ljava/util/List; + METHOD method_22523 create ()Lnet/minecraft/class_4559$class_4560; + METHOD method_22524 exactMatch (Lnet/minecraft/class_2769;I)Lnet/minecraft/class_4559$class_4560; + ARG 1 property + ARG 2 value + METHOD method_22525 exactMatch (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Lnet/minecraft/class_4559$class_4560; + ARG 1 property + ARG 2 value + METHOD method_22526 exactMatch (Lnet/minecraft/class_2769;Ljava/lang/String;)Lnet/minecraft/class_4559$class_4560; + ARG 1 property + ARG 2 valueName + METHOD method_22527 exactMatch (Lnet/minecraft/class_2769;Z)Lnet/minecraft/class_4559$class_4560; + ARG 1 property + ARG 2 value + METHOD method_22528 build ()Lnet/minecraft/class_4559; + CLASS class_4561 ExactValueCondition + FIELD field_20739 value Ljava/lang/String; + METHOD (Ljava/lang/String;Ljava/lang/String;)V + ARG 1 key + ARG 2 value + CLASS class_4562 Condition + FIELD field_20740 key Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 key + METHOD method_22529 toJson ()Lcom/google/gson/JsonElement; + METHOD method_22530 test (Lnet/minecraft/class_2689;Lnet/minecraft/class_2688;)Z + ARG 1 stateManager + ARG 2 state + METHOD method_22531 reportMissing (Lnet/minecraft/class_2689;Ljava/util/function/Consumer;)V + ARG 1 factory + ARG 2 reporter + METHOD method_22532 test (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;)Z + ARG 1 state + ARG 2 property + METHOD method_22533 getKey ()Ljava/lang/String; + CLASS class_4563 RangedValueCondition + FIELD field_20741 min Ljava/lang/String; + FIELD field_20742 max Ljava/lang/String; + METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 key + ARG 2 min + ARG 3 max + FIELD field_20736 ANY Lnet/minecraft/class_4559; + FIELD field_20737 conditions Ljava/util/List; + METHOD (Ljava/util/List;)V + ARG 1 testers + METHOD method_22513 toJson ()Lcom/google/gson/JsonElement; + METHOD method_22514 test (Lnet/minecraft/class_2680;)Z + ARG 1 state + METHOD method_22515 test (Lnet/minecraft/class_2689;Lnet/minecraft/class_2688;)Z + ARG 1 stateManager + ARG 2 container + METHOD method_22516 check (Lnet/minecraft/class_2689;Ljava/util/function/Consumer;)V + ARG 1 factory + ARG 2 reporter + METHOD method_22518 test (Lnet/minecraft/class_3610;)Z + ARG 1 sate + METHOD method_22519 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4559; + ARG 0 json + METHOD method_22521 createPredicate (Ljava/lang/String;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4559$class_4562; + ARG 0 key + ARG 1 json + METHOD method_22522 asNullableString (Lcom/google/gson/JsonElement;)Ljava/lang/String; + ARG 0 json diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 3a30cbe600..9c3e900b54 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate CLASS class_2049 Builder FIELD field_16318 catType Lnet/minecraft/class_2960; FIELD field_16491 equipment Lnet/minecraft/class_3735; + FIELD field_20699 player Lnet/minecraft/class_4553; + FIELD field_20700 team Ljava/lang/String; FIELD field_9602 distance Lnet/minecraft/class_2025; FIELD field_9603 nbt Lnet/minecraft/class_2105; FIELD field_9604 location Lnet/minecraft/class_2090; @@ -11,6 +13,8 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate METHOD method_16112 catType (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2048$class_2049; METHOD method_16113 type (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2048$class_2049; METHOD method_16227 equipment (Lnet/minecraft/class_3735;)Lnet/minecraft/class_2048$class_2049; + METHOD method_22469 player (Lnet/minecraft/class_4553;)Lnet/minecraft/class_2048$class_2049; + METHOD method_22470 team (Ljava/lang/String;)Lnet/minecraft/class_2048$class_2049; METHOD method_8915 nbt (Lnet/minecraft/class_2105;)Lnet/minecraft/class_2048$class_2049; METHOD method_8916 create ()Lnet/minecraft/class_2048$class_2049; METHOD method_8917 type (Lnet/minecraft/class_2050;)Lnet/minecraft/class_2048$class_2049; @@ -23,6 +27,8 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate METHOD method_8924 distance (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2048$class_2049; FIELD field_16317 catType Lnet/minecraft/class_2960; FIELD field_16490 equipment Lnet/minecraft/class_3735; + FIELD field_20697 player Lnet/minecraft/class_4553; + FIELD field_20698 team Ljava/lang/String; FIELD field_9594 effects Lnet/minecraft/class_2102; FIELD field_9595 type Lnet/minecraft/class_2050; FIELD field_9596 location Lnet/minecraft/class_2090; @@ -39,14 +45,17 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 5 nbt ARG 6 flags ARG 7 equipment + ARG 8 player + ARG 9 team + ARG 10 catType METHOD method_8909 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z ARG 1 world - METHOD method_8910 deserializeAll (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2048; + METHOD method_8910 fromJsonArray (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2048; ARG 0 element METHOD method_8911 serializeAll ([Lnet/minecraft/class_2048;)Lcom/google/gson/JsonElement; ARG 0 predicates METHOD method_8912 serialize ()Lcom/google/gson/JsonElement; - METHOD method_8913 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2048; + METHOD method_8913 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2048; ARG 0 el METHOD method_8914 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Z ARG 1 player diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index 825b75b129..31fb6a1282 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -1,13 +1,21 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate CLASS class_2091 Builder + FIELD field_20717 light Lnet/minecraft/class_4552; + FIELD field_20718 block Lnet/minecraft/class_4550; + FIELD field_20719 fluid Lnet/minecraft/class_4551; FIELD field_9688 feature Lnet/minecraft/class_3195; FIELD field_9689 y Lnet/minecraft/class_2096$class_2099; FIELD field_9690 biome Lnet/minecraft/class_1959; FIELD field_9691 dimension Lnet/minecraft/class_2874; FIELD field_9692 z Lnet/minecraft/class_2096$class_2099; FIELD field_9693 x Lnet/minecraft/class_2096$class_2099; + METHOD method_22484 create ()Lnet/minecraft/class_2090$class_2091; METHOD method_9023 build ()Lnet/minecraft/class_2090; METHOD method_9024 biome (Lnet/minecraft/class_1959;)Lnet/minecraft/class_2090$class_2091; + ARG 1 biome + FIELD field_20714 light Lnet/minecraft/class_4552; + FIELD field_20715 block Lnet/minecraft/class_4550; + FIELD field_20716 fluid Lnet/minecraft/class_4551; FIELD field_9681 z Lnet/minecraft/class_2096$class_2099; FIELD field_9682 x Lnet/minecraft/class_2096$class_2099; FIELD field_9683 biome Lnet/minecraft/class_1959; @@ -22,6 +30,9 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 4 biome ARG 5 feature ARG 6 dimension + ARG 7 light + ARG 8 block + ARG 9 fluid METHOD method_9016 dimension (Lnet/minecraft/class_2874;)Lnet/minecraft/class_2090; ARG 0 dimension METHOD method_9017 feature (Lnet/minecraft/class_3195;)Lnet/minecraft/class_2090; @@ -29,12 +40,15 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate METHOD method_9018 test (Lnet/minecraft/class_3218;DDD)Z ARG 1 world ARG 2 x - METHOD method_9019 serialize ()Lcom/google/gson/JsonElement; + ARG 4 y + ARG 6 z + METHOD method_9019 toJson ()Lcom/google/gson/JsonElement; METHOD method_9020 test (Lnet/minecraft/class_3218;FFF)Z ARG 1 world ARG 2 x ARG 3 y - METHOD method_9021 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2090; + ARG 4 z + METHOD method_9021 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2090; ARG 0 element METHOD method_9022 biome (Lnet/minecraft/class_1959;)Lnet/minecraft/class_2090; ARG 0 biome diff --git a/mappings/net/minecraft/recipe/book/RecipeBook.mapping b/mappings/net/minecraft/recipe/book/RecipeBook.mapping index 98aed71441..e67a7f933d 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBook.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBook.mapping @@ -10,19 +10,29 @@ CLASS net/minecraft/class_3439 net/minecraft/recipe/book/RecipeBook FIELD field_17269 smokerGuiOpen Z FIELD field_17270 smokerFilteringCraftable Z METHOD method_14875 copyFrom (Lnet/minecraft/class_3439;)V + ARG 1 book METHOD method_14876 add (Lnet/minecraft/class_1860;)V + ARG 1 recipe METHOD method_14877 display (Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_14878 contains (Lnet/minecraft/class_1860;)Z + ARG 1 recipe METHOD method_14879 remove (Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_14880 isFilteringCraftable (Lnet/minecraft/class_1729;)Z + ARG 1 container METHOD method_14881 add (Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_14882 setFurnaceGuiOpen (Z)V ARG 1 furnaceGuiOpen METHOD method_14883 shouldDisplay (Lnet/minecraft/class_1860;)Z + ARG 1 recipe METHOD method_14884 setGuiOpen (Z)V ARG 1 guiOpen METHOD method_14885 display (Lnet/minecraft/class_1860;)V + ARG 1 recipe METHOD method_14886 onRecipeDisplayed (Lnet/minecraft/class_1860;)V + ARG 1 recipe METHOD method_14887 isGuiOpen ()Z METHOD method_14888 setFurnaceFilteringCraftable (Z)V ARG 1 furnaceFilteringCraftable @@ -32,6 +42,7 @@ CLASS net/minecraft/class_3439 net/minecraft/recipe/book/RecipeBook METHOD method_14891 isFurnaceGuiOpen ()Z METHOD method_14892 isFurnaceFilteringCraftable ()Z METHOD method_14893 remove (Lnet/minecraft/class_1860;)V + ARG 1 recipe METHOD method_17317 isBlastFurnaceGuiOpen ()Z METHOD method_17318 setBlastFurnaceGuiOpen (Z)V ARG 1 blastFurnaceGuiOpen @@ -44,3 +55,5 @@ CLASS net/minecraft/class_3439 net/minecraft/recipe/book/RecipeBook METHOD method_17323 isSmokerFilteringCraftable ()Z METHOD method_17324 setSmokerFilteringCraftable (Z)V ARG 1 smokerFilteringCraftable + METHOD method_22845 contains (Lnet/minecraft/class_2960;)Z + ARG 1 id diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 74a34a2858..f8b94e54ef 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -9,6 +9,9 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_17601 serverId Ljava/lang/String; FIELD field_17704 DEMO_LEVEL_INFO Lnet/minecraft/class_1940; FIELD field_19237 eraseCache Z + FIELD field_20279 COMPLETED_UNIT_FUTURE Ljava/util/concurrent/CompletableFuture; + FIELD field_20850 dataCommandStorage Lnet/minecraft/class_4565; + FIELD field_20851 predicateManager Lnet/minecraft/class_4567; FIELD field_4543 onlineMode Z FIELD field_4544 running Z FIELD field_4545 forceGameMode Z @@ -103,6 +106,8 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_21692 dumpStats (Ljava/nio/file/Path;)V METHOD method_21713 dumpThreads (Ljava/nio/file/Path;)V METHOD method_21714 getFunctionPermissionLevel ()I + METHOD method_22827 getDataCommandStorage ()Lnet/minecraft/class_4565; + METHOD method_22828 getPredicateManager ()Lnet/minecraft/class_4567; METHOD method_3716 getKeyPair ()Ljava/security/KeyPair; METHOD method_3717 start ()V METHOD method_3718 isFlightEnabled ()Z diff --git a/mappings/net/minecraft/server/command/DataCommand.mapping b/mappings/net/minecraft/server/command/DataCommand.mapping index fee47aa5c9..95eaadaf9d 100644 --- a/mappings/net/minecraft/server/command/DataCommand.mapping +++ b/mappings/net/minecraft/server/command/DataCommand.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand METHOD method_13925 addArgumentsToBuilder (Lcom/mojang/brigadier/builder/ArgumentBuilder;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 1 argument ARG 2 argumentAdder - FIELD field_13790 OBJECT_TYPES Ljava/util/List; + FIELD field_13790 OBJECT_TYPE_FACTORIES Ljava/util/List; FIELD field_13791 GET_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13792 SOURCE_OBJECT_TYPES Ljava/util/List; FIELD field_13793 GET_UNKNOWN_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 5f9bb9040f..1daf76776f 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -76,3 +76,4 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand METHOD method_13323 getExistsConditionExecute (ZLnet/minecraft/class_3050$class_3051;)Lcom/mojang/brigadier/Command; ARG 0 positive ARG 1 condition + METHOD method_22829 testLootCondition (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;)Z diff --git a/mappings/net/minecraft/state/AbstractPropertyContainer.mapping b/mappings/net/minecraft/state/AbstractState.mapping similarity index 84% rename from mappings/net/minecraft/state/AbstractPropertyContainer.mapping rename to mappings/net/minecraft/state/AbstractState.mapping index 8961c1b174..4787244031 100644 --- a/mappings/net/minecraft/state/AbstractPropertyContainer.mapping +++ b/mappings/net/minecraft/state/AbstractState.mapping @@ -1,6 +1,6 @@ -CLASS net/minecraft/class_2679 net/minecraft/state/AbstractPropertyContainer +CLASS net/minecraft/class_2679 net/minecraft/state/AbstractState CLASS 1 - METHOD method_11575 valueToString (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; + METHOD method_11575 nameValue (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; ARG 1 property ARG 2 value FIELD field_12285 entries Lcom/google/common/collect/ImmutableMap; @@ -15,6 +15,7 @@ CLASS net/minecraft/class_2679 net/minecraft/state/AbstractPropertyContainer ARG 1 o METHOD method_11569 getProperties ()Ljava/util/Collection; METHOD method_11570 contains (Lnet/minecraft/class_2769;)Z + ARG 1 property METHOD method_11571 createWithTable (Ljava/util/Map;)V ARG 1 states METHOD method_11572 cycle (Lnet/minecraft/class_2769;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/state/PropertyContainer.mapping b/mappings/net/minecraft/state/State.mapping similarity index 51% rename from mappings/net/minecraft/state/PropertyContainer.mapping rename to mappings/net/minecraft/state/State.mapping index 8021fdea8d..04e99bb9e3 100644 --- a/mappings/net/minecraft/state/PropertyContainer.mapping +++ b/mappings/net/minecraft/state/State.mapping @@ -1,15 +1,17 @@ -CLASS net/minecraft/class_2688 net/minecraft/state/PropertyContainer +CLASS net/minecraft/class_2688 net/minecraft/state/State FIELD field_12313 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_11654 get (Lnet/minecraft/class_2769;)Ljava/lang/Comparable; - METHOD method_11655 deserialize (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_2688; + ARG 1 property + METHOD method_11655 tryRead (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_2688; ARG 0 state ARG 1 property ARG 2 propertyName ARG 3 input - ARG 4 value + ARG 4 valueName METHOD method_11656 getEntries ()Lcom/google/common/collect/ImmutableMap; METHOD method_11657 with (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/Object; ARG 1 property - METHOD method_16551 getValueAsString (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; + ARG 2 value + METHOD method_16551 nameValue (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; ARG 0 property - ARG 1 comparable + ARG 1 value diff --git a/mappings/net/minecraft/state/StateFactory.mapping b/mappings/net/minecraft/state/StateManager.mapping similarity index 59% rename from mappings/net/minecraft/state/StateFactory.mapping rename to mappings/net/minecraft/state/StateManager.mapping index 25a553a816..790aa1cb3a 100644 --- a/mappings/net/minecraft/state/StateFactory.mapping +++ b/mappings/net/minecraft/state/StateManager.mapping @@ -1,21 +1,28 @@ -CLASS net/minecraft/class_2689 net/minecraft/state/StateFactory +CLASS net/minecraft/class_2689 net/minecraft/state/StateManager CLASS class_2690 Builder - FIELD field_12318 baseObject Ljava/lang/Object; - FIELD field_12319 propertyMap Ljava/util/Map; + FIELD field_12318 owner Ljava/lang/Object; + FIELD field_12319 namedProperties Ljava/util/Map; + METHOD (Ljava/lang/Object;)V + ARG 1 owner METHOD method_11667 add ([Lnet/minecraft/class_2769;)Lnet/minecraft/class_2689$class_2690; + ARG 1 properties METHOD method_11668 build (Lnet/minecraft/class_2689$class_2691;)Lnet/minecraft/class_2689; METHOD method_11669 validate (Lnet/minecraft/class_2769;)V + ARG 1 property CLASS class_2691 Factory METHOD create (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;)Lnet/minecraft/class_2679; - ARG 1 propertyMap - FIELD field_12314 NAME_MATCHER Ljava/util/regex/Pattern; + ARG 1 owner + ARG 2 entries + FIELD field_12314 VALID_NAME_PATTERN Ljava/util/regex/Pattern; FIELD field_12315 states Lcom/google/common/collect/ImmutableList; - FIELD field_12316 propertyMap Lcom/google/common/collect/ImmutableSortedMap; - FIELD field_12317 baseObject Ljava/lang/Object; + FIELD field_12316 properties Lcom/google/common/collect/ImmutableSortedMap; + FIELD field_12317 owner Ljava/lang/Object; METHOD (Ljava/lang/Object;Lnet/minecraft/class_2689$class_2691;Ljava/util/Map;)V - ARG 1 baseObject + ARG 1 owner + ARG 3 namedProperties METHOD method_11659 getProperties ()Ljava/util/Collection; - METHOD method_11660 getBaseObject ()Ljava/lang/Object; + METHOD method_11660 getOwner ()Ljava/lang/Object; METHOD method_11662 getStates ()Lcom/google/common/collect/ImmutableList; METHOD method_11663 getProperty (Ljava/lang/String;)Lnet/minecraft/class_2769; + ARG 1 name METHOD method_11664 getDefaultState ()Lnet/minecraft/class_2688; diff --git a/mappings/net/minecraft/state/property/Property.mapping b/mappings/net/minecraft/state/property/Property.mapping index 894154a208..86875d3339 100644 --- a/mappings/net/minecraft/state/property/Property.mapping +++ b/mappings/net/minecraft/state/property/Property.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_2769 net/minecraft/state/property/Property METHOD method_11898 getValues ()Ljava/util/Collection; METHOD method_11899 getName ()Ljava/lang/String; - METHOD method_11900 getValue (Ljava/lang/String;)Ljava/util/Optional; + METHOD method_11900 parse (Ljava/lang/String;)Ljava/util/Optional; ARG 1 name - METHOD method_11901 getName (Ljava/lang/Comparable;)Ljava/lang/String; + METHOD method_11901 name (Ljava/lang/Comparable;)Ljava/lang/String; ARG 1 value - METHOD method_11902 getValueType ()Ljava/lang/Class; + METHOD method_11902 getType ()Ljava/lang/Class; diff --git a/mappings/net/minecraft/tag/FluidTags.mapping b/mappings/net/minecraft/tag/FluidTags.mapping index a9d136f07d..ebe548d62c 100644 --- a/mappings/net/minecraft/tag/FluidTags.mapping +++ b/mappings/net/minecraft/tag/FluidTags.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_3486 net/minecraft/tag/FluidTags ARG 0 id METHOD method_15096 setContainer (Lnet/minecraft/class_3503;)V ARG 0 container + METHOD method_22448 getContainer ()Lnet/minecraft/class_3503; diff --git a/mappings/net/minecraft/util/TagHelper.mapping b/mappings/net/minecraft/util/TagHelper.mapping deleted file mode 100644 index ed0e3e31f1..0000000000 --- a/mappings/net/minecraft/util/TagHelper.mapping +++ /dev/null @@ -1,30 +0,0 @@ -CLASS net/minecraft/class_2512 net/minecraft/util/TagHelper - FIELD field_11582 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_10681 deserializeBlockState (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2680; - ARG 0 tag - METHOD method_10682 withProperty (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2688; - ARG 0 state - ARG 1 property - METHOD method_10683 deserializeProfile (Lnet/minecraft/class_2487;)Lcom/mojang/authlib/GameProfile; - ARG 0 tag - METHOD method_10684 serializeProfile (Lnet/minecraft/class_2487;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2487; - ARG 0 tag - ARG 1 profile - METHOD method_10685 getPropertyValueAsString (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; - ARG 0 property - ARG 1 value - METHOD method_10686 serializeBlockState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2487; - METHOD method_10687 areTagsEqual (Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;Z)Z - ARG 0 tag1 - ARG 1 tag2 - ARG 2 deepCheck - METHOD method_10688 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2487; - METHOD method_10689 serializeUuid (Ljava/util/UUID;)Lnet/minecraft/class_2487; - ARG 0 uuid - METHOD method_10690 deserializeUuid (Lnet/minecraft/class_2487;)Ljava/util/UUID; - ARG 0 tag - METHOD method_10691 deserializeBlockPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2338; - ARG 0 tag - METHOD method_10692 serializeBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; - ARG 0 pos - METHOD method_10693 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Lnet/minecraft/class_2487;II)Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping index 281fe94a11..18936d0ab0 100644 --- a/mappings/net/minecraft/world/PersistentStateManager.mapping +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -6,12 +6,21 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager METHOD (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V ARG 1 directory ARG 2 dataFixer - METHOD method_120 get (Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; + METHOD method_120 readFromFile (Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; ARG 1 factory ARG 2 id METHOD method_123 set (Lnet/minecraft/class_18;)V + ARG 1 state METHOD method_125 save ()V + METHOD method_17921 isCompressed (Ljava/io/PushbackInputStream;)Z METHOD method_17922 getFile (Ljava/lang/String;)Ljava/io/File; ARG 1 id + METHOD method_17923 readTag (Ljava/lang/String;I)Lnet/minecraft/class_2487; + ARG 1 id + ARG 2 dataVersion METHOD method_17924 getOrCreate (Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; ARG 1 factory + ARG 2 id + METHOD method_20786 get (Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; + ARG 1 factory + ARG 2 id diff --git a/mappings/net/minecraft/world/loot/LootManager.mapping b/mappings/net/minecraft/world/loot/LootManager.mapping index b6e70142b9..d54542bd4a 100644 --- a/mappings/net/minecraft/world/loot/LootManager.mapping +++ b/mappings/net/minecraft/world/loot/LootManager.mapping @@ -1,13 +1,19 @@ CLASS net/minecraft/class_60 net/minecraft/world/loot/LootManager + FIELD field_20752 conditionManager Lnet/minecraft/class_4567; FIELD field_970 suppliers Ljava/util/Map; FIELD field_974 GSON Lcom/google/gson/Gson; FIELD field_975 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Lnet/minecraft/class_4567;)V + ARG 1 conditionManager METHOD method_367 getSupplier (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; ARG 1 id METHOD method_368 (Ljava/lang/String;Ljava/lang/String;)V ARG 0 key ARG 1 value METHOD method_369 check (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V + ARG 0 reporter + ARG 1 id + ARG 2 table METHOD method_370 getSupplierNames ()Ljava/util/Set; METHOD method_372 toJson (Lnet/minecraft/class_52;)Lcom/google/gson/JsonElement; ARG 0 supplier diff --git a/mappings/net/minecraft/world/loot/LootSupplier.mapping b/mappings/net/minecraft/world/loot/LootTable.mapping similarity index 96% rename from mappings/net/minecraft/world/loot/LootSupplier.mapping rename to mappings/net/minecraft/world/loot/LootTable.mapping index ac0c65b554..d0f1279aa2 100644 --- a/mappings/net/minecraft/world/loot/LootSupplier.mapping +++ b/mappings/net/minecraft/world/loot/LootTable.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_52 net/minecraft/world/loot/LootSupplier +CLASS net/minecraft/class_52 net/minecraft/world/loot/LootTable CLASS class_53 Builder FIELD field_949 pools Ljava/util/List; FIELD field_950 type Lnet/minecraft/class_176; @@ -25,7 +25,7 @@ CLASS net/minecraft/class_52 net/minecraft/world/loot/LootSupplier FIELD field_947 GENERIC Lnet/minecraft/class_176; FIELD field_948 EMPTY Lnet/minecraft/class_52; METHOD (Lnet/minecraft/class_176;[Lnet/minecraft/class_55;[Lnet/minecraft/class_117;)V - ARG 1 contextType + ARG 1 type ARG 2 pools ARG 3 functions METHOD method_319 getDrops (Lnet/minecraft/class_47;)Ljava/util/List; @@ -45,6 +45,7 @@ CLASS net/minecraft/class_52 net/minecraft/world/loot/LootSupplier ARG 1 inventory ARG 2 context METHOD method_330 check (Lnet/minecraft/class_58;)V + ARG 1 reporter METHOD method_331 (Ljava/util/function/Consumer;Lnet/minecraft/class_1799;)V ARG 1 stack METHOD method_332 limitedConsumer (Ljava/util/function/Consumer;)Ljava/util/function/Consumer; diff --git a/mappings/net/minecraft/world/loot/LootTableRanges.mapping b/mappings/net/minecraft/world/loot/LootTableRanges.mapping index 5f0f0bb01c..5e481ecda9 100644 --- a/mappings/net/minecraft/world/loot/LootTableRanges.mapping +++ b/mappings/net/minecraft/world/loot/LootTableRanges.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_63 net/minecraft/world/loot/LootTableRanges FIELD field_978 types Ljava/util/Map; - METHOD method_383 deserialize (Lcom/google/gson/JsonElement;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_59; + METHOD method_383 fromJson (Lcom/google/gson/JsonElement;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_59; ARG 0 json ARG 1 context - METHOD method_384 serialize (Lnet/minecraft/class_59;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; + METHOD method_384 toJson (Lnet/minecraft/class_59;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; ARG 0 range ARG 1 context diff --git a/mappings/net/minecraft/world/loot/LootTableReporter.mapping b/mappings/net/minecraft/world/loot/LootTableReporter.mapping index 54c9ae3da5..ecf34f9e52 100644 --- a/mappings/net/minecraft/world/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/world/loot/LootTableReporter.mapping @@ -1,7 +1,30 @@ CLASS net/minecraft/class_58 net/minecraft/world/loot/LootTableReporter + FIELD field_20756 contextType Lnet/minecraft/class_176; + FIELD field_20757 conditionGetter Ljava/util/function/Function; + FIELD field_20758 conditions Ljava/util/Set; + FIELD field_20759 supplierGetter Ljava/util/function/Function; + FIELD field_20760 suppliers Ljava/util/Set; FIELD field_964 name Ljava/lang/String; FIELD field_965 messages Lcom/google/common/collect/Multimap; FIELD field_966 nameFactory Ljava/util/function/Supplier; + METHOD method_22567 checkContext (Lnet/minecraft/class_46;)V + ARG 1 contextAware + METHOD method_22568 withContextType (Lnet/minecraft/class_176;)Lnet/minecraft/class_58; + ARG 1 contextType + METHOD method_22569 withSupplier (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_58; + ARG 1 name + ARG 2 id + METHOD method_22570 hasSupplier (Lnet/minecraft/class_2960;)Z + ARG 1 id + METHOD method_22571 withCondition (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_58; + ARG 1 name + ARG 2 id + METHOD method_22572 hasCondition (Lnet/minecraft/class_2960;)Z + ARG 1 id + METHOD method_22574 getSupplier (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; + ARG 1 id + METHOD method_22576 getCondition (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4570; + ARG 1 id METHOD method_359 getContext ()Ljava/lang/String; METHOD method_360 report (Ljava/lang/String;)V ARG 1 message diff --git a/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping index 76a1c43e47..9caf3ec6d6 100644 --- a/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_205 net/minecraft/world/loot/condition/LocationCheckLootCondition CLASS class_206 Factory FIELD field_1282 predicate Lnet/minecraft/class_2090; + FIELD field_20765 offset Lnet/minecraft/class_2338; + METHOD (Lnet/minecraft/class_2090;Lnet/minecraft/class_2338;)V + ARG 1 predicate + ARG 2 offset METHOD method_884 builder (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_4570$class_210; ARG 0 predicateBuilder METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping b/mappings/net/minecraft/world/loot/condition/LootConditionConsumingBuilder.mapping similarity index 61% rename from mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping rename to mappings/net/minecraft/world/loot/condition/LootConditionConsumingBuilder.mapping index f8c418dd7a..bf0b76428b 100644 --- a/mappings/net/minecraft/world/loot/ConditionConsumerBuilder.mapping +++ b/mappings/net/minecraft/world/loot/condition/LootConditionConsumingBuilder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_192 net/minecraft/world/loot/ConditionConsumerBuilder +CLASS net/minecraft/class_192 net/minecraft/world/loot/condition/LootConditionConsumingBuilder METHOD method_512 getThis ()Ljava/lang/Object; METHOD method_840 withCondition (Lnet/minecraft/class_4570$class_210;)Ljava/lang/Object; ARG 1 builder diff --git a/mappings/net/minecraft/world/loot/condition/LootConditionManager.mapping b/mappings/net/minecraft/world/loot/condition/LootConditionManager.mapping new file mode 100644 index 0000000000..2d5963fc57 --- /dev/null +++ b/mappings/net/minecraft/world/loot/condition/LootConditionManager.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_4567 net/minecraft/world/loot/condition/LootConditionManager + FIELD field_20753 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_20754 GSON Lcom/google/gson/Gson; + FIELD field_20755 conditions Ljava/util/Map; + METHOD method_22559 getIds ()Ljava/util/Set; + METHOD method_22564 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4570; + ARG 1 id + METHOD method_22565 get (Lnet/minecraft/class_2960;Lnet/minecraft/class_4570;)Lnet/minecraft/class_4570; + ARG 1 id + ARG 2 fallback diff --git a/mappings/net/minecraft/world/loot/condition/ReferenceLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/ReferenceLootCondition.mapping new file mode 100644 index 0000000000..2094e872ec --- /dev/null +++ b/mappings/net/minecraft/world/loot/condition/ReferenceLootCondition.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_4568 net/minecraft/world/loot/condition/ReferenceLootCondition + CLASS class_4569 Factory + FIELD field_20763 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_20764 id Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 id + METHOD test (Ljava/lang/Object;)Z + ARG 1 context diff --git a/mappings/net/minecraft/world/loot/condition/TimeCheckLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/TimeCheckLootCondition.mapping new file mode 100644 index 0000000000..5568295444 --- /dev/null +++ b/mappings/net/minecraft/world/loot/condition/TimeCheckLootCondition.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_4571 net/minecraft/world/loot/condition/TimeCheckLootCondition + CLASS class_4572 Factory + FIELD field_20767 period Ljava/lang/Long; + FIELD field_20768 value Lnet/minecraft/class_61; + METHOD (Ljava/lang/Long;Lnet/minecraft/class_61;)V + ARG 1 period + ARG 2 value diff --git a/mappings/net/minecraft/world/loot/context/LootContext.mapping b/mappings/net/minecraft/world/loot/context/LootContext.mapping index a0d05f7182..28e5df6554 100644 --- a/mappings/net/minecraft/world/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/world/loot/context/LootContext.mapping @@ -42,21 +42,31 @@ CLASS net/minecraft/class_47 net/minecraft/world/loot/context/LootContext METHOD write (Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V ARG 1 writer ARG 2 entity - FIELD field_938 identifier Lnet/minecraft/class_169; + FIELD field_938 parameter Lnet/minecraft/class_169; FIELD field_941 type Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_169;)V ARG 3 type ARG 4 parameter METHOD method_314 fromString (Ljava/lang/String;)Lnet/minecraft/class_47$class_50; ARG 0 type - METHOD method_315 getIdentifier ()Lnet/minecraft/class_169; + METHOD method_315 getParameter ()Lnet/minecraft/class_169; + FIELD field_20750 conditionGetter Ljava/util/function/Function; + FIELD field_20751 conditions Ljava/util/Set; FIELD field_923 random Ljava/util/Random; - FIELD field_924 manager Ljava/util/function/Function; + FIELD field_924 supplierGetter Ljava/util/function/Function; FIELD field_925 parameters Ljava/util/Map; FIELD field_926 luck F FIELD field_927 suppliers Ljava/util/Set; FIELD field_928 world Lnet/minecraft/class_3218; FIELD field_929 drops Ljava/util/Map; + METHOD method_22555 addCondition (Lnet/minecraft/class_4570;)Z + ARG 1 condition + METHOD method_22556 getSupplier (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; + ARG 1 id + METHOD method_22557 removeCondition (Lnet/minecraft/class_4570;)V + ARG 1 condition + METHOD method_22558 getCondition (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4570; + ARG 1 id METHOD method_294 getRandom ()Ljava/util/Random; METHOD method_295 removeDrop (Lnet/minecraft/class_52;)V ARG 1 supplier diff --git a/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping b/mappings/net/minecraft/world/loot/context/LootContextAware.mapping similarity index 53% rename from mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping rename to mappings/net/minecraft/world/loot/context/LootContextAware.mapping index a2c2287084..05c3663525 100644 --- a/mappings/net/minecraft/world/loot/context/ParameterConsumer.mapping +++ b/mappings/net/minecraft/world/loot/context/LootContextAware.mapping @@ -1,3 +1,4 @@ -CLASS net/minecraft/class_46 net/minecraft/world/loot/context/ParameterConsumer +CLASS net/minecraft/class_46 net/minecraft/world/loot/context/LootContextAware METHOD method_292 check (Lnet/minecraft/class_58;)V + ARG 1 reporter METHOD method_293 getRequiredParameters ()Ljava/util/Set; diff --git a/mappings/net/minecraft/world/loot/entry/LootEntry.mapping b/mappings/net/minecraft/world/loot/entry/LootEntry.mapping index 02ce047a29..5c4fb5cf71 100644 --- a/mappings/net/minecraft/world/loot/entry/LootEntry.mapping +++ b/mappings/net/minecraft/world/loot/entry/LootEntry.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_79 net/minecraft/world/loot/entry/LootEntry CLASS class_80 Builder - FIELD field_990 children Ljava/util/List; + FIELD field_990 conditions Ljava/util/List; METHOD method_417 withChild (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_65$class_66; ARG 1 builder METHOD method_418 getThisBuilder ()Lnet/minecraft/class_79$class_80; diff --git a/mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping b/mappings/net/minecraft/world/loot/function/LootFunctionConsumingBuilder.mapping similarity index 63% rename from mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping rename to mappings/net/minecraft/world/loot/function/LootFunctionConsumingBuilder.mapping index f7a1bc42b9..a667f56f02 100644 --- a/mappings/net/minecraft/world/loot/FunctionConsumerBuilder.mapping +++ b/mappings/net/minecraft/world/loot/function/LootFunctionConsumingBuilder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_116 net/minecraft/world/loot/FunctionConsumerBuilder +CLASS net/minecraft/class_116 net/minecraft/world/loot/function/LootFunctionConsumingBuilder METHOD method_511 withFunction (Lnet/minecraft/class_117$class_118;)Ljava/lang/Object; ARG 1 lootFunctionBuilder METHOD method_512 getThis ()Ljava/lang/Object;