diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping
index e0c38a3e06..82ce8076fb 100644
--- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping
+++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity
+ FIELD field_29971 MAX_RADIUS F
FIELD field_5928 customColor Z
FIELD field_5929 radiusOnUse F
FIELD field_5930 radiusGrowth F
@@ -21,6 +22,15 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity
ARG 2 x
ARG 4 y
ARG 6 z
+ METHOD method_32874 (Ljava/util/Map$Entry;)Z
+ ARG 1 entry
+ METHOD method_35043 setDurationOnUse (I)V
+ ARG 1 durationOnUse
+ METHOD method_35044 getRadiusOnUse ()F
+ METHOD method_35045 getRadiusGrowth ()F
+ METHOD method_35046 getDurationOnUse ()I
+ METHOD method_35047 getWaitTime ()I
+ METHOD method_35048 getPotion ()Lnet/minecraft/class_1842;
METHOD method_5595 setWaitTime (I)V
ARG 1 ticks
METHOD method_5596 setRadiusGrowth (F)V
diff --git a/mappings/net/minecraft/entity/Dismounting.mapping b/mappings/net/minecraft/entity/Dismounting.mapping
index 58e85a86fa..16d3495007 100644
--- a/mappings/net/minecraft/entity/Dismounting.mapping
+++ b/mappings/net/minecraft/entity/Dismounting.mapping
@@ -18,6 +18,7 @@ CLASS net/minecraft/class_5275 net/minecraft/entity/Dismounting
ARG 0 entityType
ARG 1 world
ARG 2 pos
+ ARG 3 ignoreInvalidPos
METHOD method_33353 canPlaceEntityAt (Lnet/minecraft/class_1941;Lnet/minecraft/class_243;Lnet/minecraft/class_1309;Lnet/minecraft/class_4050;)Z
ARG 0 world
ARG 1 offset
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index 302bf211ba..895b643323 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -247,8 +247,13 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
COMMENT
COMMENT @implNote The swim height of 0 allows short entities like baby animals
COMMENT to start swimming to avoid suffocation.
+ METHOD method_29494 (Lnet/minecraft/class_2680;)Z
+ ARG 0 state
METHOD method_29495 refreshPositionAfterTeleport (Lnet/minecraft/class_243;)V
ARG 1 pos
+ METHOD method_30022 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z
+ ARG 1 state
+ ARG 2 pos
METHOD method_30076 removeFromDimension ()V
METHOD method_30227 getTrackedPosition ()Lnet/minecraft/class_243;
METHOD method_30228 updateTrackedPosition (Lnet/minecraft/class_243;)V
@@ -261,6 +266,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
ARG 1 destWorld
ARG 2 destPos
ARG 3 destIsNether
+ METHOD method_30331 (Lnet/minecraft/class_3218;Lnet/minecraft/class_5459$class_5460;)Lnet/minecraft/class_5454;
+ ARG 2 rect
METHOD method_30632 collidesWithStateAtPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
ARG 1 pos
ARG 2 state
@@ -278,11 +285,17 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
ARG 1 delta
METHOD method_31166 getClientCameraPosVec (F)Lnet/minecraft/class_243;
ARG 1 tickDelta
+ METHOD method_31469 (Lnet/minecraft/class_1297;)Z
+ ARG 0 entity
+ METHOD method_31470 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z
+ ARG 1 entity
METHOD method_31471 onSpawnPacket (Lnet/minecraft/class_2604;)V
ARG 1 packet
METHOD method_31472 discard ()V
METHOD method_31473 attemptTickInVoid ()V
COMMENT Calls {@link #tickInVoid()} when the entity is 64 blocks below the world's {@linkplain net.minecraft.world.HeightLimitView#getBottomY() minimum Y position}.
+ METHOD method_31474 (Lnet/minecraft/class_1297;)V
+ ARG 0 entity
METHOD method_31476 getChunkPos ()Lnet/minecraft/class_1923;
METHOD method_31477 getBlockX ()I
METHOD method_31478 getBlockY ()I
@@ -703,6 +716,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
ARG 8 pitch
METHOD method_5809 isOnFire ()Z
METHOD method_5810 isPushable ()Z
+ METHOD method_5813 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
+ ARG 1 style
METHOD method_5814 setPosition (DDD)V
ARG 1 x
ARG 3 y
diff --git a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping
index 4b780abe75..7dfacbfea7 100644
--- a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping
+++ b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping
@@ -1,5 +1,6 @@
CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity
FIELD field_27009 pickingCount I
+ FIELD field_30055 DESPAWN_AGE I
FIELD field_6159 amount I
FIELD field_6161 health I
FIELD field_6162 target Lnet/minecraft/class_1657;
@@ -26,6 +27,18 @@ CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity
ARG 2 amount
METHOD method_31497 merge (Lnet/minecraft/class_1303;)V
ARG 1 other
+ METHOD method_31498 onEverySecond ()V
+ COMMENT Called every second (every 20 ticks).
+ COMMENT
+ COMMENT @implSpec This method first checks if the orb still has a nearby {@link #target},
+ COMMENT and assigns a new target if there is none. It then tries to merge nearby experience orbs.
+ METHOD method_35051 repairPlayerGears (Lnet/minecraft/class_1657;I)I
+ COMMENT Repairs a player's gears using the experience recursively, until the experience is
+ COMMENT all used or all gears are repaired.
+ COMMENT
+ COMMENT @return the amount of leftover experience
+ ARG 1 player
+ ARG 2 amount
METHOD method_5917 getMendingRepairAmount (I)I
ARG 1 experienceAmount
METHOD method_5918 roundToOrbSize (I)I
diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping
index 4d6f13d9b0..c1de261c90 100644
--- a/mappings/net/minecraft/entity/ItemEntity.mapping
+++ b/mappings/net/minecraft/entity/ItemEntity.mapping
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity
+ FIELD field_30456 DESPAWN_AGE I
FIELD field_7199 STACK Lnet/minecraft/class_2940;
FIELD field_7200 thrower Ljava/util/UUID;
FIELD field_7201 health I
diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
index 433f58a681..1b3703d13b 100644
--- a/mappings/net/minecraft/entity/LivingEntity.mapping
+++ b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -117,6 +117,10 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
ARG 1 pos
METHOD method_18403 sleep (Lnet/minecraft/class_2338;)V
ARG 1 pos
+ METHOD method_18404 (Lnet/minecraft/class_2338;)V
+ ARG 1 pos
+ METHOD method_18405 (Lnet/minecraft/class_2338;)Ljava/lang/Boolean;
+ ARG 1 pos
METHOD method_18406 isSleepingInBed ()Z
METHOD method_18801 applyClimbingSpeed (Lnet/minecraft/class_243;)Lnet/minecraft/class_243;
ARG 1 motion
@@ -144,6 +148,10 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
ARG 1 hand
METHOD method_20237 getEquipmentBreakStatus (Lnet/minecraft/class_1304;)B
ARG 0 slot
+ METHOD method_20238 (Lnet/minecraft/class_1309;)V
+ ARG 0 player
+ METHOD method_20239 (Lnet/minecraft/class_1309;)V
+ ARG 0 player
METHOD method_21753 getStingerCount ()I
METHOD method_21754 isHoldingOntoLadder ()Z
COMMENT @return {@code true} if this entity should not lose height while in a climbing state
@@ -157,6 +165,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
ARG 2 damageMultiplier
METHOD method_23667 swingHand (Lnet/minecraft/class_1268;Z)V
ARG 1 hand
+ ARG 2 fromServerPlayer
METHOD method_23733 onKilledBy (Lnet/minecraft/class_1309;)V
COMMENT Performs secondary effects after this mob has been killed.
COMMENT
@@ -174,10 +183,13 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
COMMENT
COMMENT This checks both the entity's main and off hand.
ARG 1 item
+ METHOD method_24519 (Lnet/minecraft/class_1792;Lnet/minecraft/class_1799;)Z
+ ARG 1 stack
METHOD method_24520 isHolding (Ljava/util/function/Predicate;)Z
COMMENT Checks if this entity is holding a certain item.
COMMENT
COMMENT
This checks both the entity's main and off hand.
+ ARG 1 predicate
METHOD method_24831 getPoses ()Lcom/google/common/collect/ImmutableList;
METHOD method_24832 getClimbingPos ()Ljava/util/Optional;
METHOD method_24833 getBoundingBox (Lnet/minecraft/class_4050;)Lnet/minecraft/class_238;
@@ -185,6 +197,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_25937 displaySoulSpeedEffects ()V
METHOD method_26082 applyStatusEffect (Lnet/minecraft/class_1293;)V
ARG 1 effect
+ METHOD method_26084 (Lnet/minecraft/class_1309;)V
+ ARG 0 player
METHOD method_26319 canWalkOnFluid (Lnet/minecraft/class_3611;)Z
ARG 1 fluid
METHOD method_26825 getAttributeValue (Lnet/minecraft/class_1320;)D
@@ -237,6 +251,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
ARG 1 slot
METHOD method_32322 getEquipmentSlot (I)Lnet/minecraft/class_1304;
ARG 0 slotId
+ METHOD method_32323 (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)Z
+ ARG 1 stack
METHOD method_32324 removePowderSnowSlow ()V
METHOD method_32325 addPowderSnowSlowIfNeeded ()V
METHOD method_32326 getPreferredEquipmentSlot (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1304;
@@ -286,6 +302,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
ARG 1 type
METHOD method_6017 getSoundPitch ()F
METHOD method_6018 setRiptideTicks (I)V
+ ARG 1 riptideTicks
METHOD method_6019 setCurrentHand (Lnet/minecraft/class_1268;)V
ARG 1 hand
METHOD method_6020 onStatusEffectApplied (Lnet/minecraft/class_1293;)V
diff --git a/mappings/net/minecraft/entity/SaddledComponent.mapping b/mappings/net/minecraft/entity/SaddledComponent.mapping
index 0171b8d1cc..91163f72ef 100644
--- a/mappings/net/minecraft/entity/SaddledComponent.mapping
+++ b/mappings/net/minecraft/entity/SaddledComponent.mapping
@@ -1,9 +1,11 @@
CLASS net/minecraft/class_4980 net/minecraft/entity/SaddledComponent
FIELD field_23215 boosted Z
+ FIELD field_23216 boostedTime I
FIELD field_23217 currentBoostTime I
FIELD field_23218 dataTracker Lnet/minecraft/class_2945;
FIELD field_23219 boostTime Lnet/minecraft/class_2940;
FIELD field_23220 saddled Lnet/minecraft/class_2940;
+ FIELD field_30060 MIN_BOOST_TIME I
METHOD (Lnet/minecraft/class_2945;Lnet/minecraft/class_2940;Lnet/minecraft/class_2940;)V
ARG 1 dataTracker
ARG 2 boostTime
diff --git a/mappings/net/minecraft/entity/ai/brain/Brain.mapping b/mappings/net/minecraft/entity/ai/brain/Brain.mapping
index 34f1662957..ddace429f0 100644
--- a/mappings/net/minecraft/entity/ai/brain/Brain.mapping
+++ b/mappings/net/minecraft/entity/ai/brain/Brain.mapping
@@ -121,6 +121,7 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain
METHOD method_29519 hasMemoryModuleWithValue (Lnet/minecraft/class_4140;Ljava/lang/Object;)Z
ARG 1 type
ARG 2 value
+ METHOD method_35060 clear ()V
CLASS class_5302 MemoryEntry
FIELD field_24661 type Lnet/minecraft/class_4140;
FIELD field_24662 data Ljava/util/Optional;
diff --git a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping
index a1453ef047..5ed283af85 100644
--- a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping
+++ b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping
@@ -20,6 +20,7 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector
METHOD (Ljava/util/function/Supplier;)V
ARG 1 profiler
METHOD method_19048 getRunningGoals ()Ljava/util/stream/Stream;
+ METHOD method_35113 clear ()V
METHOD method_6273 enableControl (Lnet/minecraft/class_1352$class_4134;)V
ARG 1 control
METHOD method_6274 disableControl (Lnet/minecraft/class_1352$class_4134;)V
diff --git a/mappings/net/minecraft/entity/boss/WitherEntity.mapping b/mappings/net/minecraft/entity/boss/WitherEntity.mapping
index 1e1c2859a1..fe6cd5c281 100644
--- a/mappings/net/minecraft/entity/boss/WitherEntity.mapping
+++ b/mappings/net/minecraft/entity/boss/WitherEntity.mapping
@@ -1,5 +1,7 @@
CLASS net/minecraft/class_1528 net/minecraft/entity/boss/WitherEntity
FIELD field_18125 HEAD_TARGET_PREDICATE Lnet/minecraft/class_4051;
+ FIELD field_30441 DEFAULT_INVUL_TIMER I
+ FIELD field_7082 blockBreakingCooldown I
FIELD field_7083 sideHeadYaws [F
FIELD field_7084 sideHeadPitches [F
FIELD field_7085 INVUL_TIMER Lnet/minecraft/class_2940;
@@ -8,10 +10,14 @@ CLASS net/minecraft/class_1528 net/minecraft/entity/boss/WitherEntity
FIELD field_7088 TRACKED_ENTITY_ID_1 Lnet/minecraft/class_2940;
FIELD field_7089 TRACKED_ENTITY_ID_3 Lnet/minecraft/class_2940;
FIELD field_7090 TRACKED_ENTITY_ID_2 Lnet/minecraft/class_2940;
+ FIELD field_7091 skullCooldowns [I
+ FIELD field_7092 chargedSkullCooldowns [I
FIELD field_7093 bossBar Lnet/minecraft/class_3213;
FIELD field_7094 prevSideHeadYaws [F
FIELD field_7095 prevSideHeadPitches [F
METHOD method_26904 createWitherAttributes ()Lnet/minecraft/class_5132$class_5133;
+ METHOD method_6873 (Lnet/minecraft/class_1309;)Z
+ ARG 0 entity
METHOD method_6874 getHeadX (I)D
ARG 1 headIndex
METHOD method_6875 setInvulTimer (I)V
diff --git a/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping b/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping
index 6a01f7e54c..68314efec4 100644
--- a/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping
+++ b/mappings/net/minecraft/entity/damage/BadRespawnPointDamageSource.mapping
@@ -1 +1,3 @@
CLASS net/minecraft/class_1286 net/minecraft/entity/damage/BadRespawnPointDamageSource
+ METHOD method_5551 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
+ ARG 0 style
diff --git a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping
index 6cea3cb6cb..2c228f39bb 100644
--- a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping
@@ -7,6 +7,8 @@ CLASS net/minecraft/class_1548 net/minecraft/entity/mob/CreeperEntity
FIELD field_7229 lastFuseTime I
FIELD field_7230 FUSE_SPEED Lnet/minecraft/class_2940;
FIELD field_7231 IGNITED Lnet/minecraft/class_2940;
+ METHOD method_20256 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V
+ ARG 1 player
METHOD method_26908 createCreeperAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_7000 isIgnited ()Z
METHOD method_7001 spawnEffectsCloud ()V
diff --git a/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping b/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping
index 623e5216e5..5a90e1b2ce 100644
--- a/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping
@@ -1,3 +1,5 @@
CLASS net/minecraft/class_1550 net/minecraft/entity/mob/ElderGuardianEntity
FIELD field_17492 SCALE F
METHOD method_26909 createElderGuardianAttributes ()Lnet/minecraft/class_5132$class_5133;
+ METHOD method_7011 (Lnet/minecraft/class_3222;)Z
+ ARG 1 player
diff --git a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping
index 54b512610e..464fe1ea51 100644
--- a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_1577 net/minecraft/entity/mob/GuardianEntity
+ FIELD field_30470 WARMUP_TIME I
FIELD field_7280 SPIKES_RETRACTED Lnet/minecraft/class_2940;
FIELD field_7281 spikesExtensionRate F
FIELD field_7282 beamTicks I
diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
index 920995d825..ce433eb4ff 100644
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -91,6 +91,9 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
ARG 2 slot
METHOD method_30759 enchantMainHandItem (F)V
ARG 1 power
+ METHOD method_33191 (Lnet/minecraft/class_1309;)D
+ ARG 1 entity
+ METHOD method_35056 clear ()V
METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F
ARG 1 slot
METHOD method_5930 setForwardSpeed (F)V
diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping
index f470067679..3d7c8e12fb 100644
--- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping
@@ -10,12 +10,22 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity
FIELD field_7346 PEEK_AMOUNT Lnet/minecraft/class_2940;
METHOD method_24350 canStay (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
ARG 1 pos
+ ARG 2 direction
METHOD method_24351 findAttachSide (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350;
ARG 1 pos
METHOD method_26921 createShulkerAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_31546 setColor (Lnet/minecraft/class_1767;)V
ARG 1 color
METHOD method_31547 spawnNewShulker ()V
+ METHOD method_33346 (Lnet/minecraft/class_2350;F)Lnet/minecraft/class_238;
+ ARG 0 direction
+ METHOD method_33347 (Lnet/minecraft/class_2350;FF)Lnet/minecraft/class_238;
+ ARG 0 direction
+ METHOD method_33348 tryAttachOrTeleport ()V
+ METHOD method_33349 tickOpenProgress ()Z
+ METHOD method_33350 moveEntities ()V
+ METHOD method_33351 (Lnet/minecraft/class_2338;)Z
+ ARG 1 pos
METHOD method_35192 setAttachedFace (Lnet/minecraft/class_2350;)V
ARG 1 face
METHOD method_7115 getPeekAmount ()I
diff --git a/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping b/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping
index 57a3a2d458..e9a385b2f5 100644
--- a/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping
@@ -1,5 +1,6 @@
CLASS net/minecraft/class_1613 net/minecraft/entity/mob/SkeletonEntity
FIELD field_28642 CONVERTING Lnet/minecraft/class_2940;
+ FIELD field_28643 inPowderSnowTime I
FIELD field_28644 conversionTime I
FIELD field_30495 STRAY_CONVERSION_TIME_KEY Ljava/lang/String;
METHOD method_33589 setConversionTime (I)V
diff --git a/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping b/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping
index 1bf709a02b..e00bb3e5d0 100644
--- a/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_1506 net/minecraft/entity/mob/SkeletonHorseEntity
+ FIELD field_30427 DESPAWN_AGE I
FIELD field_7003 trapTriggerGoal Lnet/minecraft/class_1505;
FIELD field_7004 trapTime I
FIELD field_7005 trapped Z
diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping
index 0983e15ca1..94a594c357 100644
--- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping
@@ -1,4 +1,6 @@
CLASS net/minecraft/class_1621 net/minecraft/entity/mob/SlimeEntity
+ FIELD field_30496 MIN_SIZE I
+ FIELD field_30497 MAX_SIZE I
FIELD field_7387 lastStretch F
FIELD field_7388 stretch F
FIELD field_7389 targetStretch F
diff --git a/mappings/net/minecraft/entity/mob/WitchEntity.mapping b/mappings/net/minecraft/entity/mob/WitchEntity.mapping
index 1b4064dfa3..ee069deea3 100644
--- a/mappings/net/minecraft/entity/mob/WitchEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/WitchEntity.mapping
@@ -5,6 +5,8 @@ CLASS net/minecraft/class_1640 net/minecraft/entity/mob/WitchEntity
FIELD field_7417 drinkTimeLeft I
FIELD field_7418 DRINKING_SPEED_PENALTY_MODIFIER_ID Ljava/util/UUID;
FIELD field_7419 DRINKING Lnet/minecraft/class_2940;
+ METHOD method_16474 (Lnet/minecraft/class_1309;)Z
+ ARG 1 entity
METHOD method_26927 createWitchAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_7192 setDrinking (Z)V
ARG 1 drinking
diff --git a/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping
index afc64636c3..6b5fd770a0 100644
--- a/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ZoglinEntity.mapping
@@ -14,4 +14,6 @@ CLASS net/minecraft/class_5136 net/minecraft/entity/mob/ZoglinEntity
METHOD method_26936 shouldAttack (Lnet/minecraft/class_1309;)Z
ARG 0 entity
METHOD method_26937 createZoglinAttributes ()Lnet/minecraft/class_5132$class_5133;
+ METHOD method_26938 setAttackTarget (Lnet/minecraft/class_1309;)V
+ ARG 1 entity
METHOD method_26939 isAdult ()Z
diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping
index bebd30fe47..f65206c18b 100644
--- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping
@@ -16,6 +16,7 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity
ARG 0 difficulty
METHOD method_26940 createZombieAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_29936 shouldBeBaby (Ljava/util/Random;)Z
+ ARG 0 random
METHOD method_6001 initAttributes ()V
METHOD method_7200 convertTo (Lnet/minecraft/class_1299;)V
ARG 1 entityType
diff --git a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping
index d7f1f48346..7a9b8e4b76 100644
--- a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping
@@ -3,6 +3,8 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity
FIELD field_25380 angerTime I
FIELD field_25381 targetUuid Ljava/util/UUID;
FIELD field_25382 ANGRY_SOUND_DELAY_RANGE Lnet/minecraft/class_6019;
+ FIELD field_25608 angerPassingCooldown I
+ FIELD field_25609 ANGER_PASSING_COOLDOWN_RANGE Lnet/minecraft/class_6019;
FIELD field_7307 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322;
FIELD field_7308 angrySoundDelay I
FIELD field_7311 ATTACKING_SPEED_BOOST_ID Ljava/util/UUID;
@@ -14,4 +16,14 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity
ARG 4 random
METHOD method_26941 createZombifiedPiglinAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_29533 playAngrySound ()V
+ METHOD method_29937 (Lnet/minecraft/class_1590;)V
+ ARG 1 zombifiedPiglin
+ METHOD method_29938 (Lnet/minecraft/class_1590;)Z
+ ARG 1 zombifiedPiglin
+ METHOD method_29939 (Lnet/minecraft/class_1590;)Z
+ ARG 0 zombifiedPiglin
+ METHOD method_29940 (Lnet/minecraft/class_1590;)Z
+ ARG 1 zombifiedPiglin
+ METHOD method_29941 tickAngerPassing ()V
+ METHOD method_29942 angerNearbyZombifiedPiglins ()V
METHOD method_30080 tickAngrySound ()V
diff --git a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping
index e6285071e4..c7c738f9fe 100644
--- a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_1429 net/minecraft/entity/passive/AnimalEntity
+ FIELD field_30270 BREEDING_COOLDOWN I
FIELD field_6744 lovingPlayer Ljava/util/UUID;
FIELD field_6745 loveTicks I
METHOD method_20663 isValidNaturalSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
diff --git a/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping b/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping
index 2f8cf74e07..33c41fbe5a 100644
--- a/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping
+++ b/mappings/net/minecraft/entity/passive/AxolotlBrain.mapping
@@ -1,14 +1,20 @@
CLASS net/minecraft/class_5768 net/minecraft/entity/passive/AxolotlBrain
FIELD field_28351 WALK_TOWARD_ADULT_RANGE Lnet/minecraft/class_6019;
METHOD method_33241 getTemptItems ()Lnet/minecraft/class_1856;
+ METHOD method_33242 (Lnet/minecraft/class_1309;)F
+ ARG 0 entity
METHOD method_33243 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095;
ARG 0 brain
METHOD method_33244 (Lnet/minecraft/class_5762;)V
ARG 0 axolotl
+ METHOD method_33245 (Lnet/minecraft/class_1309;)F
+ ARG 0 entity
METHOD method_33246 addPlayDeadActivities (Lnet/minecraft/class_4095;)V
ARG 0 brain
METHOD method_33247 getAttackTarget (Lnet/minecraft/class_5762;)Ljava/util/Optional;
ARG 0 axolotl
+ METHOD method_33248 (Lnet/minecraft/class_1309;)F
+ ARG 0 entity
METHOD method_33249 addFightActivities (Lnet/minecraft/class_4095;)V
ARG 0 brain
METHOD method_33250 hasBreedTarget (Lnet/minecraft/class_5762;)Z
diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping
index 3ea6ee31a6..957b1a3eb1 100644
--- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping
@@ -5,11 +5,18 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
FIELD field_28335 VARIANT Lnet/minecraft/class_2940;
FIELD field_28336 PLAYING_DEAD Lnet/minecraft/class_2940;
FIELD field_28337 FROM_BUCKET Lnet/minecraft/class_2940;
+ FIELD field_30388 PLAY_DEAD_TICKS I
+ FIELD field_30389 BUFF_RANGE D
+ FIELD field_30390 BLUE_BABY_CHANCE I
+ FIELD field_30391 VARIANT_KEY Ljava/lang/String;
+ FIELD field_30392 MAX_AIR I
+ FIELD field_30393 BUFF_DURATION I
METHOD method_33219 setVariant (Lnet/minecraft/class_5762$class_5767;)V
ARG 1 variant
METHOD method_33221 shouldBabyBeDifferent (Ljava/util/Random;)Z
ARG 0 random
METHOD method_33223 buffPlayer (Lnet/minecraft/class_1657;)V
+ ARG 0 player
METHOD method_33225 getVariant ()Lnet/minecraft/class_5762$class_5767;
METHOD method_33226 isPlayingDead ()Z
METHOD method_33227 createAxolotlAttributes ()Lnet/minecraft/class_5132$class_5133;
@@ -19,6 +26,9 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
ARG 1 air
METHOD method_33231 setPlayingDead (Z)V
ARG 1 playingDead
+ METHOD method_35175 buffAttacker (Lnet/minecraft/class_5762;)V
+ ARG 0 axolotl
+ METHOD method_35176 hasAir ()Z
CLASS class_5763 AxolotlData
FIELD field_28338 variants [Lnet/minecraft/class_5762$class_5767;
METHOD ([Lnet/minecraft/class_5762$class_5767;)V
diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping
index 00d062b35a..d79ab4d8ec 100644
--- a/mappings/net/minecraft/entity/passive/CatEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping
@@ -16,6 +16,8 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity
FIELD field_6811 CAT_TYPE Lnet/minecraft/class_2940;
METHOD method_16082 getSleepAnimation (F)F
ARG 1 tickDelta
+ METHOD method_16083 (Ljava/util/HashMap;)V
+ ARG 0 map
METHOD method_16084 updateHeadDownAnimation ()V
METHOD method_16085 updateAnimations ()V
METHOD method_16086 isSleepingWithOwner ()Z
@@ -55,6 +57,9 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity
METHOD (Lnet/minecraft/class_1451;)V
ARG 1 cat
METHOD method_16097 dropMorningGifts ()V
+ METHOD method_16098 cannotSleep ()Z
+ METHOD method_27801 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2338;
+ ARG 1 direction
CLASS class_3700 TemptGoal
FIELD field_16298 player Lnet/minecraft/class_1657;
FIELD field_17948 cat Lnet/minecraft/class_1451;
diff --git a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping
index b53bda7ac2..f4a9c62989 100644
--- a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping
@@ -1,5 +1,7 @@
CLASS net/minecraft/class_1433 net/minecraft/entity/passive/DolphinEntity
FIELD field_18101 CLOSE_PLAYER_PREDICATE Lnet/minecraft/class_4051;
+ FIELD field_30326 MAX_AIR I
+ FIELD field_30327 MAX_MOISTNESS I
FIELD field_6747 TREASURE_POS Lnet/minecraft/class_2940;
FIELD field_6748 CAN_TAKE Ljava/util/function/Predicate;
FIELD field_6749 MOISTNESS Lnet/minecraft/class_2940;
@@ -12,6 +14,8 @@ CLASS net/minecraft/class_1433 net/minecraft/entity/passive/DolphinEntity
ARG 4 random
METHOD method_26884 createDolphinAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_6484 isNearTarget ()Z
+ METHOD method_6485 (Lnet/minecraft/class_1542;)Z
+ ARG 0 item
METHOD method_6486 setHasFish (Z)V
ARG 1 hasFish
METHOD method_6487 hasFish ()Z
@@ -36,5 +40,6 @@ CLASS net/minecraft/class_1433 net/minecraft/entity/passive/DolphinEntity
ARG 1 dolphin
ARG 2 speed
CLASS class_1437 PlayWithItemsGoal
+ FIELD field_6758 nextPlayingTime I
METHOD method_18056 spitOutItem (Lnet/minecraft/class_1799;)V
ARG 1 stack
diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping
index bd2a9efc90..67a223ad19 100644
--- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping
@@ -15,11 +15,19 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity
FIELD field_17962 extraRollingHeight F
FIELD field_17963 lastExtraRollingHeight F
FIELD field_17964 eatingTime I
+ METHOD method_18253 (Lnet/minecraft/class_1297;)Z
+ ARG 0 entity
+ METHOD method_18254 (Lnet/minecraft/class_1309;)Z
+ ARG 0 entity
METHOD method_18255 setType (Lnet/minecraft/class_4019$class_4039;)V
ARG 1 type
METHOD method_18257 canJumpChase (Lnet/minecraft/class_4019;Lnet/minecraft/class_1309;)Z
ARG 0 fox
ARG 1 chasedEntity
+ METHOD method_18261 (Lnet/minecraft/class_1297;)Z
+ ARG 0 entity
+ METHOD method_18262 (Lnet/minecraft/class_1309;)Z
+ ARG 0 entity
METHOD method_18265 (Lnet/minecraft/class_1542;)Z
ARG 0 item
METHOD method_18266 addTrustedUuid (Ljava/util/UUID;)V
@@ -67,9 +75,18 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity
ARG 1 sleeping
METHOD method_18428 canTrust (Ljava/util/UUID;)Z
ARG 1 uuid
+ METHOD method_18429 (Lnet/minecraft/class_1309;)Z
+ ARG 1 entity
METHOD method_18430 canEat (Lnet/minecraft/class_1799;)Z
ARG 1 stack
+ METHOD method_18431 (Lnet/minecraft/class_1309;)Z
+ ARG 1 entity
+ METHOD method_20451 (Lnet/minecraft/class_1309;)Z
+ ARG 1 entity
+ METHOD method_24347 (Lnet/minecraft/class_1309;)Z
+ ARG 1 entity
METHOD method_26885 createFoxAttributes ()Lnet/minecraft/class_5132$class_5133;
+ METHOD method_35172 isJumping ()Z
CLASS class_4020 DefendFriendGoal
FIELD field_17966 offender Lnet/minecraft/class_1309;
FIELD field_17967 friend Lnet/minecraft/class_1309;
@@ -93,11 +110,16 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity
ARG 2 chance
CLASS class_4025 EatSweetBerriesGoal
FIELD field_17974 timer I
+ FIELD field_30336 EATING_TIME I
METHOD (Lnet/minecraft/class_4019;DII)V
ARG 2 speed
ARG 4 range
ARG 5 maxYDifference
METHOD method_18307 eatSweetBerry ()V
+ METHOD method_33586 pickGlowBerries (Lnet/minecraft/class_2680;)V
+ ARG 1 state
+ METHOD method_33587 pickSweetBerries (Lnet/minecraft/class_2680;)V
+ ARG 1 state
CLASS class_4026 FoxSwimGoal
CLASS class_4027 FoxData
FIELD field_17977 type Lnet/minecraft/class_4019$class_4039;
@@ -131,6 +153,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity
ARG 2 speed
CLASS class_4037 DelayedCalmDownGoal
FIELD field_17994 timer I
+ FIELD field_30337 MAX_CALM_DOWN_TIME I
METHOD method_18432 canNotCalmDown ()Z
CLASS class_4038 MoveToHuntGoal
CLASS class_4039 Type
@@ -147,6 +170,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity
METHOD method_18311 fromId (I)Lnet/minecraft/class_4019$class_4039;
ARG 0 id
METHOD method_18313 fromBiome (Ljava/util/Optional;)Lnet/minecraft/class_4019$class_4039;
+ ARG 0 biome
METHOD method_18314 byName (Ljava/lang/String;)Lnet/minecraft/class_4019$class_4039;
ARG 0 name
METHOD method_18317 getId ()I
diff --git a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping
index 10ab480f74..be37c7005b 100644
--- a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping
@@ -2,6 +2,7 @@ CLASS net/minecraft/class_1439 net/minecraft/entity/passive/IronGolemEntity
FIELD field_25365 ANGER_TIME_RANGE Lnet/minecraft/class_6019;
FIELD field_25366 angerTime I
FIELD field_25367 angryAt Ljava/util/UUID;
+ FIELD field_30338 HEALTH_PER_INGOT I
FIELD field_6759 lookingAtVillagerTicksLeft I
FIELD field_6762 attackTicksLeft I
FIELD field_6763 IRON_GOLEM_FLAGS Lnet/minecraft/class_2940;
@@ -11,6 +12,8 @@ CLASS net/minecraft/class_1439 net/minecraft/entity/passive/IronGolemEntity
METHOD method_6496 isPlayerCreated ()Z
METHOD method_6497 setLookingAtVillager (Z)V
ARG 1 lookingAtVillager
+ METHOD method_6498 (Lnet/minecraft/class_1309;)Z
+ ARG 0 entity
METHOD method_6499 setPlayerCreated (Z)V
ARG 1 playerCreated
METHOD method_6501 getAttackTicksLeft ()I
diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping
index 87bddffa4e..4a0f0d6ea6 100644
--- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping
@@ -34,6 +34,8 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity
CLASS class_1502 ChaseWolvesGoal
METHOD (Lnet/minecraft/class_1501;)V
ARG 1 llama
+ METHOD method_18446 (Lnet/minecraft/class_1309;)Z
+ ARG 0 wolf
CLASS class_1503 LlamaData
FIELD field_7001 variant I
METHOD (I)V
diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping
index dd755217ef..b68063794a 100644
--- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping
@@ -3,6 +3,7 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity
FIELD field_18106 stewEffect Lnet/minecraft/class_1291;
FIELD field_18107 stewEffectDuration I
FIELD field_18108 lightningId Ljava/util/UUID;
+ FIELD field_30339 MUTATION_CHANCE I
METHOD method_18433 setType (Lnet/minecraft/class_1438$class_4053;)V
ARG 1 type
METHOD method_18434 chooseBabyType (Lnet/minecraft/class_1438;)Lnet/minecraft/class_1438$class_4053;
@@ -10,6 +11,8 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity
METHOD method_18435 getMooshroomType ()Lnet/minecraft/class_1438$class_4053;
METHOD method_18436 getStewEffectFrom (Lnet/minecraft/class_1799;)Ljava/util/Optional;
ARG 1 flower
+ METHOD method_20253 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V
+ ARG 1 player
METHOD method_20665 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
ARG 0 type
ARG 1 world
diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping
index 8b546e8078..a63879a12e 100644
--- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping
@@ -25,6 +25,8 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity
METHOD method_26888 createPandaAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_35173 isBrown ()Z
METHOD method_6503 updateLieOnBackAnimation ()V
+ METHOD method_6504 (Lnet/minecraft/class_1542;)Z
+ ARG 0 item
METHOD method_6505 setLyingOnBack (Z)V
ARG 1 lyingOnBack
METHOD method_6508 getHiddenGene ()Lnet/minecraft/class_1440$class_1443;
diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping
index e7bfed8a2f..5eb0ca85cd 100644
--- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping
@@ -19,6 +19,8 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity
ARG 4 random
METHOD method_26889 createParrotAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_6578 flapWings ()V
+ METHOD method_6579 (Ljava/util/HashMap;)V
+ ARG 0 map
METHOD method_6580 getSoundPitch (Ljava/util/Random;)F
ARG 0 random
METHOD method_6582 isSongPlaying ()Z
diff --git a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping
index d33c6f1010..fe0a13109c 100644
--- a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_1296 net/minecraft/entity/passive/PassiveEntity
+ FIELD field_29969 BABY_AGE I
FIELD field_5947 happyTicksRemaining I
FIELD field_5948 forcedAge I
FIELD field_5949 CHILD Lnet/minecraft/class_2940;
diff --git a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping
index 331f8f08ae..62e29f5363 100644
--- a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping
@@ -1,8 +1,13 @@
CLASS net/minecraft/class_1454 net/minecraft/entity/passive/PufferfishEntity
+ FIELD field_30353 NOT_PUFFED I
+ FIELD field_30354 SEMI_PUFFED I
+ FIELD field_30355 FULLY_PUFFED I
FIELD field_6832 deflateTicks I
FIELD field_6833 inflateTicks I
FIELD field_6834 BLOW_UP_FILTER Ljava/util/function/Predicate;
FIELD field_6835 PUFF_STATE Lnet/minecraft/class_2940;
+ METHOD method_6591 (Lnet/minecraft/class_1309;)Z
+ ARG 0 entity
METHOD method_6592 getScaleForPuffState (I)F
ARG 0 puffState
METHOD method_6593 sting (Lnet/minecraft/class_1308;)V
diff --git a/mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping b/mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping
index cf2a682a56..6301b93870 100644
--- a/mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping
@@ -1,7 +1,11 @@
CLASS net/minecraft/class_1425 net/minecraft/entity/passive/SchoolingFishEntity
FIELD field_6733 groupSize I
FIELD field_6734 leader Lnet/minecraft/class_1425;
+ METHOD method_6458 (Lnet/minecraft/class_1425;)V
+ ARG 1 fish
METHOD method_6459 decreaseGroupSize ()V
+ METHOD method_6460 (Lnet/minecraft/class_1425;)Z
+ ARG 1 fish
METHOD method_6461 joinGroupOf (Lnet/minecraft/class_1425;)Lnet/minecraft/class_1425;
ARG 1 groupLeader
METHOD method_6462 increaseGroupSize ()V
diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping
index 4d5d7a7a87..6f1699e66d 100644
--- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping
@@ -7,6 +7,8 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity
METHOD method_17690 createDyeMixingCraftingInventory (Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1715;
ARG 0 firstColor
ARG 1 secondColor
+ METHOD method_20254 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V
+ ARG 1 player
METHOD method_26893 createSheepAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_6628 getNeckAngle (F)F
ARG 1 delta
@@ -22,6 +24,8 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity
ARG 0 dyeColor
METHOD method_6635 setSheared (Z)V
ARG 1 sheared
+ METHOD method_6637 (Ljava/util/EnumMap;)V
+ ARG 0 map
METHOD method_6639 getChildColor (Lnet/minecraft/class_1429;Lnet/minecraft/class_1429;)Lnet/minecraft/class_1767;
ARG 1 firstParent
ARG 2 secondParent
diff --git a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping
index 61f012ec42..eaa2a62dd3 100644
--- a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping
@@ -1,5 +1,7 @@
CLASS net/minecraft/class_1473 net/minecraft/entity/passive/SnowGolemEntity
FIELD field_6873 SNOW_GOLEM_FLAGS Lnet/minecraft/class_2940;
+ METHOD method_20255 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V
+ ARG 1 player
METHOD method_26894 createSnowGolemAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_6642 setHasPumpkin (Z)V
ARG 1 hasPumpkin
diff --git a/mappings/net/minecraft/entity/passive/StriderEntity.mapping b/mappings/net/minecraft/entity/passive/StriderEntity.mapping
index 929bc1f6f1..199b49dec2 100644
--- a/mappings/net/minecraft/entity/passive/StriderEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/StriderEntity.mapping
@@ -21,6 +21,11 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity
METHOD method_26924 createStriderAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_30078 isEscapingDanger ()Z
METHOD method_30079 isBeingTempted ()Z
+ METHOD method_30336 initializeRider (Lnet/minecraft/class_5425;Lnet/minecraft/class_1266;Lnet/minecraft/class_1308;Lnet/minecraft/class_1315;)Lnet/minecraft/class_1315;
+ ARG 1 world
+ ARG 2 difficulty
+ ARG 3 rider
+ ARG 4 entityData
CLASS class_4988 Navigation
METHOD (Lnet/minecraft/class_4985;Lnet/minecraft/class_1937;)V
ARG 1 entity
diff --git a/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping b/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping
index c96df4ccd9..c4e3d78bf8 100644
--- a/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping
@@ -4,6 +4,8 @@ CLASS net/minecraft/class_3986 net/minecraft/entity/passive/TraderLlamaEntity
METHOD method_20502 canDespawn ()Z
METHOD method_20503 heldByTrader ()Z
METHOD method_20504 leashedByPlayer ()Z
+ METHOD method_35189 setDespawnDelay (I)V
+ ARG 1 despawnDelay
CLASS class_3987 DefendTraderGoal
FIELD field_17718 llama Lnet/minecraft/class_1501;
FIELD field_17719 offender Lnet/minecraft/class_1309;
diff --git a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping
index 0d18a7fd09..ad66d7d741 100644
--- a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_1474 net/minecraft/entity/passive/TropicalFishEntity
+ FIELD field_30378 BUCKET_VARIANT_TAG_KEY Ljava/lang/String;
FIELD field_6874 VARIANT Lnet/minecraft/class_2940;
FIELD field_6875 SHAPE_IDS [Lnet/minecraft/class_2960;
FIELD field_6876 LARGE_FISH_VARIETY_IDS [Lnet/minecraft/class_2960;
diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping
index ec1b2b7eba..301a139b4c 100644
--- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping
@@ -24,6 +24,8 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity
ARG 1 pos
METHOD method_6684 isLandBound ()Z
METHOD method_6687 getTravelPos ()Lnet/minecraft/class_2338;
+ METHOD method_6688 (Lnet/minecraft/class_1309;)Z
+ ARG 0 entity
METHOD method_6691 isActivelyTravelling ()Z
METHOD method_6693 getHomePos ()Lnet/minecraft/class_2338;
METHOD method_6695 isDiggingSand ()Z
diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping
index c67401996d..b2cdb57d37 100644
--- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping
@@ -31,6 +31,8 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
ARG 1 world
ARG 2 villager
ARG 3 time
+ METHOD method_19178 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_4140;Lnet/minecraft/class_4208;)V
+ ARG 3 pos
METHOD method_19179 reinitializeBrain (Lnet/minecraft/class_3218;)V
ARG 1 world
METHOD method_19182 restock ()V
@@ -48,10 +50,21 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
ARG 1 player
METHOD method_19193 depleteFood (I)V
ARG 1 amount
+ METHOD method_19520 (Lnet/minecraft/class_1646;Lnet/minecraft/class_4158;)Z
+ ARG 0 villager
+ ARG 1 poiType
+ METHOD method_19521 (Lnet/minecraft/class_1646;Lnet/minecraft/class_4158;)Z
+ ARG 0 villager
+ ARG 1 poiType
+ METHOD method_19522 (Lnet/minecraft/class_1646;Lnet/minecraft/class_4158;)Z
+ ARG 0 villager
+ ARG 1 poiType
METHOD method_19623 hasSeedToPlant ()Z
METHOD method_19625 setExperience (I)V
ARG 1 amount
METHOD method_20264 sayNo ()V
+ METHOD method_20593 (Lnet/minecraft/class_4139;)Z
+ ARG 0 gossipType
METHOD method_20594 getReputation (Lnet/minecraft/class_1657;)I
ARG 1 player
METHOD method_20687 canSummonGolem (J)Z
@@ -59,6 +72,7 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
METHOD method_20688 summonGolem (Lnet/minecraft/class_3218;JI)V
ARG 1 world
ARG 2 time
+ ARG 4 requiredCount
METHOD method_20690 notifyDeath (Lnet/minecraft/class_1297;)V
ARG 1 killer
METHOD method_20693 (JLnet/minecraft/class_1646;)Z
@@ -66,6 +80,8 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
METHOD method_20696 decayGossip ()V
METHOD method_20697 eatForBreeding ()V
METHOD method_20698 lacksFood ()Z
+ METHOD method_20699 (Lnet/minecraft/class_1309;)Z
+ ARG 0 entity
METHOD method_20741 hasRecentlySlept (J)Z
ARG 1 worldTime
METHOD method_20821 clearDailyRestockCount ()V
@@ -82,6 +98,9 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
METHOD method_21724 updateDemandBonus ()V
COMMENT Updates the demand bonus of all the trade offers of this villager.
METHOD method_26955 createVillagerAttributes ()Lnet/minecraft/class_5132$class_5133;
+ METHOD method_29278 (Lnet/minecraft/class_1646;Lnet/minecraft/class_4158;)Z
+ ARG 0 villager
+ ARG 1 poiType
METHOD method_29279 isNatural ()Z
METHOD method_30023 getHighestOpenPositionOnOffset (Lnet/minecraft/class_2338;DD)Lnet/minecraft/class_2338;
ARG 1 pos
diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping
index 1b510b68ef..42d2aa357e 100644
--- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping
@@ -3,6 +3,8 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity
FIELD field_25371 ANGER_TIME_RANGE Lnet/minecraft/class_6019;
FIELD field_25372 targetUuid Ljava/util/UUID;
FIELD field_25373 ANGER_TIME Lnet/minecraft/class_2940;
+ FIELD field_30386 WILD_MAX_HEALTH F
+ FIELD field_30387 TAMED_MAX_HEALTH F
FIELD field_6944 furWet Z
FIELD field_6945 lastShakeProgress F
FIELD field_6946 BEGGING Lnet/minecraft/class_2940;
@@ -11,6 +13,8 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity
FIELD field_6950 COLLAR_COLOR Lnet/minecraft/class_2940;
FIELD field_6951 canShakeWaterOff Z
FIELD field_6952 begAnimationProgress F
+ METHOD method_18444 (Lnet/minecraft/class_1309;)Z
+ ARG 0 entity
METHOD method_26897 createWolfAttributes ()Lnet/minecraft/class_5132$class_5133;
METHOD method_31167 resetShake ()V
METHOD method_6707 getFurWetBrightnessMultiplier (F)F
diff --git a/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping
index b469fb6d83..3d75d2ce0d 100644
--- a/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping
+++ b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping
@@ -12,5 +12,7 @@ CLASS net/minecraft/class_1678 net/minecraft/entity/projectile/ShulkerBulletEnti
ARG 3 target
ARG 4 axis
METHOD method_35208 getDirection ()Lnet/minecraft/class_2350;
+ METHOD method_7486 (Lnet/minecraft/class_2350$class_2351;)V
+ ARG 1 axis
METHOD method_7487 setDirection (Lnet/minecraft/class_2350;)V
ARG 1 direction
diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping
index b46da93454..b26a02bed8 100644
--- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping
+++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping
@@ -27,6 +27,10 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
ARG 1 pos
METHOD method_22864 getAdjacentRailPositionsByShape (Lnet/minecraft/class_2768;)Lcom/mojang/datafixers/util/Pair;
ARG 0 shape
+ METHOD method_22865 (Ljava/util/EnumMap;)V
+ ARG 0 map
+ METHOD method_30340 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
+ ARG 1 pos
METHOD method_7504 getMaxOffRailSpeed ()D
METHOD method_7505 snapPositionToRailWithOffset (DDDD)Lnet/minecraft/class_243;
COMMENT This method is used to determine the minecart's render orientation, by computing a position along the rail slightly before and slightly after the minecart's actual position.
diff --git a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping
index f2a28a922b..9e43d75711 100644
--- a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping
+++ b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping
@@ -36,6 +36,8 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity
METHOD method_30959 canCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z
ARG 0 entity
ARG 1 other
+ METHOD method_31552 (Lnet/minecraft/class_1297;)Z
+ ARG 0 entity
METHOD method_7531 setBubbleWobbleTicks (I)V
ARG 1 wobbleTicks
METHOD method_7532 getUnderWaterLocation ()Lnet/minecraft/class_1690$class_1691;
@@ -84,6 +86,8 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity
ARG 3 baseBlock
ARG 4 name
METHOD method_7558 getType (I)Lnet/minecraft/class_1690$class_1692;
+ ARG 0 type
METHOD method_7559 getName ()Ljava/lang/String;
METHOD method_7560 getBaseBlock ()Lnet/minecraft/class_2248;
METHOD method_7561 getType (Ljava/lang/String;)Lnet/minecraft/class_1690$class_1692;
+ ARG 0 name