From 52768fb91621dc4662997dc1c3c5860f3331b6c2 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Mon, 3 Aug 2020 02:25:46 -0500 Subject: [PATCH] Horse armor slot fix (#1643) * Horse armor slot fix Addresses https://github.com/FabricMC/yarn/commit/2a404a0023a51bfaa916b62e26633a5508550efb#commitcomment-41118532 Signed-off-by: liach * Update mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping Co-authored-by: liach --- .../entity/passive/HorseBaseEntity.mapping | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index c05a5167a2..aa3841052d 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -40,7 +40,16 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity ARG 1 uuid METHOD method_6733 playEatingAnimation ()V METHOD method_6734 canBreed ()Z - METHOD method_6735 canEquip ()Z + METHOD method_6735 hasArmorSlot ()Z + COMMENT Whether this horse has a slot for custom equipment besides a saddle. + COMMENT + COMMENT

In the item slot argument type, the slot is referred to as + COMMENT horse.armor. In this horse's screen, it appears in the middle of + COMMENT the left side, and right below the saddle slot if this horse has a saddle + COMMENT slot.

+ COMMENT + COMMENT

This is used by horse armors and llama carpets, but can be + COMMENT refitted to any purpose.

METHOD method_6736 isAngry ()Z METHOD method_6737 setAngry (Z)V ARG 1 angry @@ -68,7 +77,10 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity ARG 1 bred METHOD method_6752 bondWithPlayer (Lnet/minecraft/class_1657;)Z ARG 1 player - METHOD method_6753 setSaddled ()Z + METHOD method_6753 hasArmorInSlot ()Z + COMMENT Whether this horse already has an item stack in its horse armor slot. + COMMENT + COMMENT @see #hasArmorSlot() METHOD method_6754 getChildHealthBonus ()F METHOD method_6755 getMaxTemper ()I METHOD method_6757 playAngrySound ()V @@ -93,6 +105,9 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity METHOD method_6771 getJumpStrength ()D METHOD method_6772 getEatingAnimationProgress (F)F ARG 1 tickDelta - METHOD method_6773 canEquip (Lnet/minecraft/class_1799;)Z + METHOD method_6773 isHorseArmor (Lnet/minecraft/class_1799;)Z + COMMENT Whether the given item stack is valid for this horse's armor slot. + COMMENT + COMMENT @see #hasArmorSlot() ARG 1 item METHOD method_6774 getChildJumpStrengthBonus ()D