From 0a3900ac222131d598025aca095b5d4900084a55 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Sat, 11 Jan 2020 17:06:56 +0100 Subject: [PATCH] A couple living entity mappings (#1039) * LivingEntity#method_23883(0) -> dropXp * LivingEntity#method_23733(1)[1 = ] -> adversary * LivingEntity#method_23733(1) -> onKilledBy * +227 doc in LivingEntity#onKilledBy(1) * LivingEntity#method_23329(2) -> computeFallDamage * LivingEntity#computeFallDamage(2)[1 = ] -> fallDistance * LivingEntity#computeFallDamage(2)[2 = ] -> damageMultiplier * LivingEntity#method_23328(0) -> playBlockFallSound * LivingEntity#method_21754(0) -> isHoldingLadder * +175 doc in LivingEntity#isHoldingLadder(0) * LivingEntity#method_22382(0) -> shouldSpawnConsumptionEffects * LivingEntity#method_6018(1) -> setPushCooldown * Fix return tag * Name PlayerEntity#clipAtLedge * Move onKilledBy param doc * isHoldingLadder -> isHoldingOntoLadder * Fix param comment indent --- .../net/minecraft/entity/LivingEntity.mapping | 17 +++++++++++++++++ .../entity/player/PlayerEntity.mapping | 1 + 2 files changed, 18 insertions(+) diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 830e9ce3ff..7aa9482514 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -365,3 +365,20 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6132 applyArmorToDamage (Lnet/minecraft/class_1282;F)F ARG 1 source ARG 2 amount + METHOD method_23883 dropXp ()V + METHOD method_23733 onKilledBy (Lnet/minecraft/class_1309;)V + COMMENT Performs secondary effects after this mob has been killed. + COMMENT + COMMENT

The default behaviour spawns a wither rose if {@code adversary} is a {@code WitherEntity}. + COMMENT + ARG 1 adversary + COMMENT the main adversary responsible for this entity's death + METHOD method_23329 computeFallDamage (FF)I + ARG 1 fallDistance + ARG 2 damageMultiplier + METHOD method_23328 playBlockFallSound ()V + METHOD method_21754 isHoldingOntoLadder ()Z + COMMENT @return {@code true} if this entity should not lose height while in a climbing state + COMMENT @see net.minecraft.entity.LivingEntity#applyClimbingSpeed(net.minecraft.util.math.Vec3d) + METHOD method_22382 shouldSpawnConsumptionEffects ()Z + METHOD method_6018 setPushCooldown (I)V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index d360c79bf5..77c9a0942a 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -53,6 +53,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_21701 canMine (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1934;)Z METHOD method_21823 shouldCancelInteraction ()Z METHOD method_21824 shouldDismount ()Z + METHOD method_21825 clipAtLedge ()Z METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7255 addExperience (I)V