diff --git a/mappings/net/minecraft/block/LandingBlock.mapping b/mappings/net/minecraft/block/LandingBlock.mapping index 5764cb1e63..be54cb037b 100644 --- a/mappings/net/minecraft/block/LandingBlock.mapping +++ b/mappings/net/minecraft/block/LandingBlock.mapping @@ -11,3 +11,4 @@ CLASS net/minecraft/class_5688 net/minecraft/block/LandingBlock ARG 3 fallingBlockEntity METHOD method_32897 getEntityPredicate ()Ljava/util/function/Predicate; METHOD method_32898 getDamageSource (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 1 attacker diff --git a/mappings/net/minecraft/client/render/entity/animation/CamelAnimations.mapping b/mappings/net/minecraft/client/render/entity/animation/CamelAnimations.mapping index 04374ffb04..73af4578a9 100644 --- a/mappings/net/minecraft/client/render/entity/animation/CamelAnimations.mapping +++ b/mappings/net/minecraft/client/render/entity/animation/CamelAnimations.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_7730 net/minecraft/client/render/entity/animation/CamelAnimations FIELD field_40384 WALKING Lnet/minecraft/class_7184; - FIELD field_40385 SITTING Lnet/minecraft/class_7184; - FIELD field_40386 STANDING_UP Lnet/minecraft/class_7184; + FIELD field_40385 SITTING_TRANSITION Lnet/minecraft/class_7184; + FIELD field_40386 STANDING_TRANSITION Lnet/minecraft/class_7184; FIELD field_40387 DASHING Lnet/minecraft/class_7184; FIELD field_40388 IDLING Lnet/minecraft/class_7184; + FIELD field_40749 SITTING Lnet/minecraft/class_7184; diff --git a/mappings/net/minecraft/client/util/math/MatrixStack.mapping b/mappings/net/minecraft/client/util/math/MatrixStack.mapping index 21fa97ad7c..04d190a410 100644 --- a/mappings/net/minecraft/client/util/math/MatrixStack.mapping +++ b/mappings/net/minecraft/client/util/math/MatrixStack.mapping @@ -48,6 +48,10 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack ARG 1 matrix METHOD method_34426 loadIdentity ()V COMMENT Sets the top entry to be the identity matrix. + METHOD method_46416 translate (FFF)V + ARG 1 x + ARG 2 y + ARG 3 z CLASS class_4665 Entry FIELD field_21327 positionMatrix Lorg/joml/Matrix4f; FIELD field_21328 normalMatrix Lorg/joml/Matrix3f; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index cda0776d1c..70d0e658f7 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -919,6 +919,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 velocity METHOD method_45321 getLeashOffset (F)Lnet/minecraft/class_243; ARG 1 tickDelta + METHOD method_46395 extinguishWithSound ()V METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V COMMENT Called when this entity's collision box intersects {@code state}. diff --git a/mappings/net/minecraft/entity/JumpingMount.mapping b/mappings/net/minecraft/entity/JumpingMount.mapping index 658a82a283..c5c3c08e16 100644 --- a/mappings/net/minecraft/entity/JumpingMount.mapping +++ b/mappings/net/minecraft/entity/JumpingMount.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1316 net/minecraft/entity/JumpingMount - METHOD method_45327 getDashCooldown ()I + METHOD method_45327 getJumpCooldown ()I METHOD method_6153 canJump ()Z METHOD method_6154 setJumpStrength (I)V ARG 1 strength diff --git a/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping b/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping index 68314efec4..ea0e4e8ddd 100644 --- a/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_1286 net/minecraft/entity/damage/BadRespawnPointDamageSource + METHOD (Lnet/minecraft/class_243;)V + ARG 1 pos METHOD method_5551 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 0 style diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping index 77aed0efcc..ace7bdcdde 100644 --- a/mappings/net/minecraft/entity/damage/DamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping @@ -59,6 +59,12 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource ARG 0 attacker METHOD method_44327 bypassesProtection ()Z METHOD method_44328 setBypassesProtection ()Lnet/minecraft/class_1282; + METHOD method_46392 fallingBlock (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 0 attacker + METHOD method_46393 anvil (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 0 attacker + METHOD method_46394 fallingStalactite (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 0 attacker METHOD method_5504 isUnblockable ()Z METHOD method_5505 setOutOfWorld ()Lnet/minecraft/class_1282; METHOD method_5506 getDeathMessage (Lnet/minecraft/class_1309;)Lnet/minecraft/class_2561; @@ -70,6 +76,8 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource METHOD method_5511 mob (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; ARG 0 attacker METHOD method_5512 explosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; + ARG 0 explosion + ARG 1 attacker METHOD method_5513 thorns (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; ARG 0 attacker METHOD method_5514 isScaledWithDifficulty ()Z @@ -90,6 +98,7 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource ARG 0 projectile ARG 1 attacker METHOD method_5523 badRespawnPoint (Lnet/minecraft/class_243;)Lnet/minecraft/class_1282; + ARG 0 pos METHOD method_5524 thrownProjectile (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; ARG 0 projectile ARG 1 attacker diff --git a/mappings/net/minecraft/entity/damage/PositionedDamageSource.mapping b/mappings/net/minecraft/entity/damage/PositionedDamageSource.mapping new file mode 100644 index 0000000000..3960f515d8 --- /dev/null +++ b/mappings/net/minecraft/entity/damage/PositionedDamageSource.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7835 net/minecraft/entity/damage/PositionedDamageSource + FIELD field_40729 pos Lnet/minecraft/class_243; + METHOD (Ljava/lang/String;Lnet/minecraft/class_243;)V + ARG 1 name + ARG 2 pos diff --git a/mappings/net/minecraft/entity/damage/ProjectileDamageSource.mapping b/mappings/net/minecraft/entity/damage/ProjectileDamageSource.mapping index a5bef68ede..fd630b3c56 100644 --- a/mappings/net/minecraft/entity/damage/ProjectileDamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/ProjectileDamageSource.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1284 net/minecraft/entity/damage/ProjectileDamageSource + FIELD field_40728 attacker Lnet/minecraft/class_1297; METHOD (Ljava/lang/String;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)V ARG 1 name ARG 2 projectile diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index f2a51d58d5..8776e88006 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -49,6 +49,7 @@ CLASS net/minecraft/class_1560 net/minecraft/entity/mob/EndermanEntity FIELD field_7261 ticksSinceUnseenTeleport I FIELD field_7262 lookAtPlayerWarmup I METHOD (Lnet/minecraft/class_1560;Ljava/util/function/Predicate;)V + ARG 1 enderman ARG 2 targetPredicate METHOD method_18449 (Lnet/minecraft/class_1560;Lnet/minecraft/class_1309;)Z ARG 1 playerEntity diff --git a/mappings/net/minecraft/entity/passive/CamelBrain.mapping b/mappings/net/minecraft/entity/passive/CamelBrain.mapping index f2e499136a..301f0e3254 100644 --- a/mappings/net/minecraft/entity/passive/CamelBrain.mapping +++ b/mappings/net/minecraft/entity/passive/CamelBrain.mapping @@ -12,3 +12,7 @@ CLASS net/minecraft/class_7691 net/minecraft/entity/passive/CamelBrain METHOD method_45370 addIdleActivities (Lnet/minecraft/class_4095;)V ARG 0 brain CLASS class_7692 CamelWalkTask + CLASS class_7693 SitOrStandTask + FIELD field_40160 lastPoseTickDelta I + METHOD (I)V + ARG 1 lastPoseSecondsDelta diff --git a/mappings/net/minecraft/entity/passive/CamelEntity.mapping b/mappings/net/minecraft/entity/passive/CamelEntity.mapping index f19004d643..662186a8cd 100644 --- a/mappings/net/minecraft/entity/passive/CamelEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CamelEntity.mapping @@ -2,13 +2,15 @@ CLASS net/minecraft/class_7689 net/minecraft/entity/passive/CamelEntity FIELD field_40131 BREEDING_INGREDIENT Lnet/minecraft/class_1856; FIELD field_40136 SITTING_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_40137 dashCooldown I + FIELD field_40138 idleAnimationCooldown I FIELD field_40139 DASHING Lnet/minecraft/class_2940; FIELD field_40140 LAST_POSE_TICK Lnet/minecraft/class_2940; FIELD field_40141 walkingAnimationState Lnet/minecraft/class_7094; - FIELD field_40142 sittingAnimationState Lnet/minecraft/class_7094; - FIELD field_40143 standingUpAnimationState Lnet/minecraft/class_7094; + FIELD field_40142 sittingTransitionAnimationState Lnet/minecraft/class_7094; + FIELD field_40143 standingTransitionAnimationState Lnet/minecraft/class_7094; FIELD field_40144 idlingAnimationState Lnet/minecraft/class_7094; FIELD field_40145 dashingAnimationState Lnet/minecraft/class_7094; + FIELD field_40734 sittingAnimationState Lnet/minecraft/class_7094; METHOD method_45344 setLastPoseTick (J)V ARG 1 lastPoseTick METHOD method_45345 clampPassengerYaw (Lnet/minecraft/class_1297;)V @@ -20,11 +22,13 @@ CLASS net/minecraft/class_7689 net/minecraft/entity/passive/CamelEntity METHOD method_45353 startStanding ()V METHOD method_45354 setStanding ()V METHOD method_45355 getLastPoseTickDelta ()J + METHOD method_45356 updateAnimations ()V METHOD method_45357 isStationary ()Z METHOD method_45360 createCamelAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_45361 isDashing ()Z METHOD method_45362 setDashing (Z)V ARG 1 dashing + METHOD method_46398 shouldPlaySittingTransitionAnimation ()Z CLASS class_7690 CamelBodyControl METHOD (Lnet/minecraft/class_7689;Lnet/minecraft/class_7689;)V ARG 2 camel diff --git a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping index 67a42c0bdc..2ab0e162e3 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEntity + FIELD field_40737 AFFECTED_BY_WATER Ljava/util/function/Predicate; METHOD (Lnet/minecraft/class_1937;DDD)V ARG 1 world ARG 2 x @@ -7,6 +8,8 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEnti METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V ARG 1 world ARG 2 owner + METHOD method_46401 (Lnet/minecraft/class_1309;)Z + ARG 0 entity METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_1842;)V ARG 1 stack ARG 2 potion diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index 37ed155151..54e8721979 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -69,6 +69,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion ARG 2 stack METHOD method_29553 chooseBehavior (Lnet/minecraft/class_1297;)Lnet/minecraft/class_5362; ARG 1 entity + METHOD method_46406 getEntity ()Lnet/minecraft/class_1297; METHOD method_8346 getAffectedBlocks ()Ljava/util/List; METHOD method_8347 getCausingEntity ()Lnet/minecraft/class_1309; METHOD method_8348 collectBlocksAndDamageEntities ()V