Entity mappings (#657)

* Entity mapping modifications

* Entity mapping renames

* improvements

* xp -> experience, Snowgolem -> SnowGolem, spitout -> spitOut, lastLeveledUp -> lastPlayedLevelUpSoundTime, missed an instance of targetting

* Rename SnowgolemEntity.mapping to SnowGolemEntity.mapping

Stupid file system doesn't make a difference between cases.

* touchingLava -> inLava, touchLava() - setInLava()

* putOnTopmostSolidBlock -> afterSpawn

* owner -> actor, other improvements

* Actors are evil. Or something.

* Missed some actors, reverted stuff that's now part of #663

* isInfestableBlock -> isInfestable

* getRegularBlock(BlockState) ->fromRegularBlock

Another method with inverse logic in that class.

* use method name from main branch for surface collision

mappings/net/minecraft/block/InfestedBlock.mapping

@@ -1,11 +1,11 @@
 CLASS bpe net/minecraft/block/InfestedBlock
 	FIELD a regularBlock Lbml;
-	FIELD b INFESTED_TO_REGULAR Ljava/util/Map;
+	FIELD b REGULAR_TO_INFESTED Ljava/util/Map;
 	METHOD <init> (Lbml;Lbml$c;)V
 		ARG 1 regularBlock
 		ARG 2 settings
 	METHOD d getRegularBlock ()Lbml;
-	METHOD e getRegularBlock (Lbml;)Lbvj;
+	METHOD e fromRegularBlock (Lbml;)Lbvj;
-		ARG 0 infestedBlockState
+		ARG 0 regularBlock
-	METHOD j hasRegularBlock (Lbvj;)Z
+	METHOD j isInfestable (Lbvj;)Z
-		ARG 0 infestedBlockState
+		ARG 0 block

mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping

@@ -20,6 +20,8 @@ CLASS dhk net/minecraft/client/network/ClientPlayerInteractionManager
 		ARG 2 recipe
 	METHOD a copyAbilities (Lavx;)V
 	METHOD a attackEntity (Lavx;Laif;)V
+		ARG 1 player
+		ARG 2 target
 	METHOD a interactEntity (Lavx;Laif;Lagz;)Laha;
 		ARG 1 player
 		ARG 2 entity
@@ -28,20 +30,27 @@ CLASS dhk net/minecraft/client/network/ClientPlayerInteractionManager
 	METHOD a interactItem (Lavx;Lbhh;Lagz;)Laha;
 		ARG 1 player
 		ARG 2 world
+		ARG 3 hand
 	METHOD a dropCreativeStack (Lbca;)V
 	METHOD a clickCreativeStack (Lbca;I)V
 		ARG 1 stack
 	METHOD a setGameMode (Lbhe;)V
 	METHOD a createPlayer (Ldhl;Lyu;Lcuy;)Ldjv;
+		ARG 1 world
+		ARG 2 stateHandler
+		ARG 3 recipeBook
 	METHOD a interactBlock (Ldjv;Ldhl;Lagz;Lcrr;)Laha;
 		ARG 1 player
 		ARG 2 world
+		ARG 3 hand
+		ARG 4 hitResult
 	METHOD a breakBlock (Lev;)Z
 	METHOD a attackBlock (Lev;Lfa;)Z
 		ARG 1 pos
 	METHOD b cancelBlockBreaking ()V
 	METHOD b stopUsingItem (Lavx;)V
 	METHOD b isCurrentlyBreaking (Lev;)Z
+		ARG 1 pos
 	METHOD c getReachDistance ()F
 	METHOD d tick ()V
 	METHOD e hasExperienceBar ()Z

mappings/net/minecraft/client/network/packet/SetTradeOffersPacket.mapping

@@ -3,15 +3,15 @@ CLASS lr net/minecraft/client/network/packet/SetTradeOffersPacket
 	FIELD b recipes Lbgl;
 	FIELD c levelProgress I
 	FIELD d experience I
-	FIELD e levelled Z
+	FIELD e leveled Z
 	METHOD <init> (ILbgl;IIZ)V
 		ARG 1 syncId
 		ARG 2 recipes
 		ARG 3 levelProgress
 		ARG 4 experience
-		ARG 5 levelled
+		ARG 5 leveled
 	METHOD b getSyncId ()I
 	METHOD c getOffers ()Lbgl;
 	METHOD d getLevelProgress ()I
 	METHOD e getExperience ()I
-	METHOD f isLevelled ()Z
+	METHOD f isLeveled ()Z

mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping

@@ -19,17 +19,30 @@ CLASS aie net/minecraft/entity/AreaEffectCloudEntity
 	METHOD <init> (Lbhh;DDD)V
 		ARG 1 world
 		ARG 2 x
+		ARG 4 y
+		ARG 6 z
 	METHOD a setRadius (F)V
+		ARG 1 radius
 	METHOD a setColor (I)V
+		ARG 1 rgb
 	METHOD a addEffect (Lahz;)V
+		ARG 1 effect
 	METHOD a setOwner (Laio;)V
+		ARG 1 owner
 	METHOD a setPotion (Lbdp;)V
+		ARG 1 potion
 	METHOD a setParticleType (Lgd;)V
+		ARG 1 particle
 	METHOD a setWaiting (Z)V
-	METHOD b setRadiusStart (F)V
+		ARG 1 waiting
+	METHOD b setRadiusOnUse (F)V
+		ARG 1 radius
 	METHOD b setDuration (I)V
+		ARG 1 duration
 	METHOD c setRadiusGrowth (F)V
+		ARG 1 growth
 	METHOD d setWaitTime (I)V
+		ARG 1 ticks
 	METHOD f getRadius ()F
 	METHOD i getColor ()I
 	METHOD k getParticleType ()Lgd;

mappings/net/minecraft/entity/CrossbowUser.mapping

@@ -1,7 +1,9 @@
 CLASS atw net/minecraft/entity/CrossbowUser
 	METHOD a shoot (Laio;Lbca;Lawm;F)V
 		ARG 1 target
+		ARG 2 crossbow
 		ARG 3 projectile
+		ARG 4 multiShotSpray
 	METHOD a setCharging (Z)V
 		ARG 1 charging
 	METHOD w getTarget ()Laio;

mappings/net/minecraft/entity/DamageUtil.mapping

@@ -1,4 +1,7 @@
 CLASS ahm net/minecraft/entity/DamageUtil
+	METHOD a getInflictedDamage (FF)F
+		ARG 0 damageDealt
+		ARG 1 protection
 	METHOD a getDamageLeft (FFF)F
 		ARG 0 damage
 		ARG 1 armor

mappings/net/minecraft/entity/EnderEyeEntity.mapping

@@ -1,2 +1,19 @@
 CLASS awg net/minecraft/entity/EnderEyeEntity
+	FIELD b ITEM Lqh;
+	FIELD c velocityX D
+	FIELD d velocityY D
+	FIELD e velocityZ D
 	FIELD f useCount I
+	FIELD g dropsItem Z
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+	METHOD a moveTowards (Lev;)V
+		ARG 1 pos
+	METHOD b setItem (Lbca;)V
+		ARG 1 stack
+	METHOD c (Lbca;)V
+		ARG 0 stack
+	METHOD i getTrackedItem ()Lbca;

mappings/net/minecraft/entity/Entity.mapping

@@ -13,7 +13,7 @@ CLASS aif net/minecraft/entity/Entity
 	FIELD O age I
 	FIELD P insideWater Z
 	FIELD Q waterHeight D
-	FIELD S isTouchingLava Z
+	FIELD S inLava Z
 	FIELD V dataTracker Lqk;
 	FIELD W FLAGS Lqh;
 	FIELD X POSE Lqh;
@@ -81,6 +81,7 @@ CLASS aif net/minecraft/entity/Entity
 	METHOD U getScoreboardTags ()Ljava/util/Set;
 	METHOD V kill ()V
 	METHOD W getDataTracker ()Lqk;
+	METHOD X afterSpawn ()V
 	METHOD Y remove ()V
 	METHOD Z getPose ()Laiy;
 	METHOD a handleStatus (B)V
@@ -91,6 +92,9 @@ CLASS aif net/minecraft/entity/Entity
 		ARG 1 cursorDeltaX
 		ARG 3 cursorDeltaY
 	METHOD a requestTeleport (DDD)V
+		ARG 1 x
+		ARG 3 y
+		ARG 5 z
 	METHOD a setPositionAnglesAndUpdate (DDDFF)V
 		ARG 1 x
 		ARG 3 y
@@ -101,9 +105,12 @@ CLASS aif net/minecraft/entity/Entity
 		ARG 1 x
 		ARG 3 y
 		ARG 5 z
+		ARG 7 yaw
+		ARG 8 pitch
 	METHOD a rayTrace (DFZ)Lcrt;
 		ARG 1 maxDistance
 		ARG 3 tickDelta
+		ARG 4 includeFluids
 	METHOD a fall (DZLbvj;Lev;)V
 		ARG 1 heightDifference
 		ARG 3 onGround
@@ -111,16 +118,22 @@ CLASS aif net/minecraft/entity/Entity
 		ARG 5 blockPos
 	METHOD a setRotation (FF)V
 		ARG 1 yaw
+		ARG 2 pitch
 	METHOD a updateVelocity (FLcrv;)V
 		ARG 1 speed
 		ARG 2 movementInput
 	METHOD a damage (Laho;F)Z
 		ARG 1 source
 		ARG 2 amount
+	METHOD a updateKilledAdvancementCriterion (Laif;ILaho;)V
+		ARG 1 killer
+		ARG 2 score
+		ARG 3 damageSource
 	METHOD a startRiding (Laif;Z)Z
 		ARG 1 entity
 	METHOD a setEquippedStack (Laik;Lbca;)V
 		ARG 1 slot
+		ARG 2 stack
 	METHOD a dealDamage (Laio;Laif;)V
 		ARG 1 attacker
 		ARG 2 target
@@ -128,31 +141,47 @@ CLASS aif net/minecraft/entity/Entity
 		ARG 1 type
 		ARG 2 offset
 	METHOD a getSize (Laiy;)Laig;
+		ARG 1 pose
 	METHOD a getEyeHeight (Laiy;Laig;)F
+		ARG 1 pose
+		ARG 2 size
 	METHOD a onStruckByLightning (Latl;)V
 		ARG 1 lightning
 	METHOD a interactAt (Lavx;Lcrv;Lagz;)Laha;
 		ARG 1 player
 		ARG 2 hitPos
+		ARG 3 hand
 	METHOD a dropStack (Lbca;)Lato;
+		ARG 1 stack
 	METHOD a dropStack (Lbca;F)Lato;
 		ARG 1 stack
+		ARG 2 yOffset
 	METHOD a canExplosionDestroyBlock (Lbha;Lbgr;Lev;Lbvj;F)Z
 		ARG 1 explosion
 		ARG 2 world
 		ARG 3 pos
 		ARG 4 state
+		ARG 5 explosionPower
 	METHOD a getEffectiveExplosionResistance (Lbha;Lbgr;Lev;Lbvj;Lckz;F)F
 		ARG 1 explosion
 		ARG 2 world
 		ARG 3 pos
-		ARG 5 state
+		ARG 4 blockState
+		ARG 5 fluidState
+		ARG 6 max
 	METHOD a dropItem (Lbhg;)Lato;
+		ARG 1 item
 	METHOD a dropItem (Lbhg;I)Lato;
+		ARG 1 item
+		ARG 2 yOffset
 	METHOD a setWorld (Lbhh;)V
+		ARG 1 world
 	METHOD a applyMirror (Lbpw;)F
+		ARG 1 mirror
 	METHOD a applyRotation (Lbqw;)F
+		ARG 1 rotation
 	METHOD a onBlockCollision (Lbvj;)V
+		ARG 1 state
 	METHOD a slowMovement (Lbvj;Lcrv;)V
 		ARG 1 state
 		ARG 2 multipliers
@@ -162,6 +191,7 @@ CLASS aif net/minecraft/entity/Entity
 		ARG 1 anchor
 		ARG 2 target
 	METHOD a setBoundingBox (Lcrq;)V
+		ARG 1 boundingBox
 	METHOD a movementInputToVelocity (Lcrv;FF)Lcrv;
 		ARG 0 movementInput
 		ARG 1 speed
@@ -170,7 +200,9 @@ CLASS aif net/minecraft/entity/Entity
 		ARG 1 offset
 		ARG 2 type
 	METHOD a isTeamPlayer (Lcsx;)Z
+		ARG 1 team
 	METHOD a populateCrashReport (Le;)V
+		ARG 1 section
 	METHOD a setPositionAndAngles (Lev;FF)V
 		ARG 1 pos
 		ARG 2 yaw
@@ -180,21 +212,32 @@ CLASS aif net/minecraft/entity/Entity
 		ARG 2 state
 	METHOD a readCustomDataFromTag (Lib;)V
 		ARG 1 tag
+	METHOD a hasPassengerType (Ljava/lang/Class;)Z
+		ARG 1 clazz
 	METHOD a addScoreboardTag (Ljava/lang/String;)Z
+		ARG 1 tag
 	METHOD a setUuid (Ljava/util/UUID;)V
+		ARG 1 uuid
 	METHOD a onTrackedDataSet (Lqh;)V
 		ARG 1 data
+	METHOD a canBeSpectated (Lvh;)Z
+		ARG 1 spectator
 	METHOD a playSound (Lyj;FF)V
 		ARG 1 sound
 		ARG 2 volume
+		ARG 3 pitch
 	METHOD a isInFluid (Lzb;)Z
+		ARG 1 fluidTag
 	METHOD a isInFluid (Lzb;Z)Z
+		ARG 1 fluidTag
 		ARG 2 requireLoadedChunk
 	METHOD a toListTag ([D)Lii;
+		ARG 1 values
 	METHOD a toListTag ([F)Lii;
+		ARG 1 values
 	METHOD aA spawnSprintingParticles ()V
-	METHOD aB onLavaCollision ()V
+	METHOD aB setInLava ()V
-	METHOD aC isTouchingLava ()Z
+	METHOD aC isInLava ()Z
 	METHOD aD getLightmapCoordinates ()I
 	METHOD aE getBrightnessAtEyes ()F
 	METHOD aF scheduleVelocityUpdate ()V
@@ -231,8 +274,9 @@ CLASS aif net/minecraft/entity/Entity
 	METHOD aj getHighSpeedSplashSound ()Lyj;
 	METHOD ak checkBlockCollision ()V
 	METHOD am isSilent ()Z
-	METHOD an isUnaffectedByGravity ()Z
+	METHOD an hasNoGravity ()Z
 	METHOD ao canClimb ()Z
+	METHOD ap getCollisionBox ()Lcrq;
 	METHOD aq isFireImmune ()Z
 	METHOD ar isInsideWater ()Z
 	METHOD as isInsideWaterOrRain ()Z
@@ -257,18 +301,28 @@ CLASS aif net/minecraft/entity/Entity
 		ARG 1 index
 		ARG 2 value
 	METHOD b isInvulnerableTo (Laho;)Z
+		ARG 1 damageSource
+	METHOD b onKilledOther (Laio;)V
+		ARG 1 other
 	METHOD b setPose (Laiy;)V
+		ARG 1 pose
 	METHOD b onPlayerCollision (Lavx;)V
+		ARG 1 player
 	METHOD b interact (Lavx;Lagz;)Z
 		ARG 1 player
+		ARG 2 hand
 	METHOD b doesNotCollide (Lcrq;)Z
 		ARG 1 box
 	METHOD b squaredHorizontalLength (Lcrv;)D
+		ARG 0 vector
 	METHOD b writeCustomDataToTag (Lib;)V
 		ARG 1 tag
 	METHOD b removeScoreboardTag (Ljava/lang/String;)Z
+		ARG 1 tag
 	METHOD b setCustomName (Ljm;)V
+		ARG 1 name
 	METHOD b onStartedTrackingBy (Lvh;)V
+		ARG 1 player
 	METHOD b updateMovementInFluid (Lzb;)Z
 		ARG 1 tag
 	METHOD bA getUuid ()Ljava/util/UUID;
@@ -289,6 +343,7 @@ CLASS aif net/minecraft/entity/Entity
 	METHOD bP getEntityWorld ()Lbhh;
 	METHOD bQ getServer ()Lnet/minecraft/server/MinecraftServer;
 	METHOD bR isImmuneToExplosion ()Z
+	METHOD bS entityDataRequiresOperator ()Z
 	METHOD bU getPrimaryPassenger ()Laif;
 	METHOD bV getPassengerList ()Ljava/util/List;
 	METHOD bW getPassengersDeep ()Ljava/util/Collection;
@@ -304,6 +359,7 @@ CLASS aif net/minecraft/entity/Entity
 	METHOD bh isSprinting ()Z
 	METHOD bi isSwimming ()Z
 	METHOD bj isInSwimmingPose ()Z
+	METHOD bk shouldLeaveSwimmingPose ()Z
 	METHOD bl isGlowing ()Z
 	METHOD bm isInvisible ()Z
 	METHOD bn getScoreboardTeam ()Lcsx;
@@ -324,14 +380,21 @@ CLASS aif net/minecraft/entity/Entity
 		ARG 1 pitch
 		ARG 2 yaw
 	METHOD c wouldPoseNotCollide (Laiy;)Z
+		ARG 1 pose
 	METHOD c canSeePlayer (Lavx;)Z
 		ARG 1 player
 	METHOD c squaredDistanceTo (Lcrv;)D
+		ARG 1 vector
 	METHOD c setInPortal (Lev;)V
 		ARG 1 pos
 	METHOD c saveSelfToTag (Lib;)Z
+		ARG 1 tag
+	METHOD c removeClickEvents (Ljm;)V
+		ARG 0 textComponent
 	METHOD c onStoppedTrackingBy (Lvh;)V
+		ARG 1 player
 	METHOD c setSilent (Z)V
+		ARG 1 silent
 	METHOD ca getVehicle ()Laif;
 	METHOD cb getSoundCategory ()Lyl;
 	METHOD cd getCommandSource ()Lcd;
@@ -350,14 +413,21 @@ CLASS aif net/minecraft/entity/Entity
 		ARG 1 pitch
 		ARG 2 yaw
 	METHOD d setVelocity (Lcrv;)V
+		ARG 1 velocity
 	METHOD d saveToTag (Lib;)Z
-	METHOD d setUnaffectedByGravity (Z)V
+		ARG 1 tag
+	METHOD d setNoGravity (Z)V
+		ARG 1 noGravity
 	METHOD e squaredDistanceTo (DDD)D
 		ARG 1 x
+		ARG 3 y
+		ARG 5 z
 	METHOD e setEntityId (I)V
+		ARG 1 id
 	METHOD e getEyeHeight (Laiy;)F
 		ARG 1 pose
 	METHOD e toTag (Lib;)Lib;
+		ARG 1 tag
 	METHOD e setSneaking (Z)V
 		ARG 1 sneaking
 	METHOD equals (Ljava/lang/Object;)Z
@@ -371,6 +441,7 @@ CLASS aif net/minecraft/entity/Entity
 	METHOD f setOnFireFor (I)V
 		ARG 1 seconds
 	METHOD f fromTag (Lib;)V
+		ARG 1 tag
 	METHOD f setSprinting (Z)V
 		ARG 1 sprinting
 	METHOD g shouldRenderFrom (DDD)Z
@@ -380,7 +451,9 @@ CLASS aif net/minecraft/entity/Entity
 	METHOD g getPitch (F)F
 		ARG 1 tickDelta
 	METHOD g burn (I)V
+		ARG 1 time
 	METHOD g distanceTo (Laif;)F
+		ARG 1 entity
 	METHOD g setSwimming (Z)V
 		ARG 1 swimming
 	METHOD h tick ()V
@@ -393,6 +466,7 @@ CLASS aif net/minecraft/entity/Entity
 	METHOD h getFlag (I)Z
 		ARG 1 index
 	METHOD h squaredDistanceTo (Laif;)D
+		ARG 1 entity
 	METHOD h setGlowing (Z)V
 		ARG 1 glowing
 	METHOD i pushOutOfBlocks (DDD)V
@@ -404,6 +478,7 @@ CLASS aif net/minecraft/entity/Entity
 	METHOD i setBreath (I)V
 		ARG 1 breath
 	METHOD i pushAwayFrom (Laif;)V
+		ARG 1 entity
 	METHOD i setInvisible (Z)V
 		ARG 1 invisible
 	METHOD j stopRiding ()V
@@ -414,35 +489,49 @@ CLASS aif net/minecraft/entity/Entity
 	METHOD j getCameraPosVec (F)Lcrv;
 		ARG 1 tickDelta
 	METHOD j allowsPermissionLevel (I)Z
-	METHOD j onBubbleColumnSufaceCollision (Z)V
+	METHOD j onBubbleColumnSurfaceCollision (Z)V
-		ARG 1 downwards
+		ARG 1 drag
 	METHOD k isBeingRainedOn ()Z
 	METHOD k setHeadYaw (F)V
 		ARG 1 headYaw
 	METHOD k updatePassengerPosition (Laif;)V
 		ARG 1 passenger
 	METHOD k onBubbleColumnCollision (Z)V
-		ARG 1 downwards
+		ARG 1 drag
 	METHOD l isInsideBubbleColumn ()Z
 	METHOD l setYaw (F)V
+		ARG 1 yaw
 	METHOD l onPassengerLookAround (Laif;)V
 		ARG 1 passenger
 	METHOD l setInvulnerable (Z)V
+		ARG 1 invulnerable
 	METHOD m startRiding (Laif;)Z
+		ARG 1 entity
 	METHOD m setCustomNameVisible (Z)V
+		ARG 1 visible
 	METHOD n canStartRiding (Laif;)Z
+		ARG 1 entity
 	METHOD o addPassenger (Laif;)V
+		ARG 1 passenger
 	METHOD p removePassenger (Laif;)V
+		ARG 1 passenger
 	METHOD q canAddPassenger (Laif;)Z
+		ARG 1 passenger
 	METHOD r isTeammate (Laif;)Z
+		ARG 1 other
 	METHOD s isPartOf (Laif;)Z
+		ARG 1 entity
 	METHOD t isSpectator ()Z
 	METHOD t handlePlayerAttack (Laif;)Z
-	METHOD u setPositionAndAngles (Laif;)V
+	METHOD u copyPositionAndRotation (Laif;)V
+		ARG 1 entity
 	METHOD u_ initDataTracker ()V
 	METHOD w hasPassenger (Laif;)Z
+		ARG 1 passenger
 	METHOD x isConnectedThroughVehicle (Laif;)Z
 		ARG 1 entity
 	METHOD x_ refreshSize ()V
 	METHOD y getPermissionLevel ()I
+	METHOD y hasPassengerDeep (Laif;)Z
+		ARG 1 passenger
 	METHOD y_ getPistonBehavior ()Lclf;

mappings/net/minecraft/entity/EntityCategory.mapping

@@ -4,6 +4,11 @@ CLASS aiq net/minecraft/entity/EntityCategory
 	FIELD h peaceful Z
 	FIELD i animal Z
 	FIELD j name Ljava/lang/String;
+	METHOD <init> (Ljava/lang/String;ILjava/lang/String;IZZ)V
+		ARG 3 name
+		ARG 4 spawnCap
+		ARG 5 peaceful
+		ARG 6 animal
 	METHOD a getName ()Ljava/lang/String;
 	METHOD b getSpawnCap ()I
 	METHOD c isPeaceful ()Z

mappings/net/minecraft/entity/EntitySize.mapping

@@ -2,6 +2,10 @@ CLASS aig net/minecraft/entity/EntitySize
 	FIELD a width F
 	FIELD b height F
 	FIELD c constant Z
+	METHOD <init> (FFZ)V
+		ARG 1 width
+		ARG 2 height
+		ARG 3 constant
 	METHOD a scaled (F)Laig;
 		ARG 1 ratio
 	METHOD a scaled (FF)Laig;

mappings/net/minecraft/entity/EntityType.mapping

@@ -1,19 +1,31 @@
 CLASS aij net/minecraft/entity/EntityType
 	CLASS aij$a Builder
-		FIELD a function Laij$b;
+		FIELD a factory Laij$b;
-		FIELD b entityClass Laiq;
+		FIELD b category Laiq;
 		FIELD c saveable Z
 		FIELD d summonable Z
+		FIELD e fireImmune Z
 		FIELD f size Laig;
+		METHOD <init> (Laij$b;Laiq;)V
+			ARG 1 factory
+			ARG 2 category
 		METHOD a disableSummon ()Laij$a;
 		METHOD a setSize (FF)Laij$a;
 			ARG 1 width
 			ARG 2 height
 		METHOD a create (Laij$b;Laiq;)Laij$a;
+			ARG 0 factory
+			ARG 1 category
 		METHOD a create (Laiq;)Laij$a;
+			ARG 0 category
 		METHOD a build (Ljava/lang/String;)Laij;
+			ARG 1 id
 		METHOD b disableSaving ()Laij$a;
+		METHOD c makeFireImmune ()Laij$a;
 	CLASS aij$b EntityFactory
+		METHOD create (Laij;Lbhh;)Laif;
+			ARG 1 type
+			ARG 2 world
 	FIELD aY LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD aZ factory Laij$b;
 	FIELD ba category Laiq;
@@ -35,28 +47,64 @@ CLASS aij net/minecraft/entity/EntityType
 		ARG 7 size
 	METHOD a isSaveable ()Z
 	METHOD a createSimpleBoundingBox (DDD)Lcrq;
+		ARG 1 feetX
+		ARG 3 feetY
+		ARG 5 feetZ
 	METHOD a createInstanceFromId (ILbhh;)Laif;
+		ARG 0 type
+		ARG 1 world
 	METHOD a getId (Laij;)Lqs;
+		ARG 0 type
 	METHOD a create (Lbhh;)Laif;
+		ARG 1 world
 	METHOD a newInstance (Lbhh;Laij;)Laif;
 		ARG 0 world
 		ARG 1 type
 	METHOD a loadFromEntityTag (Lbhh;Lavx;Laif;Lib;)V
+		ARG 0 world
+		ARG 1 player
+		ARG 3 itemTag
 	METHOD a spawnFromItemStack (Lbhh;Lbca;Lavx;Lev;Lair;ZZ)Laif;
+		ARG 1 world
+		ARG 2 stack
+		ARG 3 player
+		ARG 4 pos
+		ARG 5 spawnType
 	METHOD a spawn (Lbhh;Lib;Ljm;Lavx;Lev;Lair;ZZ)Laif;
+		ARG 1 world
+		ARG 2 itemTag
+		ARG 3 name
+		ARG 4 player
+		ARG 5 pos
+		ARG 6 spawnType
 	METHOD a getOriginY (Lbhk;Lev;ZLcrq;)D
+		ARG 0 world
+		ARG 1 pos
+		ARG 3 boundingBox
 	METHOD a fromTag (Lib;)Ljava/util/Optional;
 		ARG 0 compoundTag
 	METHOD a getEntityFromTag (Lib;Lbhh;)Ljava/util/Optional;
+		ARG 0 tag
+		ARG 1 world
 	METHOD a loadEntityWithPassengers (Lib;Lbhh;Ljava/util/function/Function;)Laif;
 		ARG 0 compoundTag
 		ARG 1 world
 		ARG 2 entityProcessor
 	METHOD a get (Ljava/lang/String;)Ljava/util/Optional;
+		ARG 0 id
 	METHOD a register (Ljava/lang/String;Laij$a;)Laij;
+		ARG 0 id
+		ARG 1 type
 	METHOD a isTaggedWith (Lzb;)Z
+		ARG 1 tag
 	METHOD b isSummonable ()Z
 	METHOD b create (Lbhh;Lib;Ljm;Lavx;Lev;Lair;ZZ)Laif;
+		ARG 1 world
+		ARG 2 itemTag
+		ARG 3 name
+		ARG 4 player
+		ARG 5 pos
+		ARG 6 spawnType
 	METHOD b loadEntityFromTag (Lib;Lbhh;)Ljava/util/Optional;
 		ARG 0 compoundTag
 		ARG 1 world

mappings/net/minecraft/entity/EquipmentSlot.mapping

@@ -10,6 +10,9 @@ CLASS aik net/minecraft/entity/EquipmentSlot
 		ARG 5 armorStandId
 		ARG 6 name
 	METHOD a getType ()Laik$a;
+	METHOD a fromTypeIndex (Laik$a;I)Laik;
+		ARG 0 type
+		ARG 1 index
 	METHOD a byName (Ljava/lang/String;)Laik;
 		ARG 0 name
 	METHOD b getEntitySlotId ()I

mappings/net/minecraft/entity/ExperienceOrbEntity.mapping

@@ -13,6 +13,10 @@ CLASS ail net/minecraft/entity/ExperienceOrbEntity
 		ARG 8 amount
 	METHOD a roundToOrbSize (I)I
 		ARG 0 value
+	METHOD b getMendingRepairCost (I)I
+		ARG 1 repairAmount
+	METHOD c getMendingRepairAmount (I)I
+		ARG 1 experienceAmount
 	METHOD f getExperienceAmount ()I
 	METHOD i getOrbSize ()I
 	METHOD k applyWaterMovement ()V

mappings/net/minecraft/entity/FallingBlockEntity.mapping

@@ -12,8 +12,12 @@ CLASS atn net/minecraft/entity/FallingBlockEntity
 		ARG 1 world
 		ARG 2 x
 		ARG 4 y
+		ARG 6 z
+		ARG 8 block
 	METHOD a setFallingBlockPos (Lev;)V
+		ARG 1 pos
 	METHOD a setHurtEntities (Z)V
+		ARG 1 hurtEntities
 	METHOD f getFallingBlockPos ()Lev;
 	METHOD i getWorldClient ()Lbhh;
 	METHOD k getBlockState ()Lbvj;

mappings/net/minecraft/entity/FireworkEntity.mapping

@@ -11,6 +11,13 @@ CLASS awi net/minecraft/entity/FireworkEntity
 		ARG 4 y
 		ARG 6 z
 		ARG 8 item
+	METHOD <init> (Lbhh;Lbca;DDDZ)V
+		ARG 1 world
+		ARG 2 item
+		ARG 3 x
+		ARG 5 y
+		ARG 7 z
+		ARG 9 shotAtAngle
 	METHOD <init> (Lbhh;Lbca;Laio;)V
 		ARG 1 world
 		ARG 2 item
@@ -18,5 +25,6 @@ CLASS awi net/minecraft/entity/FireworkEntity
 	METHOD a handleCollision (Lcrt;)V
 	METHOD i wasShotAtAngle ()Z
 	METHOD k explodeAndRemove ()V
+	METHOD l hasExplosionEffects ()Z
 	METHOD m explode ()V
 	METHOD n wasShotByEntity ()Z

mappings/net/minecraft/entity/InteractionObserver.mapping

@@ -1,3 +1,4 @@
 CLASS aiz net/minecraft/entity/InteractionObserver
 	METHOD a onInteractionWith (Laqd;Laif;)V
 		ARG 1 interaction
+		ARG 2 entity

mappings/net/minecraft/entity/ItemEntity.mapping

@@ -18,10 +18,20 @@ CLASS ato net/minecraft/entity/ItemEntity
 		ARG 6 z
 		ARG 8 stack
 	METHOD a setPickupDelay (I)V
+		ARG 1 pickupDelay
 	METHOD a tryMerge (Lato;)V
+		ARG 1 other
+	METHOD a merge (Lato;Lbca;Lato;Lbca;)V
+		ARG 0 targetEntity
+		ARG 1 targetStack
+		ARG 2 sourceEntity
+		ARG 3 sourceStack
 	METHOD b setStack (Lbca;)V
+		ARG 1 stack
 	METHOD b setOwner (Ljava/util/UUID;)V
+		ARG 1 uuid
 	METHOD c setThrower (Ljava/util/UUID;)V
+		ARG 1 uuid
 	METHOD i getStack ()Lbca;
 	METHOD k getOwner ()Ljava/util/UUID;
 	METHOD l getThrower ()Ljava/util/UUID;

mappings/net/minecraft/entity/JumpingMount.mapping

@@ -1,5 +1,7 @@
 CLASS aix net/minecraft/entity/JumpingMount
 	METHOD F_ canJump ()Z
 	METHOD a_ setJumpStrength (I)V
+		ARG 1 strength
 	METHOD b startJumping (I)V
+		ARG 1 height
 	METHOD c stopJumping ()V

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -2,6 +2,7 @@ CLASS aio net/minecraft/entity/LivingEntity
 	FIELD aA deathTime I
 	FIELD aB lastHandSwingProgress F
 	FIELD aC handSwingProgress F
+	FIELD aD lastAttackedTicks I
 	FIELD aE lastLimbDistance F
 	FIELD aF limbDistance F
 	FIELD aG limbAngle F
@@ -49,8 +50,10 @@ CLASS aio net/minecraft/entity/LivingEntity
 	METHOD A getAttackDistanceScalingFactor (Laif;)D
 	METHOD C updatePotionVisibility ()V
 	METHOD C tryAttack (Laif;)Z
+		ARG 1 target
 	METHOD D pushAway (Laif;)V
 	METHOD E canSee (Laif;)Z
+		ARG 1 entity
 	METHOD a teleport (DDDZ)Z
 		ARG 1 x
 		ARG 3 y
@@ -60,7 +63,9 @@ CLASS aio net/minecraft/entity/LivingEntity
 	METHOD a setStackInHand (Lagz;Lbca;)V
 		ARG 1 hand
 	METHOD a onDeath (Laho;)V
+		ARG 1 damageSource
 	METHOD a dropEquipment (Laho;IZ)V
+		ARG 1 damageSource
 		ARG 2 addedDropChance
 		ARG 3 dropAllowed
 	METHOD a dropLoot (Laho;Z)V
@@ -76,8 +81,10 @@ CLASS aio net/minecraft/entity/LivingEntity
 		ARG 1 item
 		ARG 2 count
 	METHOD a canTarget (Laij;)Z
+		ARG 1 type
 	METHOD a isEquippedStackValid (Laik;)Z
 	METHOD a setAttacker (Laio;)V
+		ARG 1 attacker
 	METHOD a isTarget (Laio;Lapz;)Z
 		ARG 1 target
 		ARG 2 targetPredicate
@@ -105,7 +112,10 @@ CLASS aio net/minecraft/entity/LivingEntity
 		ARG 2 damage
 	METHOD b getStatusEffect (Lahx;)Lahz;
 	METHOD b getEquippedStack (Laik;)Lbca;
+		ARG 1 slot
 	METHOD b getActiveEyeHeight (Laiy;Laig;)F
+		ARG 1 pose
+		ARG 2 size
 	METHOD b onEquipStack (Lbca;)V
 		ARG 1 stack
 	METHOD b spawnConsumptionEffects (Lbca;I)V
@@ -119,16 +129,19 @@ CLASS aio net/minecraft/entity/LivingEntity
 		ARG 2 value
 	METHOD c setCurrentHand (Lagz;)V
 	METHOD c playHurtSound (Laho;)V
+		ARG 1 damageSource
 	METHOD c applyEnchantmentsToDamage (Laho;F)F
 		ARG 1 source
 		ARG 2 amount
 	METHOD c removePotionEffect (Lahx;)Lahz;
 	METHOD c addPotionEffect (Lahz;)Z
+		ARG 1 effect
 	METHOD c sendEquipmentBreakStatus (Laik;)V
 		ARG 1 slot
 	METHOD c canTarget (Laio;)Z
 		ARG 1 target
 	METHOD c getDrinkSound (Lbca;)Lyj;
+		ARG 1 stack
 	METHOD c containsOnlyAmbientEffects (Ljava/util/Collection;)Z
 		ARG 0 effects
 	METHOD c swimUpward (Lzb;)V
@@ -179,11 +192,14 @@ CLASS aio net/minecraft/entity/LivingEntity
 		ARG 2 damage
 	METHOD d removeStatusEffect (Lahx;)Z
 	METHOD d isPotionEffective (Lahz;)Z
+		ARG 1 effect
 	METHOD d getEquipmentBreakStatus (Laik;)B
 	METHOD d takeShieldHit (Laio;)V
 		ARG 1 source
 	METHOD d getCurrentExperience (Lavx;)I
+		ARG 1 player
 	METHOD d getEatSound (Lbca;)Lyj;
+		ARG 1 stack
 	METHOD d setSleepingPosition (Lev;)V
 	METHOD da getMovementSpeed ()F
 	METHOD db tickNewAi ()V
@@ -212,10 +228,13 @@ CLASS aio net/minecraft/entity/LivingEntity
 	METHOD e knockback (Laio;)V
 		ARG 1 target
 	METHOD e canPickUp (Lbca;)Z
+		ARG 1 stack
 	METHOD e travel (Lcrv;)V
 		ARG 1 movementInput
 	METHOD e sleep (Lev;)V
+		ARG 1 pos
 	METHOD f attackLivingEntity (Laio;)V
+		ARG 1 target
 	METHOD f getArrowType (Lbca;)Lbca;
 	METHOD g playEquipmentBreakEffects (Lbca;)V
 		ARG 1 item
@@ -233,6 +252,7 @@ CLASS aio net/minecraft/entity/LivingEntity
 	METHOD n damageShield (F)V
 		ARG 1 amount
 	METHOD n getFallSound (I)Lyj;
+		ARG 1 fallDistance
 	METHOD o setMovementSpeed (F)V
 		ARG 1 movementSpeed
 	METHOD o setStuckArrows (I)V
@@ -240,6 +260,7 @@ CLASS aio net/minecraft/entity/LivingEntity
 	METHOD p getHandSwingProgress (F)F
 		ARG 1 tickDelta
 	METHOD q setAbsorptionAmount (F)V
+		ARG 1 amount
 	METHOD v_ isChild ()Z
 	METHOD w_ isClimbing ()Z
 	METHOD z onAttacking (Laif;)V

mappings/net/minecraft/entity/PrimedTntEntity.mapping

@@ -6,7 +6,10 @@ CLASS atp net/minecraft/entity/PrimedTntEntity
 		ARG 1 world
 		ARG 2 x
 		ARG 4 y
+		ARG 6 z
+		ARG 8 igniter
 	METHOD a setFuse (I)V
+		ARG 1 fuse
 	METHOD f getCausingEntity ()Laio;
 	METHOD i getFuse ()I
 	METHOD k getFuseTimer ()I

mappings/net/minecraft/entity/SpawnRestriction.mapping

@@ -2,8 +2,16 @@ CLASS ajb net/minecraft/entity/SpawnRestriction
 	CLASS ajb$a Entry
 		FIELD a heightMapType Lbyq$a;
 		FIELD b location Lajb$b;
+		METHOD <init> (Lbyq$a;Lajb$b;)V
+			ARG 1 heightMapType
+			ARG 2 location
 	CLASS ajb$b Location
 	FIELD a mapping Ljava/util/Map;
 	METHOD a getLocation (Laij;)Lajb$b;
+		ARG 0 type
 	METHOD a register (Laij;Lajb$b;Lbyq$a;)V
+		ARG 0 type
+		ARG 1 location
+		ARG 2 heightMapType
 	METHOD b getHeightMapType (Laij;)Lbyq$a;
+		ARG 0 type

mappings/net/minecraft/entity/ai/GoToOwnerAndPurrGoal.mapping

@@ -1,2 +0,0 @@
-CLASS ami net/minecraft/entity/ai/GoToOwnerAndPurrGoal
-	FIELD g cat Laqs;

mappings/net/minecraft/entity/ai/RangedAttackMob.mapping

@@ -0,0 +1,3 @@
+CLASS auo net/minecraft/entity/ai/RangedAttackMob
+	METHOD a attack (Laio;F)V
+		ARG 1 target

mappings/net/minecraft/entity/ai/RangedAttacker.mapping

@@ -1,3 +0,0 @@
-CLASS auo net/minecraft/entity/ai/RangedAttacker
-	METHOD a attack (Laio;F)V
-		ARG 1 target

mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping

@@ -1,5 +1,5 @@
 CLASS amh net/minecraft/entity/ai/goal/AnimalMateGoal
-	FIELD a owner Laqr;
+	FIELD a animal Laqr;
 	FIELD b world Lbhh;
 	FIELD c mate Laqr;
 	FIELD d VALID_MATE_PREDICATE Lapz;
@@ -7,9 +7,10 @@ CLASS amh net/minecraft/entity/ai/goal/AnimalMateGoal
 	FIELD f timer I
 	FIELD g chance D
 	METHOD <init> (Laqr;D)V
-		ARG 1 owner
+		ARG 1 animal
 		ARG 2 chance
 	METHOD <init> (Laqr;DLjava/lang/Class;)V
+		ARG 1 animal
 		ARG 2 chance
 		ARG 4 entityClass
 	METHOD g breed ()V

mappings/net/minecraft/entity/ai/goal/AttackGoal.mapping

@@ -3,3 +3,5 @@ CLASS anm net/minecraft/entity/ai/goal/AttackGoal
 	FIELD b mob Laip;
 	FIELD c target Laio;
 	FIELD d cooldown I
+	METHOD <init> (Laip;)V
+		ARG 1 mob

mappings/net/minecraft/entity/ai/goal/AttackWithOwnerGoal.mapping

@@ -1,4 +1,6 @@
 CLASS aov net/minecraft/entity/ai/goal/AttackWithOwnerGoal
-	FIELD a owner Lajc;
+	FIELD a tameable Lajc;
 	FIELD b attacking Laio;
 	FIELD c lastAttackTime I
+	METHOD <init> (Lajc;)V
+		ARG 1 tameable

mappings/net/minecraft/entity/ai/goal/AvoidSunlightGoal.mapping

@@ -1,4 +1,4 @@
 CLASS anz net/minecraft/entity/ai/goal/AvoidSunlightGoal
-	FIELD a owner Laiv;
+	FIELD a mob Laiv;
 	METHOD <init> (Laiv;)V
-		ARG 1 owner
+		ARG 1 mob

mappings/net/minecraft/entity/ai/goal/BowAttackGoal.mapping

@@ -1,3 +1,14 @@
 CLASS anw net/minecraft/entity/ai/goal/BowAttackGoal
+	FIELD a actor Lauj;
+	FIELD b speed D
+	FIELD c attackInterval I
+	FIELD d squaredRange F
+	FIELD e cooldown I
+	METHOD <init> (Lauj;DIF)V
+		ARG 1 actor
+		ARG 2 speed
+		ARG 4 attackInterval
+		ARG 5 range
 	METHOD a setAttackInterval (I)V
+		ARG 1 attackInterval
 	METHOD g isHoldingBow ()Z

mappings/net/minecraft/entity/ai/goal/BreakDoorGoal.mapping

@@ -1,3 +1,12 @@
 CLASS amf net/minecraft/entity/ai/goal/BreakDoorGoal
 	FIELD a breakProgress I
 	FIELD b prevBreakProgress I
+	FIELD g difficultySufficientPredicate Ljava/util/function/Predicate;
+	METHOD <init> (Laip;ILjava/util/function/Predicate;)V
+		ARG 1 mob
+		ARG 3 difficultySufficientPredicate
+	METHOD <init> (Laip;Ljava/util/function/Predicate;)V
+		ARG 1 mob
+		ARG 2 difficultySufficientPredicate
+	METHOD a isDifficultySufficient (Lagx;)Z
+		ARG 1 difficulty

mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping

@@ -1,4 +1,8 @@
 CLASS amg net/minecraft/entity/ai/goal/BreatheAirGoal
-	FIELD a owner Laiv;
+	FIELD a mob Laiv;
+	METHOD <init> (Laiv;)V
+		ARG 1 mob
 	METHOD a isAirPos (Lbhk;Lev;)Z
+		ARG 1 world
+		ARG 2 pos
 	METHOD g moveToAir ()V

mappings/net/minecraft/entity/ai/goal/CatSitOnBlockGoal.mapping

@@ -1,2 +1,5 @@
 CLASS amj net/minecraft/entity/ai/goal/CatSitOnBlockGoal
 	FIELD g cat Laqs;
+	METHOD <init> (Laqs;D)V
+		ARG 1 cat
+		ARG 2 speed

mappings/net/minecraft/entity/ai/goal/ChaseBoatGoal.mapping

@@ -1,6 +1,6 @@
 CLASS amp net/minecraft/entity/ai/goal/ChaseBoatGoal
-	FIELD b owner Laiv;
+	FIELD b mob Laiv;
 	FIELD c passenger Laio;
 	FIELD d state Lame;
 	METHOD <init> (Laiv;)V
-		ARG 1 owner
+		ARG 1 mob

mappings/net/minecraft/entity/ai/goal/CreeperIgniteGoal.mapping

@@ -1,5 +1,5 @@
 CLASS aod net/minecraft/entity/ai/goal/CreeperIgniteGoal
-	FIELD a owner Latv;
+	FIELD a creeper Latv;
 	FIELD b target Laio;
 	METHOD <init> (Latv;)V
-		ARG 1 owner
+		ARG 1 creeper

mappings/net/minecraft/entity/ai/goal/CrossbowAttackGoal.mapping

@@ -1,8 +1,12 @@
 CLASS anx net/minecraft/entity/ai/goal/CrossbowAttackGoal
 	CLASS anx$a Stage
-	FIELD a entity Lauj;
+	FIELD a actor Lauj;
 	FIELD b stage Lanx$a;
+	FIELD c speed D
+	FIELD d squaredRange F
 	METHOD <init> (Lauj;DF)V
-		ARG 1 entity
+		ARG 1 actor
+		ARG 2 speed
+		ARG 4 range
 	METHOD g isEntityHoldingCrossbow ()Z
 	METHOD j isUncharged ()Z

mappings/net/minecraft/entity/ai/goal/DisableableFollowTargetGoal.mapping

@@ -1,3 +1,11 @@
 CLASS aor net/minecraft/entity/ai/goal/DisableableFollowTargetGoal
 	FIELD i enabled Z
+	METHOD <init> (Laxc;Ljava/lang/Class;IZZLjava/util/function/Predicate;)V
+		ARG 1 actor
+		ARG 2 targetEntityClass
+		ARG 3 reciprocalChance
+		ARG 4 checkVisibility
+		ARG 5 checkCanNavigate
+		ARG 6 targetPredicate
 	METHOD a setEnabled (Z)V
+		ARG 1 enabled

mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping

@@ -2,6 +2,7 @@ CLASS amk net/minecraft/entity/ai/goal/DolphinJumpGoal
 	FIELD b dolphin Laqw;
 	FIELD c chance I
 	METHOD <init> (Laqw;I)V
+		ARG 1 dolphin
 		ARG 2 chance
 	METHOD a isWater (Lev;III)Z
 		ARG 1 pos

mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping

@@ -1,7 +1,11 @@
 CLASS aml net/minecraft/entity/ai/goal/DoorInteractGoal
 	FIELD a shouldStop Z
-	FIELD d owner Laip;
+	FIELD d mob Laip;
 	FIELD e doorPos Lev;
+	METHOD <init> (Laip;)V
+		ARG 1 mob
 	METHOD a getDoor (Lbhh;Lev;)Z
+		ARG 0 world
+		ARG 1 pos
 	METHOD a setDoorOpen (Z)V
 		ARG 1 open

mappings/net/minecraft/entity/ai/goal/EatGrassGoal.mapping

@@ -1,8 +1,8 @@
 CLASS amm net/minecraft/entity/ai/goal/EatGrassGoal
 	FIELD a GRASS_PREDICATE Ljava/util/function/Predicate;
-	FIELD b owner Laip;
+	FIELD b mob Laip;
 	FIELD c world Lbhh;
 	FIELD d timer I
 	METHOD <init> (Laip;)V
-		ARG 1 entity
+		ARG 1 mob
 	METHOD g getTimer ()I

mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping

@@ -1,13 +1,15 @@
 CLASS anp net/minecraft/entity/ai/goal/EscapeDangerGoal
-	FIELD a owner Laiv;
+	FIELD a mob Laiv;
 	FIELD b speed D
 	FIELD c targetX D
 	FIELD d targetY D
 	FIELD e targetZ D
 	METHOD <init> (Laiv;D)V
-		ARG 1 owner
+		ARG 1 mob
 		ARG 2 speed
 	METHOD a locateClosestWater (Lbgr;Laif;II)Lev;
+		ARG 1 blockView
+		ARG 2 entity
 		ARG 3 rangeX
 		ARG 4 rangeY
 	METHOD g findTarget ()Z

mappings/net/minecraft/entity/ai/goal/EscapeSunlightGoal.mapping

@@ -1,11 +1,11 @@
 CLASS amn net/minecraft/entity/ai/goal/EscapeSunlightGoal
-	FIELD a owner Laiv;
+	FIELD a mob Laiv;
 	FIELD b targetX D
 	FIELD c targetY D
 	FIELD d targetZ D
 	FIELD e speed D
 	FIELD f world Lbhh;
 	METHOD <init> (Laiv;D)V
-		ARG 1 owner
+		ARG 1 mob
 		ARG 2 speed
 	METHOD h locateShadedPos ()Lcrv;

mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping

@@ -1,19 +1,19 @@
 CLASS amc net/minecraft/entity/ai/goal/FleeEntityGoal
-	FIELD a fleeingEntity Laiv;
+	FIELD a mob Laiv;
 	FIELD b targetEntity Laio;
 	FIELD c fleeDistance F
 	FIELD d fleePath Lcng;
 	FIELD e fleeingEntityNavigation Laph;
 	FIELD f classToFleeFrom Ljava/lang/Class;
-	FIELD i fleeSlowSpeed D
+	FIELD i slowSpeed D
-	FIELD j fleeFastSpeed D
+	FIELD j fastSpeed D
 	FIELD k withinRangePredicate Lapz;
 	METHOD <init> (Laiv;Ljava/lang/Class;FDD)V
-		ARG 1 fleeingEntity
+		ARG 1 mob
-		ARG 2 classToFleeFrom
+		ARG 2 fleeFromType
-		ARG 3 fleeDistance
+		ARG 3 distance
-		ARG 4 fleeSlowSpeed
+		ARG 4 slowSpeed
-		ARG 6 fleeFastSpeed
+		ARG 6 fastSpeed
 	METHOD <init> (Laiv;Ljava/lang/Class;FDDLjava/util/function/Predicate;)V
 		ARG 1 fleeingEntity
 		ARG 2 classToFleeFrom
@@ -21,8 +21,8 @@ CLASS amc net/minecraft/entity/ai/goal/FleeEntityGoal
 		ARG 4 fleeSlowSpeed
 		ARG 6 fleeFastSpeed
 	METHOD <init> (Laiv;Ljava/lang/Class;Ljava/util/function/Predicate;FDDLjava/util/function/Predicate;)V
-		ARG 1 fleeingEntity
+		ARG 1 mob
-		ARG 2 classToFleeFrom
+		ARG 2 fleeFromType
-		ARG 4 fleeDistance
+		ARG 4 distance
-		ARG 5 fleeSlowSpeed
+		ARG 5 slowSpeed
-		ARG 7 fleeFastSpeed
+		ARG 7 fastSpeed

mappings/net/minecraft/entity/ai/goal/FlyToOwnerGoal.mapping

@@ -1 +0,0 @@
-CLASS ams net/minecraft/entity/ai/goal/FlyToOwnerGoal

mappings/net/minecraft/entity/ai/goal/FollowGroupLeaderGoal.mapping

@@ -1,5 +1,8 @@
 CLASS amq net/minecraft/entity/ai/goal/FollowGroupLeaderGoal
-	FIELD a owner Laqq;
+	FIELD a fish Laqq;
 	FIELD b moveDelay I
 	FIELD c checkSurroundingDelay I
+	METHOD <init> (Laqq;)V
+		ARG 1 fish
 	METHOD a getSurroundingSearchDelay (Laqq;)I
+		ARG 1 fish

mappings/net/minecraft/entity/ai/goal/FollowMobGoal.mapping

@@ -1 +1,13 @@
 CLASS amr net/minecraft/entity/ai/goal/FollowMobGoal
+	FIELD a mob Laip;
+	FIELD b targetPredicate Ljava/util/function/Predicate;
+	FIELD c target Laip;
+	FIELD d speed D
+	FIELD e navigation Laph;
+	FIELD g minDistance F
+	FIELD i maxDistance F
+	METHOD <init> (Laip;DFF)V
+		ARG 1 mob
+		ARG 2 speed
+		ARG 4 minDistance
+		ARG 5 maxDistance

mappings/net/minecraft/entity/ai/goal/FollowOwnerFlyingGoal.mapping

@@ -0,0 +1 @@
+CLASS ams net/minecraft/entity/ai/goal/FollowOwnerFlyingGoal

mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping

@@ -1,7 +1,14 @@
 CLASS amt net/minecraft/entity/ai/goal/FollowOwnerGoal
-	FIELD a caller Lajc;
+	FIELD a tameable Lajc;
 	FIELD b world Lbhk;
 	FIELD c owner Laio;
+	FIELD e navigation Laph;
+	FIELD g maxDistance F
 	FIELD h minDistance F
 	METHOD <init> (Lajc;DFF)V
-		ARG 1 caller
+		ARG 1 tameable
+		ARG 2 speed
+		ARG 4 minDistance
+		ARG 5 maxDistance
+	METHOD a (Lev;)Z
+		ARG 1 pos

mappings/net/minecraft/entity/ai/goal/FollowParentGoal.mapping

@@ -1,3 +1,8 @@
 CLASS amu net/minecraft/entity/ai/goal/FollowParentGoal
-	FIELD a owner Laqr;
+	FIELD a animal Laqr;
 	FIELD b parent Laqr;
+	FIELD c speed D
+	FIELD d delay I
+	METHOD <init> (Laqr;D)V
+		ARG 1 animal
+		ARG 2 speed

mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping

@@ -4,16 +4,19 @@ CLASS aoq net/minecraft/entity/ai/goal/FollowTargetGoal
 	FIELD c targetEntity Laio;
 	FIELD d targetPredicate Lapz;
 	METHOD <init> (Laip;Ljava/lang/Class;IZZLjava/util/function/Predicate;)V
-		ARG 2 targetEntityClass
+		ARG 1 mob
+		ARG 2 targetClass
 		ARG 3 reciprocalChance
 		ARG 4 checkVisibility
 		ARG 5 checkCanNavigate
 		ARG 6 targetPredicate
 	METHOD <init> (Laip;Ljava/lang/Class;Z)V
-		ARG 2 targetEntityClass
+		ARG 1 mob
+		ARG 2 targetClass
 		ARG 3 checkVisibility
 	METHOD <init> (Laip;Ljava/lang/Class;ZZ)V
-		ARG 2 targetEntityClass
+		ARG 1 mob
+		ARG 2 targetClass
 		ARG 3 checkVisibility
 		ARG 4 checkCanNavigate
 	METHOD a getSearchBox (D)Lcrq;

mappings/net/minecraft/entity/ai/goal/FollowTargetIfTamedGoal.mapping

@@ -1 +1,7 @@
 CLASS aot net/minecraft/entity/ai/goal/FollowTargetIfTamedGoal
+	FIELD i tameable Lajc;
+	METHOD <init> (Lajc;Ljava/lang/Class;ZLjava/util/function/Predicate;)V
+		ARG 1 tameable
+		ARG 2 targetClass
+		ARG 3 checkVisibility
+		ARG 4 targetPredicate

mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping

@@ -1,6 +1,9 @@
 CLASS anc net/minecraft/entity/ai/goal/FormCaravanGoal
-	FIELD a owner Larv;
+	FIELD a llama Larv;
 	FIELD b speed D
 	FIELD c counter I
+	METHOD <init> (Larv;D)V
+		ARG 1 llama
+		ARG 2 speed
 	METHOD a canFollow (Larv;I)Z
 		ARG 2 length

mappings/net/minecraft/entity/ai/goal/GoToEntityTargetGoal.mapping

@@ -1,4 +1,12 @@
 CLASS anl net/minecraft/entity/ai/goal/GoToEntityTargetGoal
-	FIELD a owner Laiv;
+	FIELD a mob Laiv;
 	FIELD b target Laio;
+	FIELD c x D
+	FIELD d y D
+	FIELD e z D
+	FIELD f speed D
 	FIELD g maxDistance F
+	METHOD <init> (Laiv;DF)V
+		ARG 1 mob
+		ARG 2 speed
+		ARG 4 maxDistance

mappings/net/minecraft/entity/ai/goal/GoToOwnerAndPurrGoal.mapping

@@ -0,0 +1,6 @@
+CLASS ami net/minecraft/entity/ai/goal/GoToOwnerAndPurrGoal
+	FIELD g cat Laqs;
+	METHOD <init> (Laqs;DI)V
+		ARG 1 cat
+		ARG 2 speed
+		ARG 4 range

mappings/net/minecraft/entity/ai/goal/GoToVillageGoal.mapping

@@ -1,5 +1,8 @@
 CLASS aoc net/minecraft/entity/ai/goal/GoToVillageGoal
-	FIELD a owner Laiv;
+	FIELD a mob Laiv;
 	FIELD b searchRange I
 	FIELD c targetPosition Lev;
+	METHOD <init> (Laiv;I)V
+		ARG 1 mob
+		ARG 2 searchRange
 	METHOD g findOtherWaypoint ()V

mappings/net/minecraft/entity/ai/goal/GoToWalkTargetGoal.mapping

@@ -4,3 +4,6 @@ CLASS ank net/minecraft/entity/ai/goal/GoToWalkTargetGoal
 	FIELD c y D
 	FIELD d z D
 	FIELD e speed D
+	METHOD <init> (Laiv;D)V
+		ARG 1 mob
+		ARG 2 speed

mappings/net/minecraft/entity/ai/goal/HoldInHandsGoal.mapping

@@ -1,4 +1,10 @@
 CLASS aoi net/minecraft/entity/ai/goal/HoldInHandsGoal
+	FIELD a actor Laip;
 	FIELD b item Lbca;
 	FIELD c condition Ljava/util/function/Predicate;
 	FIELD d sound Lyj;
+	METHOD <init> (Laip;Lbca;Lyj;Ljava/util/function/Predicate;)V
+		ARG 1 actor
+		ARG 2 item
+		ARG 3 sound
+		ARG 4 condition

mappings/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.mapping

@@ -1,9 +1,9 @@
 CLASS aoa net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal
-	FIELD a owner Lars;
+	FIELD a horse Lars;
 	FIELD b speed D
 	FIELD c targetX D
 	FIELD d targetY D
 	FIELD e targetZ D
 	METHOD <init> (Lars;D)V
-		ARG 1 owner
+		ARG 1 horse
 		ARG 2 speed

mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping

@@ -1,5 +1,7 @@
 CLASS ann net/minecraft/entity/ai/goal/IronGolemLookGoal
 	FIELD a CLOSE_VILLAGER_PREDICATE Lapz;
-	FIELD b ironGolemEntity Laqz;
+	FIELD b golem Laqz;
 	FIELD c targetVillager Lavk;
 	FIELD d lookCountdown I
+	METHOD <init> (Laqz;)V
+		ARG 1 golem

mappings/net/minecraft/entity/ai/goal/LongDoorInteractGoal.mapping

@@ -1,4 +1,4 @@
 CLASS ano net/minecraft/entity/ai/goal/LongDoorInteractGoal
 	FIELD b ticksLeft I
 	METHOD <init> (Laip;Z)V
-		ARG 1 owner
+		ARG 1 mob

mappings/net/minecraft/entity/ai/goal/LookAroundGoal.mapping

@@ -1,7 +1,7 @@
 CLASS ans net/minecraft/entity/ai/goal/LookAroundGoal
-	FIELD a owner Laip;
+	FIELD a mob Laip;
 	FIELD b deltaX D
 	FIELD c deltaZ D
 	FIELD d lookTime I
 	METHOD <init> (Laip;)V
-		ARG 1 owner
+		ARG 1 mob

mappings/net/minecraft/entity/ai/goal/LookAtCustomerGoal.mapping

@@ -1,4 +1,4 @@
 CLASS ane net/minecraft/entity/ai/goal/LookAtCustomerGoal
 	FIELD f trader Lavg;
 	METHOD <init> (Lavg;)V
-		ARG 1 owner
+		ARG 1 trader

mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping

@@ -1,5 +1,5 @@
 CLASS and net/minecraft/entity/ai/goal/LookAtEntityGoal
-	FIELD a owner Laip;
+	FIELD a mob Laip;
 	FIELD b target Laif;
 	FIELD c range F
 	FIELD d targetType Ljava/lang/Class;
@@ -7,11 +7,11 @@ CLASS and net/minecraft/entity/ai/goal/LookAtEntityGoal
 	FIELD f lookTime I
 	FIELD g chance F
 	METHOD <init> (Laip;Ljava/lang/Class;F)V
-		ARG 1 owner
+		ARG 1 mob
 		ARG 2 targetType
 		ARG 3 range
 	METHOD <init> (Laip;Ljava/lang/Class;FF)V
-		ARG 1 owner
+		ARG 1 mob
 		ARG 2 targetType
 		ARG 3 range
 		ARG 4 chance

mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping

@@ -1,8 +1,13 @@
 CLASS anf net/minecraft/entity/ai/goal/MeleeAttackGoal
-	FIELD a entity Laiv;
+	FIELD a mob Laiv;
 	FIELD b ticksUntilAttack I
+	FIELD d speed D
+	FIELD h targetX D
+	FIELD i targetY D
+	FIELD j targetZ D
 	METHOD <init> (Laiv;DZ)V
-		ARG 1 entity
+		ARG 1 mob
+		ARG 2 speed
 	METHOD a getSquaredMaxAttackDistance (Laio;)D
 		ARG 1 entity
 	METHOD a attack (Laio;D)V

mappings/net/minecraft/entity/ai/goal/MoveIntoWaterGoal.mapping

@@ -1,2 +1,4 @@
 CLASS aoh net/minecraft/entity/ai/goal/MoveIntoWaterGoal
-	FIELD a owner Laiv;
+	FIELD a mob Laiv;
+	METHOD <init> (Laiv;)V
+		ARG 1 mob

mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping

@@ -1 +1,10 @@
 CLASS ani net/minecraft/entity/ai/goal/MoveThroughVillageGoal
+	FIELD a mob Laiv;
+	FIELD b speed D
+	FIELD c targetPath Lcng;
+	FIELD d target Lev;
+	FIELD e requiresNighttime Z
+	METHOD <init> (Laiv;DZILjava/util/function/BooleanSupplier;)V
+		ARG 1 mob
+		ARG 2 speed
+		ARG 4 requiresNighttime

mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping

@@ -1,4 +1,7 @@
 CLASS anq net/minecraft/entity/ai/goal/MoveToRaidCenterGoal
-	FIELD a owner Laxc;
+	FIELD a actor Laxc;
+	METHOD <init> (Laxc;)V
+		ARG 1 actor
 	METHOD a includeFreeRaiders (Laxb;)V
+		ARG 1 raid
 	METHOD g moveToAlternativePosition ()V

mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping

@@ -1,5 +1,5 @@
 CLASS anj net/minecraft/entity/ai/goal/MoveToTargetPosGoal
-	FIELD a owner Laiv;
+	FIELD a mob Laiv;
 	FIELD b speed D
 	FIELD c cooldown I
 	FIELD d tryingTime I
@@ -10,11 +10,11 @@ CLASS anj net/minecraft/entity/ai/goal/MoveToTargetPosGoal
 	FIELD i range I
 	FIELD j maxYDifference I
 	METHOD <init> (Laiv;DI)V
-		ARG 1 owner
+		ARG 1 mob
 		ARG 2 speed
 		ARG 4 range
 	METHOD <init> (Laiv;DII)V
-		ARG 1 owner
+		ARG 1 mob
 		ARG 2 speed
 		ARG 4 range
 		ARG 5 maxYDifference

mappings/net/minecraft/entity/ai/goal/ParrotClimbOntoPlayerGoal.mapping

@@ -1,6 +0,0 @@
-CLASS ana net/minecraft/entity/ai/goal/ParrotClimbOntoPlayerGoal
-	FIELD a parrot Lark;
-	FIELD b parrotOwner Lvh;
-	FIELD c mounted Z
-	METHOD <init> (Lark;)V
-		ARG 1 parrot

mappings/net/minecraft/entity/ai/goal/PounceAtTargetGoal.mapping

@@ -1,5 +1,7 @@
 CLASS anb net/minecraft/entity/ai/goal/PounceAtTargetGoal
-	FIELD a owner Laip;
+	FIELD a mob Laip;
 	FIELD b target Laio;
+	FIELD c velocity F
 	METHOD <init> (Laip;F)V
-		ARG 1 owner
+		ARG 1 rmob
+		ARG 2 velocity

mappings/net/minecraft/entity/ai/goal/ProjectileAttackGoal.mapping

@@ -1,6 +1,15 @@
 CLASS anv net/minecraft/entity/ai/goal/ProjectileAttackGoal
-	FIELD a mobEntity Laip;
+	FIELD a mob Laip;
-	FIELD b rangedAttacker Lauo;
+	FIELD b owner Lauo;
 	FIELD c target Laio;
+	FIELD e mobSpeed D
+	FIELD i maxShootRange F
+	FIELD j squaredMaxShootRange F
+	METHOD <init> (Lauo;DIF)V
+		ARG 1 mob
+		ARG 2 mobSpeed
+		ARG 5 maxShootRange
 	METHOD <init> (Lauo;DIIF)V
-		ARG 1 entity
+		ARG 1 mob
+		ARG 2 mobSpeed
+		ARG 6 maxShootRange

mappings/net/minecraft/entity/ai/goal/RaidGoal.mapping

@@ -1,4 +1,9 @@
 CLASS aos net/minecraft/entity/ai/goal/RaidGoal
 	FIELD i cooldown I
+	METHOD <init> (Laxc;Ljava/lang/Class;ZLjava/util/function/Predicate;)V
+		ARG 1 raider
+		ARG 2 targetEntityClass
+		ARG 3 checkVisibility
+		ARG 4 tragetPredicate
 	METHOD h getCooldown ()I
 	METHOD j decreaseCooldown ()V

mappings/net/minecraft/entity/ai/goal/RevengeGoal.mapping

@@ -4,7 +4,12 @@ CLASS aop net/minecraft/entity/ai/goal/RevengeGoal
 	FIELD c lastAttackedTime I
 	FIELD d noRevengeTypes [Ljava/lang/Class;
 	FIELD i noHelpTypes [Ljava/lang/Class;
+	METHOD <init> (Laiv;[Ljava/lang/Class;)V
+		ARG 1 mob
+		ARG 2 noRevengeTypes
 	METHOD a setMobEntityTarget (Laip;Laio;)V
+		ARG 1 mob
+		ARG 2 target
 	METHOD a setGroupRevenge ([Ljava/lang/Class;)Laop;
 		ARG 1 noHelpTypes
 	METHOD g callSameTypeForRevenge ()V

mappings/net/minecraft/entity/ai/goal/SitGoal.mapping

@@ -1,4 +1,7 @@
 CLASS aob net/minecraft/entity/ai/goal/SitGoal
-	FIELD a entity Lajc;
+	FIELD a tameable Lajc;
 	FIELD b enabledWithOwner Z
+	METHOD <init> (Lajc;)V
+		ARG 1 tameable
 	METHOD a setEnabledWithOwner (Z)V
+		ARG 1 enabledWithOwner

mappings/net/minecraft/entity/ai/goal/SitOnOwnerShoulder.mapping

@@ -0,0 +1,6 @@
+CLASS ana net/minecraft/entity/ai/goal/SitOnOwnerShoulder
+	FIELD a tameable Lark;
+	FIELD b owner Lvh;
+	FIELD c mounted Z
+	METHOD <init> (Lark;)V
+		ARG 1 tameable

mappings/net/minecraft/entity/ai/goal/SkeletonHorseGoal.mapping

@@ -1,2 +0,0 @@
-CLASS ary net/minecraft/entity/ai/goal/SkeletonHorseGoal
-	FIELD a owner Larx;

mappings/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.mapping

@@ -0,0 +1,9 @@
+CLASS ary net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal
+	FIELD a skeletonHorse Larx;
+	METHOD <init> (Larx;)V
+		ARG 1 skeletonHorse
+	METHOD a getHorse (Lagy;)Lars;
+		ARG 1 localDifficulty
+	METHOD a getSkeleton (Lagy;Lars;)Laut;
+		ARG 1 localDifficulty
+		ARG 2 vehicle

mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping

@@ -1,10 +1,10 @@
 CLASS any net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal
 	FIELD g targetBlock Lbml;
-	FIELD h owner Laip;
+	FIELD h stepAndDestroyMob Laip;
 	FIELD i counter I
 	METHOD <init> (Lbml;Laiv;DI)V
 		ARG 1 targetBlock
-		ARG 2 owner
+		ARG 2 mob
 		ARG 3 speed
 		ARG 5 maxYDifference
 	METHOD a onDestroyBlock (Lbhh;Lev;)V

mappings/net/minecraft/entity/ai/goal/StopFollowingCustomerGoal.mapping

@@ -1 +1,4 @@
 CLASS aog net/minecraft/entity/ai/goal/StopFollowingCustomerGoal
+	FIELD a trader Lavg;
+	METHOD <init> (Lavg;)V
+		ARG 1 trader

mappings/net/minecraft/entity/ai/goal/SwimGoal.mapping

@@ -1,2 +1,4 @@
 CLASS amo net/minecraft/entity/ai/goal/SwimGoal
-	FIELD a entityMob Laip;
+	FIELD a mob Laip;
+	METHOD <init> (Laip;)V
+		ARG 1 mob

mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping

@@ -1,5 +1,5 @@
 CLASS aof net/minecraft/entity/ai/goal/TemptGoal
-	FIELD a owner Laiv;
+	FIELD a mob Laiv;
 	FIELD b closestPlayer Lavx;
 	FIELD c TEMPTING_ENTITY_PREDICATE Lapz;
 	FIELD d speed D
@@ -10,18 +10,18 @@ CLASS aof net/minecraft/entity/ai/goal/TemptGoal
 	FIELD i lastPlayerYaw D
 	FIELD j cooldown I
 	FIELD k active Z
-	FIELD l temptItem Lbef;
+	FIELD l food Lbef;
 	FIELD m canBeScared Z
 	METHOD <init> (Laiv;DLbef;Z)V
-		ARG 1 owner
+		ARG 1 mob
 		ARG 2 speed
-		ARG 4 temptItem
+		ARG 4 food
 		ARG 5 canBeScared
 	METHOD <init> (Laiv;DZLbef;)V
-		ARG 1 owner
+		ARG 1 mob
 		ARG 2 speed
 		ARG 4 canBeScared
-		ARG 5 temptItem
+		ARG 5 food
 	METHOD a isTempedBy (Lbca;)Z
 		ARG 1 stack
 	METHOD g canBeScared ()Z

mappings/net/minecraft/entity/ai/goal/TrackAttackerGoal.mapping

@@ -1 +0,0 @@
-CLASS aou net/minecraft/entity/ai/goal/TrackAttackerGoal

mappings/net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal.mapping

@@ -1,3 +1,5 @@
 CLASS aoo net/minecraft/entity/ai/goal/TrackIronGolemTargetGoal
-	FIELD a ironGolem Laqz;
+	FIELD a golem Laqz;
 	FIELD b target Laio;
+	METHOD <init> (Laqz;)V
+		ARG 1 golem

mappings/net/minecraft/entity/ai/goal/TrackOwnerAttackerGoal.mapping

@@ -0,0 +1,6 @@
+CLASS aou net/minecraft/entity/ai/goal/TrackOwnerAttackerGoal
+	FIELD a tameable Lajc;
+	FIELD b attacker Laio;
+	FIELD c lastAttackedTime I
+	METHOD <init> (Lajc;)V
+		ARG 1 tameable

mappings/net/minecraft/entity/ai/goal/TrackTargetGoal.mapping

@@ -3,15 +3,22 @@ CLASS aow net/minecraft/entity/ai/goal/TrackTargetGoal
 	FIELD b canNavigateFlag I
 	FIELD c checkCanNavigateCooldown I
 	FIELD d timeWithoutVisibility I
-	FIELD e entity Laip;
+	FIELD e mob Laip;
 	FIELD f checkVisibility Z
 	FIELD g target Laio;
 	FIELD h maxTimeWithoutVisibility I
+	METHOD <init> (Laip;Z)V
+		ARG 1 mob
+		ARG 2 checkVisibility
 	METHOD <init> (Laip;ZZ)V
+		ARG 1 mob
 		ARG 2 checkVisibility
 		ARG 3 checkNavigable
 	METHOD a setMaxTimeWithoutVisibility (I)Laow;
+		ARG 1 time
 	METHOD a canNavigateToEntity (Laio;)Z
+		ARG 1 entity
 	METHOD a canTrack (Laio;Lapz;)Z
 		ARG 1 target
+		ARG 2 targetPredicate
 	METHOD k getFollowRange ()D

mappings/net/minecraft/entity/ai/goal/WanderAroundFarGoal.mapping

@@ -1,2 +1,6 @@
 CLASS aok net/minecraft/entity/ai/goal/WanderAroundFarGoal
-	FIELD h farWanderProbability F
+	FIELD h probability F
+	METHOD <init> (Laiv;DF)V
+		ARG 1 mob
+		ARG 2 speed
+		ARG 4 probabiliity

mappings/net/minecraft/entity/ai/goal/WanderAroundGoal.mapping

@@ -1,5 +1,5 @@
 CLASS ant net/minecraft/entity/ai/goal/WanderAroundGoal
-	FIELD a owner Laiv;
+	FIELD a mob Laiv;
 	FIELD b targetX D
 	FIELD c targetY D
 	FIELD d targetZ D
@@ -7,10 +7,10 @@ CLASS ant net/minecraft/entity/ai/goal/WanderAroundGoal
 	FIELD f chance I
 	FIELD g ignoringChance Z
 	METHOD <init> (Laiv;D)V
-		ARG 1 owner
+		ARG 1 mob
 		ARG 2 speed
 	METHOD <init> (Laiv;DI)V
-		ARG 1 owner
+		ARG 1 mob
 		ARG 2 speed
 		ARG 4 chance
 	METHOD a setChance (I)V

mappings/net/minecraft/entity/ai/goal/WeightedGoal.mapping

@@ -2,6 +2,9 @@ CLASS aol net/minecraft/entity/ai/goal/WeightedGoal
 	FIELD a goal Lamv;
 	FIELD b weight I
 	FIELD c running Z
+	METHOD <init> (ILamv;)V
+		ARG 1 weight
+		ARG 2 goal
 	METHOD a canBeReplacedBy (Laol;)Z
 		ARG 1 goal
 	METHOD g isRunning ()Z

mappings/net/minecraft/entity/ai/goal/WolfBegGoal.mapping

@@ -1,11 +1,12 @@
 CLASS amd net/minecraft/entity/ai/goal/WolfBegGoal
-	FIELD a owner Larq;
+	FIELD a wolf Larq;
 	FIELD b begFrom Lavx;
 	FIELD c world Lbhh;
 	FIELD d begDistance F
 	FIELD e timer I
 	FIELD f validPlayerPredicate Lapz;
 	METHOD <init> (Larq;F)V
-		ARG 1 owner
+		ARG 1 wolf
 		ARG 2 begDistance
 	METHOD a isAttractive (Lavx;)Z
+		ARG 1 player

mappings/net/minecraft/entity/ai/goal/ZombieAttackGoal.mapping

@@ -0,0 +1,5 @@
+CLASS aom net/minecraft/entity/ai/goal/ZombieAttackGoal
+	FIELD d zombie Lavd;
+	METHOD <init> (Lavd;DZ)V
+		ARG 1 zombie
+		ARG 2 speed

mappings/net/minecraft/entity/ai/goal/ZombieRaiseArmsGoal.mapping

@@ -1,2 +0,0 @@
-CLASS aom net/minecraft/entity/ai/goal/ZombieRaiseArmsGoal
-	FIELD d zombie Lavd;

mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping

@@ -18,6 +18,9 @@ CLASS aph net/minecraft/entity/ai/pathing/EntityNavigation
 		ARG 3 y
 		ARG 5 z
 	METHOD a startMovingTo (DDDD)Z
+		ARG 1 x
+		ARG 3 y
+		ARG 5 z
 		ARG 7 speed
 	METHOD a createPathNodeNavigator (I)Lcni;
 	METHOD a findPathTo (Laif;)Lcng;

mappings/net/minecraft/entity/attribute/AbstractEntityAttributeContainer.mapping

@@ -7,9 +7,13 @@ CLASS aji net/minecraft/entity/attribute/AbstractEntityAttributeContainer
 		ARG 1 attribute
 	METHOD a add (Lajf;)V
 		ARG 1 instance
+	METHOD a removeAll (Lcom/google/common/collect/Multimap;)V
+		ARG 1 modifiers
 	METHOD a get (Ljava/lang/String;)Lajf;
 		ARG 1 name
 	METHOD b register (Laje;)Lajf;
 		ARG 1 attribute
+	METHOD b replaceAll (Lcom/google/common/collect/Multimap;)V
+		ARG 1 modifiers
 	METHOD c createInstance (Laje;)Lajf;
 		ARG 1 attribute

mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping

@@ -3,6 +3,7 @@ CLASS ajf net/minecraft/entity/attribute/EntityAttributeInstance
 	METHOD a setBaseValue (D)V
 		ARG 1 baseValue
 	METHOD a getModifiers (Lajg$a;)Ljava/util/Collection;
+		ARG 1 operation
 	METHOD a hasModifier (Lajg;)Z
 		ARG 1 modifier
 	METHOD a getModifier (Ljava/util/UUID;)Lajg;

mappings/net/minecraft/entity/attribute/EntityAttributeInstanceImpl.mapping

@@ -11,5 +11,6 @@ CLASS ajj net/minecraft/entity/attribute/EntityAttributeInstanceImpl
 		ARG 1 container
 		ARG 2 attribute
 	METHOD b getAllModifiers (Lajg$a;)Ljava/util/Collection;
+		ARG 1 operation
 	METHOD f invalidateCache ()V
 	METHOD g computeValue ()D

mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping

@@ -15,14 +15,17 @@ CLASS ajg net/minecraft/entity/attribute/EntityAttributeModifier
 	METHOD <init> (Ljava/lang/String;DLajg$a;)V
 		ARG 1 name
 		ARG 2 amount
+		ARG 4 operation
 	METHOD <init> (Ljava/util/UUID;Ljava/lang/String;DLajg$a;)V
 		ARG 1 uuid
 		ARG 2 name
 		ARG 3 amount
+		ARG 5 operation
 	METHOD <init> (Ljava/util/UUID;Ljava/util/function/Supplier;DLajg$a;)V
 		ARG 1 uuid
 		ARG 2 nameGetter
 		ARG 3 amount
+		ARG 5 operation
 	METHOD a getId ()Ljava/util/UUID;
 	METHOD a setSerialize (Z)Lajg;
 		ARG 1 serialize

mappings/net/minecraft/entity/attribute/EntityAttributes.mapping

@@ -15,11 +15,13 @@ CLASS auq net/minecraft/entity/attribute/EntityAttributes
 		ARG 0 instance
 	METHOD a fromTag (Lajf;Lib;)V
 		ARG 0 instance
+		ARG 1 tag
 	METHOD a toTag (Lajg;)Lib;
 		ARG 0 modifier
 	METHOD a toTag (Laji;)Lii;
 		ARG 0 container
 	METHOD a fromTag (Laji;Lii;)V
 		ARG 0 container
+		ARG 1 tag
 	METHOD a createFromTag (Lib;)Lajg;
 		ARG 0 tag

mappings/net/minecraft/entity/boss/BossBar.mapping

@@ -3,8 +3,8 @@ CLASS agq net/minecraft/entity/boss/BossBar
 		FIELD h name Ljava/lang/String;
 		FIELD i format Lc;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lc;)V
-			ARG 1 format
 			ARG 3 name
+			ARG 4 format
 		METHOD a getTextFormat ()Lc;
 		METHOD a byName (Ljava/lang/String;)Lagq$a;
 			ARG 0 name

mappings/net/minecraft/entity/boss/BossBarManager.mapping

@@ -1,10 +1,21 @@
 CLASS rj net/minecraft/entity/boss/BossBarManager
 	FIELD a server Lnet/minecraft/server/MinecraftServer;
-	FIELD b bossBars Ljava/util/Map;
+	FIELD b commandBossBars Ljava/util/Map;
+	METHOD <init> (Lnet/minecraft/server/MinecraftServer;)V
+		ARG 1 server
 	METHOD a getIds ()Ljava/util/Collection;
 	METHOD a fromTag (Lib;)V
+		ARG 1 tag
 	METHOD a get (Lqs;)Lri;
+		ARG 1 id
 	METHOD a add (Lqs;Ljm;)Lri;
+		ARG 1 id
+		ARG 2 displayName
 	METHOD a remove (Lri;)V
+		ARG 1 bossBar
+	METHOD a onPlayerConnect (Lvh;)V
+		ARG 1 player
 	METHOD b getAll ()Ljava/util/Collection;
+	METHOD b onPlayerDisconnenct (Lvh;)V
+		ARG 1 player
 	METHOD c toTag ()Lib;

mappings/net/minecraft/entity/boss/CommandBossBar.mapping

@@ -3,13 +3,26 @@ CLASS ri net/minecraft/entity/boss/CommandBossBar
 	FIELD i playerUuids Ljava/util/Set;
 	FIELD j value I
 	FIELD k maxValue I
+	METHOD <init> (Lqs;Ljm;)V
+		ARG 1 id
+		ARG 2 displayName
 	METHOD a getId ()Lqs;
 	METHOD a setValue (I)V
+		ARG 1 value
 	METHOD a fromTag (Lib;Lqs;)Lri;
+		ARG 0 tag
+		ARG 1 id
 	METHOD a addPlayers (Ljava/util/Collection;)Z
+		ARG 1 players
 	METHOD a addPlayer (Ljava/util/UUID;)V
+		ARG 1 uuid
 	METHOD b setMaxValue (I)V
+		ARG 1 maxValue
 	METHOD c getValue ()I
+	METHOD c onPlayerConnect (Lvh;)V
+		ARG 1 player
 	METHOD d getMaxValue ()I
+	METHOD d onPlayerDisconnect (Lvh;)V
+		ARG 1 player
 	METHOD e getTextComponent ()Ljm;
 	METHOD f toTag ()Lib;

mappings/net/minecraft/entity/boss/ServerBossBar.mapping

@@ -1,13 +1,18 @@
 CLASS vd net/minecraft/entity/boss/ServerBossBar
 	FIELD h players Ljava/util/Set;
+	FIELD i unmodifiablePlayers Ljava/util/Set;
 	FIELD j visible Z
 	METHOD <init> (Ljm;Lagq$a;Lagq$b;)V
-		ARG 1 name
+		ARG 1 displayName
 		ARG 2 color
+		ARG 3 style
 	METHOD a sendPacket (Lkq$a;)V
+		ARG 1 type
 	METHOD a addPlayer (Lvh;)V
+		ARG 1 player
 	METHOD b clearPlayers ()V
 	METHOD b removePlayer (Lvh;)V
+		ARG 1 player
 	METHOD d setVisible (Z)V
 		ARG 1 visible
 	METHOD g isVisible ()Z

mappings/net/minecraft/entity/boss/WitherEntity.mapping

@@ -1,13 +1,40 @@
 CLASS ata net/minecraft/entity/boss/WitherEntity
 	FIELD bA INVUL_TIMER Lqh;
 	FIELD bB HEAD_TARGET_PREDICATE Lapz;
+	FIELD bC sideHeadPitches [F
+	FIELD bD sideHeadYaws [F
+	FIELD bE prevSideHeadPitches [F
+	FIELD bF prevSideHeadYaws [F
+	FIELD bJ bossBar Lvd;
+	FIELD bK CAN_ATTACK_PREDICATE Ljava/util/function/Predicate;
 	FIELD b TRACKED_ENTITY_ID_1 Lqh;
+	FIELD bz TRACKED_ENTITY_IDS Ljava/util/List;
 	FIELD c TRACKED_ENTITY_ID_2 Lqh;
 	FIELD d TRACKED_ENTITY_ID_3 Lqh;
+	METHOD a getNextAngle (FFF)F
+		ARG 1 prevAngle
+		ARG 2 desiredAngle
+		ARG 3 maxDifference
+	METHOD a getHeadYaw (I)F
+		ARG 1 headIndex
+	METHOD a (IDDDZ)V
+		ARG 1 headIndex
 	METHOD a setTrackedEntityId (II)V
 		ARG 1 headIndex
+		ARG 2 id
+	METHOD b getHeadPitch (I)F
+		ARG 1 headIndex
 	METHOD b canDestroy (Lbvj;)Z
+		ARG 0 block
 	METHOD dV getInvulTimer ()I
 	METHOD dW isAtHalfHealth ()Z
 	METHOD q setInvulTimer (I)V
+		ARG 1 ticks
 	METHOD r getTrackedEntityId (I)I
+		ARG 1 headIndex
+	METHOD s getHeadX (I)D
+		ARG 1 headIndex
+	METHOD t getHeadY (I)D
+		ARG 1 headIndex
+	METHOD u getHeadZ (I)D
+		ARG 1 headIndex

mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping

@@ -8,7 +8,7 @@ CLASS asg net/minecraft/entity/boss/dragon/EnderDragonEntity
 	FIELD bG partWingRight Lase;
 	FIELD bH partWingLeft Lase;
 	FIELD b PHASE_TYPE Lqh;
-	FIELD bM enderCrystal Lasf;
+	FIELD bM connectedCrystal Lasf;
 	FIELD bN LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD bO CLOSE_PLAYER_PREDICATE Lapz;
 	FIELD bP fight Lbyh;

mappings/net/minecraft/entity/boss/dragon/EnderDragonPart.mapping

@@ -1,6 +1,9 @@
 CLASS ase net/minecraft/entity/boss/dragon/EnderDragonPart
 	FIELD b owner Lasg;
 	FIELD c name Ljava/lang/String;
+	FIELD d partSize Laig;
 	METHOD <init> (Lasg;Ljava/lang/String;FF)V
+		ARG 1 owner
 		ARG 2 name
 		ARG 3 width
+		ARG 4 height

mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping

@@ -5,3 +5,6 @@ CLASS byg net/minecraft/entity/boss/dragon/EnderDragonSpawnState
 	FIELD d SUMMONING_DRAGOM Lbyg;
 	FIELD e END Lbyg;
 	METHOD a run (Lvg;Lbyh;Ljava/util/List;ILev;)V
+		ARG 1 world
+		ARG 2 fight
+		ARG 3 crystals

mappings/net/minecraft/entity/mob/BlazeEntity.mapping

@@ -1,5 +1,9 @@
 CLASS att net/minecraft/entity/mob/BlazeEntity
 	CLASS att$a ShootFireballGoal
+		FIELD a blaze Latt;
+		METHOD <init> (Latt;)V
+			ARG 1 blaze
 	FIELD d BLAZE_FLAGS Lqh;
 	METHOD l isFireActive ()Z
 	METHOD r setFireActive (Z)V
+		ARG 1 active

mappings/net/minecraft/entity/mob/DrownedEntity.mapping

@@ -1,8 +1,42 @@
 CLASS atx net/minecraft/entity/mob/DrownedEntity
+	CLASS atx$a DrownedAttackGoal
+		FIELD d drowned Latx;
+		METHOD <init> (Latx;DZ)V
+			ARG 1 drowned
+			ARG 2 speed
+	CLASS atx$b LeaveWaterGoal
+		FIELD g drowned Latx;
+		METHOD <init> (Latx;D)V
+			ARG 1 drowned
+			ARG 2 speed
+	CLASS atx$c WanderAroundOnSurfaceGoal
+		FIELD a mob Laiv;
+		FIELD b x D
+		FIELD c y D
+		FIELD d z D
+		FIELD e speed D
+		FIELD f world Lbhh;
+		METHOD <init> (Laiv;D)V
+			ARG 1 mob
+			ARG 2 speed
+		METHOD g getWanderTarget ()Lcrv;
 	CLASS atx$d DrownedMoveControl
 		FIELD i drowned Latx;
+		METHOD <init> (Latx;)V
+			ARG 1 drowned
+	CLASS atx$e
+		FIELD a drowned Latx;
+		FIELD b speed D
+		FIELD c minY I
+		METHOD <init> (Latx;DI)V
+			ARG 1 drowned
+			ARG 2 speed
+			ARG 4 minY
+	CLASS atx$f TridentAttackGoal
+		FIELD a drowned Latx;
 	FIELD b waterNavigation Lapj;
-	FIELD bz targettingUnderwater Z
+	FIELD bz targetingUnderwater Z
 	FIELD c landNavigation Lapg;
-	METHOD eg isTargettingUnderwater ()Z
+	METHOD eg isTargetingUnderwater ()Z
-	METHOD r setTargettingUnderwater (Z)V
+	METHOD r setTargetingUnderwater (Z)V
+		ARG 1 targetingUnderwater

mappings/net/minecraft/entity/mob/EndermanEntity.mapping

@@ -1,27 +1,33 @@
 CLASS atz net/minecraft/entity/mob/EndermanEntity
 	CLASS atz$a ChasePlayerGoal
-		FIELD a endermanEntity Latz;
+		FIELD a enderman Latz;
 		METHOD <init> (Latz;)V
-			ARG 1 endermanEntity
+			ARG 1 enderman
 	CLASS atz$b PlaceBlockGoal
-		FIELD a owner Latz;
+		FIELD a enderman Latz;
+		METHOD <init> (Latz;)V
+			ARG 1 enderman
 	CLASS atz$c TeleportTowardsPlayerGoal
-		FIELD i endermanEntity Latz;
+		FIELD i enderman Latz;
 		FIELD j targetPlayer Lavx;
 		FIELD k lookAtPlayerWarmup I
 		FIELD l ticksSinceUnseenTeleport I
 		FIELD m staringPlayerPredicate Lapz;
 		FIELD n validTargetPredicate Lapz;
 		METHOD <init> (Latz;)V
-			ARG 1 endermanEntity
+			ARG 1 enderman
 		METHOD a (Latz;Laio;)Z
 			ARG 1 playerEntity
 	CLASS atz$d PickUpBlockGoal
-		FIELD a owner Latz;
+		FIELD a enderman Latz;
+		METHOD <init> (Latz;)V
+			ARG 1 enderman
 	FIELD bA PLAYER_ENDERMITE_PREDICATE Ljava/util/function/Predicate;
 	FIELD bB lastAngrySoundAge I
 	FIELD bC ageWhenTargetSet I
+	FIELD b ATTACKING_SPEED_BOOST_UUID Ljava/util/UUID;
 	FIELD bz ANGRY Lqh;
+	FIELD c ATTACKING_SPEED_BOOST Lajg;
 	FIELD d CARRIED_BLOCK Lqh;
 	METHOD a teleportTo (Laif;)Z
 		ARG 1 targetEntity
@@ -30,6 +36,7 @@ CLASS atz net/minecraft/entity/mob/EndermanEntity
 	METHOD dX getCarriedBlock ()Lbvj;
 	METHOD dY isAngry ()Z
 	METHOD f isPlayerStaring (Lavx;)Z
+		ARG 1 player
 	METHOD k teleport (DDD)Z
 		ARG 1 x
 		ARG 3 y

mappings/net/minecraft/entity/mob/EvokerEntity.mapping

@@ -1,9 +1,11 @@
 CLASS auc net/minecraft/entity/mob/EvokerEntity
 	CLASS auc$a ConjureFangsGoal
 		METHOD a conjureFangs (DDDDFI)V
-			ARG 1 z
+			ARG 1 x
-			ARG 3 maxY
+			ARG 3 z
-			ARG 5 warmup
+			ARG 5 maxY
+			ARG 7 y
+			ARG 10 warmup
 	CLASS auc$b LookAtTargetOrWololoTarget
 	CLASS auc$c SummonVexGoal
 		FIELD e closeVexPredicate Lapz;
@@ -11,4 +13,5 @@ CLASS auc net/minecraft/entity/mob/EvokerEntity
 		FIELD e purpleSheepPredicate Lapz;
 	FIELD bz wololoTarget Larj;
 	METHOD a setWololoTarget (Larj;)V
+		ARG 1 sheep
 	METHOD eq getWololoTarget ()Larj;

mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping

@@ -9,9 +9,12 @@ CLASS awf net/minecraft/entity/mob/EvokerFangsEntity
 		ARG 2 x
 		ARG 4 y
 		ARG 6 z
+		ARG 9 warmup
+		ARG 10 owner
 	METHOD a getAnimationProgress (F)F
 		ARG 1 tickDelta
 	METHOD a setOwner (Laio;)V
+		ARG 1 owner
 	METHOD c damage (Laio;)V
 		ARG 1 target
 	METHOD f getOwner ()Laio;

mappings/net/minecraft/entity/mob/GhastEntity.mapping

@@ -1,12 +1,22 @@
 CLASS aud net/minecraft/entity/mob/GhastEntity
+	CLASS aud$a LookAtTargetGoal
+		FIELD a ghast Laud;
+		METHOD <init> (Laud;)V
+			ARG 1 ghast
 	CLASS aud$b GhastMoveControl
 		FIELD i ghast Laud;
 	CLASS aud$c ShootFireballGoal
 		FIELD a cooldown I
-		FIELD b owner Laud;
+		FIELD b ghast Laud;
+		METHOD <init> (Laud;)V
+			ARG 1 ghast
 	CLASS aud$d FlyRandomlyGoal
+		FIELD a ghast Laud;
+		METHOD <init> (Laud;)V
+			ARG 1 ghast
 	FIELD b SHOOTING Lqh;
 	FIELD c fireballStrength I
 	METHOD dT getFireballStrength ()I
 	METHOD l isShooting ()Z
 	METHOD r setShooting (Z)V
+		ARG 1 shooting

mappings/net/minecraft/entity/mob/GuardianEntity.mapping

@@ -1,10 +1,10 @@
 CLASS auf net/minecraft/entity/mob/GuardianEntity
 	CLASS auf$a FireBeamGoal
-		FIELD a owner Lauf;
+		FIELD a guardian Lauf;
 		FIELD b beamTicks I
-		FIELD c elderOwner Z
+		FIELD c elder Z
 		METHOD <init> (Lauf;)V
-			ARG 1 owner
+			ARG 1 guardian
 	CLASS auf$b GuardianTargetPredicate
 		FIELD a owner Lauf;
 		METHOD <init> (Lauf;)V
@@ -13,6 +13,8 @@ CLASS auf net/minecraft/entity/mob/GuardianEntity
 			ARG 1 context
 	CLASS auf$c GuardianMoveControl
 		FIELD i guardian Lauf;
+		METHOD <init> (Lauf;)V
+			ARG 1 guardian
 	FIELD bA tailAngle F
 	FIELD bB prevTailAngle F
 	FIELD bC wanderGoal Lant;

mappings/net/minecraft/entity/mob/IllagerEntity.mapping

@@ -1,5 +1,6 @@
 CLASS atr net/minecraft/entity/mob/IllagerEntity
 	CLASS atr$a State
+	CLASS atr$b LongDoorInteractGoal
 	METHOD <init> (Laij;Lbhh;)V
 		ARG 1 type
 	METHOD l getState ()Latr$a;

mappings/net/minecraft/entity/mob/MobEntity.mapping

@@ -42,6 +42,7 @@ CLASS aip net/minecraft/entity/mob/MobEntity
 		ARG 2 newAngle
 		ARG 3 maxChangeInAngle
 	METHOD a initEquipment (Lagy;)V
+		ARG 1 difficulty
 	METHOD a lookAtEntity (Laif;FF)V
 		ARG 1 targetEntity
 		ARG 2 maxYawChange
@@ -64,13 +65,25 @@ CLASS aip net/minecraft/entity/mob/MobEntity
 		ARG 2 previous
 		ARG 3 slot
 	METHOD a initialize (Lbhi;Lagy;Lair;Laja;Lib;)Laja;
-		ARG 3 difficulty
+		ARG 1 world
+		ARG 2 difficulty
+		ARG 3 spawnType
+		ARG 4 entityData
+		ARG 5 entityTag
 	METHOD a canSpawn (Lbhi;Lair;)Z
+		ARG 1 world
+		ARG 2 spawnType
+	METHOD a canSpawnAt (Lbhi;Lair;Lev;)Z
+		ARG 1 world
+		ARG 2 spawnType
+		ARG 3 pos
 	METHOD a canSpawn (Lbhk;)Z
 		ARG 1 world
 	METHOD a getPathNodeTypeWeight (Lcnc;)F
+		ARG 1 type
 	METHOD a setPathNodeTypeWeight (Lcnc;F)V
 		ARG 1 type
+		ARG 2 weight
 	METHOD a isInWalkTargetRange (Lev;)Z
 	METHOD a setWalkTarget (Lev;I)V
 	METHOD a detachLeash (ZZ)V

mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping

@@ -7,5 +7,6 @@ CLASS aiv net/minecraft/entity/mob/MobEntityWithAi
 	METHOD dT isNavigating ()Z
 	METHOD dU getRunFromLeashSpeed ()D
 	METHOD f getPathfindingFavor (Lev;)F
+		ARG 1 pos
 	METHOD u updateForLeashLength (F)V
 		ARG 1 leashLength

mappings/net/minecraft/entity/mob/MobVisibilityCache.mapping

@@ -2,5 +2,8 @@ CLASS apt net/minecraft/entity/mob/MobVisibilityCache
 	FIELD a owner Laip;
 	FIELD b visibleEntities Ljava/util/List;
 	FIELD c invisibleEntities Ljava/util/List;
+	METHOD <init> (Laip;)V
+		ARG 1 owner
 	METHOD a clear ()V
 	METHOD a canSee (Laif;)Z
+		ARG 1 entity

mappings/net/minecraft/entity/mob/PatrolEntity.mapping

@@ -1,8 +1,12 @@
 CLASS auk net/minecraft/entity/mob/PatrolEntity
 	CLASS auk$a PatrolGoal
-		FIELD a owner Lauk;
+		FIELD a actor Lauk;
 		FIELD b leaderSpeed D
 		FIELD c fellowSpeed D
+		METHOD <init> (Lauk;DD)V
+			ARG 1 actor
+			ARG 2 leaderSpeed
+			ARG 4 fellowSpeed
 		METHOD g wander ()V
 	FIELD b patrolTarget Lev;
 	FIELD c patrolLeader Z
@@ -17,4 +21,6 @@ CLASS auk net/minecraft/entity/mob/PatrolEntity
 	METHOD ee setRandomPatrolTarget ()V
 	METHOD ef isRaidCenterSet ()Z
 	METHOD g setPatrolTarget (Lev;)V
+		ARG 1 targetPos
 	METHOD r setPatrolLeader (Z)V
+		ARG 1 patrolLeader

mappings/net/minecraft/entity/mob/PhantomEntity.mapping

@@ -1,10 +1,17 @@
 CLASS aul net/minecraft/entity/mob/PhantomEntity
 	CLASS aul$a PhantomMovementType
-	CLASS aul$b
+	CLASS aul$b FindTargetGoal
 		FIELD b PLAYERS_IN_RANGE_PREDICATE Lapz;
+		FIELD c delay I
+	CLASS aul$c StartAttackGoal
 	CLASS aul$d PhantomBodyControl
+	CLASS aul$e CircleMovementGoal
 	CLASS aul$f PhantomLookControl
 	CLASS aul$g PhantomMoveControl
+		METHOD <init> (Laul;Laip;)V
+			ARG 2 owner
+	CLASS aul$h MovementGoal
+	CLASS aul$i SwoopMovementGoal
 	FIELD b SIZE Lqh;
 	FIELD bz movementType Laul$a;
 	METHOD a setPhantomSize (I)V

mappings/net/minecraft/entity/mob/RavagerEntity.mapping

@@ -1,4 +1,5 @@
 CLASS aup net/minecraft/entity/mob/RavagerEntity
+	CLASS aup$a AttackGoal
 	CLASS aup$b
 		METHOD <init> (Laip;Lbhh;)V
 			ARG 1 world

mappings/net/minecraft/entity/mob/ShulkerEntity.mapping

@@ -3,9 +3,13 @@ CLASS aur net/minecraft/entity/mob/ShulkerEntity
 		FIELD b counter I
 	CLASS aur$b ShulkerBodyControl
 	CLASS aur$c SearchForTargetGoal
+		METHOD <init> (Laur;)V
+			ARG 1 shulker
 		METHOD a (Laio;)Z
 			ARG 0 entity
 	CLASS aur$d SearchForPlayerGoal
+		METHOD <init> (Laur;Laur;)V
+			ARG 2 shulker
 	CLASS aur$e PeekGoal
 		FIELD b counter I
 	FIELD bA ATTR_COVERED_ARMOR_BONUS_UUID Ljava/util/UUID;

mappings/net/minecraft/entity/mob/SilverfishEntity.mapping

@@ -1,2 +1,14 @@
 CLASS aus net/minecraft/entity/mob/SilverfishEntity
+	CLASS aus$a WanderAndInfestGoal
+		FIELD h direction Lfa;
+		FIELD i canInfest Z
+		METHOD <init> (Laus;)V
+			ARG 1 silverfish
+	CLASS aus$b CallForHelpGoal
+		FIELD a silverfish Laus;
+		FIELD b delay I
+		METHOD <init> (Laus;)V
+			ARG 1 silverfish
+		METHOD g onHurt ()V
 	FIELD b CLOSE_PLAYER_PREDICATE Lapz;
+	FIELD c callForHelpGoal Laus$b;

mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping

@@ -1 +1,6 @@
 CLASS arx net/minecraft/entity/mob/SkeletonHorseEntity
+	FIELD bK trapped Z
+	FIELD bL trapTime I
+	METHOD dV isTrapped ()Z
+	METHOD r setTrapped (Z)V
+		ARG 1 trapped

mappings/net/minecraft/entity/mob/SlimeEntity.mapping

@@ -1,14 +1,32 @@
 CLASS auu net/minecraft/entity/mob/SlimeEntity
+	CLASS auu$a
+		FIELD a slime Lauu;
+		METHOD <init> (Lauu;)V
+			ARG 1 slime
+	CLASS auu$b
+		FIELD a slime Lauu;
+		METHOD <init> (Lauu;)V
+			ARG 1 slime
+	CLASS auu$c
+		FIELD a slime Lauu;
+		METHOD <init> (Lauu;)V
+			ARG 1 slime
 	CLASS auu$d SlimeMoveControl
 		FIELD i targetYaw F
 		FIELD j ticksUntilJump I
 		FIELD k slime Lauu;
 		FIELD l jumpOften Z
+		METHOD <init> (Lauu;)V
+			ARG 1 slime
 		METHOD a move (D)V
 			ARG 1 speed
 		METHOD a look (FZ)V
 			ARG 1 targetYaw
 			ARG 2 jumpOften
+	CLASS auu$e
+		FIELD a slime Lauu;
+		METHOD <init> (Lauu;)V
+			ARG 1 slime
 	FIELD bA onGroundLastTick Z
 	FIELD b targetStretch F
 	FIELD bz SLIME_SIZE Lqh;

mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping

@@ -1,4 +1,14 @@
 CLASS auv net/minecraft/entity/mob/SpellcastingIllagerEntity
+	CLASS auv$a Spell
+		FIELD g id I
+		FIELD h particleVelocity [D
+		METHOD <init> (Ljava/lang/String;IIDDD)V
+			ARG 3 id
+			ARG 4 particleVelocityX
+			ARG 6 particleVelocityY
+			ARG 8 particleVelocityZ
+		METHOD a byId (I)Lauv$a;
+			ARG 0 id
 	CLASS auv$b LookAtTargetGoal
 	CLASS auv$c CastSpellGoal
 		FIELD b spellCooldown I
@@ -7,6 +17,7 @@ CLASS auv net/minecraft/entity/mob/SpellcastingIllagerEntity
 		METHOD h startTimeDelay ()I
 		METHOD j castSpell ()V
 		METHOD k getSoundPrepare ()Lyj;
+		METHOD l getSpell ()Lauv$a;
 		METHOD m getInitialCooldown ()I
 	FIELD bA spell Lauv$a;
 	FIELD b spellTicks I

mappings/net/minecraft/entity/mob/SpiderEntity.mapping

@@ -1,4 +1,15 @@
 CLASS auw net/minecraft/entity/mob/SpiderEntity
+	CLASS auw$a AttackGoal
+		METHOD <init> (Lauw;)V
+			ARG 1 spider
+	CLASS auw$b SpawnEffectData
+		FIELD a effect Lahx;
+		METHOD a setEffect (Ljava/util/Random;)V
+			ARG 1 random
+	CLASS auw$c FollowTargetGoal
+		METHOD <init> (Lauw;Ljava/lang/Class;)V
+			ARG 1 spider
+			ARG 2 targetEntityClass
 	FIELD b SPIDER_FLAGS Lqh;
 	METHOD l getCanClimb ()Z
 	METHOD r setCanClimb (Z)V

mappings/net/minecraft/entity/mob/VexEntity.mapping

@@ -2,7 +2,11 @@ CLASS auz net/minecraft/entity/mob/VexEntity
 	CLASS auz$a ChargeTargetGoal
 	CLASS auz$b TrackOwnerTargetGoal
 		FIELD b TRACK_OWNER_PREDICATE Lapz;
+		METHOD <init> (Lauz;Laiv;)V
+			ARG 2 mob
 	CLASS auz$c VexMoveControl
+		METHOD <init> (Lauz;Lauz;)V
+			ARG 2 owner
 	CLASS auz$d LookAtTargetGoal
 	FIELD bA lifeTicks I
 	FIELD b VEX_FLAGS Lqh;
@@ -15,11 +19,13 @@ CLASS auz net/minecraft/entity/mob/VexEntity
 		ARG 1 mask
 		ARG 2 value
 	METHOD a setOwner (Laip;)V
+		ARG 1 owner
 	METHOD b areFlagsSet (I)Z
 		ARG 1 mask
 	METHOD dW getBounds ()Lev;
 	METHOD dX isCharging ()Z
 	METHOD g setBounds (Lev;)V
+		ARG 1 pos
 	METHOD l getOwner ()Laip;
 	METHOD r setCharging (Z)V
 		ARG 1 charging

mappings/net/minecraft/entity/mob/VindicatorEntity.mapping

@@ -1,3 +1,10 @@
 CLASS ava net/minecraft/entity/mob/VindicatorEntity
-	CLASS ava$a VindicatorBreakDoorGoal
+	CLASS ava$a BreakDoorGoal
+	CLASS ava$b FollowEntityGoal
+		METHOD <init> (Lava;)V
+			ARG 1 vindicator
+	CLASS ava$c AttackGoal
+		METHOD <init> (Lava;Lava;)V
+			ARG 2 vindicator
+	FIELD b DIFFICULTY_ALLOWS_DOOR_BREAKING_PREDICATE Ljava/util/function/Predicate;
 	FIELD bz isJohnny Z

mappings/net/minecraft/entity/mob/ZombieEntity.mapping

@@ -1,5 +1,8 @@
 CLASS avd net/minecraft/entity/mob/ZombieEntity
 	CLASS avd$a DestroyEggGoal
+		METHOD <init> (Lavd;Laiv;DI)V
+			ARG 2 mob
+			ARG 3 speed
 	FIELD bB CONVERTING_IN_WATER Lqh;
 	FIELD bD breakDoorsGoal Lamf;
 	FIELD bE canBreakDoors Z

mappings/net/minecraft/entity/mob/ZombiePigmanEntity.mapping

@@ -1,7 +1,14 @@
 CLASS aum net/minecraft/entity/mob/ZombiePigmanEntity
 	CLASS aum$a FollowPlayerIfAngryGoal
+		METHOD <init> (Laum;)V
+			ARG 1 pigman
 	CLASS aum$b AvoidZombiesGoal
+		METHOD <init> (Laum;)V
+			ARG 1 pigman
+	FIELD bA angrySoundDelay I
 	FIELD bB angerTarget Ljava/util/UUID;
+	FIELD b ATTACKING_SPEED_BOOST_UUID Ljava/util/UUID;
 	FIELD bz anger I
+	FIELD c ATTACKING_SPEED_BOOST Lajg;
 	METHOD a copyEntityData (Laif;)V
 	METHOD ed isAngry ()Z

mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping

@@ -8,8 +8,13 @@ CLASS ave net/minecraft/entity/mob/ZombieVillagerEntity
 	METHOD a setXp (I)V
 		ARG 1 xp
 	METHOD a setVillagerData (Lavl;)V
+		ARG 1 data
 	METHOD a setConverting (Ljava/util/UUID;I)V
+		ARG 1 uuid
+		ARG 2 delay
 	METHOD a finishConversion (Lvg;)V
+		ARG 1 world
 	METHOD ed isConverting ()Z
 	METHOD eg getConversionRate ()I
 	METHOD g setOfferData (Lib;)V
+		ARG 1 offerTag

mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping

@@ -5,3 +5,4 @@ CLASS arr net/minecraft/entity/passive/AbstractDonkeyEntity
 	METHOD dV hasChest ()Z
 	METHOD dY playAddChestSound ()V
 	METHOD r setHasChest (Z)V
+		ARG 1 hasChest

mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping

@@ -8,7 +8,9 @@ CLASS avg net/minecraft/entity/passive/AbstractTraderEntity
 		ARG 2 pool
 		ARG 3 count
 	METHOD a produceParticles (Lgd;)V
+		ARG 1 parameters
 	METHOD b afterUsing (Lbgk;)V
+		ARG 1 offer
 	METHOD dX hasCustomer ()Z
 	METHOD ea getYesSound ()Lyj;
 	METHOD eb playCelebrateSound ()V
@@ -16,5 +18,6 @@ CLASS avg net/minecraft/entity/passive/AbstractTraderEntity
 	METHOD ed getInventory ()Lahf;
 	METHOD ef fillRecipes ()V
 	METHOD r setHeadRollingTimeLeft (I)V
+		ARG 1 time
 	METHOD r getTradingSound (Z)Lyj;
 		ARG 1 sold

mappings/net/minecraft/entity/passive/BatEntity.mapping

@@ -1,5 +1,7 @@
 CLASS aqm net/minecraft/entity/passive/BatEntity
 	FIELD b BAT_FLAGS Lqh;
 	FIELD c CLOSE_PLAYER_PREDICATE Lapz;
+	FIELD d hangingPosition Lev;
+	METHOD dT isTodayAroundHalloween ()Z
 	METHOD l isRoosting ()Z
 	METHOD r setRoosting (Z)V

mappings/net/minecraft/entity/passive/CatEntity.mapping

@@ -1,14 +1,28 @@
 CLASS aqs net/minecraft/entity/passive/CatEntity
 	CLASS aqs$a CatFleeGoal
-		FIELD i entity Laqs;
+		FIELD i cat Laqs;
+		METHOD <init> (Laqs;Ljava/lang/Class;FDD)V
+			ARG 1 cat
+			ARG 2 fleeFromType
+			ARG 3 distance
+			ARG 4 slowSpeed
+			ARG 6 fastSpeed
 	CLASS aqs$b SleepWithOwnerGoal
-		FIELD a entity Laqs;
+		FIELD a cat Laqs;
 		FIELD b owner Lavx;
 		FIELD c bedPos Lev;
 		FIELD d ticksOnBed I
+		METHOD <init> (Laqs;)V
+			ARG 1 cat
 		METHOD h dropMorningGifts ()V
-	CLASS aqs$c CatTemptGoal
+	CLASS aqs$c TemptGoal
+		FIELD c player Lavx;
 		FIELD d cat Laqs;
+		METHOD <init> (Laqs;DLbef;Z)V
+			ARG 1 cat
+			ARG 2 speed
+			ARG 4 food
+			ARG 5 canBeScared
 	FIELD bD TEXTURES Ljava/util/Map;
 	FIELD bE TAMING_INGREDIENT Lbef;
 	FIELD bF CAT_TYPE Lqh;

mappings/net/minecraft/entity/passive/DolphinEntity.mapping

@@ -1,6 +1,10 @@
 CLASS aqw net/minecraft/entity/passive/DolphinEntity
 	CLASS aqw$a DolphinMoveControl
 		FIELD i dolphin Laqw;
+	CLASS aqw$b LeadToNearbyTreasureGoal
+		FIELD a dolphin Laqw;
+		METHOD <init> (Laqw;)V
+			ARG 1 dolphin
 	CLASS aqw$c SwimWithPlayerGoal
 		FIELD a dolphin Laqw;
 		FIELD b speed D
@@ -8,6 +12,9 @@ CLASS aqw net/minecraft/entity/passive/DolphinEntity
 		METHOD <init> (Laqw;D)V
 			ARG 1 dolphin
 			ARG 2 speed
+	CLASS aqw$d PlayWithItemsGoal
+		METHOD a spitOutItem (Lbca;)V
+			ARG 1 stack
 	FIELD bA CLOSE_PLAYER_PREDICATE Lapz;
 	FIELD b CAN_TAKE Ljava/util/function/Predicate;
 	FIELD bz MOISTNESS Lqh;

mappings/net/minecraft/entity/passive/FishEntity.mapping

@@ -1,7 +1,12 @@
 CLASS aqo net/minecraft/entity/passive/FishEntity
 	CLASS aqo$a FishMoveControl
 		FIELD i fish Laqo;
+		METHOD <init> (Laqo;)V
+			ARG 1 owner
 	CLASS aqo$b SwimToRandomPlaceGoal
+		FIELD h fish Laqo;
+		METHOD <init> (Laqo;)V
+			ARG 1 fish
 	FIELD b FROM_BUCKET Lqh;
 	METHOD <init> (Laij;Lbhh;)V
 		ARG 1 type
@@ -9,5 +14,6 @@ CLASS aqo net/minecraft/entity/passive/FishEntity
 	METHOD dW getFlopSound ()Lyj;
 	METHOD dX isFromBucket ()Z
 	METHOD i copyDataToStack (Lbca;)V
+		ARG 1 stack
 	METHOD l getFishBucketItem ()Lbca;
 	METHOD r setFromBucket (Z)V

mappings/net/minecraft/entity/passive/FoxEntity.mapping

@@ -3,28 +3,60 @@ CLASS aqy net/minecraft/entity/passive/FoxEntity
 		FIELD j offender Laio;
 		FIELD k friend Laio;
 		FIELD l lastAttackedTime I
+		METHOD <init> (Laqy;Ljava/lang/Class;ZZLjava/util/function/Predicate;)V
+			ARG 2 targetEntityClass
+			ARG 3 checkVisibility
+			ARG 4 checkCanNavigate
+			ARG 5 targetPredicate
 	CLASS aqy$b StopWanderingGoal
 		FIELD a timer I
 	CLASS aqy$c WorriableEntityFilter
+		METHOD test (Ljava/lang/Object;)Z
+			ARG 1 entity
 	CLASS aqy$d CalmDownGoal
 		FIELD b WORRIABLE_ENTITY_PREDICATE Lapz;
 		METHOD g isAtFavoredLocation ()Z
 		METHOD h canCalmDown ()Z
 	CLASS aqy$e MateGoal
+		METHOD <init> (Laqy;D)V
+			ARG 2 chance
 	CLASS aqy$f EatSweetBerriesGoal
 		FIELD g timer I
+		METHOD <init> (Laqy;DII)V
+			ARG 2 speed
+			ARG 4 rannge
+			ARG 5 maxYDifference
 		METHOD m eatSweetBerry ()V
 	CLASS aqy$g FoxSwimGoal
+	CLASS aqy$h FollowParentGoal
+		FIELD b fox Laqy;
+		METHOD <init> (Laqy;Laqy;D)V
+			ARG 2 fox
+			ARG 3 speed
 	CLASS aqy$i FoxData
 		FIELD a type Laqy$v;
 		FIELD b uses I
+		METHOD <init> (Laqy$v;)V
+			ARG 1 type
+	CLASS aqy$j LookAtEntityGoal
+		METHOD <init> (Laqy;Laip;Ljava/lang/Class;F)V
+			ARG 2 fox
+			ARG 3 targetType
+			ARG 4 range
 	CLASS aqy$k FoxLookControl
 	CLASS aqy$l AttackGoal
+		METHOD <init> (Laqy;DZ)V
+			ARG 2 speed
 	CLASS aqy$m FoxMoveControl
 	CLASS aqy$n EscapeWhenNotAggresiveGoal
+		METHOD <init> (Laqy;D)V
+			ARG 2 speed
 	CLASS aqy$o JumpChasingGoal
 	CLASS aqy$p PickupItemGoal
 	CLASS aqy$q GoToVillageGoal
+		METHOD <init> (Laqy;II)V
+			ARG 2 unused
+			ARG 3 searchRange
 		METHOD g canGoToVillage ()Z
 	CLASS aqy$r SitDownAndLookAroundGoal
 		FIELD c lookX D
@@ -34,18 +66,29 @@ CLASS aqy net/minecraft/entity/passive/FoxEntity
 		METHOD j chooseNewAngle ()V
 	CLASS aqy$s AvoidDaylightGoal
 		FIELD c timer I
+		METHOD <init> (Laqy;D)V
+			ARG 2 speed
 	CLASS aqy$t DelayedCalmDownGoal
 		FIELD c timer I
+		METHOD j canNotCalmDown ()Z
 	CLASS aqy$u MoveToHuntGoal
 	CLASS aqy$v Type
-		FIELD d byName Ljava/util/Map;
+		FIELD c TYPES [Laqy$v;
+		FIELD d NAME_TYPE_MAP Ljava/util/Map;
 		FIELD e id I
 		FIELD f key Ljava/lang/String;
 		FIELD g biomes Ljava/util/List;
+		METHOD <init> (Ljava/lang/String;IILjava/lang/String;[Lbie;)V
+			ARG 3 id
+			ARG 4 key
+			ARG 5 biomes
 		METHOD a getKey ()Ljava/lang/String;
 		METHOD a fromId (I)Laqy$v;
+			ARG 0 id
 		METHOD a fromBiome (Lbie;)Laqy$v;
+			ARG 0 biome
 		METHOD a byName (Ljava/lang/String;)Laqy$v;
+			ARG 0 name
 		METHOD b getBiomes ()Ljava/util/List;
 		METHOD c getId ()I
 	FIELD bA FOX_FLAGS Lqh;
@@ -65,8 +108,10 @@ CLASS aqy net/minecraft/entity/passive/FoxEntity
 	FIELD bP eatingTime I
 	FIELD bz TYPE Lqh;
 	METHOD a setType (Laqy$v;)V
+		ARG 1 type
 	METHOD a canJumpChase (Laqy;Laio;)Z
 	METHOD b addTrustedUuid (Ljava/util/UUID;)V
+		ARG 1 uuid
 	METHOD c canTrust (Ljava/util/UUID;)Z
 	METHOD d setFoxFlag (IZ)V
 		ARG 1 mask
@@ -84,15 +129,22 @@ CLASS aqy net/minecraft/entity/passive/FoxEntity
 	METHOD em wakeUp ()V
 	METHOD en stopActions ()V
 	METHOD eo wantsToPickupItem ()Z
+	METHOD j canEat (Lbca;)Z
+		ARG 1 stack
 	METHOD k spit (Lbca;)V
 	METHOD l dropItem (Lbca;)V
 	METHOD r getFoxFlag (I)Z
+		ARG 1 bitmask
 	METHOD r setSitting (Z)V
+		ARG 1 sitting
 	METHOD s setChasing (Z)V
 	METHOD t setCrouching (Z)V
 	METHOD u setRollingHead (Z)V
 	METHOD v getHeadRoll (F)F
 	METHOD v setWalking (Z)V
+		ARG 1 walking
 	METHOD w getBodyRotationHeightOffset (F)F
 	METHOD w setAggressive (Z)V
+		ARG 1 aggressive
 	METHOD x setSleeping (Z)V
+		ARG 1 sleeping

mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping

@@ -30,8 +30,10 @@ CLASS ars net/minecraft/entity/passive/HorseBaseEntity
 		ARG 1 player
 		ARG 2 item
 	METHOD b setOwnerUuid (Ljava/util/UUID;)V
+		ARG 1 uuid
 	METHOD d setHorseFlag (IZ)V
-		ARG 1 index
+		ARG 1 bitmask
+		ARG 2 flag
 	METHOD dV playEatingAnimation ()V
 	METHOD dW getInventorySize ()I
 	METHOD dX getAngrySound ()Lyj;
@@ -62,14 +64,17 @@ CLASS ars net/minecraft/entity/passive/HorseBaseEntity
 	METHOD ey getChildJumpStrengthBonus ()D
 	METHOD ez getChildMovementSpeedBonus ()D
 	METHOD g putPlayerOnBack (Lavx;)V
+		ARG 1 player
 	METHOD h bondWithPlayer (Lavx;)Z
 		ARG 1 player
 	METHOD j canEquip (Lbca;)Z
 		ARG 1 item
 	METHOD r getHorseFlag (I)Z
+		ARG 1 bitmask
 	METHOD s setTemper (I)V
 		ARG 1 temper
 	METHOD s setTame (Z)V
+		ARG 1 tame
 	METHOD t addTemper (I)I
 		ARG 1 difference
 	METHOD t setInAir (Z)V

mappings/net/minecraft/entity/passive/HorseEntity.mapping

@@ -1,4 +1,5 @@
 CLASS aru net/minecraft/entity/passive/HorseEntity
+	FIELD bJ HORSE_ARMOR_BONUS_UUID Ljava/util/UUID;
 	FIELD bK VARIANT Lqh;
 	FIELD bL HORSE_TEX [Ljava/lang/String;
 	FIELD bM HORSE_TEX_ID [Ljava/lang/String;
@@ -12,5 +13,9 @@ CLASS aru net/minecraft/entity/passive/HorseEntity
 	METHOD eB getTextureLayers ()[Ljava/lang/String;
 	METHOD eC clearTextureInfo ()V
 	METHOD eD initTextureInfo ()V
+	METHOD k equipArmor (Lbca;)V
+		ARG 1 stack
 	METHOD l setArmorTypeFromStack (Lbca;)V
+		ARG 1 stack
 	METHOD u setVariant (I)V
+		ARG 1 variant

mappings/net/minecraft/entity/passive/LlamaEntity.mapping

@@ -1,4 +1,7 @@
 CLASS arv net/minecraft/entity/passive/LlamaEntity
+	CLASS arv$a ChaseWolvesGoal
+		METHOD <init> (Larv;)V
+			ARG 1 llama
 	FIELD bJ ATTR_STRENGTH Lqh;
 	FIELD bK CARPET_COLOR Lqh;
 	FIELD bL ATTR_VARIANT Lqh;

mappings/net/minecraft/entity/passive/MooshroomEntity.mapping

@@ -1,14 +1,21 @@
 CLASS ara net/minecraft/entity/passive/MooshroomEntity
 	CLASS ara$a Type
 		FIELD c name Ljava/lang/String;
-		FIELD d mushroomState Lbvj;
+		FIELD d mushroom Lbvj;
+		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lbvj;)V
+			ARG 3 name
+			ARG 4 mushroom
 		METHOD a getMushroomState ()Lbvj;
 		METHOD b fromName (Ljava/lang/String;)Lara$a;
+			ARG 0 name
 	FIELD bA stewEffect Lahx;
 	FIELD bB stewEffectDuration I
 	FIELD bD lightningId Ljava/util/UUID;
 	FIELD bz TYPE Lqh;
 	METHOD a setType (Lara$a;)V
+		ARG 1 type
 	METHOD a chooseBabyType (Lara;)Lara$a;
+		ARG 1 mooshroom
 	METHOD dV getMooshroomType ()Lara$a;
 	METHOD j getStewEffectFrom (Lbca;)Lorg/apache/commons/lang3/tuple/Pair;
+		ARG 1 flower

mappings/net/minecraft/entity/passive/OcelotEntity.mapping

@@ -1,8 +1,19 @@
 CLASS arb net/minecraft/entity/passive/OcelotEntity
-	CLASS arb$a OcelotFleeGoal
+	CLASS arb$a FleeGoal
 		FIELD i ocelot Larb;
+		METHOD <init> (Larb;Ljava/lang/Class;FDD)V
+			ARG 1 ocelot
+			ARG 2 fleeFromType
+			ARG 3 distance
+			ARG 4 slowSpeed
+			ARG 6 fastSpeed
 	CLASS arb$b OcelotTemptGoal
 		FIELD c ocelot Larb;
+		METHOD <init> (Larb;DLbef;Z)V
+			ARG 1 ocelot
+			ARG 2 speed
+			ARG 4 food
+			ARG 5 canBeScared
 	FIELD bA TRUSTING Lqh;
 	FIELD bB fleeGoal Larb$a;
 	FIELD bD temptGoal Larb$b;

mappings/net/minecraft/entity/passive/PandaEntity.mapping

@@ -10,8 +10,10 @@ CLASS arc net/minecraft/entity/passive/PandaEntity
 			ARG 5 recessive
 		METHOD a getId ()I
 		METHOD a byId (I)Larc$a;
+			ARG 0 id
 		METHOD a byName (Ljava/lang/String;)Larc$a;
 		METHOD a createRandom (Ljava/util/Random;)Larc$a;
+			ARG 0 random
 		METHOD b getName ()Ljava/lang/String;
 		METHOD b getProductGene (Larc$a;Larc$a;)Larc$a;
 			ARG 0 mainGene
@@ -19,8 +21,17 @@ CLASS arc net/minecraft/entity/passive/PandaEntity
 		METHOD c isRecessive ()Z
 	CLASS arc$b AttackGoal
 		FIELD d panda Larc;
+		METHOD <init> (Larc;DZ)V
+			ARG 1 panda
+			ARG 2 speed
 	CLASS arc$c PandaFleeGoal
-		FIELD i owner Larc;
+		FIELD i panda Larc;
+		METHOD <init> (Larc;Ljava/lang/Class;FDD)V
+			ARG 1 panda
+			ARG 2 fleeFromType
+			ARG 3 distance
+			ARG 4 slowSpeed
+			ARG 6 fastSpeed
 	CLASS arc$d PandaMateGoal
 		FIELD d CLOSE_PLAYER_PREDICATE Lapz;
 		FIELD e panda Larc;
@@ -34,17 +45,25 @@ CLASS arc net/minecraft/entity/passive/PandaEntity
 		FIELD a panda Larc;
 		METHOD <init> (Larc;[Ljava/lang/Class;)V
 			ARG 1 panda
+			ARG 2 noRevengeTypes
 	CLASS arc$g LieOnBackGoal
 		FIELD a panda Larc;
 		FIELD b nextLieOnBackAge I
-	CLASS arc$h PandaLookAtEntityGoal
+		METHOD <init> (Larc;)V
+			ARG 1 panda
+	CLASS arc$h LookAtEntityGoal
 		FIELD f panda Larc;
 		METHOD <init> (Larc;Ljava/lang/Class;F)V
 			ARG 1 panda
+			ARG 2 targetType
+			ARG 3 range
 	CLASS arc$i PandaMoveControl
 		FIELD i panda Larc;
 	CLASS arc$j ExtinguishFireGoal
 		FIELD f panda Larc;
+		METHOD <init> (Larc;D)V
+			ARG 1 panda
+			ARG 2 speed
 	CLASS arc$k PlayGoal
 		FIELD a panda Larc;
 		METHOD <init> (Larc;)V
@@ -73,8 +92,12 @@ CLASS arc net/minecraft/entity/passive/PandaEntity
 	FIELD bQ IS_FOOD Ljava/util/function/Predicate;
 	FIELD bz playingTicks I
 	METHOD a setMainGene (Larc$a;)V
+		ARG 1 gene
 	METHOD a initGenes (Larc;Larc;)V
+		ARG 1 mother
+		ARG 2 father
 	METHOD b setHiddenGene (Larc$a;)V
+		ARG 1 gene
 	METHOD d setPandaFlag (IZ)V
 		ARG 1 mask
 		ARG 2 value
@@ -104,6 +127,7 @@ CLASS arc net/minecraft/entity/passive/PandaEntity
 	METHOD ey updatePlaying ()V
 	METHOD ez sneeze ()V
 	METHOD j canEat (Lbca;)Z
+		ARG 1 stack
 	METHOD r setAskForBambooTicks (I)V
 		ARG 1 askForBambooTicks
 	METHOD r setScared (Z)V
@@ -111,11 +135,13 @@ CLASS arc net/minecraft/entity/passive/PandaEntity
 	METHOD s setSneezeProgress (I)V
 		ARG 1 sneezeProgress
 	METHOD s setLyingOnBack (Z)V
+		ARG 1 lyingOnBack
 	METHOD t setEatingTicks (I)V
 		ARG 1 eatingTicks
 	METHOD t setEating (Z)V
 		ARG 1 eating
 	METHOD u hasPandaFlag (I)Z
+		ARG 1 bitmask
 	METHOD u setSneezing (Z)V
 		ARG 1 sneezing
 	METHOD v getScaredAnimationProgress (F)F

mappings/net/minecraft/entity/passive/PufferfishEntity.mapping

@@ -1,4 +1,8 @@
 CLASS arg net/minecraft/entity/passive/PufferfishEntity
+	CLASS arg$a
+		FIELD a pufferfish Larg;
+		METHOD <init> (Larg;)V
+			ARG 1 pufferfish
 	FIELD b PUFF_STATE Lqh;
 	METHOD a sting (Laip;)V
 		ARG 1 mob

mappings/net/minecraft/entity/passive/RabbitEntity.mapping

@@ -1,20 +1,38 @@
 CLASS arh net/minecraft/entity/passive/RabbitEntity
 	CLASS arh$a RabbitAttackGoal
-	CLASS arh$b RabbitFleeGoal
+		METHOD <init> (Larh;)V
+			ARG 1 rabbit
+	CLASS arh$b FleeGoal
 		FIELD i rabbit Larh;
+		METHOD <init> (Larh;Ljava/lang/Class;FDD)V
+			ARG 1 rabbit
+			ARG 2 fleeFromType
+			ARG 3 distance
+			ARG 4 slowSpeed
+			ARG 6 fastSpeed
 	CLASS arh$c RabbitEntityData
 		FIELD a type I
 		METHOD <init> (I)V
 			ARG 1 type
 	CLASS arh$d RabbitJumpControl
 		FIELD c rabbit Larh;
+		METHOD <init> (Larh;Larh;)V
+			ARG 2 owner
 		METHOD c isActive ()Z
 	CLASS arh$e RabbitMoveControl
 		FIELD i rabbit Larh;
-	CLASS arh$f RabbitEscapeDangerGoal
+		METHOD <init> (Larh;)V
-		FIELD f owner Larh;
+			ARG 1 owner
-	CLASS arh$g
+	CLASS arh$f EscapeDangerGoal
+		FIELD f rabbit Larh;
+		METHOD <init> (Larh;D)V
+			ARG 1 rabbit
+			ARG 2 speed
+	CLASS arh$g EatCarrotCropGoal
 		FIELD g rabbit Larh;
+		FIELD h wantsCarrots Z
+		METHOD <init> (Larh;)V
+			ARG 1 rabbit
 	FIELD bA KILLER_BUNNY Lqs;
 	FIELD bB jumpTicks I
 	FIELD bD jumpDuration I

mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping

@@ -1,12 +1,16 @@
 CLASS aqq net/minecraft/entity/passive/SchoolingFishEntity
 	CLASS aqq$a Data
 		FIELD a leader Laqq;
+		METHOD <init> (Laqq;)V
+			ARG 1 leader
 	FIELD b leader Laqq;
 	FIELD c groupSize I
 	METHOD <init> (Laij;Lbhh;)V
 		ARG 1 type
 	METHOD a joinGroupOf (Laqq;)Laqq;
+		ARG 1 groupLeader
 	METHOD a pullInOtherFish (Ljava/util/stream/Stream;)V
+		ARG 1 fish
 	METHOD dX getMaxGroupSize ()I
 	METHOD dY hasLeader ()Z
 	METHOD dZ leaveGroup ()V

mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping

@@ -0,0 +1,5 @@
+CLASS arl net/minecraft/entity/passive/SnowGolemEntity
+	FIELD b SNOW_GOLEM_FLAGS Lqh;
+	METHOD l hasPumpkin ()Z
+	METHOD r setHasPumpkin (Z)V
+		ARG 1 hasPumpkin

mappings/net/minecraft/entity/passive/SnowmanEntity.mapping

@@ -1,4 +0,0 @@
-CLASS arl net/minecraft/entity/passive/SnowmanEntity
-	FIELD b SNOWMAN_FLAGS Lqh;
-	METHOD l hasPumpkin ()Z
-	METHOD r setHasPumpkin (Z)V

mappings/net/minecraft/entity/passive/SquidEntity.mapping

@@ -1,8 +1,10 @@
 CLASS arm net/minecraft/entity/passive/SquidEntity
 	CLASS arm$a EscapeAttackerGoal
 		FIELD b timer I
-	CLASS arm$b SwimInOneDirectionGoal
+	CLASS arm$b SwimGoal
-		FIELD b owner Larm;
+		FIELD b squid Larm;
+		METHOD <init> (Larm;Larm;)V
+			ARG 2 squid
 	FIELD bE constantVelocityRate F
 	FIELD bH constantVelocityX F
 	FIELD bI constantVelocityY F

mappings/net/minecraft/entity/passive/TameableEntity.mapping

@@ -9,14 +9,19 @@ CLASS ajc net/minecraft/entity/passive/TameableEntity
 		ARG 1 target
 		ARG 2 owner
 	METHOD b setOwnerUuid (Ljava/util/UUID;)V
+		ARG 1 uuid
 	METHOD dV isTamed ()Z
 	METHOD dW onTamedChanged ()V
 	METHOD dX isSitting ()Z
 	METHOD dY getOwner ()Laio;
 	METHOD dZ getSitGoal ()Laob;
 	METHOD e setOwner (Lavx;)V
+		ARG 1 player
 	METHOD h isOwner (Laio;)Z
+		ARG 1 entity
 	METHOD r showEmoteParticle (Z)V
 		ARG 1 positive
 	METHOD s setTamed (Z)V
+		ARG 1 tamed
 	METHOD t setSitting (Z)V
+		ARG 1 sitting

mappings/net/minecraft/entity/passive/TameableShoulderEntity.mapping

@@ -3,4 +3,5 @@ CLASS ark net/minecraft/entity/passive/TameableShoulderEntity
 	METHOD <init> (Laij;Lbhh;)V
 		ARG 1 type
 	METHOD d mountOnto (Lvh;)Z
+		ARG 1 player
 	METHOD eh isReadyToSitOnPlayer ()Z

mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping

@@ -1,6 +1,10 @@
 CLASS arz net/minecraft/entity/passive/TraderLlamaEntity
 	CLASS arz$a DefendTraderGoal
+		FIELD b llama Larv;
 		FIELD c offender Laio;
 		FIELD d traderLastAttackedTime I
+		METHOD <init> (Larz;Larv;)V
+			ARG 2 llama
 	FIELD bJ despawnDelay I
 	METHOD v setDespawnDelay (I)V
+		ARG 1 delay

mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping

@@ -17,6 +17,12 @@ CLASS arn net/minecraft/entity/passive/TropicalFishEntity
 		FIELD c pattern I
 		FIELD d baseColor I
 		FIELD e patternColor I
+		METHOD <init> (Larn;IIII)V
+			ARG 1 leader
+			ARG 2 shape
+			ARG 3 pattern
+			ARG 4 baseColor
+			ARG 5 patternColor
 	FIELD bA LARGE_FISH_VARIETY_IDS [Lqs;
 	FIELD bB commonSpawn Z
 	FIELD b COMMON_VARIANTS [I
@@ -42,6 +48,7 @@ CLASS arn net/minecraft/entity/passive/TropicalFishEntity
 	METHOD s getTranslationKey (I)Ljava/lang/String;
 		ARG 0 variant
 	METHOD t setVariant (I)V
+		ARG 1 variant
 	METHOD u getShape (I)I
 		ARG 0 variant
 	METHOD v getBaseDyeColorIndex (I)I

mappings/net/minecraft/entity/passive/TurtleEntity.mapping

@@ -2,15 +2,15 @@ CLASS aro net/minecraft/entity/passive/TurtleEntity
 	CLASS aro$a MateGoal
 		FIELD d turtle Laro;
 		METHOD <init> (Laro;D)V
-			ARG 1 owner
+			ARG 1 turtle
 			ARG 2 speed
 	CLASS aro$b GoHomeGoal
-		FIELD a owner Laro;
+		FIELD a turtle Laro;
 		FIELD b speed D
 		FIELD c noPath Z
 		FIELD d homeReachingTryTicks I
 		METHOD <init> (Laro;D)V
-			ARG 1 owner
+			ARG 1 turtle
 			ARG 2 speed
 	CLASS aro$c WanderInWaterGoal
 		FIELD g turtle Laro;
@@ -25,11 +25,11 @@ CLASS aro net/minecraft/entity/passive/TurtleEntity
 	CLASS aro$e TurtleMoveControl
 		FIELD i turtle Laro;
 		METHOD <init> (Laro;)V
-			ARG 1 owner
+			ARG 1 turtle
 		METHOD g updateVelocity ()V
 	CLASS aro$f TurtleEscapeDangerGoal
 		METHOD <init> (Laro;D)V
-			ARG 1 owner
+			ARG 1 turtle
 			ARG 2 speed
 	CLASS aro$g TurtleSwimNavigation
 		METHOD <init> (Laro;Lbhh;)V
@@ -37,21 +37,25 @@ CLASS aro net/minecraft/entity/passive/TurtleEntity
 			ARG 2 world
 	CLASS aro$h WanderOnLandGoal
 		FIELD h turtle Laro;
+		METHOD <init> (Laro;DI)V
+			ARG 1 turtle
+			ARG 2 speed
+			ARG 4 chance
 	CLASS aro$i ApproachFoodHoldingPlayerGoal
 		FIELD a CLOSE_ENTITY_PREDICATE Lapz;
-		FIELD b owner Laro;
+		FIELD b turtle Laro;
 		FIELD c speed D
 		FIELD d targetPlayer Lavx;
 		FIELD e cooldown I
 		FIELD f attractiveItems Ljava/util/Set;
 		METHOD <init> (Laro;DLbbv;)V
-			ARG 1 owner
+			ARG 1 turtle
 			ARG 2 speed
 			ARG 4 attractiveItem
 		METHOD a isAttractive (Lbca;)Z
 			ARG 1 stack
 	CLASS aro$j TravelGoal
-		FIELD a owner Laro;
+		FIELD a turtle Laro;
 		FIELD b speed D
 		FIELD c noPath Z
 		METHOD <init> (Laro;D)V

mappings/net/minecraft/entity/passive/VillagerEntity.mapping

@@ -24,10 +24,15 @@ CLASS avk net/minecraft/entity/passive/VillagerEntity
 	FIELD bP lastRestock J
 	FIELD bQ MEMORY_MODULES Lcom/google/common/collect/ImmutableList;
 	FIELD bR SENSORS Lcom/google/common/collect/ImmutableList;
+	METHOD <init> (Laij;Lbhh;Lavp;)V
+		ARG 1 entityType
+		ARG 2 world
+		ARG 3 type
 	METHOD a isLackingBuddyGolem (J)Z
 		ARG 1 time
 	METHOD a wantsGolem (Laif;)Z
 	METHOD a initBrain (Lajd;)V
+		ARG 1 brain
 	METHOD a releaseTicketFor (Lapb;)V
 	METHOD a talkWithVillager (Lavk;J)V
 		ARG 1 villager
@@ -35,7 +40,9 @@ CLASS avk net/minecraft/entity/passive/VillagerEntity
 	METHOD a setVillagerData (Lavl;)V
 		ARG 1 villagerData
 	METHOD a reinitializeBrain (Lvg;)V
-	METHOD b setRecipes (Lbgl;)V
+		ARG 1 world
+	METHOD b setOffers (Lbgl;)V
+		ARG 1 offers
 	METHOD eg resetCustomer ()V
 	METHOD ei restock ()V
 	METHOD ej playWorkSound ()V
@@ -59,3 +66,4 @@ CLASS avk net/minecraft/entity/passive/VillagerEntity
 	METHOD s depleteFood (I)V
 		ARG 1 amount
 	METHOD t setExperience (I)V
+		ARG 1 amount

mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping

@@ -1,12 +1,20 @@
 CLASS avq net/minecraft/entity/passive/WanderingTraderEntity
 	CLASS avq$a WanderToTargetGoal
+		FIELD a trader Lavq;
 		FIELD b proximityDistance D
 		FIELD c speed D
+		METHOD <init> (Lavq;Lavq;DD)V
+			ARG 2 trader
+			ARG 3 proximityDistance
+			ARG 5 speed
 		METHOD a isTooFarFrom (Lev;D)Z
+			ARG 1 pos
 			ARG 2 proximityDistance
 	FIELD bA wanderTarget Lev;
 	FIELD bB despawnDelay I
 	METHOD eg getDespawnDelay ()I
 	METHOD eh getWanderTarget ()Lev;
 	METHOD g setWanderTarget (Lev;)V
+		ARG 1 pos
 	METHOD s setDespawnDelay (I)V
+		ARG 1 delay

mappings/net/minecraft/entity/passive/WolfEntity.mapping

@@ -1,6 +1,12 @@
 CLASS arq net/minecraft/entity/passive/WolfEntity
 	CLASS arq$a AvoidLlamaGoal
 		FIELD j wolf Larq;
+		METHOD <init> (Larq;Larq;Ljava/lang/Class;FDD)V
+			ARG 2 wolf
+			ARG 3 fleeFromType
+			ARG 4 distance
+			ARG 5 slowSpeed
+			ARG 7 fastSpeed
 		METHOD a isScaredOf (Larv;)Z
 			ARG 1 llama
 	FIELD bD FOLLOW_TAMED_PREDICATE Ljava/util/function/Predicate;
@@ -22,6 +28,7 @@ CLASS arq net/minecraft/entity/passive/WolfEntity
 	METHOD f getShakeAnimationProgress (FF)F
 		ARG 1 tickDelta
 	METHOD u setAngry (Z)V
+		ARG 1 angry
 	METHOD v getWetBrightnessMultiplier (F)F
 		ARG 1 tickDelta
 	METHOD v setBegging (Z)V

mappings/net/minecraft/entity/player/PlayerEntity.mapping

@@ -4,17 +4,19 @@ CLASS avx net/minecraft/entity/player/PlayerEntity
 		METHOD a getText ()Ljm;
 	FIELD bA container Layb;
 	FIELD bB hungerManager Laxx;
-	FIELD bF experienceOrbPickupDelay I
+	FIELD bF experiencePickUpDelay I
 	FIELD b SIZES Ljava/util/Map;
 	FIELD bM isInWater Z
 	FIELD bN abilities Lavu;
-	FIELD bO experience I
+	FIELD bO experienceLevel I
-	FIELD bP experienceLevel I
+	FIELD bP totalExperience I
-	FIELD bQ experienceLevelProgress F
+	FIELD bQ experienceProgress F
 	FIELD bR enchantmentTableSeed I
 	FIELD bT fishHook Latj;
+	FIELD bU lastPlayedLevelUpSoundTime I
 	FIELD bV gameProfile Lcom/mojang/authlib/GameProfile;
 	FIELD bW reducedDebugInfo Z
+	FIELD bX selectedItem Lbca;
 	FIELD bY itemCooldownManager Lbbw;
 	FIELD bs STANDING_SIZE Laig;
 	FIELD bt PLAYER_MODEL_BIT_MASK Lqh;
@@ -29,23 +31,41 @@ CLASS avx net/minecraft/entity/player/PlayerEntity
 	FIELD e sleepTimer I
 	FIELD f spawnPosition Lev;
 	FIELD g spawnForced Z
+	METHOD <init> (Lbhh;Lcom/mojang/authlib/GameProfile;)V
+		ARG 1 world
+		ARG 2 profile
 	METHOD a sendTradeOffers (ILbgl;IIZ)V
 		ARG 1 syncId
+		ARG 2 offers
+		ARG 3 levelProgress
+		ARG 4 experience
+		ARG 5 leveled
 	METHOD a openContainer (Lahd;)Ljava/util/OptionalInt;
 	METHOD a addCritParticles (Laif;)V
+		ARG 1 target
 	METHOD a interact (Laif;Lagz;)Laha;
 		ARG 1 entity
+		ARG 2 hand
 	METHOD a setMainHand (Lain;)V
+		ARG 1 absoluteHand
 	METHOD a openHorseInventory (Lars;Lagt;)V
 	METHOD a shouldDamagePlayer (Lavx;)Z
+		ARG 1 player
 	METHOD a isSkinOverlayVisible (Lavy;)Z
+		ARG 1 modelPart
+	METHOD a applyEnchantmentCosts (Lbca;I)V
+		ARG 1 enchantedItem
+		ARG 2 experienceLevels
 	METHOD a openEditBookScreen (Lbca;Lagz;)V
+		ARG 1 book
+		ARG 2 hand
 	METHOD a dropItem (Lbca;Z)Lato;
 		ARG 1 stack
 	METHOD a dropItem (Lbca;ZZ)Lato;
 		ARG 1 stack
 	METHOD a openCommandBlockMinecartScreen (Lbgn;)V
 	METHOD a setGameMode (Lbhe;)V
+		ARG 1 gameMode
 	METHOD a openCommandBlockScreen (Lbtr;)V
 	METHOD a openJigsawScreen (Lbuc;)V
 	METHOD a openEditSignScreen (Lbui;)V
@@ -53,12 +73,16 @@ CLASS avx net/minecraft/entity/player/PlayerEntity
 	METHOD a getUuidFromProfile (Lcom/mojang/authlib/GameProfile;)Ljava/util/UUID;
 		ARG 0 profile
 	METHOD a trySleep (Lev;)Lcom/mojang/datafixers/util/Either;
+		ARG 1 pos
 	METHOD a isWithinSleepingRange (Lev;Lfa;)Z
 		ARG 1 sleepPos
+		ARG 2 direction
 	METHOD a canPlaceOn (Lev;Lfa;Lbca;)Z
 		ARG 1 pos
 		ARG 2 facing
+		ARG 3 stack
 	METHOD a spawnParticles (Lgd;)V
+		ARG 1 parameters
 	METHOD a unlockRecipes (Ljava/util/Collection;)I
 		ARG 1 recipes
 	METHOD a addChatMessage (Ljm;Z)V
@@ -69,16 +93,23 @@ CLASS avx net/minecraft/entity/player/PlayerEntity
 		ARG 1 stat
 		ARG 2 amount
 	METHOD a playSound (Lyj;Lyl;FF)V
+		ARG 1 event
+		ARG 2 category
+		ARG 3 volume
+		ARG 4 pitch
 	METHOD a resetStat (Lyq;)V
 		ARG 1 stat
 	METHOD a increaseStat (Lyq;I)V
 		ARG 1 stat
 		ARG 2 amount
 	METHOD a wakeUp (ZZZ)V
+		ARG 3 setSpawn
 	METHOD a unlockRecipes ([Lqs;)V
 		ARG 1 ids
 	METHOD b addEnchantedHitParticles (Laif;)V
+		ARG 1 target
 	METHOD b getBlockBreakingSpeed (Lbvj;)F
+		ARG 1 block
 	METHOD b isBedObstructed (Lev;Lfa;)Z
 		ARG 1 pos
 		ARG 2 direction
@@ -88,13 +119,18 @@ CLASS avx net/minecraft/entity/player/PlayerEntity
 		ARG 1 recipes
 	METHOD b incrementStat (Lyq;)V
 		ARG 1 stat
+	METHOD c addExperienceLevels (I)V
+		ARG 1 levels
 	METHOD c collideWithEntity (Laif;)V
+		ARG 1 entity
 	METHOD c isUsingEffectiveTool (Lbvj;)Z
+		ARG 1 block
 	METHOD c getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID;
 		ARG 0 nickname
 	METHOD c addTellClickEvent (Ljm;)Ljm;
 		ARG 1 component
 	METHOD d addExperience (I)V
+		ARG 1 experience
 	METHOD dA updateInWater ()Z
 	METHOD dB updateSize ()V
 	METHOD dC getScore ()I
@@ -118,10 +154,13 @@ CLASS avx net/minecraft/entity/player/PlayerEntity
 	METHOD dV getReducedDebugInfo ()Z
 	METHOD dW getShoulderEntityLeft ()Lib;
 	METHOD dX getShoulderEntityRight ()Lib;
+	METHOD dY getAttackCooldownProgressPerTick ()F
+	METHOD dZ resetLastAttackedTicks ()V
 	METHOD ea getItemCooldownManager ()Lbbw;
 	METHOD eb getLuck ()F
 	METHOD ec isCreativeLevelTwoOp ()Z
 	METHOD f attack (Laif;)V
+		ARG 1 target
 	METHOD f doesNotSuffocate (Lev;)Z
 		ARG 1 pos
 	METHOD g createCooldownManager ()Lbbw;
@@ -130,17 +169,28 @@ CLASS avx net/minecraft/entity/player/PlayerEntity
 	METHOD g addShoulderEntity (Lib;)Z
 		ARG 1 tag
 	METHOD h setShoulderEntityLeft (Lib;)V
+		ARG 1 entityTag
 	METHOD i setShoulderEntityRight (Lib;)V
+		ARG 1 entityTag
 	METHOD j updateShoulderEntity (Lib;)V
+		ARG 1 entityTag
 	METHOD l updateTurtleHelmet ()V
 	METHOD n dropSelectedItem (Z)Lato;
+		ARG 1 dropEntireStack
 	METHOD o disableShield (Z)V
 		ARG 1 sprinting
 	METHOD p canConsume (Z)Z
+		ARG 1 ignoreHunger
 	METHOD q setScore (I)V
+		ARG 1 score
 	METHOD q setReducedDebugInfo (Z)V
+		ARG 1 reducedDebugInfo
 	METHOD r sendAbilitiesUpdate ()V
 	METHOD r addExhaustion (F)V
+		ARG 1 exhaustion
 	METHOD r addScore (I)V
+		ARG 1 score
+	METHOD s getAttackCooldownProgress (F)F
+		ARG 1 baseTime
 	METHOD t_ closeContainer ()V
 	METHOD u isCreative ()Z

mappings/net/minecraft/entity/player/PlayerInventory.mapping

@@ -7,40 +7,65 @@ CLASS avw net/minecraft/entity/player/PlayerInventory
 	FIELD f combinedInventory Ljava/util/List;
 	FIELD g cursorStack Lbca;
 	FIELD h changeCount I
+	METHOD <init> (Lavx;)V
+		ARG 1 player
+	METHOD a scrollInHotbar (D)V
+		ARG 1 scrollAmount
 	METHOD a damageArmor (F)V
 		ARG 1 armor
 	METHOD a clone (Lavw;)V
+		ARG 1 other
 	METHOD a populateRecipeFinder (Lavz;)V
+		ARG 1 finder
 	METHOD a addPickBlock (Lbca;)V
 	METHOD a canStackAddMore (Lbca;Lbca;)Z
 		ARG 1 existingStack
+		ARG 2 stack
 	METHOD a offerOrDrop (Lbhh;Lbca;)V
+		ARG 1 world
+		ARG 2 stack
 	METHOD a getBlockBreakingSpeed (Lbvj;)F
+		ARG 1 block
 	METHOD a serialize (Lii;)Lii;
+		ARG 1 tag
 	METHOD a contains (Lzb;)Z
 		ARG 1 tag
 	METHOD b getSlotWithStack (Lbca;)I
+		ARG 1 stack
 	METHOD b areItemsEqual (Lbca;Lbca;)Z
 		ARG 1 stack1
+		ARG 2 stack2
 	METHOD b isUsingEffectiveTool (Lbvj;)Z
 	METHOD b deserialize (Lii;)V
+		ARG 1 tag
 	METHOD c swapSlotWithHotbar (I)V
+		ARG 1 hotbarSlot
 	METHOD c insertStack (ILbca;)Z
 		ARG 1 slot
+		ARG 2 stack
 	METHOD d isValidHotbarIndex (I)Z
 		ARG 0 slot
+	METHOD d addStack (ILbca;)I
+		ARG 1 slot
+		ARG 2 stack
 	METHOD d getOccupiedSlotWithRoomForStack (Lbca;)I
+		ARG 1 stack
 	METHOD e getArmorStack (I)Lbca;
+		ARG 1 slot
 	METHOD e insertStack (Lbca;)Z
+		ARG 1 stack
 	METHOD f getMainHandStack ()Lbca;
 	METHOD f removeOne (Lbca;)V
+		ARG 1 stack
 	METHOD g getHotbarSize ()I
 	METHOD g setCursorStack (Lbca;)V
+		ARG 1 stack
 	METHOD h getEmptySlot ()I
 	METHOD h contains (Lbca;)Z
 		ARG 1 stack
 	METHOD i getSwappableHotbarSlot ()I
 	METHOD i addStack (Lbca;)I
+		ARG 1 stack
 	METHOD j updateItems ()V
 	METHOD k dropAll ()V
 	METHOD l getChangeCount ()I

mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping

@@ -1,3 +1,5 @@
 CLASS awh net/minecraft/entity/projectile/AbstractFireballEntity
 	FIELD f ITEM Lqh;
+	METHOD b setItem (Lbca;)V
+		ARG 1 stack
 	METHOD l getItem ()Lbca;

mappings/net/minecraft/entity/projectile/ArrowEntity.mapping

@@ -6,11 +6,19 @@ CLASS awd net/minecraft/entity/projectile/ArrowEntity
 	METHOD <init> (Lbhh;DDD)V
 		ARG 1 world
 		ARG 2 x
+		ARG 4 y
+		ARG 6 z
 	METHOD <init> (Lbhh;Laio;)V
 		ARG 1 world
+		ARG 2 owner
 	METHOD a addEffect (Lahz;)V
+		ARG 1 effect
 	METHOD b spawnParticles (I)V
 	METHOD b initFromStack (Lbca;)V
+		ARG 1 stack
 	METHOD c setColor (I)V
+		ARG 1 color
+	METHOD c getCustomPotionColor (Lbca;)I
+		ARG 0 stack
 	METHOD w getColor ()I
 	METHOD z initColor ()V

mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping

@@ -1 +1,15 @@
 CLASS awe net/minecraft/entity/projectile/DragonFireballEntity
+	METHOD <init> (Lbhh;DDDDDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 directionX
+		ARG 10 directionY
+		ARG 12 directionZ
+	METHOD <init> (Lbhh;Laio;DDD)V
+		ARG 1 world
+		ARG 2 owner
+		ARG 3 directionX
+		ARG 5 directionY
+		ARG 7 directionZ

mappings/net/minecraft/entity/projectile/ExplodingWitherSkullEntity.mapping

@@ -1,4 +1,19 @@
 CLASS awz net/minecraft/entity/projectile/ExplodingWitherSkullEntity
 	FIELD f CHARGED Lqh;
+	METHOD <init> (Lbhh;DDDDDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 directionX
+		ARG 10 directionY
+		ARG 12 directionZ
+	METHOD <init> (Lbhh;Laio;DDD)V
+		ARG 1 world
+		ARG 2 owner
+		ARG 3 directionX
+		ARG 5 directionY
+		ARG 7 directionZ
 	METHOD a setCharged (Z)V
+		ARG 1 charged
 	METHOD l isCharged ()Z

mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping

@@ -6,10 +6,21 @@ CLASS awc net/minecraft/entity/projectile/ExplosiveProjectileEntity
 	FIELD f life I
 	FIELD g ticks I
 	METHOD <init> (Laij;DDDDDDLbhh;)V
-		ARG 1 world
+		ARG 1 type
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 directionX
+		ARG 10 directionY
+		ARG 12 directionZ
+		ARG 14 world
 	METHOD <init> (Laij;Laio;DDDLbhh;)V
-		ARG 1 world
+		ARG 1 type
 		ARG 2 owner
+		ARG 3 directionX
+		ARG 5 directionY
+		ARG 7 directionZ
+		ARG 9 world
 	METHOD <init> (Laij;Lbhh;)V
 		ARG 1 type
 	METHOD L_ isBurning ()Z

mappings/net/minecraft/entity/projectile/FireballEntity.mapping

@@ -1,2 +1,16 @@
 CLASS awk net/minecraft/entity/projectile/FireballEntity
 	FIELD f explosionPower I
+	METHOD <init> (Lbhh;DDDDDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 velocityX
+		ARG 10 velocityY
+		ARG 12 velocityZ
+	METHOD <init> (Lbhh;Laio;DDD)V
+		ARG 1 world
+		ARG 2 owner
+		ARG 3 velocityX
+		ARG 5 velocityY
+		ARG 7 velocityZ

mappings/net/minecraft/entity/projectile/FishHookEntity.mapping

@@ -1,7 +1,26 @@
 CLASS atj net/minecraft/entity/projectile/FishHookEntity
 	CLASS atj$a State
 	FIELD av state Latj$a;
+	FIELD aw lureLevel I
+	FIELD ax luckOfTheSeaLevel I
 	FIELD b hookedEntity Laif;
 	FIELD c HOOK_ENTITY_ID Lqh;
 	FIELD f owner Lavx;
+	METHOD <init> (Lavx;Lbhh;II)V
+		ARG 1 thrower
+		ARG 2 world
+		ARG 3 lureLevel
+		ARG 4 luckOfTheSeaLevel
+	METHOD <init> (Lbhh;Lavx;DDD)V
+		ARG 1 world
+		ARG 2 thrower
+		ARG 3 x
+		ARG 5 y
+		ARG 7 z
+	METHOD <init> (Lbhh;Lavx;II)V
+		ARG 1 world
+		ARG 2 owner
+		ARG 3 lureLevel
+		ARG 4 luckOfTheSeaLevel
 	METHOD i getOwner ()Lavx;
+	METHOD n updateHookedEntityId ()V

mappings/net/minecraft/entity/projectile/LlamaSpitEntity.mapping

@@ -1,4 +1,15 @@
 CLASS awl net/minecraft/entity/projectile/LlamaSpitEntity
 	FIELD b owner Larv;
 	FIELD c tag Lib;
+	METHOD <init> (Lbhh;DDDDDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 velocityX
+		ARG 10 velocityY
+		ARG 12 velocityZ
+	METHOD <init> (Lbhh;Larv;)V
+		ARG 1 world
+		ARG 2 owner
 	METHOD f readTag ()V

mappings/net/minecraft/entity/projectile/Projectile.mapping

@@ -2,3 +2,4 @@ CLASS awm net/minecraft/entity/projectile/Projectile
 	METHOD c setVelocity (DDDFF)V
 		ARG 1 dirX
 		ARG 3 dirY
+		ARG 5 dirZ

mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping

@@ -14,16 +14,28 @@ CLASS awb net/minecraft/entity/projectile/ProjectileEntity
 	FIELD e pickupType Lawb$a;
 	FIELD f shake I
 	FIELD g ownerUuid Ljava/util/UUID;
+	METHOD <init> (Laij;DDDLbhh;)V
+		ARG 1 type
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 world
+	METHOD <init> (Laij;Laio;Lbhh;)V
+		ARG 1 type
+		ARG 2 owner
+		ARG 3 world
 	METHOD <init> (Laij;Lbhh;)V
 		ARG 1 type
 	METHOD a setProjectileFlag (IZ)V
 		ARG 1 index
 	METHOD a setOwner (Laif;)V
 	METHOD a onHit (Laio;)V
+		ARG 1 target
 	METHOD a onEntityHit (Lcrs;)V
 	METHOD a onHit (Lcrt;)V
 	METHOD a getEntityCollision (Lcrv;Lcrv;)Lcrs;
 	METHOD a setSound (Lyj;)V
+		ARG 1 sound
 	METHOD a setCritical (Z)V
 	METHOD b setPierceLevel (B)V
 	METHOD c setDamage (D)V

mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping

@@ -6,5 +6,17 @@ CLASS awo net/minecraft/entity/projectile/ShulkerBulletEntity
 	FIELD b owner Laio;
 	FIELD c target Laif;
 	FIELD d direction Lfa;
+	METHOD <init> (Lbhh;DDDDDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 velocityX
+		ARG 10 velocityY
+		ARG 12 velocityZ
+	METHOD <init> (Lbhh;Laio;Laif;Lfa$a;)V
+		ARG 1 world
+		ARG 2 owner
+		ARG 3 target
 	METHOD a onHit (Lcrt;)V
 	METHOD a setDirection (Lfa;)V

mappings/net/minecraft/entity/projectile/SmallFireballEntity.mapping

@@ -1 +1,15 @@
 CLASS awp net/minecraft/entity/projectile/SmallFireballEntity
+	METHOD <init> (Lbhh;DDDDDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 velocityX
+		ARG 10 velocityY
+		ARG 12 velocityZ
+	METHOD <init> (Lbhh;Laio;DDD)V
+		ARG 1 world
+		ARG 2 owner
+		ARG 3 velocityX
+		ARG 5 velocityY
+		ARG 7 velocityZ

mappings/net/minecraft/entity/projectile/SpectralArrowEntity.mapping

@@ -1,2 +1,10 @@
 CLASS awr net/minecraft/entity/projectile/SpectralArrowEntity
 	FIELD ar duration I
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+	METHOD <init> (Lbhh;Laio;)V
+		ARG 1 world
+		ARG 2 owner

mappings/net/minecraft/entity/projectile/TridentEntity.mapping

@@ -2,4 +2,13 @@ CLASS awy net/minecraft/entity/projectile/TridentEntity
 	FIELD as LOYALTY Lqh;
 	FIELD at tridentStack Lbca;
 	FIELD au dealtDamage Z
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+	METHOD <init> (Lbhh;Laio;Lbca;)V
+		ARG 1 world
+		ARG 2 owner
+		ARG 3 item
 	METHOD w isOwnerAlive ()Z

mappings/net/minecraft/entity/raid/Raid.mapping

@@ -6,7 +6,10 @@ CLASS axb net/minecraft/entity/raid/Raid
 	CLASS axb$b Member
 		FIELD f VALUES [Laxb$b;
 		FIELD g type Laij;
-		FIELD h waveToCount [I
+		FIELD h countInWave [I
+		METHOD <init> (Ljava/lang/String;ILaij;[I)V
+			ARG 3 type
+			ARG 4 countInWave
 	FIELD a OMINOUS_BANNER Lbca;
 	FIELD b EVENT_TEXT Ljw;
 	FIELD c VICTORY_SUFFIX_TEXT Ljw;
@@ -35,6 +38,11 @@ CLASS axb net/minecraft/entity/raid/Raid
 	FIELD z preCalculatedRavagerSpawnLocation Ljava/util/Optional;
 	METHOD <init> (ILvg;Lev;)V
 		ARG 1 id
+		ARG 2 world
+		ARG 3 pos
+	METHOD <init> (Lvg;Lib;)V
+		ARG 1 world
+		ARG 2 tag
 	METHOD A hasSpawnedFinalWave ()Z
 	METHOD B hasExtraWave ()Z
 	METHOD C hasSpawnedExtraWave ()Z
@@ -49,6 +57,7 @@ CLASS axb net/minecraft/entity/raid/Raid
 		ARG 2 tries
 	METHOD a setWaveCaptain (ILaxc;)V
 		ARG 1 wave
+		ARG 2 entity
 	METHOD a addRaider (ILaxc;Lev;Z)V
 		ARG 1 wave
 		ARG 2 raider
@@ -56,27 +65,39 @@ CLASS axb net/minecraft/entity/raid/Raid
 		ARG 4 existing
 	METHOD a addToWave (ILaxc;Z)Z
 		ARG 1 wave
+		ARG 2 entity
 		ARG 3 countHealth
 	METHOD a getMaxWaves (Lagx;)I
+		ARG 1 difficulty
 	METHOD a addHero (Laif;)V
+		ARG 1 entity
 	METHOD a start (Lavx;)V
 		ARG 1 player
 	METHOD a getCount (Laxb$b;IZ)I
+		ARG 1 member
 		ARG 2 wave
 		ARG 3 extra
 	METHOD a getBonusCount (Laxb$b;Ljava/util/Random;ILagy;Z)I
+		ARG 1 member
+		ARG 2 random
 		ARG 3 wave
+		ARG 4 localDifficulty
 		ARG 5 extra
 	METHOD a removeFromWave (Laxc;Z)V
+		ARG 1 entity
 		ARG 2 countHealth
 	METHOD a playRaidHorn (Lev;)V
+		ARG 1 pos
 	METHOD a toTag (Lib;)Lib;
+		ARG 1 tag
 	METHOD b isPreRaid ()Z
 	METHOD b getCaptain (I)Laxc;
 		ARG 1 wave
 	METHOD b addToWave (ILaxc;)Z
 		ARG 1 wave
+		ARG 2 entity
 	METHOD b spawnNextWave (Lev;)V
+		ARG 1 pos
 	METHOD c hasSpawned ()Z
 	METHOD c removeLeader (I)V
 		ARG 1 wave

mappings/net/minecraft/entity/raid/RaidManager.mapping

@@ -3,13 +3,25 @@ CLASS axd net/minecraft/entity/raid/RaidManager
 	FIELD b world Lvg;
 	FIELD c nextAvailableId I
 	FIELD d currentTime I
+	METHOD <init> (Lvg;)V
+		ARG 1 world
 	METHOD a tick ()V
 	METHOD a getRaid (I)Laxb;
 		ARG 1 id
 	METHOD a isLivingAroundVillage (Laio;Lev;I)Z
+		ARG 0 entity
+		ARG 1 pos
+		ARG 2 range
 	METHOD a isValidRaiderFor (Laxc;Laxb;)Z
+		ARG 0 raider
+		ARG 1 raid
 	METHOD a nameFor (Lbyc;)Ljava/lang/String;
+		ARG 0 dimension
 	METHOD a getRaidAt (Lev;)Laxb;
+		ARG 1 pos
 	METHOD a getOrCreateRaid (Lvg;Lev;)Laxb;
+		ARG 1 world
+		ARG 2 pos
 	METHOD a startRaid (Lvh;)Laxb;
+		ARG 1 player
 	METHOD e nextId ()I

mappings/net/minecraft/entity/raid/RaiderEntity.mapping

@@ -1,24 +1,32 @@
 CLASS axc net/minecraft/entity/raid/RaiderEntity
 	CLASS axc$a PatrolApproachGoal
 		FIELD a closeRaiderPredicate Lapz;
-		FIELD c raiderEntity Laxc;
+		FIELD c raider Laxc;
 		FIELD d squaredDistance F
 		METHOD <init> (Laxc;Latr;F)V
-			ARG 2 raiderEntity
+			ARG 2 illager
 			ARG 3 distance
 	CLASS axc$b PickupBannerAsLeaderGoal
+		FIELD b actor Laxc;
+		METHOD <init> (Laxc;Laxc;)V
+			ARG 2 actor
 	CLASS axc$c CelebrateGoal
+		FIELD b raider Laxc;
+		METHOD <init> (Laxc;Laxc;)V
+			ARG 2 raider
 	CLASS axc$d AttackHomeGoal
-		FIELD a owner Laxc;
+		FIELD a raider Laxc;
 		FIELD b speed D
 		FIELD c home Lev;
 		FIELD d lastHomes Ljava/util/List;
 		FIELD e distance I
 		FIELD f finished Z
 		METHOD <init> (Laxc;DI)V
+			ARG 1 raider
 			ARG 2 speed
 			ARG 4 distance
 		METHOD a canLootHome (Lev;)Z
+			ARG 1 pos
 		METHOD g isRaiding ()Z
 		METHOD h tryFindHome ()Z
 		METHOD j purgeMemory ()V
@@ -31,10 +39,13 @@ CLASS axc net/minecraft/entity/raid/RaiderEntity
 	METHOD <init> (Laij;Lbhh;)V
 		ARG 1 type
 	METHOD a setWave (I)V
+		ARG 1 wave
 	METHOD a addBonusForWave (IZ)V
 		ARG 1 wave
+		ARG 2 unused
 	METHOD a setRaid (Laxb;)V
 	METHOD b setOutOfRaidCounter (I)V
+		ARG 1 counter
 	METHOD dW getCelebratingSound ()Lyj;
 	METHOD ej canJoinRaid ()Z
 	METHOD ek getRaid ()Laxb;
@@ -45,3 +56,4 @@ CLASS axc net/minecraft/entity/raid/RaiderEntity
 	METHOD t setAbleToJoinRaid (Z)V
 		ARG 1 ableToJoinRaid
 	METHOD u setCelebrating (Z)V
+		ARG 1 celebrating

mappings/net/minecraft/entity/thrown/SnowballEntity.mapping

@@ -1,2 +1,10 @@
 CLASS awq net/minecraft/entity/thrown/SnowballEntity
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+	METHOD <init> (Lbhh;Laio;)V
+		ARG 1 world
+		ARG 2 owner
 	METHOD n getParticleParameters ()Lgd;

mappings/net/minecraft/entity/thrown/ThrownEggEntity.mapping

@@ -1 +1,9 @@
 CLASS awu net/minecraft/entity/thrown/ThrownEggEntity
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+	METHOD <init> (Lbhh;Laio;)V
+		ARG 1 world
+		ARG 2 thrower

mappings/net/minecraft/entity/thrown/ThrownEnderpearlEntity.mapping

@@ -1,2 +1,10 @@
 CLASS awv net/minecraft/entity/thrown/ThrownEnderpearlEntity
 	FIELD e owner Laio;
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+	METHOD <init> (Lbhh;Laio;)V
+		ARG 1 world
+		ARG 2 owner

mappings/net/minecraft/entity/thrown/ThrownExperienceBottleEntity.mapping

@@ -1 +1,9 @@
 CLASS aww net/minecraft/entity/thrown/ThrownExperienceBottleEntity
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+	METHOD <init> (Lbhh;Laio;)V
+		ARG 1 world
+		ARG 2 owner

mappings/net/minecraft/entity/thrown/ThrownItemEntity.mapping

@@ -9,5 +9,6 @@ CLASS aws net/minecraft/entity/thrown/ThrownItemEntity
 	METHOD <init> (Laij;Lbhh;)V
 		ARG 1 type
 	METHOD b setItem (Lbca;)V
+		ARG 1 item
 	METHOD i getDefaultItem ()Lbbv;
 	METHOD k getItem ()Lbca;

mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping

@@ -6,13 +6,17 @@ CLASS axl net/minecraft/entity/vehicle/AbstractMinecartEntity
 	METHOD <init> (Laij;Lbhh;)V
 		ARG 1 type
 	METHOD <init> (Laij;Lbhh;DDD)V
-		ARG 1 world
+		ARG 1 type
+		ARG 2 world
 		ARG 3 x
+		ARG 5 y
+		ARG 7 z
 	METHOD a onActivatorRail (IIIZ)V
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
 	METHOD a dropItems (Laho;)V
+		ARG 1 damageSource
 	METHOD a create (Lbhh;DDDLaxl$a;)Laxl;
 		ARG 0 world
 		ARG 1 x

mappings/net/minecraft/entity/vehicle/ChestMinecartEntity.mapping

@@ -1 +1,6 @@
 CLASS axp net/minecraft/entity/vehicle/ChestMinecartEntity
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z

mappings/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.mapping

@@ -5,4 +5,9 @@ CLASS axq net/minecraft/entity/vehicle/CommandBlockMinecartEntity
 	FIELD c LAST_OUTPUT Lqh;
 	FIELD d commandExecutor Lbgn;
 	FIELD e lastExecuted I
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
 	METHOD v getCommandExecutor ()Lbgn;

mappings/net/minecraft/entity/vehicle/FurnaceMinecartEntity.mapping

@@ -3,5 +3,12 @@ CLASS axr net/minecraft/entity/vehicle/FurnaceMinecartEntity
 	FIELD c pushZ D
 	FIELD d LIT Lqh;
 	FIELD e fuel I
+	FIELD f ACCEPTABLE_FUEL Lbef;
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
 	METHOD n setLit (Z)V
+		ARG 1 lit
 	METHOD v isLit ()Z

mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping

@@ -2,8 +2,15 @@ CLASS axs net/minecraft/entity/vehicle/HopperMinecartEntity
 	FIELD d enabled Z
 	FIELD e transferCooldown I
 	FIELD f currentBlockPos Lev;
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
 	METHOD C canOperate ()Z
 	METHOD D isCoolingDown ()Z
 	METHOD l setTransferCooldown (I)V
+		ARG 1 cooldown
 	METHOD n setEnabled (Z)V
+		ARG 1 enabled
 	METHOD v isEnabled ()Z

mappings/net/minecraft/entity/vehicle/MinecartEntity.mapping

@@ -1 +1,6 @@
 CLASS axo net/minecraft/entity/vehicle/MinecartEntity
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z

mappings/net/minecraft/entity/vehicle/MobSpawnerMinecartEntity.mapping

@@ -1,2 +1,7 @@
 CLASS axt net/minecraft/entity/vehicle/MobSpawnerMinecartEntity
 	FIELD b logic Lbgo;
+	METHOD <init> (Lbhh;DDD)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z

mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping

@@ -2,8 +2,17 @@ CLASS axm net/minecraft/entity/vehicle/StorageMinecartEntity
 	FIELD b inventory Lfj;
 	FIELD d lootTableId Lqs;
 	FIELD e lootSeed J
+	METHOD <init> (Laij;DDDLbhh;)V
+		ARG 1 type
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 world
 	METHOD <init> (Laij;Lbhh;)V
 		ARG 1 type
+	METHOD a getContainer (ILavw;)Layb;
+		ARG 1 syncId
+		ARG 2 playerInventory
 	METHOD a setLootTable (Lqs;J)V
 		ARG 1 id
 	METHOD createMenu (ILavw;Lavx;)Layb;

mappings/net/minecraft/inventory/Inventory.mapping

@@ -8,7 +8,7 @@ CLASS agt net/minecraft/inventory/Inventory
 		ARG 2 amount
 	METHOD a setInvStack (ILbca;)V
 		ARG 1 slot
-		ARG 2 itemStack
+		ARG 2 stack
 	METHOD a canPlayerUseInv (Lavx;)Z
 		ARG 1 player
 	METHOD a getInvAmountOf (Lbbv;)I

mappings/net/minecraft/world/MobSpawnerLogic.mapping

@@ -11,6 +11,8 @@ CLASS bgo net/minecraft/world/MobSpawnerLogic
 	FIELD l requiredPlayerRange I
 	FIELD m spawnRange I
 	METHOD a getWorld ()Lbhh;
+	METHOD a sendStatus (I)V
+		ARG 1 status
 	METHOD a spawnEntity (Laif;)V
 	METHOD a setEntityId (Laij;)V
 	METHOD a setSpawnEntry (Lbhv;)V

mappings/net/minecraft/world/PersistentState.mapping

@@ -5,8 +5,10 @@ CLASS cnq net/minecraft/world/PersistentState
 	METHOD <init> (Ljava/lang/String;)V
 		ARG 1 key
 	METHOD a fromTag (Lib;)V
+		ARG 1 tag
 	METHOD a setDirty (Z)V
 	METHOD b markDirty ()V
 	METHOD b toTag (Lib;)Lib;
+		ARG 1 tag
 	METHOD c isDirty ()Z
 	METHOD d getId ()Ljava/lang/String;