From 2d6311e10a460269909cbf8638e5b0c65740f35f Mon Sep 17 00:00:00 2001 From: Matias Koivikko Date: Thu, 1 Feb 2024 17:40:11 +0200 Subject: [PATCH] Map armor changes (#3776) * Map armor changes * Fix spelling * Delete accidently created html file --------- Co-authored-by: YanisBft --- .../minecraft/item/AnimalArmorItem.mapping | 8 ++++++++ mappings/net/minecraft/item/ArmorItem.mapping | 6 ++++++ .../net/minecraft/item/ArmorMaterial.mapping | 20 +++++++++++++++++++ .../net/minecraft/item/ArmorMaterials.mapping | 19 ++++++++++++++++++ .../net/minecraft/registry/Registries.mapping | 1 + 5 files changed, 54 insertions(+) diff --git a/mappings/net/minecraft/item/AnimalArmorItem.mapping b/mappings/net/minecraft/item/AnimalArmorItem.mapping index 3213737071..f9d35e8061 100644 --- a/mappings/net/minecraft/item/AnimalArmorItem.mapping +++ b/mappings/net/minecraft/item/AnimalArmorItem.mapping @@ -2,10 +2,18 @@ CLASS net/minecraft/class_4059 net/minecraft/item/AnimalArmorItem FIELD field_47823 entityTexture Lnet/minecraft/class_2960; FIELD field_47824 type Lnet/minecraft/class_4059$class_9076; METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_4059$class_9076;Lnet/minecraft/class_1792$class_1793;)V + ARG 1 material ARG 2 type + ARG 3 settings METHOD method_18454 getEntityTexture ()Lnet/minecraft/class_2960; METHOD method_55756 getType ()Lnet/minecraft/class_4059$class_9076; CLASS class_9076 Type FIELD field_47827 textureIdFunction Ljava/util/function/Function; METHOD (Ljava/lang/String;ILjava/util/function/Function;)V ARG 3 textureIdFunction + METHOD method_56686 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + ARG 0 id + METHOD method_56687 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 path + METHOD method_56688 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + ARG 0 id diff --git a/mappings/net/minecraft/item/ArmorItem.mapping b/mappings/net/minecraft/item/ArmorItem.mapping index 6b1bd37c79..c40e188427 100644 --- a/mappings/net/minecraft/item/ArmorItem.mapping +++ b/mappings/net/minecraft/item/ArmorItem.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem FIELD field_7879 DISPENSER_BEHAVIOR Lnet/minecraft/class_2357; FIELD field_7881 material Lnet/minecraft/class_6880; METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_1738$class_8051;Lnet/minecraft/class_1792$class_1793;)V + ARG 1 material + ARG 2 type ARG 3 settings METHOD method_26353 getToughness ()F METHOD method_48397 (Ljava/util/EnumMap;)V @@ -18,8 +20,12 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem CLASS class_8051 Type FIELD field_41938 equipmentSlot Lnet/minecraft/class_1304; FIELD field_41939 name Ljava/lang/String; + FIELD field_48839 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;ILnet/minecraft/class_1304;Ljava/lang/String;)V ARG 3 equipmentSlot ARG 4 name METHOD method_48399 getEquipmentSlot ()Lnet/minecraft/class_1304; METHOD method_48400 getName ()Ljava/lang/String; + METHOD method_56690 getMaxDamage (I)I + ARG 1 multiplier + METHOD method_56691 isTrimmable ()Z diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping index 138de11d73..66beb487a8 100644 --- a/mappings/net/minecraft/item/ArmorMaterial.mapping +++ b/mappings/net/minecraft/item/ArmorMaterial.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial FIELD comp_2301 getRepairIngredient Ljava/util/function/Supplier; FIELD comp_2303 getToughness F FIELD comp_2304 getKnockbackResistance F + FIELD field_48840 CODEC Lcom/mojang/serialization/Codec; METHOD comp_2299 getEnchantability ()I COMMENT Returns the base enchantment value used by {@link ArmorItem} with this material. COMMENT @@ -55,3 +56,22 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial COMMENT @return the amount of armor protection points offered by an {@link ArmorItem} with this {@link ArmorMaterial} ARG 1 type COMMENT the {@link ArmorItem.Type} of the {@link Item} with this {@link ArmorMaterial} + CLASS class_9196 Layer + FIELD field_48841 id Lnet/minecraft/class_2960; + FIELD field_48842 suffix Ljava/lang/String; + FIELD field_48843 dyeable Z + FIELD field_48844 layer2Texture Lnet/minecraft/class_2960; + FIELD field_48845 layer1Texture Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 id + METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Z)V + ARG 1 id + ARG 2 suffix + ARG 3 dyeable + METHOD method_56692 isDyeable ()Z + METHOD method_56693 getTexture (Z)Lnet/minecraft/class_2960; + ARG 1 secondLayer + METHOD method_56694 (ZLjava/lang/String;)Ljava/lang/String; + ARG 2 path + METHOD method_56695 getTextureId (Z)Lnet/minecraft/class_2960; + ARG 1 secondLayer diff --git a/mappings/net/minecraft/item/ArmorMaterials.mapping b/mappings/net/minecraft/item/ArmorMaterials.mapping index e8ff472ab3..3b130ae802 100644 --- a/mappings/net/minecraft/item/ArmorMaterials.mapping +++ b/mappings/net/minecraft/item/ArmorMaterials.mapping @@ -16,3 +16,22 @@ CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials ARG 0 map METHOD method_48412 (Ljava/util/EnumMap;)V ARG 0 map + METHOD method_56697 getDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + ARG 0 registry + METHOD method_56698 register (Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/class_6880;FFLjava/util/function/Supplier;)Lnet/minecraft/class_6880; + ARG 0 id + ARG 1 defense + ARG 2 enchantability + ARG 3 equipSound + ARG 4 toughness + ARG 5 knockbackResistance + ARG 6 repairIngredient + METHOD method_56699 register (Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/class_6880;FFLjava/util/function/Supplier;Ljava/util/List;)Lnet/minecraft/class_6880; + ARG 0 id + ARG 1 defense + ARG 2 enchantability + ARG 3 equipSound + ARG 4 toughness + ARG 5 knockbackResistance + ARG 6 repairIngredient + ARG 7 layers diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index cf8b292472..8a8e6404d4 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -73,6 +73,7 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_46912 POOL_ALIAS_BINDING Lnet/minecraft/class_2378; FIELD field_47496 CRITERION Lnet/minecraft/class_2378; FIELD field_47555 NUMBER_FORMAT_TYPE Lnet/minecraft/class_2378; + FIELD field_48976 ARMOR_MATERIAL 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;