From caba504ecb62628b90ba5bc04fa6dade75a20b8b Mon Sep 17 00:00:00 2001 From: Matias Koivikko Date: Wed, 20 Mar 2024 19:10:31 +0200 Subject: [PATCH] Map new components (#3820) --- .../component/DataComponentTypes.mapping | 14 ++++++++ .../component/type/ToolComponent.mapping | 36 +++++++++++++++++++ .../net/minecraft/item/FoodComponent.mapping | 12 +++++++ mappings/net/minecraft/item/Item.mapping | 7 ++++ mappings/net/minecraft/item/ItemStack.mapping | 2 ++ .../net/minecraft/item/ToolMaterial.mapping | 3 ++ .../net/minecraft/item/ToolMaterials.mapping | 2 ++ mappings/net/minecraft/recipe/Recipe.mapping | 1 + .../minecraft/recipe/RepairItemRecipe.mapping | 5 +++ mappings/net/minecraft/util/Rarity.mapping | 14 ++++++++ 10 files changed, 96 insertions(+) create mode 100644 mappings/net/minecraft/component/type/ToolComponent.mapping diff --git a/mappings/net/minecraft/component/DataComponentTypes.mapping b/mappings/net/minecraft/component/DataComponentTypes.mapping index 85c420eb91..01bdeef0a6 100644 --- a/mappings/net/minecraft/component/DataComponentTypes.mapping +++ b/mappings/net/minecraft/component/DataComponentTypes.mapping @@ -99,3 +99,17 @@ CLASS net/minecraft/class_9334 net/minecraft/component/DataComponentTypes ARG 0 builder METHOD method_57932 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; ARG 0 builder + METHOD method_58564 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_58565 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_58566 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_58567 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_58568 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_58569 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_58570 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder diff --git a/mappings/net/minecraft/component/type/ToolComponent.mapping b/mappings/net/minecraft/component/type/ToolComponent.mapping new file mode 100644 index 0000000000..259ccf3025 --- /dev/null +++ b/mappings/net/minecraft/component/type/ToolComponent.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/class_9424 net/minecraft/component/type/ToolComponent + FIELD field_50009 CODEC Lcom/mojang/serialization/Codec; + FIELD field_50010 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_58424 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_58425 getSpeed (Lnet/minecraft/class_2680;)F + ARG 1 state + METHOD method_58426 correctsForDrops (Lnet/minecraft/class_2680;)Z + ARG 1 state + CLASS class_9425 Rule + FIELD field_50011 CODEC Lcom/mojang/serialization/Codec; + FIELD field_50012 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_58427 ofNeverDropping (Lnet/minecraft/class_6862;)Lnet/minecraft/class_9424$class_9425; + ARG 0 tag + METHOD method_58428 ofAlwaysDropping (Lnet/minecraft/class_6862;F)Lnet/minecraft/class_9424$class_9425; + ARG 0 blocks + ARG 1 speed + METHOD method_58429 of (Lnet/minecraft/class_6862;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_9424$class_9425; + ARG 0 tag + ARG 1 speed + ARG 2 correctForDrops + METHOD method_58430 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_58431 ofAlwaysDropping (Ljava/util/List;F)Lnet/minecraft/class_9424$class_9425; + ARG 0 blocks + ARG 1 speed + METHOD method_58432 of (Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_9424$class_9425; + ARG 0 blocks + ARG 1 speed + ARG 2 correctForDrops + METHOD method_58433 of (Lnet/minecraft/class_6862;F)Lnet/minecraft/class_9424$class_9425; + ARG 0 tag + ARG 1 speed + METHOD method_58434 of (Ljava/util/List;F)Lnet/minecraft/class_9424$class_9425; + ARG 0 blocks + ARG 1 speed diff --git a/mappings/net/minecraft/item/FoodComponent.mapping b/mappings/net/minecraft/item/FoodComponent.mapping index f0aa516558..e7181a1ff6 100644 --- a/mappings/net/minecraft/item/FoodComponent.mapping +++ b/mappings/net/minecraft/item/FoodComponent.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_4174 net/minecraft/item/FoodComponent 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 METHOD (IFZFLjava/util/List;)V ARG 1 hunger ARG 2 saturationModifier @@ -23,11 +26,15 @@ CLASS net/minecraft/class_4174 net/minecraft/item/FoodComponent 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 CLASS class_4175 Builder FIELD field_18620 hunger I FIELD field_18621 saturationModifier F FIELD field_18623 alwaysEdible Z FIELD field_18625 statusEffects Lcom/google/common/collect/ImmutableList$Builder; + FIELD field_49995 eatSeconds F METHOD method_19237 saturationModifier (F)Lnet/minecraft/class_4174$class_4175; COMMENT Specifies the saturation modifier of a food item. COMMENT @@ -52,3 +59,8 @@ CLASS net/minecraft/class_4174 net/minecraft/item/FoodComponent METHOD method_19241 snack ()Lnet/minecraft/class_4174$class_4175; COMMENT Specifies that a food item is snack-like and is eaten quickly. METHOD method_19242 build ()Lnet/minecraft/class_4174; + CLASS class_9423 StatusEffectEntry + FIELD field_49996 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49997 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_58401 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 95c9967835..91551f0f4f 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -131,6 +131,12 @@ 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_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 + 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; COMMENT Called when the player uses (or starts using) the item. COMMENT The use action, by default, is bound to the right mouse button. @@ -381,6 +387,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 1 type ARG 2 value METHOD method_57350 getComponents ()Lnet/minecraft/class_9323; + METHOD method_58406 getValidatedComponents ()Lnet/minecraft/class_9323; METHOD method_7889 maxCount (I)Lnet/minecraft/class_1792$class_1793; COMMENT Sets the maximum stack count of any ItemStack with an Item using this Settings instance. COMMENT diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index b25f1e4a5b..81c7bb3a56 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -323,6 +323,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 components METHOD method_58094 (Lnet/minecraft/class_1799;)Lnet/minecraft/class_9326; ARG 0 stack + METHOD method_58407 takesDamageFrom (Lnet/minecraft/class_1282;)Z + ARG 1 source METHOD method_7909 getItem ()Lnet/minecraft/class_1792; COMMENT {@return the item of this stack} COMMENT diff --git a/mappings/net/minecraft/item/ToolMaterial.mapping b/mappings/net/minecraft/item/ToolMaterial.mapping index 34f81e9add..4b23c76d96 100644 --- a/mappings/net/minecraft/item/ToolMaterial.mapping +++ b/mappings/net/minecraft/item/ToolMaterial.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_1832 net/minecraft/item/ToolMaterial COMMENT Defines the material stats of a {@link net.minecraft.item.ToolItem} item. COMMENT

COMMENT To view available vanilla tool materials, visit {@link net.minecraft.item.ToolMaterials}. + METHOD method_58418 createComponent (Lnet/minecraft/class_6862;)Lnet/minecraft/class_9424; + ARG 1 tag + METHOD method_58419 getInverseTag ()Lnet/minecraft/class_6862; METHOD method_8023 getRepairIngredient ()Lnet/minecraft/class_1856; COMMENT {@return the {@link Ingredient} used to repair items using this {@link ToolMaterial}} COMMENT

diff --git a/mappings/net/minecraft/item/ToolMaterials.mapping b/mappings/net/minecraft/item/ToolMaterials.mapping index 9007dada96..530532b2e7 100644 --- a/mappings/net/minecraft/item/ToolMaterials.mapping +++ b/mappings/net/minecraft/item/ToolMaterials.mapping @@ -1,11 +1,13 @@ CLASS net/minecraft/class_1834 net/minecraft/item/ToolMaterials COMMENT Provides the default {@link ToolMaterial}s used by vanilla tools. + FIELD field_50006 inverseTag Lnet/minecraft/class_6862; FIELD field_8924 itemDurability I FIELD field_8928 repairIngredient Ljava/util/function/Supplier; FIELD field_8931 attackDamage F FIELD field_8932 miningSpeed F FIELD field_8933 enchantability I METHOD (Ljava/lang/String;ILnet/minecraft/class_6862;IFFILjava/util/function/Supplier;)V + ARG 3 inverseTag ARG 4 itemDurability ARG 5 miningSpeed ARG 6 attackDamage diff --git a/mappings/net/minecraft/recipe/Recipe.mapping b/mappings/net/minecraft/recipe/Recipe.mapping index 7be7203c43..8f56b16582 100644 --- a/mappings/net/minecraft/recipe/Recipe.mapping +++ b/mappings/net/minecraft/recipe/Recipe.mapping @@ -79,6 +79,7 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe COMMENT @return the resulting item stack ARG 1 inventory COMMENT the input inventory + ARG 2 lookup METHOD method_8117 getIngredients ()Lnet/minecraft/class_2371; COMMENT {@return the ingredients accepted as inputs for this recipe} Used by the recipe book COMMENT when displaying a ghost form of this recipe on the crafting grid as well as for diff --git a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping index 36997da8e5..dba095218b 100644 --- a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping +++ b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping @@ -3,3 +3,8 @@ CLASS net/minecraft/class_4317 net/minecraft/recipe/RepairItemRecipe ARG 3 enchantment METHOD method_57528 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304$class_9305;)V ARG 3 builder + METHOD method_58438 findPair (Lnet/minecraft/class_8566;)Lcom/mojang/datafixers/util/Pair; + ARG 1 inventory + METHOD method_58439 canCombineStacks (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 0 first + ARG 1 second diff --git a/mappings/net/minecraft/util/Rarity.mapping b/mappings/net/minecraft/util/Rarity.mapping index caaf1ff449..3a99550917 100644 --- a/mappings/net/minecraft/util/Rarity.mapping +++ b/mappings/net/minecraft/util/Rarity.mapping @@ -1,2 +1,16 @@ CLASS net/minecraft/class_1814 net/minecraft/util/Rarity + FIELD field_50001 CODEC Lcom/mojang/serialization/Codec; + FIELD field_50002 idToValue Ljava/util/function/IntFunction; + FIELD field_50003 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_50004 index I + FIELD field_50005 name Ljava/lang/String; FIELD field_8908 formatting Lnet/minecraft/class_124; + METHOD (Ljava/lang/String;IILjava/lang/String;Lnet/minecraft/class_124;)V + ARG 3 index + ARG 4 name + ARG 5 formatting + METHOD method_58413 getFormatting ()Lnet/minecraft/class_124; + METHOD method_58414 (Lnet/minecraft/class_1814;)I + ARG 0 value + METHOD method_58415 (Lnet/minecraft/class_1814;)I + ARG 0 value