diff --git a/mappings/net/minecraft/advancement/criterion/Criteria.mapping b/mappings/net/minecraft/advancement/criterion/Criteria.mapping index 9a4207c825..7fab91ab1c 100644 --- a/mappings/net/minecraft/advancement/criterion/Criteria.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criteria.mapping @@ -54,6 +54,8 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria FIELD field_47187 CODEC Lcom/mojang/serialization/Codec; FIELD field_48268 DEFAULT_BLOCK_USE Lnet/minecraft/class_9107; FIELD field_48269 ANY_BLOCK_USE Lnet/minecraft/class_9104; + FIELD field_49922 CRAFTER_RECIPE_CRAFTED Lnet/minecraft/class_8508; + FIELD field_49923 FALL_AFTER_EXPLOSION Lnet/minecraft/class_9421; METHOD method_54933 getDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_179; ARG 0 registry METHOD method_767 register (Ljava/lang/String;Lnet/minecraft/class_179;)Lnet/minecraft/class_179; diff --git a/mappings/net/minecraft/advancement/criterion/FallAfterExplosionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FallAfterExplosionCriterion.mapping new file mode 100644 index 0000000000..6c24e541a0 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/FallAfterExplosionCriterion.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_9421 net/minecraft/advancement/criterion/FallAfterExplosionCriterion + METHOD method_58358 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)V + ARG 1 player + ARG 2 startPosition + ARG 3 cause + METHOD method_58359 (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_47;Lnet/minecraft/class_9421$class_9422;)Z + ARG 4 conditions + CLASS class_9422 Conditions + FIELD comp_2029 player Ljava/util/Optional; + FIELD field_49978 CODEC Lcom/mojang/serialization/Codec; + METHOD method_58360 matches (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_47;)Z + ARG 1 world + ARG 2 startPosition + ARG 3 endPosition + ARG 4 cause + METHOD method_58361 create (Lnet/minecraft/class_2025;Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; + ARG 0 distance + ARG 1 cause + METHOD method_58362 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping index 5849718784..756e95a504 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping @@ -22,3 +22,5 @@ CLASS net/minecraft/class_8508 net/minecraft/advancement/criterion/RecipeCrafted ARG 2 ingredients METHOD method_55106 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_58450 createCrafterRecipeCrafted (Lnet/minecraft/class_2960;)Lnet/minecraft/class_175; + ARG 0 recipeId diff --git a/mappings/net/minecraft/class_9421.mapping b/mappings/net/minecraft/class_9421.mapping deleted file mode 100644 index aa688d02ed..0000000000 --- a/mappings/net/minecraft/class_9421.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_9421 - CLASS class_9422 - FIELD comp_2029 player Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/texture/MapDecorationsAtlasManager.mapping b/mappings/net/minecraft/client/texture/MapDecorationsAtlasManager.mapping new file mode 100644 index 0000000000..52e10e6da8 --- /dev/null +++ b/mappings/net/minecraft/client/texture/MapDecorationsAtlasManager.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9443 net/minecraft/client/texture/MapDecorationsAtlasManager + METHOD (Lnet/minecraft/class_1060;)V + ARG 1 manager + METHOD method_58516 getSprite (Lnet/minecraft/class_20;)Lnet/minecraft/class_1058; + ARG 1 decoration diff --git a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping index 69fd10f438..eed2b3a220 100644 --- a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping @@ -1,5 +1,12 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgumentType FIELD field_10812 EXAMPLES Ljava/util/Collection; + FIELD field_50056 INVALID_ITEM_ID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_50057 UNKNOWN_ITEM_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_50058 UNKNOWN_ITEM_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_50059 MALFORMED_ITEM_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD field_50060 UNKNOWN_ITEM_PREDICATE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_50061 MALFORMED_ITEM_PREDICATE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD field_50062 COUNT_ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_7157;)V ARG 1 commandRegistryAccess METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; @@ -13,3 +20,10 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgum METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; ARG 1 reader CLASS class_2295 ItemStackPredicateArgument + CLASS class_9445 + FIELD field_50066 itemRegistryWrapper Lnet/minecraft/class_7225$class_7226; + FIELD field_50067 dataComponentTypeRegistryWrapper Lnet/minecraft/class_7225$class_7226; + FIELD field_50068 itemSubPredicateTypeRegistryWrapper Lnet/minecraft/class_7225$class_7226; + FIELD field_50069 nbtOps Lnet/minecraft/class_6903; + METHOD (Lnet/minecraft/class_7225$class_7874;)V + ARG 1 registryLookup diff --git a/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping b/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping index 34cc4fd8de..e7e59aaed2 100644 --- a/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping @@ -62,6 +62,7 @@ CLASS net/minecraft/class_2203 net/minecraft/command/argument/NbtPathArgumentTyp ARG 1 name ARG 2 filter CLASS class_2209 NbtPath + FIELD field_50034 CODEC Lcom/mojang/serialization/Codec; FIELD field_9909 string Ljava/lang/String; FIELD field_9910 nodeEndIndices Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_9911 nodes [Lnet/minecraft/class_2203$class_2210; @@ -83,6 +84,10 @@ CLASS net/minecraft/class_2203 net/minecraft/command/argument/NbtPathArgumentTyp ARG 0 element ARG 1 depth METHOD method_54100 getString ()Ljava/lang/String; + METHOD method_58472 parse (Ljava/lang/String;)Lnet/minecraft/class_2203$class_2209; + ARG 0 path + METHOD method_58474 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 path METHOD method_9366 get (Lnet/minecraft/class_2520;)Ljava/util/List; ARG 1 element METHOD method_9367 getOrInit (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)Ljava/util/List; diff --git a/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping index ec029b3bdd..85eb9f1431 100644 --- a/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping @@ -1,57 +1,37 @@ -CLASS net/minecraft/class_7733 net/minecraft/command/argument/RegistryEntryArgumentType - FIELD field_40401 NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; - FIELD field_40402 INVALID_TYPE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType; - FIELD field_40403 EXAMPLES Ljava/util/Collection; - FIELD field_40404 NOT_SUMMONABLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD field_40405 registryRef Lnet/minecraft/class_5321; - FIELD field_40406 registryWrapper Lnet/minecraft/class_7225; - METHOD (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;)V +CLASS net/minecraft/class_9433 net/minecraft/command/argument/RegistryEntryArgumentType + FIELD field_50037 FAILED_TO_PARSE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_50038 EXAMPLES Ljava/util/Collection; + FIELD field_50039 INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_50040 registryLookup Lnet/minecraft/class_7225$class_7874; + FIELD field_50042 entryCodec Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V ARG 1 registryAccess - ARG 2 registryRef - METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 1 context - ARG 2 builder - METHOD method_45601 getEntityAttribute (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 2 registry + ARG 3 entryCodec + METHOD method_58481 getLootTable (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 context - ARG 1 name - METHOD method_45602 getRegistryEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; - ARG 0 context - ARG 1 name - ARG 2 registryRef - METHOD method_45603 registryEntry (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;)Lnet/minecraft/class_7733; + ARG 1 argument + METHOD method_58482 lootTable (Lnet/minecraft/class_7157;)Lnet/minecraft/class_9433$class_9436; ARG 0 registryAccess - ARG 1 registryRef - METHOD method_45604 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 id - METHOD method_45605 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 element - ARG 1 type - METHOD method_45606 (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 element - ARG 1 type - ARG 2 expectedType - METHOD method_45607 getConfiguredFeature (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + METHOD method_58485 getLootFunction (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 context - ARG 1 name - METHOD method_45608 getStructure (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 1 argument + METHOD method_58486 lootFunction (Lnet/minecraft/class_7157;)Lnet/minecraft/class_9433$class_9434; + ARG 0 registryAccess + METHOD method_58488 getLootCondition (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 context - ARG 1 name - METHOD method_45609 getEntityType (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 1 argument + METHOD method_58489 lootCondition (Lnet/minecraft/class_7157;)Lnet/minecraft/class_9433$class_9435; + ARG 0 registryAccess + METHOD method_58490 getArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 context - ARG 1 name - METHOD method_45610 getSummonableEntityType (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; - ARG 0 context - ARG 1 name - METHOD method_45611 getStatusEffect (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; - ARG 0 context - ARG 1 name - METHOD method_45612 getEnchantment (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; - ARG 0 context - ARG 1 name - METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; - ARG 1 reader - CLASS class_7734 Serializer - CLASS class_7735 Properties - FIELD field_40408 registryRef Lnet/minecraft/class_5321; - METHOD (Lnet/minecraft/class_7733$class_7734;Lnet/minecraft/class_5321;)V - ARG 2 registryRef + ARG 1 argument + CLASS class_9434 LootFunctionArgumentType + METHOD (Lnet/minecraft/class_7157;)V + ARG 1 registryAccess + CLASS class_9435 LootConditionArgumentType + METHOD (Lnet/minecraft/class_7157;)V + ARG 1 registryAccess + CLASS class_9436 LootTableArgumentType + METHOD (Lnet/minecraft/class_7157;)V + ARG 1 registryAccess diff --git a/mappings/net/minecraft/command/argument/RegistryEntryReferenceArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryEntryReferenceArgumentType.mapping new file mode 100644 index 0000000000..940b28af46 --- /dev/null +++ b/mappings/net/minecraft/command/argument/RegistryEntryReferenceArgumentType.mapping @@ -0,0 +1,57 @@ +CLASS net/minecraft/class_7733 net/minecraft/command/argument/RegistryEntryReferenceArgumentType + FIELD field_40401 NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD field_40402 INVALID_TYPE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType; + FIELD field_40403 EXAMPLES Ljava/util/Collection; + FIELD field_40404 NOT_SUMMONABLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_40405 registryRef Lnet/minecraft/class_5321; + FIELD field_40406 registryWrapper Lnet/minecraft/class_7225; + METHOD (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;)V + ARG 1 registryAccess + ARG 2 registryRef + METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 builder + METHOD method_45601 getEntityAttribute (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD method_45602 getRegistryEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + ARG 2 registryRef + METHOD method_45603 registryEntry (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;)Lnet/minecraft/class_7733; + ARG 0 registryAccess + ARG 1 registryRef + METHOD method_45604 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 id + METHOD method_45605 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 element + ARG 1 type + METHOD method_45606 (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 element + ARG 1 type + ARG 2 expectedType + METHOD method_45607 getConfiguredFeature (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD method_45608 getStructure (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD method_45609 getEntityType (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD method_45610 getSummonableEntityType (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD method_45611 getStatusEffect (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD method_45612 getEnchantment (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; + ARG 0 context + ARG 1 name + METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; + ARG 1 reader + CLASS class_7734 Serializer + CLASS class_7735 Properties + FIELD field_40408 registryRef Lnet/minecraft/class_5321; + METHOD (Lnet/minecraft/class_7733$class_7734;Lnet/minecraft/class_5321;)V + ARG 2 registryRef diff --git a/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping b/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping index b71f162625..e01b3fefc7 100644 --- a/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping +++ b/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping @@ -21,6 +21,8 @@ CLASS net/minecraft/class_9285 net/minecraft/component/type/AttributeModifiersCo ARG 0 format METHOD method_58113 (Ljava/util/List;)Lnet/minecraft/class_9285; ARG 0 attributeModifiers + METHOD method_58423 withShowInTooltip (Z)Lnet/minecraft/class_9285; + ARG 1 showInTooltip CLASS class_9286 Builder FIELD field_49331 entries Lcom/google/common/collect/ImmutableList$Builder; METHOD method_57486 build ()Lnet/minecraft/class_9285; diff --git a/mappings/net/minecraft/component/type/DyedColorComponent.mapping b/mappings/net/minecraft/component/type/DyedColorComponent.mapping index e3d607ccad..fe590a9a32 100644 --- a/mappings/net/minecraft/component/type/DyedColorComponent.mapping +++ b/mappings/net/minecraft/component/type/DyedColorComponent.mapping @@ -13,3 +13,5 @@ CLASS net/minecraft/class_9282 net/minecraft/component/type/DyedColorComponent ARG 1 dyes METHOD method_58112 (Ljava/lang/Integer;)Lnet/minecraft/class_9282; ARG 0 rgb + METHOD method_58422 withShowInTooltip (Z)Lnet/minecraft/class_9282; + ARG 1 showInTooltip diff --git a/mappings/net/minecraft/item/FoodComponent.mapping b/mappings/net/minecraft/component/type/FoodComponent.mapping similarity index 69% rename from mappings/net/minecraft/item/FoodComponent.mapping rename to mappings/net/minecraft/component/type/FoodComponent.mapping index e7181a1ff6..84d8167710 100644 --- a/mappings/net/minecraft/item/FoodComponent.mapping +++ b/mappings/net/minecraft/component/type/FoodComponent.mapping @@ -1,9 +1,5 @@ -CLASS net/minecraft/class_4174 net/minecraft/item/FoodComponent +CLASS net/minecraft/class_4174 net/minecraft/component/type/FoodComponent COMMENT Represents the components that make up the properties of a food item. - FIELD comp_2491 hunger I - FIELD comp_2492 saturationModifier F - FIELD comp_2493 alwaysEdible Z - FIELD comp_2495 statusEffects Ljava/util/List; FIELD field_49992 CODEC Lcom/mojang/serialization/Codec; FIELD field_49993 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_49994 DEFAULT_EAT_SECONDS F @@ -11,21 +7,6 @@ CLASS net/minecraft/class_4174 net/minecraft/item/FoodComponent ARG 1 hunger ARG 2 saturationModifier ARG 3 meat - METHOD comp_2491 hunger ()I - COMMENT Gets the amount of hunger a food item will fill. - COMMENT - COMMENT

One hunger is equivalent to half of a hunger bar icon. - METHOD comp_2492 saturationModifier ()F - COMMENT Gets the saturation modifier of a food item. - COMMENT - COMMENT

This value is typically used to determine how long a player can sustain the current hunger value before the hunger is used. - METHOD comp_2493 alwaysEdible ()Z - COMMENT Checks if a food item can be eaten when the current hunger bar is full. - METHOD comp_2495 statusEffects ()Ljava/util/List; - COMMENT Gets a list of all status effect instances that may be applied when a food item is consumed. - COMMENT - COMMENT

The first value in the pair is the status effect instance to be applied. - COMMENT

The second value is the chance the status effect gets applied, on a scale between {@code 0.0F} and {@code 1.0F}. METHOD method_58399 getEatTicks ()I METHOD method_58400 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/item/FoodComponents.mapping b/mappings/net/minecraft/component/type/FoodComponents.mapping similarity index 97% rename from mappings/net/minecraft/item/FoodComponents.mapping rename to mappings/net/minecraft/component/type/FoodComponents.mapping index 705bcc203e..fcf49214f6 100644 --- a/mappings/net/minecraft/item/FoodComponents.mapping +++ b/mappings/net/minecraft/component/type/FoodComponents.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4176 net/minecraft/item/FoodComponents +CLASS net/minecraft/class_4176 net/minecraft/component/type/FoodComponents COMMENT Contains all the default food components used in vanilla food items. FIELD field_18626 PORKCHOP Lnet/minecraft/class_4174; FIELD field_18627 POTATO Lnet/minecraft/class_4174; diff --git a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping index b6a81c27f4..b321cf004a 100644 --- a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping +++ b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_9304 net/minecraft/component/type/ItemEnchantmentsComp FIELD field_49390 showInTooltip Z FIELD field_49753 INLINE_CODEC Lcom/mojang/serialization/Codec; FIELD field_49754 BASE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_50014 MAX_ENCHANTMENT_LEVEL I METHOD (Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap;Z)V ARG 1 enchantments ARG 2 showInTooltip @@ -30,6 +31,8 @@ CLASS net/minecraft/class_9304 net/minecraft/component/type/ItemEnchantmentsComp ARG 0 component METHOD method_58118 (Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap;)Lnet/minecraft/class_9304; ARG 0 map + METHOD method_58449 withShowInTooltip (Z)Lnet/minecraft/class_9304; + ARG 1 showInTooltip CLASS class_9305 Builder FIELD field_49391 enchantments Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap; FIELD field_49392 showInTooltip Z diff --git a/mappings/net/minecraft/component/type/ToolComponent.mapping b/mappings/net/minecraft/component/type/ToolComponent.mapping index 259ccf3025..a0cf6d1576 100644 --- a/mappings/net/minecraft/component/type/ToolComponent.mapping +++ b/mappings/net/minecraft/component/type/ToolComponent.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_9424 net/minecraft/component/type/ToolComponent ARG 0 instance METHOD method_58425 getSpeed (Lnet/minecraft/class_2680;)F ARG 1 state - METHOD method_58426 correctsForDrops (Lnet/minecraft/class_2680;)Z + METHOD method_58426 isCorrectForDrops (Lnet/minecraft/class_2680;)Z ARG 1 state CLASS class_9425 Rule FIELD field_50011 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/component/type/UnbreakableComponent.mapping b/mappings/net/minecraft/component/type/UnbreakableComponent.mapping index 18027a21d4..809127a607 100644 --- a/mappings/net/minecraft/component/type/UnbreakableComponent.mapping +++ b/mappings/net/minecraft/component/type/UnbreakableComponent.mapping @@ -4,3 +4,5 @@ CLASS net/minecraft/class_9300 net/minecraft/component/type/UnbreakableComponent FIELD field_49368 TOOLTIP_TEXT Lnet/minecraft/class_2561; METHOD method_57515 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_58435 withShowInTooltip (Z)Lnet/minecraft/class_9300; + ARG 1 showInTooltip diff --git a/mappings/net/minecraft/data/server/tag/onetwentyone/OneTwentyOneStructureTagProvider.mapping b/mappings/net/minecraft/data/server/tag/onetwentyone/OneTwentyOneStructureTagProvider.mapping new file mode 100644 index 0000000000..e4bd0aea0e --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/onetwentyone/OneTwentyOneStructureTagProvider.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9447 net/minecraft/data/server/tag/onetwentyone/OneTwentyOneStructureTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + ARG 3 structureTagLookupFuture diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index b2f964bce9..f09b46dc47 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment FIELD field_45769 registryEntry Lnet/minecraft/class_6880$class_6883; + FIELD field_50013 properties Lnet/minecraft/class_1887$class_9427; FIELD field_9084 translationKey Ljava/lang/String; + METHOD (Lnet/minecraft/class_1887$class_9427;)V + ARG 1 properties METHOD method_20742 getMaxPower (I)I ARG 1 level METHOD method_25949 isAvailableForEnchantedBookOffer ()Z @@ -11,6 +14,32 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment COMMENT loots with random enchant function} METHOD method_53216 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; METHOD method_56109 getApplicableItems ()Lnet/minecraft/class_6862; + METHOD method_58440 constantCost (I)Lnet/minecraft/class_1887$class_9426; + ARG 0 base + METHOD method_58441 leveledCost (II)Lnet/minecraft/class_1887$class_9426; + ARG 0 base + ARG 1 perLevel + METHOD method_58442 properties (Lnet/minecraft/class_6862;IILnet/minecraft/class_1887$class_9426;Lnet/minecraft/class_1887$class_9426;I[Lnet/minecraft/class_1304;)Lnet/minecraft/class_1887$class_9427; + ARG 0 supportedItems + ARG 1 weight + ARG 2 maxLevel + ARG 3 minCost + ARG 4 maxCost + ARG 5 anvilCost + ARG 6 slots + METHOD method_58443 properties (Lnet/minecraft/class_6862;Lnet/minecraft/class_6862;IILnet/minecraft/class_1887$class_9426;Lnet/minecraft/class_1887$class_9426;I[Lnet/minecraft/class_1304;)Lnet/minecraft/class_1887$class_9427; + ARG 0 supportedItems + ARG 1 primaryItems + ARG 2 weight + ARG 3 maxLevel + ARG 4 minCost + ARG 5 maxCost + ARG 6 anvilCost + ARG 7 slots + METHOD method_58444 isPrimaryItem (Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_58445 getWeight ()I + METHOD method_58446 getAnvilCost ()I METHOD method_8178 onUserDamaged (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;I)V ARG 1 user ARG 2 attacker @@ -50,3 +79,7 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment METHOD method_8196 getAttackDamage (ILnet/minecraft/class_1299;)F ARG 1 level ARG 2 entityType + CLASS class_9426 Cost + METHOD method_58447 forLevel (I)I + ARG 1 level + CLASS class_9427 Properties diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 066ce6224e..8bfa96154c 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -34,6 +34,8 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 0 stack METHOD method_58117 hasEnchantments (Lnet/minecraft/class_1799;)Z ARG 0 stack + METHOD method_58448 getSweepingMultiplier (I)F + ARG 0 level METHOD method_8198 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;Lnet/minecraft/class_1887;I)V ARG 2 enchantment ARG 3 level diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/TemptationsSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/TemptationsSensor.mapping index 82fe51f420..8685ba7e7e 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/TemptationsSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/TemptationsSensor.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_5760 net/minecraft/entity/ai/brain/sensor/TemptationsSensor FIELD field_28330 TEMPTER_PREDICATE Lnet/minecraft/class_4051; - FIELD field_28331 ingredient Ljava/util/function/Predicate; + FIELD field_28331 predicate Ljava/util/function/Predicate; FIELD field_30262 MAX_DISTANCE I + METHOD (Ljava/util/function/Predicate;)V + ARG 1 predicate METHOD method_33214 (Lnet/minecraft/class_1314;Lnet/minecraft/class_3222;)Z ARG 1 player METHOD method_33215 test (Lnet/minecraft/class_1657;)Z diff --git a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping index f9de173024..27900ba520 100644 --- a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping @@ -12,10 +12,11 @@ CLASS net/minecraft/class_1391 net/minecraft/entity/ai/goal/TemptGoal FIELD field_6619 lastPlayerPitch D FIELD field_6620 canBeScared Z FIELD field_6621 lastPlayerZ D - FIELD field_6622 food Ljava/util/function/Predicate; + FIELD field_6622 foodPredicate Ljava/util/function/Predicate; METHOD (Lnet/minecraft/class_1314;DLjava/util/function/Predicate;Z)V ARG 1 entity ARG 2 speed + ARG 4 foodPredicate ARG 5 canBeScared METHOD method_16081 canBeScared ()Z METHOD method_6312 isTemptedBy (Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index 17dbc08dd8..26ae4269bc 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -66,6 +66,8 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity ARG 2 reason ARG 3 pos ARG 4 random + METHOD method_57305 (Lnet/minecraft/class_2487;)V + ARG 1 nbt CLASS class_5763 AxolotlData FIELD field_28338 variants [Lnet/minecraft/class_5762$class_5767; METHOD ([Lnet/minecraft/class_5762$class_5767;)V diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index 7bb1ff9e0c..39a4dfaa3b 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -98,6 +98,8 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity METHOD method_35163 getGoalSelector ()Lnet/minecraft/class_1355; METHOD method_57301 setHivePos (Lnet/minecraft/class_2338;)V ARG 1 pos + METHOD method_58363 (Lnet/minecraft/class_1799;)Z + ARG 0 stack CLASS class_4467 NotAngryGoal METHOD method_21814 canBeeStart ()Z METHOD method_21815 canBeeContinue ()Z diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index e3c30b3b06..2e5fd220ea 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity FIELD field_30310 CROUCHING_SPEED D FIELD field_30311 NORMAL_SPEED D FIELD field_30312 SPRINTING_SPEED D + FIELD field_49979 DEFAULT_VARIANT Lnet/minecraft/class_5321; FIELD field_6808 fleeGoal Lnet/minecraft/class_1451$class_3698; FIELD field_6810 temptGoal Lnet/minecraft/class_1391; FIELD field_6811 CAT_VARIANT Lnet/minecraft/class_2940; @@ -42,6 +43,10 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity METHOD method_26881 createCatAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_58168 tryTame (Lnet/minecraft/class_1657;)V ARG 1 player + METHOD method_58364 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_58365 (Lnet/minecraft/class_1799;)Z + ARG 0 stack METHOD method_6175 onTamedChanged ()V CLASS class_3698 CatFleeGoal FIELD field_16293 cat Lnet/minecraft/class_1451; @@ -68,4 +73,5 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity METHOD (Lnet/minecraft/class_1451;DLjava/util/function/Predicate;Z)V ARG 1 cat ARG 2 speed + ARG 4 foodPredicate ARG 5 canBeScared diff --git a/mappings/net/minecraft/entity/passive/CowEntity.mapping b/mappings/net/minecraft/entity/passive/CowEntity.mapping index 78eb63f1a8..9c2736842f 100644 --- a/mappings/net/minecraft/entity/passive/CowEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CowEntity.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_1430 net/minecraft/entity/passive/CowEntity FIELD field_47771 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; METHOD method_26883 createCowAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_58367 (Lnet/minecraft/class_1799;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/entity/passive/FrogVariant.mapping b/mappings/net/minecraft/entity/passive/FrogVariant.mapping index d80ca82010..e9760b0a2c 100644 --- a/mappings/net/minecraft/entity/passive/FrogVariant.mapping +++ b/mappings/net/minecraft/entity/passive/FrogVariant.mapping @@ -1,2 +1,9 @@ CLASS net/minecraft/class_7106 net/minecraft/entity/passive/FrogVariant METHOD method_43091 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/String;)Lnet/minecraft/class_7106; + ARG 0 registry + ARG 1 key + ARG 2 id + METHOD method_58368 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_58369 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7106; + ARG 0 registry diff --git a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping index be12a3d1fc..7dbe5fb5c2 100644 --- a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping @@ -19,6 +19,8 @@ CLASS net/minecraft/class_3701 net/minecraft/entity/passive/OcelotEntity ARG 4 random METHOD method_22329 getAttackDamage ()F METHOD method_26887 createOcelotAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_58370 (Lnet/minecraft/class_1799;)Z + ARG 0 stack CLASS class_3702 FleeGoal FIELD field_16303 ocelot Lnet/minecraft/class_3701; METHOD (Lnet/minecraft/class_3701;Ljava/lang/Class;FDD)V diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 7d2507eb91..ffd0078d79 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -32,6 +32,8 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity METHOD method_18442 isIdle ()Z METHOD method_26888 createPandaAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_35173 isBrown ()Z + METHOD method_58371 (Lnet/minecraft/class_1799;)Z + ARG 0 stack METHOD method_6503 updateLieOnBackAnimation ()V METHOD method_6504 (Lnet/minecraft/class_1542;)Z ARG 0 item diff --git a/mappings/net/minecraft/entity/passive/PigEntity.mapping b/mappings/net/minecraft/entity/passive/PigEntity.mapping index 9e370cd33b..22c65834d0 100644 --- a/mappings/net/minecraft/entity/passive/PigEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PigEntity.mapping @@ -3,3 +3,7 @@ CLASS net/minecraft/class_1452 net/minecraft/entity/passive/PigEntity FIELD field_6815 BOOST_TIME Lnet/minecraft/class_2940; FIELD field_6816 SADDLED Lnet/minecraft/class_2940; METHOD method_26890 createPigAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_58372 (Lnet/minecraft/class_1799;)Z + ARG 0 stack + METHOD method_58373 (Lnet/minecraft/class_1799;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index b7fc204e00..135b7c4fe0 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity METHOD method_47854 getTypeFromPos (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1463$class_7990; ARG 0 world ARG 1 pos + METHOD method_58374 (Lnet/minecraft/class_1799;)Z + ARG 0 stack METHOD method_6605 getJumpProgress (F)F ARG 1 delta METHOD method_6606 setSpeed (D)V diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index 410426d17b..98492ef7cc 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -11,6 +11,8 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity ARG 0 firstColor ARG 1 secondColor METHOD method_26893 createSheepAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_58375 (Lnet/minecraft/class_1799;)Z + ARG 0 stack METHOD method_6628 getNeckAngle (F)F ARG 1 delta METHOD method_6629 isSheared ()Z diff --git a/mappings/net/minecraft/entity/passive/StriderEntity.mapping b/mappings/net/minecraft/entity/passive/StriderEntity.mapping index c97df61535..c2cbe7fc20 100644 --- a/mappings/net/minecraft/entity/passive/StriderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/StriderEntity.mapping @@ -25,6 +25,8 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity ARG 2 difficulty ARG 3 rider ARG 4 entityData + METHOD method_58395 (Lnet/minecraft/class_1799;)Z + ARG 0 stack CLASS class_4988 Navigation METHOD (Lnet/minecraft/class_4985;Lnet/minecraft/class_1937;)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping index 9db3dc9833..6740d547a0 100644 --- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity ARG 3 pos ARG 4 random METHOD method_26896 createTurtleAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_58376 (Lnet/minecraft/class_1799;)Z + ARG 0 stack METHOD method_6676 setDiggingSand (Z)V ARG 1 diggingSand METHOD method_6679 hasEgg ()Z diff --git a/mappings/net/minecraft/entity/passive/WolfVariant.mapping b/mappings/net/minecraft/entity/passive/WolfVariant.mapping index 4c12491e44..4002aef10e 100644 --- a/mappings/net/minecraft/entity/passive/WolfVariant.mapping +++ b/mappings/net/minecraft/entity/passive/WolfVariant.mapping @@ -1,4 +1,33 @@ CLASS net/minecraft/class_9346 net/minecraft/entity/passive/WolfVariant FIELD field_49724 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49980 ENTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_49981 wildId Lnet/minecraft/class_2960; + FIELD field_49982 tameId Lnet/minecraft/class_2960; + FIELD field_49983 angryId Lnet/minecraft/class_2960; + FIELD field_49984 wildTextureId Lnet/minecraft/class_2960; + FIELD field_49985 tameTextureId Lnet/minecraft/class_2960; + FIELD field_49986 angryTextureId Lnet/minecraft/class_2960; + FIELD field_49987 biomes Lnet/minecraft/class_6885; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_6885;)V + ARG 1 wildId + ARG 2 tameId + ARG 3 angryId + ARG 4 biomes + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_58064 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_58377 getWildTextureId ()Lnet/minecraft/class_2960; + METHOD method_58378 getTextureId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + ARG 0 id + METHOD method_58379 (Lnet/minecraft/class_9346;)Lnet/minecraft/class_2960; + ARG 0 wolfVariant + METHOD method_58380 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 oldPath + METHOD method_58381 getTameTextureId ()Lnet/minecraft/class_2960; + METHOD method_58382 (Lnet/minecraft/class_9346;)Lnet/minecraft/class_2960; + ARG 0 wolfVariant + METHOD method_58383 getAngryTextureId ()Lnet/minecraft/class_2960; + METHOD method_58384 (Lnet/minecraft/class_9346;)Lnet/minecraft/class_2960; + ARG 0 wolfVariant + METHOD method_58385 getBiomes ()Lnet/minecraft/class_6885; diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 1d359c9625..ebe3a308f2 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_41765 damageTiltYaw F FIELD field_46174 DEFAULT_MAIN_ARM Lnet/minecraft/class_1306; FIELD field_47821 VEHICLE_ATTACHMENT_POS Lnet/minecraft/class_243; + FIELD field_49989 currentExplosionImpactPos Lnet/minecraft/class_243; + FIELD field_49991 ignoreFallDamageFromCurrentExplosion Z FIELD field_7483 strideDistance F FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796; FIELD field_7486 enderChestInventory Lnet/minecraft/class_1730; @@ -161,6 +163,8 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 2 additionalRange COMMENT the player's additional interaction range added to {@linkplain COMMENT #getEntityInteractionRange the default range} + METHOD method_58397 (Lnet/minecraft/class_243;)V + ARG 1 currentExplosionImpactPos METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7255 addExperience (I)V diff --git a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping index 78c9516e66..292e73770c 100644 --- a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping +++ b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping @@ -24,6 +24,10 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker METHOD (Ljava/util/List;Z)V ARG 1 predicates ARG 2 showInTooltip + METHOD (Ljava/util/List;ZLjava/util/List;)V + ARG 1 predicates + ARG 2 showInTooltip + ARG 3 tooltipText METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_38070 check (Lnet/minecraft/class_2694;)Z @@ -49,3 +53,5 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker ARG 0 checker METHOD method_57334 (Lnet/minecraft/class_6538;)Lcom/mojang/serialization/DataResult; ARG 0 checker + METHOD method_58402 withShowInTooltip (Z)Lnet/minecraft/class_6538; + ARG 1 showInTooltip diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 91551f0f4f..f380a38b7e 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item FIELD field_36401 registryEntry Lnet/minecraft/class_6880$class_6883; FIELD field_40209 requiredFeatures Lnet/minecraft/class_7699; FIELD field_49263 components Lnet/minecraft/class_9323; + FIELD field_49998 MAX_MAX_COUNT I FIELD field_8001 ATTACK_SPEED_MODIFIER_ID Ljava/util/UUID; FIELD field_8003 BLOCK_ITEMS Ljava/util/Map; FIELD field_8006 ATTACK_DAMAGE_MODIFIER_ID Ljava/util/UUID; @@ -131,10 +132,13 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 3 player METHOD method_57336 getBreakSound ()Lnet/minecraft/class_3414; METHOD method_57347 getComponents ()Lnet/minecraft/class_9323; + METHOD method_58403 getBonusAttackDamage (Lnet/minecraft/class_1657;F)F + ARG 1 player + ARG 2 baseAttackDamage METHOD method_58404 getMiningSpeed (Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;)F ARG 1 stack ARG 2 state - METHOD method_58405 correctsForDrops (Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;)Z + METHOD method_58405 isCorrectForDrops (Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;)Z ARG 1 stack ARG 2 state METHOD method_7836 use (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271; diff --git a/mappings/net/minecraft/item/MaceItem.mapping b/mappings/net/minecraft/item/MaceItem.mapping index 41d802f6de..3393c4f33b 100644 --- a/mappings/net/minecraft/item/MaceItem.mapping +++ b/mappings/net/minecraft/item/MaceItem.mapping @@ -3,3 +3,14 @@ CLASS net/minecraft/class_9362 net/minecraft/item/MaceItem FIELD field_49824 ATTACK_DAMAGE_MODIFIER_VALUE I FIELD field_49825 ATTACK_SPEED_MODIFIER_VALUE F FIELD field_49826 ATTRIBUTE_MODIFIERS Lcom/google/common/collect/ImmutableMultimap; + FIELD field_49999 KNOCKBACK_RANGE F + FIELD field_50000 KNOCKBACK_POWER F + METHOD method_58409 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V + ARG 2 entity + METHOD method_58410 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Z + ARG 2 entity + METHOD method_58411 knockbackNearbyEntities (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;)V + ARG 1 world + ARG 2 player + ARG 3 target + METHOD method_58412 createToolComponent ()Lnet/minecraft/class_9424; diff --git a/mappings/net/minecraft/item/map/MapBannerMarker.mapping b/mappings/net/minecraft/item/map/MapBannerMarker.mapping index 97720f2c7b..bf925fcea5 100644 --- a/mappings/net/minecraft/item/map/MapBannerMarker.mapping +++ b/mappings/net/minecraft/item/map/MapBannerMarker.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker METHOD method_56812 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_71 getKey ()Ljava/lang/String; - METHOD method_72 getIconType ()Lnet/minecraft/class_6880; + METHOD method_72 getDecorationType ()Lnet/minecraft/class_6880; METHOD method_73 fromWorldBlock (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_17; ARG 0 blockView ARG 1 blockPos diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapDecoration.mapping similarity index 73% rename from mappings/net/minecraft/item/map/MapIcon.mapping rename to mappings/net/minecraft/item/map/MapDecoration.mapping index 18648c87a5..faeaae9059 100644 --- a/mappings/net/minecraft/item/map/MapIcon.mapping +++ b/mappings/net/minecraft/item/map/MapDecoration.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon +CLASS net/minecraft/class_20 net/minecraft/item/map/MapDecoration FIELD comp_1844 z B FIELD comp_1845 rotation B FIELD field_48920 CODEC Lnet/minecraft/class_9139; @@ -10,4 +10,5 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon METHOD comp_1845 rotation ()B METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD method_58451 getAssetId ()Lnet/minecraft/class_2960; METHOD method_94 isAlwaysRendered ()Z diff --git a/mappings/net/minecraft/item/map/MapDecorationType.mapping b/mappings/net/minecraft/item/map/MapDecorationType.mapping new file mode 100644 index 0000000000..65a820abae --- /dev/null +++ b/mappings/net/minecraft/item/map/MapDecorationType.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9428 net/minecraft/item/map/MapDecorationType + FIELD field_50016 NO_MAP_COLOR I + FIELD field_50017 CODEC Lcom/mojang/serialization/Codec; + FIELD field_50018 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_58452 hasMapColor ()Z diff --git a/mappings/net/minecraft/item/map/MapDecorationTypes.mapping b/mappings/net/minecraft/item/map/MapDecorationTypes.mapping new file mode 100644 index 0000000000..e826149ceb --- /dev/null +++ b/mappings/net/minecraft/item/map/MapDecorationTypes.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_21 net/minecraft/item/map/MapDecorationTypes + FIELD field_50020 TRIAL_CHAMBERS_MAP_COLOR I + METHOD method_58453 register (Ljava/lang/String;Ljava/lang/String;ZIZZ)Lnet/minecraft/class_6880; + ARG 0 id + ARG 1 assetId + ARG 2 showOnItemFrame + ARG 3 mapColor + ARG 4 trackCount + ARG 5 explorationMapElement + METHOD method_58454 register (Ljava/lang/String;Ljava/lang/String;ZZ)Lnet/minecraft/class_6880; + ARG 0 id + ARG 1 assetId + ARG 2 showOnItemFrame + ARG 3 trackCount + METHOD method_58455 getDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + ARG 0 registry diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index f2c1c7db7e..075cdd4904 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState FIELD field_112 updateTrackers Ljava/util/List; FIELD field_113 unlimitedTracking Z - FIELD field_114 showIcons Z + FIELD field_114 showDecorations Z FIELD field_115 centerZ I COMMENT The scaled center coordinate of the map state on the Z axis. COMMENT

@@ -10,7 +10,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState COMMENT The scaled center coordinate of the map state on the X axis. COMMENT

COMMENT Always {@code 0} for the client. - FIELD field_117 icons Ljava/util/Map; + FIELD field_117 decorations Ljava/util/Map; FIELD field_118 dimension Lnet/minecraft/class_5321; FIELD field_119 scale B FIELD field_120 updateTrackersByPlayer Ljava/util/Map; @@ -25,13 +25,13 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState FIELD field_31831 MAX_SCALE I FIELD field_31832 SIZE I FIELD field_31833 SIZE_HALF I - FIELD field_33991 MAX_ICONS I - FIELD field_33992 iconCount I + FIELD field_33991 MAX_DECORATIONS I + FIELD field_33992 decorationCount I METHOD (IIBZZZLnet/minecraft/class_5321;)V ARG 1 centerX ARG 2 centerZ ARG 3 scale - ARG 4 showIcons + ARG 4 showDecorations ARG 5 unlimitedTracking ARG 6 locked ARG 7 dimension @@ -49,7 +49,8 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_104 removeFrame (Lnet/minecraft/class_2338;I)V ARG 1 pos ARG 2 id - METHOD method_107 addIcon (Lnet/minecraft/class_6880;Lnet/minecraft/class_1936;Ljava/lang/String;DDDLnet/minecraft/class_2561;)V + METHOD method_107 addDecoration (Lnet/minecraft/class_6880;Lnet/minecraft/class_1936;Ljava/lang/String;DDDLnet/minecraft/class_2561;)V + ARG 1 type ARG 2 world ARG 3 key ARG 4 x @@ -67,6 +68,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 0 stack ARG 1 pos ARG 2 id + ARG 3 decorationType METHOD method_32361 copy ()Lnet/minecraft/class_22; METHOD method_32362 of (BZLnet/minecraft/class_5321;)Lnet/minecraft/class_22; COMMENT Creates a new map state instance for the client. @@ -82,7 +84,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 2 centerZ COMMENT the absolute center Z-coordinate ARG 4 scale - ARG 5 showIcons + ARG 5 showDecorations ARG 6 unlimitedTracking ARG 7 dimension METHOD method_32364 zoomOut ()Lnet/minecraft/class_22; @@ -90,7 +92,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState COMMENT

COMMENT The scale of the new map state is {@code currentScale + zoomOutScale} and clamped between {@code 0} and {@code 4}. COMMENT

- COMMENT The colors are not copied, neither are the icons. + COMMENT The colors are not copied, neither are the decorations. METHOD method_32365 putColor (IIB)Z COMMENT Sets the color at the specified coordinates if the current color is different. COMMENT @@ -98,10 +100,10 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 1 x ARG 2 z ARG 3 color - METHOD method_32368 removeIcon (Ljava/lang/String;)V + METHOD method_32368 removeDecoration (Ljava/lang/String;)V ARG 1 id - METHOD method_32369 replaceIcons (Ljava/util/List;)V - ARG 1 icons + METHOD method_32369 replaceDecorations (Ljava/util/List;)V + ARG 1 decorations METHOD method_32370 setColor (IIB)V ARG 1 x ARG 2 z @@ -109,17 +111,19 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_32371 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_22; ARG 0 nbt ARG 1 registryLookup - METHOD method_32372 hasMonumentIcon ()Z - METHOD method_32373 getIcons ()Ljava/lang/Iterable; - METHOD method_32374 markIconsDirty ()V + METHOD method_32372 hasExplorationMapDecoration ()Z + METHOD method_32373 getDecorations ()Ljava/lang/Iterable; + METHOD method_32374 markDecorationsDirty ()V METHOD method_35503 getBanners ()Ljava/util/Collection; - METHOD method_37343 iconCountNotLessThan (I)Z - ARG 1 iconCount + METHOD method_37343 decorationCountNotLessThan (I)Z + ARG 1 decorationCount METHOD method_52611 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; METHOD method_55784 getEqualPredicate (Lnet/minecraft/class_1799;)Ljava/util/function/Predicate; ARG 0 stack METHOD method_55785 (Lnet/minecraft/class_1799;Lnet/minecraft/class_9209;Lnet/minecraft/class_1799;)Z ARG 2 other + METHOD method_56815 (Ljava/lang/String;)V + ARG 0 banner METHOD method_57626 (Lnet/minecraft/class_1657;Ljava/lang/String;Lnet/minecraft/class_9292$class_9293;)V ARG 2 id ARG 3 decoration @@ -133,7 +137,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState FIELD field_128 startZ I FIELD field_129 startX I FIELD field_130 dirty Z - FIELD field_27891 iconsDirty Z + FIELD field_27891 decorationsDirty Z METHOD (Lnet/minecraft/class_22;Lnet/minecraft/class_1657;)V ARG 2 player METHOD method_111 markDirty (II)V @@ -142,7 +146,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_112 getPacket (Lnet/minecraft/class_9209;)Lnet/minecraft/class_2596; ARG 1 mapId METHOD method_32375 getMapUpdateData ()Lnet/minecraft/class_22$class_5637; - METHOD method_32379 markIconsDirty ()V + METHOD method_32379 markDecorationsDirty ()V CLASS class_5637 UpdateData FIELD comp_2316 startX I FIELD comp_2317 startZ I diff --git a/mappings/net/minecraft/item/map/Type.mapping b/mappings/net/minecraft/item/map/Type.mapping deleted file mode 100644 index bfc7160ea0..0000000000 --- a/mappings/net/minecraft/item/map/Type.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_21 net/minecraft/item/map/Type diff --git a/mappings/net/minecraft/item/trim/ArmorTrim.mapping b/mappings/net/minecraft/item/trim/ArmorTrim.mapping index e595240e17..2b9458dbba 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrim.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrim.mapping @@ -14,6 +14,12 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim ARG 1 material ARG 2 pattern ARG 3 showInTooltip + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;ZLjava/util/function/Function;Ljava/util/function/Function;)V + ARG 1 material + ARG 2 pattern + ARG 3 showInTooltip + ARG 4 leggingsModelIdGetter + ARG 5 genericModelIdGetter METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_48424 getPattern ()Lnet/minecraft/class_6880; @@ -26,6 +32,7 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim METHOD method_48436 getGenericModelId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; ARG 1 armorMaterial METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Ljava/lang/String; + ARG 0 material ARG 1 armorMaterial METHOD method_57406 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance @@ -41,3 +48,5 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim ARG 1 materialName METHOD method_57413 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; ARG 2 materialEntry + METHOD method_58421 withShowInTooltip (Z)Lnet/minecraft/class_8053; + ARG 1 showInTooltip diff --git a/mappings/net/minecraft/loot/LootDataType.mapping b/mappings/net/minecraft/loot/LootDataType.mapping index 9df618a01e..a824aad42d 100644 --- a/mappings/net/minecraft/loot/LootDataType.mapping +++ b/mappings/net/minecraft/loot/LootDataType.mapping @@ -1,27 +1,28 @@ CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType - FIELD comp_2520 codec Lcom/mojang/serialization/Codec; - FIELD comp_2521 id Ljava/lang/String; FIELD field_44499 LOGGER Lorg/slf4j/Logger; - METHOD comp_2520 codec ()Lcom/mojang/serialization/Codec; - METHOD comp_2521 id ()Ljava/lang/String; METHOD method_51204 parse (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/util/Optional; ARG 1 id ARG 2 ops ARG 3 json METHOD method_51207 (Lnet/minecraft/class_58;Lnet/minecraft/class_5321;Lnet/minecraft/class_46;)V ARG 0 reporter + ARG 1 key ARG 2 value METHOD method_51208 (Lnet/minecraft/class_58;Lnet/minecraft/class_5321;Lnet/minecraft/class_52;)V ARG 0 reporter + ARG 1 key ARG 2 value METHOD method_51209 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_5321;Ljava/lang/Object;)V ARG 1 reporter + ARG 2 key ARG 3 value METHOD method_51215 stream ()Ljava/util/stream/Stream; + METHOD method_51216 simpleValidator ()Lnet/minecraft/class_8490$class_8491; METHOD method_51217 tableValidator ()Lnet/minecraft/class_8490$class_8491; METHOD method_53267 (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DataResult$PartialResult;)V ARG 2 result CLASS class_8491 Validator METHOD run (Lnet/minecraft/class_58;Lnet/minecraft/class_5321;Ljava/lang/Object;)V ARG 1 reporter + ARG 2 key ARG 3 value diff --git a/mappings/net/minecraft/loot/LootTable.mapping b/mappings/net/minecraft/loot/LootTable.mapping index 53ce6695c8..dfc8b722ae 100644 --- a/mappings/net/minecraft/loot/LootTable.mapping +++ b/mappings/net/minecraft/loot/LootTable.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable FIELD field_44892 randomSequenceId Ljava/util/Optional; - FIELD field_45796 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45796 ENTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_49428 DEFAULT_SEED J + FIELD field_50021 CODEC Lcom/mojang/serialization/Codec; FIELD field_942 type Lnet/minecraft/class_176; FIELD field_943 pools Ljava/util/List; FIELD field_944 functions Ljava/util/List; diff --git a/mappings/net/minecraft/loot/LootTableReporter.mapping b/mappings/net/minecraft/loot/LootTableReporter.mapping index c82cc50a28..dd562ad7be 100644 --- a/mappings/net/minecraft/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/loot/LootTableReporter.mapping @@ -6,9 +6,11 @@ CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter METHOD (Lnet/minecraft/class_8942;Lnet/minecraft/class_176;Lnet/minecraft/class_7871$class_7872;)V ARG 1 errorReporter ARG 2 contextType + ARG 3 dataLookup METHOD (Lnet/minecraft/class_8942;Lnet/minecraft/class_176;Lnet/minecraft/class_7871$class_7872;Ljava/util/Set;)V ARG 1 errorReporter ARG 2 contextType + ARG 3 dataLookup ARG 4 referenceStack METHOD method_22567 validateContext (Lnet/minecraft/class_46;)V ARG 1 contextAware @@ -19,6 +21,8 @@ CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter METHOD method_364 makeChild (Ljava/lang/String;)Lnet/minecraft/class_58; ARG 1 name METHOD method_51218 isInStack (Lnet/minecraft/class_5321;)Z + ARG 1 key METHOD method_51219 makeChild (Ljava/lang/String;Lnet/minecraft/class_5321;)Lnet/minecraft/class_58; ARG 1 name + ARG 2 key METHOD method_51220 getDataLookup ()Lnet/minecraft/class_7871$class_7872; diff --git a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping index 371be3bf68..9c3c6cee2f 100644 --- a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_217 net/minecraft/loot/condition/LootConditionTypes - FIELD field_45869 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45869 ENTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_45870 BASE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_50031 CODEC Lcom/mojang/serialization/Codec; METHOD method_29327 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5342; ARG 0 id ARG 1 codec diff --git a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping index 692bd091cc..9e65c91210 100644 --- a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_131 net/minecraft/loot/function/LootFunctionTypes FIELD field_1102 NOOP Ljava/util/function/BiFunction; FIELD field_45831 BASE_CODEC Lcom/mojang/serialization/Codec; - FIELD field_45832 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45832 ENTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_50023 CODEC Lcom/mojang/serialization/Codec; METHOD method_29323 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5339; ARG 0 id ARG 1 codec diff --git a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping index 9331f2b960..268787a2d4 100644 --- a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping @@ -1,16 +1,19 @@ CLASS net/minecraft/class_144 net/minecraft/loot/function/SetLootTableLootFunction - FIELD field_1116 id Lnet/minecraft/class_5321; + FIELD field_1116 lootTable Lnet/minecraft/class_5321; FIELD field_1117 seed J FIELD field_34773 type Lnet/minecraft/class_6880; FIELD field_45842 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;Lnet/minecraft/class_5321;JLnet/minecraft/class_6880;)V ARG 1 conditions + ARG 2 lootTable ARG 3 seed ARG 5 blockEntityType METHOD method_35534 builder (Lnet/minecraft/class_2591;Lnet/minecraft/class_5321;)Lnet/minecraft/class_120$class_121; ARG 0 type + ARG 1 lootTable METHOD method_35535 builder (Lnet/minecraft/class_2591;Lnet/minecraft/class_5321;J)Lnet/minecraft/class_120$class_121; ARG 0 type + ARG 1 lootTable ARG 2 seed METHOD method_35536 (Lnet/minecraft/class_5321;JLnet/minecraft/class_2591;Ljava/util/List;)Lnet/minecraft/class_117; ARG 4 conditions diff --git a/mappings/net/minecraft/loot/function/ToggleTooltipsLootFunction.mapping b/mappings/net/minecraft/loot/function/ToggleTooltipsLootFunction.mapping new file mode 100644 index 0000000000..a058073722 --- /dev/null +++ b/mappings/net/minecraft/loot/function/ToggleTooltipsLootFunction.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_9429 net/minecraft/loot/function/ToggleTooltipsLootFunction + FIELD field_50027 CODEC Lcom/mojang/serialization/Codec; + FIELD field_50028 TOGGLES Ljava/util/Map; + FIELD field_50029 TOGGLE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_50030 toggles Ljava/util/Map; + METHOD (Ljava/util/List;Ljava/util/Map;)V + ARG 1 conditions + ARG 2 toggles + METHOD method_58463 (Lnet/minecraft/class_1799;Lnet/minecraft/class_9429$class_9430;Ljava/lang/Boolean;)V + ARG 1 componentType + ARG 2 showInTooltip + METHOD method_58465 (Lnet/minecraft/class_9429;)Ljava/util/Map; + ARG 0 lootFunction + METHOD method_58466 (Lnet/minecraft/class_9331;)Lcom/mojang/serialization/DataResult; + ARG 0 componentType + METHOD method_58467 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_9430 Toggle + METHOD method_58469 apply (Lnet/minecraft/class_1799;Z)V + ARG 1 stack + ARG 2 showInTooltip + CLASS class_9431 TooltipSetter + METHOD withTooltip (Ljava/lang/Object;Z)Ljava/lang/Object; + ARG 1 componentType + ARG 2 showInTooltip diff --git a/mappings/net/minecraft/loot/number/provider/StorageLootNumberProvider.mapping b/mappings/net/minecraft/loot/number/provider/StorageLootNumberProvider.mapping new file mode 100644 index 0000000000..c22b444ff0 --- /dev/null +++ b/mappings/net/minecraft/loot/number/provider/StorageLootNumberProvider.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_9432 net/minecraft/loot/number/provider/StorageLootNumberProvider + FIELD field_50033 CODEC Lcom/mojang/serialization/Codec; + METHOD method_58470 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_58471 getNumber (Lnet/minecraft/class_47;)Ljava/util/Optional; + ARG 1 context diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 634aaae5e7..34bdd45865 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -76,6 +76,7 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_49658 DATA_COMPONENT_TYPE Lnet/minecraft/class_2378; FIELD field_49911 ENTITY_SUB_PREDICATE_TYPE Lnet/minecraft/class_2378; FIELD field_49912 ITEM_SUB_PREDICATE_TYPE Lnet/minecraft/class_2378; + FIELD field_50078 MAP_DECORATION_TYPE Lnet/minecraft/class_2378; METHOD method_47450 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_47451 (Lnet/minecraft/class_2378;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/registry/RegistryEntryLookup.mapping b/mappings/net/minecraft/registry/RegistryEntryLookup.mapping index fa1a044162..0f7d18b8c9 100644 --- a/mappings/net/minecraft/registry/RegistryEntryLookup.mapping +++ b/mappings/net/minecraft/registry/RegistryEntryLookup.mapping @@ -12,3 +12,8 @@ CLASS net/minecraft/class_7871 net/minecraft/registry/RegistryEntryLookup ARG 1 registryRef METHOD method_46751 getOrThrow (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7871; ARG 1 registryRef + METHOD method_58561 getOptionalEntry (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 registryRef + ARG 2 key + METHOD method_58562 (Lnet/minecraft/class_5321;Lnet/minecraft/class_7871;)Ljava/util/Optional; + ARG 1 registryEntryLookup diff --git a/mappings/net/minecraft/registry/ReloadableRegistries.mapping b/mappings/net/minecraft/registry/ReloadableRegistries.mapping new file mode 100644 index 0000000000..517ecd1ae7 --- /dev/null +++ b/mappings/net/minecraft/registry/ReloadableRegistries.mapping @@ -0,0 +1,35 @@ +CLASS net/minecraft/class_9383 net/minecraft/registry/ReloadableRegistries + FIELD field_49916 LOGGER Lorg/slf4j/Logger; + FIELD field_49917 GSON Lcom/google/gson/Gson; + FIELD field_49918 DEFAULT_REGISTRY_ENTRY_INFO Lnet/minecraft/class_9248; + METHOD method_58280 (Lnet/minecraft/class_8490;Lnet/minecraft/class_58;Lnet/minecraft/class_6880$class_6883;)V + ARG 2 entry + METHOD method_58281 validateLootData (Lnet/minecraft/class_58;Lnet/minecraft/class_8490;Lnet/minecraft/class_5455;)V + ARG 0 reporter + ARG 1 lootDataType + ARG 2 registryManager + METHOD method_58282 (Lnet/minecraft/class_58;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_8490;)V + ARG 2 lootDataType + METHOD method_58283 (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 path + ARG 1 message + CLASS class_9384 + FIELD field_49919 registryManager Lnet/minecraft/class_5455; + METHOD (Lnet/minecraft/class_5455;)V + ARG 1 registryManager + CLASS class_9385 + FIELD field_49920 registryManager Lnet/minecraft/class_5455$class_6890; + METHOD (Lnet/minecraft/class_5455$class_6890;)V + ARG 1 registryManager + METHOD method_58289 getRegistryManager ()Lnet/minecraft/class_5455$class_6890; + METHOD method_58290 getIds (Lnet/minecraft/class_5321;)Ljava/util/Collection; + ARG 1 registryRef + METHOD method_58291 (Lnet/minecraft/class_5321;Lnet/minecraft/class_7225$class_7226;)Ljava/util/Optional; + ARG 1 registryEntryLookup + METHOD method_58292 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2960; + ARG 0 entry + METHOD method_58293 (Lnet/minecraft/class_2378;)Ljava/util/stream/Stream; + ARG 0 registry + METHOD method_58294 createRegistryLookup ()Lnet/minecraft/class_7871$class_7872; + METHOD method_58295 getLootTable (Lnet/minecraft/class_5321;)Lnet/minecraft/class_52; + ARG 1 key diff --git a/mappings/net/minecraft/server/command/ItemCommand.mapping b/mappings/net/minecraft/server/command/ItemCommand.mapping index 7f14a90f91..c286e30748 100644 --- a/mappings/net/minecraft/server/command/ItemCommand.mapping +++ b/mappings/net/minecraft/server/command/ItemCommand.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_5687 net/minecraft/server/command/ItemCommand ARG 2 sourceSlot ARG 3 pos ARG 4 slot + ARG 5 lootFunction METHOD method_32713 executeEntityCopyEntity (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILjava/util/Collection;I)I ARG 0 source ARG 1 sourceEntity @@ -43,8 +44,10 @@ CLASS net/minecraft/class_5687 net/minecraft/server/command/ItemCommand ARG 2 sourceSlot ARG 3 targets ARG 4 slot + ARG 5 lootFunction METHOD method_32715 getStackWithModifier (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 0 source + ARG 1 lootFunction ARG 2 stack METHOD method_32716 getStackInSlotFromInventoryAt (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;I)Lnet/minecraft/class_1799; ARG 0 source @@ -59,6 +62,7 @@ CLASS net/minecraft/class_5687 net/minecraft/server/command/ItemCommand ARG 0 source ARG 1 pos ARG 2 slot + ARG 3 lootFunction METHOD method_32719 executeBlockCopyBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILnet/minecraft/class_2338;I)I ARG 0 source ARG 1 sourcePos @@ -71,6 +75,7 @@ CLASS net/minecraft/class_5687 net/minecraft/server/command/ItemCommand ARG 2 sourceSlot ARG 3 pos ARG 4 slot + ARG 5 lootFunction METHOD method_32721 executeEntityCopyBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILjava/util/Collection;I)I ARG 0 source ARG 1 sourcePos @@ -83,6 +88,7 @@ CLASS net/minecraft/class_5687 net/minecraft/server/command/ItemCommand ARG 2 sourceSlot ARG 3 targets ARG 4 slot + ARG 5 lootFunction METHOD method_32723 getInventoryAtPos (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType;)Lnet/minecraft/class_1263; ARG 0 source ARG 1 pos @@ -96,6 +102,7 @@ CLASS net/minecraft/class_5687 net/minecraft/server/command/ItemCommand ARG 0 source ARG 1 targets ARG 2 slot + ARG 3 lootFunction METHOD method_32726 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 slot METHOD method_32727 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index e529de251c..ad6f632dbc 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -189,6 +189,10 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier COMMENT {@code prefix} and a dot, and suffixed with a dot and {@code suffix}} ARG 1 prefix ARG 2 suffix + METHOD method_58274 fromCommandInputNonEmpty (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2960; + ARG 0 reader + METHOD method_58275 readString (Lcom/mojang/brigadier/StringReader;)Ljava/lang/String; + ARG 0 reader CLASS class_2961 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json