24w39a ServerWorld go brrr (#3998)

@apple502j tells me to go to bed, so I'm just PR'ing the rest of what I've got so far

mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping

@@ -50,3 +50,6 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity
 	METHOD method_5611 isWaiting ()Z
 	METHOD method_57280 setPotionContents (Lnet/minecraft/class_1844;)V
 		ARG 1 potionContentsComponent
+	METHOD method_64415 serverTick (Lnet/minecraft/class_3218;)V
+		ARG 1 world
+	METHOD method_64418 clientTick ()V

mappings/net/minecraft/entity/Entity.mapping

@@ -744,6 +744,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT projectiles are always allowed to modify the world.
 		COMMENT
 		COMMENT @see World#canPlayerModifyAt
+		ARG 1 world
 		ARG 2 pos
 	METHOD method_36975 playExtinguishSound ()V
 		COMMENT Plays the {@link
@@ -1072,25 +1073,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT @see #hasControllingPassenger
 		COMMENT @see #getPassengerList
 		COMMENT @see #getFirstPassenger
-	METHOD method_5643 damage (Lnet/minecraft/class_1282;)Z
-		COMMENT Applies a damage to this entity. The exact implementation differs between subclasses.
-		COMMENT
-		COMMENT <p>{@link net.minecraft.entity.LivingEntity} has health value, and damaging the entity decreases it. This
-		COMMENT also handles shields, extra damage to helmets for falling blocks, setting the attacker,
-		COMMENT playing hurt sound, etc.
-		COMMENT
-		COMMENT <p>Some entities like {@link net.minecraft.entity.ItemEntity} also have health value, which the overridden
-		COMMENT method decrements. There also exist several entities, like {@link
-		COMMENT net.minecraft.entity.decoration.EndCrystalEntity}, where any damage discards the entity
-		COMMENT (perhaps with an explosion).
-		COMMENT
-		COMMENT <p>If this is overridden, it must check the result of {@link #isInvulnerableTo} and
-		COMMENT return early.
-		COMMENT
-		COMMENT @return whether the entity was actually damaged
-		COMMENT
-		COMMENT @see #isInvulnerableTo
-		COMMENT @see net.minecraft.entity.LivingEntity#modifyAppliedDamage
+	METHOD method_5643 clientDamage (Lnet/minecraft/class_1282;)Z
 		ARG 1 source
 	METHOD method_5644 onPassengerLookAround (Lnet/minecraft/class_1297;)V
 		ARG 1 passenger
@@ -1317,6 +1300,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT @see #dropItem(ItemConvertible)
 		COMMENT @see #dropItem(ItemConvertible, int)
 		COMMENT @see #dropStack(ItemStack)
+		ARG 1 world
+		ARG 2 stack
+		ARG 3 yOffset
 	METHOD method_56990 applyGravity ()V
 	METHOD method_5700 onBubbleColumnSurfaceCollision (Z)V
 		COMMENT Called when the entity collides with a bubble column with an air above.
@@ -1631,6 +1617,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT
 		COMMENT <p>This drops loot when applicable, and emits the {@link
 		COMMENT net.minecraft.world.event.GameEvent#ENTITY_DIE} game event.
+		ARG 1 world
 	METHOD method_5769 getHoverEvent ()Lnet/minecraft/class_2568;
 		COMMENT {@return the hover event referencing this entity}
 	METHOD method_5770 getEntityWorld ()Lnet/minecraft/class_1937;
@@ -2262,6 +2249,36 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 1 oldPos
 		ARG 2 newPos
 	METHOD method_64270 shouldPlayBurnSoundInLava ()Z
+	METHOD method_64397 damage (Lnet/minecraft/class_3218;Lnet/minecraft/class_1282;F)Z
+		COMMENT Applies a damage to this entity. The exact implementation differs between subclasses.
+		COMMENT
+		COMMENT <p>{@link net.minecraft.entity.LivingEntity} has health value, and damaging the entity decreases it. This
+		COMMENT also handles shields, extra damage to helmets for falling blocks, setting the attacker,
+		COMMENT playing hurt sound, etc.
+		COMMENT
+		COMMENT <p>Some entities like {@link net.minecraft.entity.ItemEntity} also have health value, which the overridden
+		COMMENT method decrements. There also exist several entities, like {@link
+		COMMENT net.minecraft.entity.decoration.EndCrystalEntity}, where any damage discards the entity
+		COMMENT (perhaps with an explosion).
+		COMMENT
+		COMMENT <p>If this is overridden, it must check the result of {@link #isInvulnerableTo} and
+		COMMENT return early.
+		COMMENT
+		COMMENT @return whether the entity was actually damaged
+		COMMENT
+		COMMENT @see #isInvulnerableTo
+		COMMENT @see net.minecraft.entity.LivingEntity#modifyAppliedDamage
+		ARG 1 world
+		ARG 2 source
+		ARG 3 amount
+	METHOD method_64419 serverDamage (Lnet/minecraft/class_1282;F)V
+		ARG 1 source
+		ARG 2 amount
+	METHOD method_64420 sidedDamage (Lnet/minecraft/class_1282;F)Z
+		ARG 1 source
+		ARG 2 amount
+	METHOD method_64421 isInvulnerableTo (Lnet/minecraft/class_1282;)Z
+		ARG 1 damageSource
 	METHOD method_7325 isSpectator ()Z
 		COMMENT {@return whether the entity is a spectator}
 		COMMENT

mappings/net/minecraft/entity/EyeOfEnderEntity.mapping

@@ -11,6 +11,7 @@ CLASS net/minecraft/class_1672 net/minecraft/entity/EyeOfEnderEntity
 		ARG 4 y
 		ARG 6 z
 	METHOD method_16933 setItem (Lnet/minecraft/class_1799;)V
+		ARG 1 stack
 	METHOD method_56684 getItem ()Lnet/minecraft/class_1799;
 	METHOD method_7478 initTargetPos (Lnet/minecraft/class_2338;)V
 		COMMENT Sets where the eye will fly towards.

mappings/net/minecraft/entity/InventoryOwner.mapping

@@ -2,6 +2,10 @@ CLASS net/minecraft/class_6067 net/minecraft/entity/InventoryOwner
 	FIELD field_40736 INVENTORY_KEY Ljava/lang/String;
 	METHOD method_35199 getInventory ()Lnet/minecraft/class_1277;
 	METHOD method_43544 pickUpItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;Lnet/minecraft/class_6067;Lnet/minecraft/class_1542;)V
+		ARG 0 world
+		ARG 1 entity
+		ARG 2 inventoryOwner
+		ARG 3 item
 	METHOD method_46399 writeInventory (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 nbt
 		ARG 2 registries

mappings/net/minecraft/entity/Leashable.mapping

@@ -43,6 +43,8 @@ CLASS net/minecraft/class_9817 net/minecraft/entity/Leashable
 		ARG 1 leashHolder
 		ARG 2 sendPacket
 	METHOD method_60965 tickLeash (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)V
+		ARG 0 world
+		ARG 1 entity
 	METHOD method_60966 getLeashHolder (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
 		ARG 0 entity
 	METHOD method_60967 readLeashDataFromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_9817$class_9818;

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -97,7 +97,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	FIELD field_6285 effectsChanged Z
 	FIELD field_6287 movementSpeed F
 	METHOD method_16077 dropLoot (Lnet/minecraft/class_3218;Lnet/minecraft/class_1282;Z)V
+		ARG 1 world
+		ARG 2 damageSource
+		ARG 3 causedByPlayer
 	METHOD method_16078 dropInventory (Lnet/minecraft/class_3218;)V
+		ARG 1 world
 	METHOD method_16080 drop (Lnet/minecraft/class_3218;Lnet/minecraft/class_1282;)V
 		ARG 1 world
 		ARG 2 damageSource
@@ -168,6 +172,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		COMMENT <p>To control the details of experience dropping, consider overriding
 		COMMENT {@link #shouldAlwaysDropXp()}, {@link #shouldDropXp()}, and
 		COMMENT {@link #getXpToDrop()}.
+		ARG 1 world
+		ARG 2 attacker
 	METHOD method_24518 isHolding (Lnet/minecraft/class_1792;)Z
 		COMMENT Checks if this entity is holding a certain item.
 		COMMENT
@@ -357,6 +363,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 1 slot
 		ARG 2 stack
 	METHOD method_5679 isInvulnerableTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_1282;)Z
+		ARG 1 world
+		ARG 2 damageSource
 	METHOD method_56991 canUseSlot (Lnet/minecraft/class_1304;)Z
 		ARG 1 slot
 	METHOD method_56992 isInCreativeMode ()Z
@@ -381,6 +389,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 2 damageSource
 	METHOD method_59925 hasLandedInFluid ()Z
 	METHOD method_59926 getLocationBasedEnchantmentEffects (Lnet/minecraft/class_1304;)Ljava/util/Map;
+		ARG 1 slot
 	METHOD method_5996 getAttributeInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324;
 		ARG 1 attribute
 	METHOD method_5997 attackLivingEntity (Lnet/minecraft/class_1309;)V
@@ -519,6 +528,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_6068 getMainArm ()Lnet/minecraft/class_1306;
 	METHOD method_6069 clearPotionSwirls ()V
 	METHOD method_60699 onRemoval (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297$class_5529;)V
+		ARG 1 world
+		ARG 2 reason
 	METHOD method_6070 tickCramming ()V
 	METHOD method_6071 shouldAlwaysDropXp ()Z
 		COMMENT Returns if this entity may always drop experience, skipping any
@@ -530,6 +541,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_6073 setAbsorptionAmount (F)V
 		ARG 1 absorptionAmount
 	METHOD method_6074 applyDamage (Lnet/minecraft/class_3218;Lnet/minecraft/class_1282;F)V
+		ARG 1 world
+		ARG 2 source
+		ARG 3 amount
 	METHOD method_6075 stopUsingItem ()V
 	METHOD method_6076 tickActiveItemStack ()V
 	METHOD method_6077 canEnterTrapdoor (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
@@ -610,6 +624,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		COMMENT @see #dropXp
 		COMMENT @see #shouldAlwaysDropXp()
 		COMMENT @see #shouldDropXp()
+		ARG 1 world
 	METHOD method_6111 removeStatusEffectInternal (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1293;
 		COMMENT Removes a status effect from this entity without calling any listener.
 		COMMENT
@@ -634,6 +649,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_6119 tickHandSwing ()V
 	METHOD method_6120 getBaseMovementSpeedMultiplier ()F
 	METHOD method_6121 tryAttack (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Z
+		ARG 1 world
+		ARG 2 target
 	METHOD method_6122 setStackInHand (Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)V
 		ARG 1 hand
 		ARG 2 stack
@@ -655,7 +672,13 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 1 source
 		ARG 2 amount
 	METHOD method_61417 travelGliding ()V
+	METHOD method_61418 (DLnet/minecraft/class_243;)Lnet/minecraft/class_243;
+		ARG 2 pos
 	METHOD method_61419 forEachShearedItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;Lnet/minecraft/class_1799;Ljava/util/function/BiConsumer;)V
+		ARG 1 world
+		ARG 2 lootTable
+		ARG 3 shears
+		ARG 4 lootConsumer
 	METHOD method_61420 getStackInArm (Lnet/minecraft/class_1306;)Lnet/minecraft/class_1799;
 		ARG 1 arm
 	METHOD method_61421 (Lnet/minecraft/class_5131;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V
@@ -665,6 +688,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 1 removedEquipment
 		ARG 2 slot
 		ARG 3 container
+	METHOD method_61423 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V
+		ARG 1 attribute
+		ARG 2 modifier
 	METHOD method_61424 checkGlidingCollision (DD)V
 		ARG 1 oldSpeed
 		ARG 3 newSpeed
@@ -692,9 +718,22 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_63629 (Lnet/minecraft/class_1304;)Z
 		ARG 1 slot
 	METHOD method_64169 forEachGiftedItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;Ljava/util/function/BiConsumer;)Z
+		ARG 1 world
+		ARG 2 lootTable
+		ARG 3 lootConsumer
 	METHOD method_64170 forEachGeneratedItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;Ljava/util/function/Function;Ljava/util/function/BiConsumer;)Z
+		ARG 1 world
+		ARG 2 lootTable
+		ARG 3 lootContextParametersFactory
+		ARG 4 lootConsumer
 	METHOD method_64171 (Lnet/minecraft/class_1799;Lnet/minecraft/class_8567$class_8568;)Lnet/minecraft/class_8567;
 		ARG 2 parameterSetBuilder
 	METHOD method_64172 (Lnet/minecraft/class_8567$class_8568;)Lnet/minecraft/class_8567;
 		ARG 1 parameterSetBuilder
+	METHOD method_64399 giveOrDropStack (Lnet/minecraft/class_1799;)V
+		ARG 1 stack
+	METHOD method_64448 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)V
+		ARG 2 stack
+	METHOD method_64449 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)V
+		ARG 2 stack
 	CLASS class_6823 FallSounds

mappings/net/minecraft/entity/Shearable.mapping

@@ -3,3 +3,6 @@ CLASS net/minecraft/class_5147 net/minecraft/entity/Shearable
 	COMMENT dispenser.
 	METHOD method_27072 isShearable ()Z
 	METHOD method_6636 sheared (Lnet/minecraft/class_3218;Lnet/minecraft/class_3419;Lnet/minecraft/class_1799;)V
+		ARG 1 world
+		ARG 2 shearedSoundCategory
+		ARG 3 shears

mappings/net/minecraft/entity/ai/brain/sensor/BreezeAttackablesSensor.mapping

@@ -1 +1,5 @@
 CLASS net/minecraft/class_8947 net/minecraft/entity/ai/brain/sensor/BreezeAttackablesSensor
+	METHOD method_54995 (Lnet/minecraft/class_8949;Lnet/minecraft/class_1309;)V
+		ARG 1 attackable
+	METHOD method_54996 (Lnet/minecraft/class_3218;Lnet/minecraft/class_8949;Lnet/minecraft/class_1309;)Z
+		ARG 2 target

mappings/net/minecraft/entity/ai/brain/sensor/GolemLastSeenSensor.mapping

@@ -3,5 +3,7 @@ CLASS net/minecraft/class_4307 net/minecraft/entity/ai/brain/sensor/GolemLastSee
 	FIELD field_30250 GOLEM_DETECTED_WARMUP I
 	METHOD method_20656 senseIronGolem (Lnet/minecraft/class_1309;)V
 		ARG 0 entity
+	METHOD method_20657 (Lnet/minecraft/class_1309;)Z
+		ARG 0 seenEntity
 	METHOD method_30233 rememberIronGolem (Lnet/minecraft/class_1309;)V
 		ARG 0 entity

mappings/net/minecraft/entity/ai/brain/sensor/HurtBySensor.mapping

@@ -1 +1,3 @@
 CLASS net/minecraft/class_4144 net/minecraft/entity/ai/brain/sensor/HurtBySensor
+	METHOD method_24642 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4095;Lnet/minecraft/class_1309;)V
+		ARG 2 hurtByEntity

mappings/net/minecraft/entity/ai/brain/sensor/NearestItemsSensor.mapping

@@ -3,6 +3,8 @@ CLASS net/minecraft/class_4833 net/minecraft/entity/ai/brain/sensor/NearestItems
 	FIELD field_30255 HORIZONTAL_RANGE J
 	FIELD field_30256 VERTICAL_RANGE J
 	METHOD method_24643 (Lnet/minecraft/class_1308;Lnet/minecraft/class_1542;)Z
-		ARG 1 itemEntity
+		ARG 1 itemEntityx
 	METHOD method_24644 (Lnet/minecraft/class_1542;)Z
 		ARG 0 itemEntity
+	METHOD method_24646 (Lnet/minecraft/class_1308;Lnet/minecraft/class_3218;Lnet/minecraft/class_1542;)Z
+		ARG 2 itemEntity

mappings/net/minecraft/entity/ai/brain/sensor/NearestPlayersSensor.mapping

@@ -1,5 +1,9 @@
 CLASS net/minecraft/class_4147 net/minecraft/entity/ai/brain/sensor/NearestPlayersSensor
 	METHOD method_19098 (Lnet/minecraft/class_1309;Lnet/minecraft/class_3222;)Z
 		ARG 2 player
+	METHOD method_29268 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1657;)Z
+		ARG 2 player
+	METHOD method_36981 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1657;)Z
+		ARG 2 player
 	METHOD method_61442 getFollowRange (Lnet/minecraft/class_1309;)D
 		ARG 1 entity

mappings/net/minecraft/entity/ai/brain/sensor/NearestVisibleAdultSensor.mapping

@@ -1,4 +1,8 @@
 CLASS net/minecraft/class_5356 net/minecraft/entity/ai/brain/sensor/NearestVisibleAdultSensor
+	METHOD method_29528 (Lnet/minecraft/class_1296;Lnet/minecraft/class_1309;)Z
+		ARG 1 target
 	METHOD method_29529 findNearestVisibleAdult (Lnet/minecraft/class_1296;Lnet/minecraft/class_6670;)V
 		ARG 1 entity
-		ARG 2 livingTarget
+		ARG 2 targetCache
+	METHOD method_29532 (Lnet/minecraft/class_1296;Lnet/minecraft/class_6670;)V
+		ARG 2 targetCache

mappings/net/minecraft/entity/ai/brain/sensor/NearestVisibleLivingEntitySensor.mapping

@@ -2,5 +2,14 @@ CLASS net/minecraft/class_6045 net/minecraft/entity/ai/brain/sensor/NearestVisib
 	METHOD method_35147 getVisibleLivingEntities (Lnet/minecraft/class_1309;)Ljava/util/Optional;
 		ARG 1 entity
 	METHOD method_35148 matches (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
+		ARG 1 world
+		ARG 2 entity
+		ARG 3 target
+	METHOD method_35149 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_6670;)Ljava/util/Optional;
+		ARG 3 targetCache
 	METHOD method_35150 getOutputMemoryModule ()Lnet/minecraft/class_4140;
 	METHOD method_35151 getNearestVisibleLivingEntity (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Ljava/util/Optional;
+		ARG 1 world
+		ARG 2 entity
+	METHOD method_35152 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
+		ARG 3 target

mappings/net/minecraft/entity/ai/brain/sensor/PiglinBruteSpecificSensor.mapping

@@ -1 +1,3 @@
 CLASS net/minecraft/class_5417 net/minecraft/entity/ai/brain/sensor/PiglinBruteSpecificSensor
+	METHOD method_38983 (Lnet/minecraft/class_1309;)Z
+		ARG 0 visibleEntity

mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping

@@ -25,14 +25,28 @@ CLASS net/minecraft/class_4148 net/minecraft/entity/ai/brain/sensor/Sensor
 		ARG 1 world
 		ARG 2 entity
 	METHOD method_30954 testTargetPredicate (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
+		ARG 0 world
+		ARG 1 entity
+		ARG 2 target
 	METHOD method_36982 testAttackableTargetPredicate (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
+		ARG 0 world
+		ARG 1 entity
+		ARG 2 target
 	METHOD method_37456 testAttackableTargetPredicateIgnoreVisibility (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
+		ARG 0 world
+		ARG 1 entity
+		ARG 2 target
 	METHOD method_61443 hasPredicatePassedRecently (ILjava/util/function/BiPredicate;)Ljava/util/function/BiPredicate;
 		ARG 0 times
+		ARG 1 predicate
 	METHOD method_61444 updateRange (Lnet/minecraft/class_1309;)V
 		ARG 1 entity
 	METHOD method_61445 hasTargetBeenAttackableRecently (Lnet/minecraft/class_1309;I)Ljava/util/function/BiPredicate;
 		ARG 0 entity
 		ARG 1 ticks
+	METHOD method_61446 (Lnet/minecraft/class_1309;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Z
+		ARG 1 world
+		ARG 2 target
 	METHOD method_61447 (Ljava/util/function/BiPredicate;Ljava/util/concurrent/atomic/AtomicInteger;ILjava/lang/Object;Ljava/lang/Object;)Z
-		ARG 3 target
+		ARG 3 world
+		ARG 4 target

mappings/net/minecraft/entity/ai/brain/sensor/TemptationsSensor.mapping

@@ -7,5 +7,7 @@ CLASS net/minecraft/class_5760 net/minecraft/entity/ai/brain/sensor/TemptationsS
 		ARG 1 player
 	METHOD method_33216 test (Lnet/minecraft/class_1799;)Z
 		ARG 1 stack
+	METHOD method_33217 (Lnet/minecraft/class_4051;Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;Lnet/minecraft/class_3222;)Z
+		ARG 3 player
 	METHOD method_45339 (Lnet/minecraft/class_1314;Lnet/minecraft/class_3222;)Z
-		ARG 1 player
+		ARG 1 playerx

mappings/net/minecraft/entity/ai/brain/task/FarmerWorkTask.mapping

@@ -1,6 +1,8 @@
 CLASS net/minecraft/class_4983 net/minecraft/entity/ai/brain/task/FarmerWorkTask
 	FIELD field_23226 COMPOSTABLES Ljava/util/List;
 	METHOD method_26333 craftAndDropBread (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;)V
+		ARG 1 world
+		ARG 2 villager
 	METHOD method_26334 compostSeeds (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;Lnet/minecraft/class_4208;Lnet/minecraft/class_2680;)V
 		ARG 1 world
 		ARG 2 entity

mappings/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.mapping

@@ -11,6 +11,9 @@ CLASS net/minecraft/class_4243 net/minecraft/entity/ai/brain/task/GiveGiftsToHer
 	METHOD <init> (I)V
 		ARG 1 delay
 	METHOD method_19957 giveGifts (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;Lnet/minecraft/class_1309;)V
+		ARG 1 world
+		ARG 2 villager
+		ARG 3 recipient
 	METHOD method_19958 isCloseEnough (Lnet/minecraft/class_1646;Lnet/minecraft/class_1657;)Z
 		ARG 1 villager
 		ARG 2 player
@@ -24,3 +27,6 @@ CLASS net/minecraft/class_4243 net/minecraft/entity/ai/brain/task/GiveGiftsToHer
 		ARG 1 villager
 	METHOD method_64173 getGiftLootTable (Lnet/minecraft/class_1646;)Lnet/minecraft/class_5321;
 		ARG 0 villager
+	METHOD method_64174 (Lnet/minecraft/class_1646;Lnet/minecraft/class_1309;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)V
+		ARG 2 world
+		ARG 3 stack