diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping
index 1cc0842b95..b093824243 100644
--- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping
+++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping
@@ -37,9 +37,9 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns
 		COMMENT Computes this attribute's value, taking modifiers into account.
 		COMMENT
 		COMMENT <p>Attribute modifiers are applied in order by operation:
-		COMMENT <ul><li>{@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION ADDITION} // Adds the value of the modifier to the attribute's base value.</li>
-		COMMENT <li>{@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#MULTIPLY_BASE MULTIPLY_BASE} // Multiplies the value of the modifier to the attributes base value, and then adds it to the total value.</li>
-		COMMENT <li>{@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#MULTIPLY_TOTAL MULTIPLY_TOTAL} // Adds 1 to the value of the attribute modifier. Then multiplies the attribute's value by the total value of the attribute after addition and multiplication of the base value occur.</li>
+		COMMENT <ul><li>{@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADD_VALUE ADD_VALUE} // Adds the value of the modifier to the attribute's base value.</li>
+		COMMENT <li>{@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADD_MULTIPLIED_BASE ADD_MULTIPLIED_BASE} // Multiplies the value of the modifier to the attributes base value, and then adds it to the total value.</li>
+		COMMENT <li>{@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADD_MULTIPLIED_TOTAL ADD_MULTIPLIED_TOTAL} // Adds 1 to the value of the attribute modifier. Then multiplies the attribute's value by the total value of the attribute after addition and multiplication of the base value occur.</li>
 		COMMENT </ul>
 	METHOD method_27304 tryRemoveModifier (Ljava/util/UUID;)Z
 		ARG 1 uuid
diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping
index 66beb487a8..6d8b59e111 100644
--- a/mappings/net/minecraft/item/ArmorMaterial.mapping
+++ b/mappings/net/minecraft/item/ArmorMaterial.mapping
@@ -3,55 +3,16 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial
 	COMMENT
 	COMMENT <p>
 	COMMENT To view available vanilla armor materials, visit {@link ArmorMaterials}.
-	FIELD comp_2299 getEnchantability I
-	FIELD comp_2300 getEquipSound Lnet/minecraft/class_6880;
-	FIELD comp_2301 getRepairIngredient Ljava/util/function/Supplier;
-	FIELD comp_2303 getToughness F
-	FIELD comp_2304 getKnockbackResistance F
+	FIELD comp_2299 enchantability I
 	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
-		COMMENT <p>
-		COMMENT By default, {@link ArmorItem} will override {@link Item#getEnchantability()}
-		COMMENT and delegate the call back to this method.
-		COMMENT
-		COMMENT <p>
-		COMMENT A higher return value will result in better enchantment results when using an {@code Enchanting Table}.
-		COMMENT The highest enchantability value in vanilla is Netherite, at {@code 37}.
-		COMMENT
-		COMMENT @return the enchantment value sent back to {@link Item#getEnchantability()} for armor using this material
-	METHOD comp_2300 getEquipSound ()Lnet/minecraft/class_6880;
-		COMMENT @return the {@link SoundEvent} played when a {@link net.minecraft.entity.LivingEntity} equips an {@link ArmorItem} using this {@link ArmorMaterial}
-	METHOD comp_2301 getRepairIngredient ()Ljava/util/function/Supplier;
-		COMMENT Returns the {@link Ingredient} used to repair items using this {@link ArmorMaterial}.
-		COMMENT
-		COMMENT <p>
-		COMMENT By default, {@link ArmorItem} will delegate {@link Item#canRepair(ItemStack, ItemStack)}
-		COMMENT back to this method.
-		COMMENT
-		COMMENT @return the {@link Ingredient} required to repair items with this {@link ArmorMaterial}
-	METHOD comp_2303 getToughness ()F
-		COMMENT Returns the toughness value of an {@link ArmorItem} piece using this {@link ArmorMaterial}.
-		COMMENT
-		COMMENT <p>
-		COMMENT {@link ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_ARMOR_TOUGHNESS}
-		COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type.
-		COMMENT
-		COMMENT @return the toughness value of any {@link ArmorItem} using this {@link ArmorMaterial}
-	METHOD comp_2304 getKnockbackResistance ()F
-		COMMENT {@return the knockback resistance value of an {@link ArmorItem} piece using this {@link ArmorMaterial}}
-		COMMENT
-		COMMENT <p>
-		COMMENT {@link ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_KNOCKBACK_RESISTANCE}
-		COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type.
+	METHOD comp_2299 enchantability ()I
 	METHOD method_48403 getProtection (Lnet/minecraft/class_1738$class_8051;)I
 		COMMENT Returns the amount of armor protection points offered by an {@link ArmorItem}
 		COMMENT using this {@link ArmorMaterial} while it is worn by a player.
 		COMMENT
 		COMMENT <p>
 		COMMENT The protection value returned here is applied as an {@link net.minecraft.entity.attribute.EntityAttributeModifier}
-		COMMENT to a player wearing the {@link ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier.
+		COMMENT to a player wearing the {@link ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADD_VALUE} modifier.
 		COMMENT
 		COMMENT @return the amount of armor protection points offered by an {@link ArmorItem} with this {@link ArmorMaterial}
 		ARG 1 type