24w39a stuff (#3999)

FabricMC · Sep 25, 2024 · 790c144 · 790c144
1 parent 8f0c75d
commit 790c144
Show file tree

Hide file tree

Showing 56 changed files with 246 additions and 25 deletions.
diff --git a/mappings/net/minecraft/block/dispenser/BoatDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/BoatDispenserBehavior.mapping
@@ -1,3 +1,5 @@
 CLASS net/minecraft/class_2967 net/minecraft/block/dispenser/BoatDispenserBehavior
 	FIELD field_13360 fallbackBehavior Lnet/minecraft/class_2347;
 	FIELD field_13361 boatType Lnet/minecraft/class_1299;
+	METHOD <init> (Lnet/minecraft/class_1299;)V
+		ARG 1 boatType
diff --git a/mappings/net/minecraft/class_10245.mapping b/mappings/net/minecraft/class_10245.mapping
diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping
@@ -193,6 +193,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		ARG 2 confirmed
 	METHOD method_61040 refreshNarrator (Z)V
 		ARG 1 previouslyDisabled
+	METHOD method_64506 getTextRenderer ()Lnet/minecraft/class_327;
+	METHOD method_64507 shouldHideStatusEffectHud ()Z
 	CLASS class_6390 SelectedElementNarrationData
 		FIELD field_33825 selectable Lnet/minecraft/class_6379;
 		FIELD field_33826 index I

diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping
@@ -25,6 +25,7 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
 	FIELD field_45459 SCROLLER_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_45460 SCROLLER_DISABLED_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_45461 TAB_TOP_UNSELECTED_TEXTURES [Lnet/minecraft/class_2960;
+	FIELD field_54476 statusEffectsDisplay Lnet/minecraft/class_485;
 	METHOD <init> (Lnet/minecraft/class_746;Lnet/minecraft/class_7699;Z)V
 		ARG 1 player
 		ARG 2 enabledFeatures

diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping
@@ -35,6 +35,10 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre
 	FIELD field_52801 tooltipSubmenuHandlers Ljava/util/List;
 	FIELD field_54268 SLOT_HIGHLIGHT_BACK_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_54269 SLOT_HIGHLIGHT_FRONT_TEXTURE Lnet/minecraft/class_2960;
+	METHOD <init> (Lnet/minecraft/class_1703;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
+		ARG 1 handler
+		ARG 2 inventory
+		ARG 3 title
 	METHOD method_2378 isPointWithinBounds (IIIIDD)Z
 		ARG 1 x
 		ARG 2 y
@@ -110,3 +114,5 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre
 		ARG 1 context
 	METHOD method_64242 drawSlotHighlightFront (Lnet/minecraft/class_332;)V
 		ARG 1 context
+	METHOD method_64508 drawSlots (Lnet/minecraft/class_332;)V
+		ARG 1 context
diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping
@@ -2,6 +2,9 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc
 	FIELD field_2930 mouseDown Z
 	FIELD field_2934 mouseY F
 	FIELD field_2935 mouseX F
+	FIELD field_54479 statusEffectsDisplay Lnet/minecraft/class_485;
+	METHOD <init> (Lnet/minecraft/class_1657;)V
+		ARG 1 player
 	METHOD method_2486 drawEntity (Lnet/minecraft/class_332;IIIIIFFFLnet/minecraft/class_1309;)V
 		ARG 0 context
 		ARG 1 x1

diff --git a/mappings/net/minecraft/client/gui/screen/ingame/RecipeBookScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/RecipeBookScreen.mapping
@@ -0,0 +1,14 @@
+CLASS net/minecraft/class_10260 net/minecraft/client/gui/screen/ingame/RecipeBookScreen
+	FIELD field_54474 recipeBook Lnet/minecraft/class_507;
+	FIELD field_54475 narrow Z
+	METHOD <init> (Lnet/minecraft/class_1729;Lnet/minecraft/class_507;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
+		ARG 1 handler
+		ARG 2 recipeBook
+		ARG 3 inventory
+		ARG 4 title
+	METHOD method_64509 getRecipeBookButtonPos ()Lnet/minecraft/class_8029;
+	METHOD method_64510 onRecipeBookToggled ()V
+	METHOD method_64511 shouldAddPaddingToGhostResult ()Z
+	METHOD method_64512 addRecipeBook ()V
+	METHOD method_64513 (Lnet/minecraft/class_4185;)V
+		ARG 1 button
diff --git a/...en/ingame/AbstractInventoryScreen.mapping → ...creen/ingame/StatusEffectsDisplay.mapping b/...en/ingame/AbstractInventoryScreen.mapping → ...creen/ingame/StatusEffectsDisplay.mapping
@@ -1,6 +1,10 @@
-CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen
+CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/StatusEffectsDisplay
 	FIELD field_45462 EFFECT_BACKGROUND_LARGE_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_45463 EFFECT_BACKGROUND_SMALL_TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_54477 parent Lnet/minecraft/class_465;
+	FIELD field_54478 client Lnet/minecraft/class_310;
+	METHOD <init> (Lnet/minecraft/class_465;)V
+		ARG 1 parent
 	METHOD method_18642 drawStatusEffectBackgrounds (Lnet/minecraft/class_332;IILjava/lang/Iterable;Z)V
 		ARG 1 context
 		ARG 2 x
@@ -24,4 +28,9 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInv
 		ARG 3 mouseY
 	METHOD method_38933 getStatusEffectDescription (Lnet/minecraft/class_1293;)Lnet/minecraft/class_2561;
 		ARG 1 statusEffect
-	METHOD method_38934 hideStatusEffectHud ()Z
+	METHOD method_38934 shouldHideStatusEffectHud ()Z
+	METHOD method_64514 drawStatusEffects (Lnet/minecraft/class_332;IIF)V
+		ARG 1 context
+		ARG 2 mouseX
+		ARG 3 mouseY
+		ARG 4 tickDelta
diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/GhostRecipe.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/GhostRecipe.mapping
@@ -4,6 +4,9 @@ CLASS net/minecraft/class_9934 net/minecraft/client/gui/screen/recipebook/GhostR
 	METHOD <init> (Lnet/minecraft/class_9938;)V
 		ARG 1 currentIndexProvider
 	METHOD method_62029 clear ()V
+	METHOD method_62030 (ZLnet/minecraft/class_332;Lnet/minecraft/class_310;Lnet/minecraft/class_1735;Lnet/minecraft/class_9934$class_9935;)V
+		ARG 4 slot
+		ARG 5 item
 	METHOD method_62031 put (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;)V
 		ARG 1 item
 		ARG 2 slot
@@ -16,6 +19,7 @@ CLASS net/minecraft/class_9934 net/minecraft/client/gui/screen/recipebook/GhostR
 	METHOD method_62033 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_310;Z)V
 		ARG 1 context
 		ARG 2 client
+		ARG 3 resultHasPadding
 	METHOD method_62034 put (Ljava/util/List;Lnet/minecraft/class_1735;)V
 		ARG 1 items
 		ARG 2 slot

diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping
@@ -38,6 +38,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB
 		ARG 0 resultCollection
 	METHOD method_2581 drawGhostSlots (Lnet/minecraft/class_332;Z)V
 		ARG 1 context
+		ARG 2 resultHasPadding
 	METHOD method_2582 (Lnet/minecraft/class_512;)Z
 		ARG 1 button
 	METHOD method_2583 (Lnet/minecraft/class_516;)Z

diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping
@@ -52,4 +52,8 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity
 		ARG 1 potionContentsComponent
 	METHOD method_64415 serverTick (Lnet/minecraft/class_3218;)V
 		ARG 1 world
+	METHOD method_64416 (Ljava/util/Map$Entry;)Z
+		ARG 1 entity
+	METHOD method_64417 (I)I
+		ARG 0 duration
 	METHOD method_64418 clientTick ()V
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
@@ -1200,6 +1200,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_5670 baseTick ()V
 	METHOD method_5671 getCommandSource (Lnet/minecraft/class_3218;)Lnet/minecraft/class_2168;
 		COMMENT {@return a command source which represents this entity}
+		ARG 1 world
 	METHOD method_5672 getHighSpeedSplashSound ()Lnet/minecraft/class_3414;
 	METHOD method_5675 isPushedByFluids ()Z
 		COMMENT {@return whether the entity is pushed by fluids}
@@ -1342,6 +1343,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT @see #dropItem(ItemConvertible, int)
 		COMMENT @see #dropStack(ItemStack)
 		COMMENT @see #dropStack(ItemStack, float)
+		ARG 1 world
+		ARG 2 item
 	METHOD method_5707 squaredDistanceTo (Lnet/minecraft/class_243;)D
 		COMMENT {@return the squared distance between this entity and the given position}
 		ARG 1 vector
@@ -1663,6 +1666,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT @see #dropItem(ItemConvertible)
 		COMMENT @see #dropItem(ItemConvertible, int)
 		COMMENT @see #dropStack(ItemStack, float)
+		ARG 1 world
+		ARG 2 stack
 	METHOD method_5776 isFlappingWings ()Z
 		COMMENT {@return whether the entity is flapping their wings}
 		COMMENT
@@ -2096,6 +2101,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT @see #dropItem(ItemConvertible)
 		COMMENT @see #dropStack(ItemStack)
 		COMMENT @see #dropStack(ItemStack, float)
+		ARG 1 world
+		ARG 2 item
+		ARG 3 offsetY
 	METHOD method_5871 getTargetingMargin ()F
 		COMMENT {@return the margin around the entity's bounding box where the entity
 		COMMENT targeting is still successful}
@@ -2166,7 +2174,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT <p>To despawn this entity, call {@link #discard}.
 		COMMENT
 		COMMENT @see #discard
-	METHOD method_5991 getLootTable ()Ljava/util/Optional;
+	METHOD method_5991 getLootTableKey ()Ljava/util/Optional;
 	METHOD method_59920 findCollisionsForMovement (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Ljava/util/List;Lnet/minecraft/class_238;)Ljava/util/List;
 		ARG 0 entity
 		ARG 1 world
@@ -2215,6 +2223,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_61410 shouldTickBlockCollision ()Z
 	METHOD method_61411 getLastRenderPos ()Lnet/minecraft/class_243;
 	METHOD method_61412 setPosition (Lnet/minecraft/class_10182;Ljava/util/Set;)V
+		ARG 1 pos
+		ARG 2 flags
 	METHOD method_61414 getLerpedPitch (F)F
 		ARG 1 tickDelta
 	METHOD method_61415 getLerpedYaw (F)F
@@ -2277,7 +2287,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	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
+	METHOD method_64421 isAlwaysInvulnerableTo (Lnet/minecraft/class_1282;)Z
 		ARG 1 damageSource
 	METHOD method_7325 isSpectator ()Z
 		COMMENT {@return whether the entity is a spectator}

diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
-	FIELD field_16526 lootTable Ljava/util/Optional;
+	FIELD field_16526 lootTableKey Ljava/util/Optional;
 	FIELD field_18070 dimensions Lnet/minecraft/class_4048;
 	FIELD field_18981 fireImmune Z
 	FIELD field_19423 spawnableFarFromPlayer Z
@@ -31,7 +31,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 		ARG 12 translationKey
 		ARG 13 lootTable
 		ARG 14 requiredFeatures
-	METHOD method_16351 getLootTable ()Ljava/util/Optional;
+	METHOD method_16351 getLootTableKey ()Ljava/util/Optional;
 	METHOD method_17684 fromNbt (Lnet/minecraft/class_2487;)Ljava/util/Optional;
 		ARG 0 nbt
 	METHOD method_17685 getWidth ()F

diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping
@@ -56,6 +56,8 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity
 	METHOD method_35190 setNeverDespawn ()V
 	METHOD method_48349 setOwner (Ljava/util/UUID;)V
 		ARG 1 owner
+	METHOD method_64460 applyBuoyancy (D)V
+		ARG 1 horizontalMultiplier
 	METHOD method_6972 tryMerge (Lnet/minecraft/class_1542;)V
 		ARG 1 other
 	METHOD method_6973 tryMerge ()V

diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -364,7 +364,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		ARG 2 stack
 	METHOD method_5679 isInvulnerableTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_1282;)Z
 		ARG 1 world
-		ARG 2 damageSource
+		ARG 2 source
 	METHOD method_56991 canUseSlot (Lnet/minecraft/class_1304;)Z
 		ARG 1 slot
 	METHOD method_56992 isInCreativeMode ()Z
@@ -676,8 +676,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		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 2 lootTableKey
+		ARG 3 tool
 		ARG 4 lootConsumer
 	METHOD method_61420 getStackInArm (Lnet/minecraft/class_1306;)Lnet/minecraft/class_1799;
 		ARG 1 arm
@@ -719,11 +719,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 		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 2 lootTableKey
 		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 2 lootTableKey
 		ARG 3 lootContextParametersFactory
 		ARG 4 lootConsumer
 	METHOD method_64171 (Lnet/minecraft/class_1799;Lnet/minecraft/class_8567$class_8568;)Lnet/minecraft/class_8567;

diff --git a/mappings/net/minecraft/entity/OminousItemSpawnerEntity.mapping b/mappings/net/minecraft/entity/OminousItemSpawnerEntity.mapping
@@ -13,6 +13,7 @@ CLASS net/minecraft/class_9461 net/minecraft/entity/OminousItemSpawnerEntity
 	METHOD method_58639 addParticles ()V
 	METHOD method_58640 getItem ()Lnet/minecraft/class_1799;
 	METHOD method_58641 tickServer (Lnet/minecraft/class_3218;)V
+		ARG 1 world
 	METHOD method_58642 tickClient ()V
 	METHOD method_58643 spawnItem ()V
 	METHOD method_61431 (Lnet/minecraft/class_3218;I)V

diff --git a/mappings/net/minecraft/entity/ai/TargetPredicate.mapping b/mappings/net/minecraft/entity/ai/TargetPredicate.mapping
@@ -11,9 +11,17 @@ CLASS net/minecraft/class_4051 net/minecraft/entity/ai/TargetPredicate
 	METHOD method_18418 setBaseMaxDistance (D)Lnet/minecraft/class_4051;
 		ARG 1 baseMaxDistance
 	METHOD method_18419 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
+		ARG 1 world
+		ARG 2 tester
+		ARG 3 target
 	METHOD method_18420 setPredicate (Lnet/minecraft/class_4051$class_10254;)Lnet/minecraft/class_4051;
+		ARG 1 predicate
 	METHOD method_18424 ignoreDistanceScalingFactor ()Lnet/minecraft/class_4051;
 	METHOD method_33335 copy ()Lnet/minecraft/class_4051;
 	METHOD method_36625 createAttackable ()Lnet/minecraft/class_4051;
 	METHOD method_36626 createNonAttackable ()Lnet/minecraft/class_4051;
 	METHOD method_36627 ignoreVisibility ()Lnet/minecraft/class_4051;
+	CLASS class_10254 EntityPredicate
+		METHOD method_18303 (Lnet/minecraft/class_1309;Lnet/minecraft/class_3218;)Z
+			ARG 1 target
+			ARG 2 world
diff --git a/mappings/net/minecraft/entity/ai/brain/LivingTargetCache.mapping b/mappings/net/minecraft/entity/ai/brain/LivingTargetCache.mapping
@@ -2,11 +2,16 @@ CLASS net/minecraft/class_6670 net/minecraft/entity/ai/brain/LivingTargetCache
 	FIELD field_35104 EMPTY Lnet/minecraft/class_6670;
 	FIELD field_35105 entities Ljava/util/List;
 	FIELD field_35106 targetPredicate Ljava/util/function/Predicate;
+	METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Ljava/util/List;)V
+		ARG 1 world
+		ARG 2 owner
+		ARG 3 entities
 	METHOD method_38971 empty ()Lnet/minecraft/class_6670;
 	METHOD method_38972 contains (Lnet/minecraft/class_1309;)Z
 		ARG 1 entity
 	METHOD method_38973 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
 		ARG 1 entity
+		ARG 2 target
 	METHOD method_38974 (Lit/unimi/dsi/fastutil/objects/Object2BooleanOpenHashMap;Ljava/util/function/Predicate;Lnet/minecraft/class_1309;)Z
 		ARG 2 entity
 	METHOD method_38975 findFirst (Ljava/util/function/Predicate;)Ljava/util/Optional;

diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/BreezeAttackablesSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/BreezeAttackablesSensor.mapping
@@ -1,5 +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
+		ARG 1 target
 	METHOD method_54996 (Lnet/minecraft/class_3218;Lnet/minecraft/class_8949;Lnet/minecraft/class_1309;)Z
 		ARG 2 target
diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/NearestVisibleLivingEntitySensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/NearestVisibleLivingEntitySensor.mapping
@@ -6,7 +6,7 @@ CLASS net/minecraft/class_6045 net/minecraft/entity/ai/brain/sensor/NearestVisib
 		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
+		ARG 3 entities
 	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

diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping
@@ -1,7 +1,16 @@
 CLASS net/minecraft/class_4828 net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask
 	FIELD field_30177 REMEMBER_TIME I
 	METHOD method_24621 cannotReachTarget (Lnet/minecraft/class_1309;Ljava/util/Optional;)Z
+		ARG 0 target
+		ARG 1 lastReachTime
 	METHOD method_47132 create ()Lnet/minecraft/class_7893;
+	METHOD method_47133 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Z
+		ARG 0 world
+		ARG 1 target
+	METHOD method_47134 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V
+		ARG 0 world
+		ARG 1 entity
+		ARG 2 target
 	METHOD method_47135 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;ZLnet/minecraft/class_7906;Lnet/minecraft/class_4828$class_10252;Lnet/minecraft/class_4828$class_10253;Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;J)Z
 		ARG 6 world
 		ARG 7 entity
@@ -10,8 +19,28 @@ CLASS net/minecraft/class_4828 net/minecraft/entity/ai/brain/task/ForgetAttackTa
 		ARG 4 attackTarget
 		ARG 5 cantReachWalkTargetSince
 	METHOD method_47137 create (Lnet/minecraft/class_4828$class_10253;)Lnet/minecraft/class_7893;
+		ARG 0 callback
 	METHOD method_47138 create (Lnet/minecraft/class_4828$class_10252;)Lnet/minecraft/class_7893;
+		ARG 0 condition
 	METHOD method_47139 create (Lnet/minecraft/class_4828$class_10252;Lnet/minecraft/class_4828$class_10253;Z)Lnet/minecraft/class_7893;
+		ARG 0 condition
+		ARG 1 callback
 		ARG 2 shouldForgetIfTargetUnreachable
 	METHOD method_47140 (ZLnet/minecraft/class_4828$class_10252;Lnet/minecraft/class_4828$class_10253;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App;
 		ARG 3 context
+	METHOD method_47141 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Z
+		ARG 0 world
+		ARG 1 target
+	METHOD method_47142 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V
+		ARG 0 world
+		ARG 1 entity
+		ARG 2 target
+	CLASS class_10252 AlternativeCondition
+		METHOD test (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Z
+			ARG 1 world
+			ARG 2 target
+	CLASS class_10253 ForgetCallback
+		METHOD accept (Lnet/minecraft/class_3218;Ljava/lang/Object;Lnet/minecraft/class_1309;)V
+			ARG 1 world
+			ARG 2 entity
+			ARG 3 target
diff --git a/mappings/net/minecraft/entity/ai/brain/task/PrepareRamTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/PrepareRamTask.mapping
@@ -39,7 +39,7 @@ CLASS net/minecraft/class_6336 net/minecraft/entity/ai/brain/task/PrepareRamTask
 		ARG 1 entity
 		ARG 2 target
 	METHOD method_36264 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;Lnet/minecraft/class_6670;)Ljava/util/Optional;
-		ARG 3 targetCache
+		ARG 3 mobs
 	METHOD method_36265 (Lnet/minecraft/class_1408;Lnet/minecraft/class_2338;)Z
 		ARG 1 start
 	METHOD method_36266 calculateRamTarget (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243;
@@ -51,7 +51,7 @@ CLASS net/minecraft/class_6336 net/minecraft/entity/ai/brain/task/PrepareRamTask
 	METHOD method_36270 (Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)V
 		ARG 2 mob
 	METHOD method_36272 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)Z
-		ARG 3 target
+		ARG 3 mob
 	CLASS class_6337 Ram
 		COMMENT A ram chosen during the preparation.
 		FIELD field_33471 start Lnet/minecraft/class_2338;

diff --git a/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping
@@ -1,6 +1,12 @@
 CLASS net/minecraft/class_4824 net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask
+	METHOD method_47118 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;)Z
+		ARG 0 world
+		ARG 1 entity
 	METHOD method_47119 create (Lnet/minecraft/class_4824$class_10251;)Lnet/minecraft/class_7893;
+		ARG 0 targetGetter
 	METHOD method_47120 create (Lnet/minecraft/class_4824$class_10250;Lnet/minecraft/class_4824$class_10251;)Lnet/minecraft/class_7893;
+		ARG 0 condition
+		ARG 1 targetGetter
 	METHOD method_47121 (Lnet/minecraft/class_4824$class_10250;Lnet/minecraft/class_4824$class_10251;Lnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App;
 		ARG 2 context
 	METHOD method_47122 (Lnet/minecraft/class_4824$class_10250;Lnet/minecraft/class_4824$class_10251;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911;
@@ -10,3 +16,11 @@ CLASS net/minecraft/class_4824 net/minecraft/entity/ai/brain/task/UpdateAttackTa
 		ARG 4 world
 		ARG 5 entity
 		ARG 6 time
+	CLASS class_10250 StartCondition
+		METHOD test (Lnet/minecraft/class_3218;Ljava/lang/Object;)Z
+			ARG 1 world
+			ARG 2 entity
+	CLASS class_10251 TargetGetter
+		METHOD get (Lnet/minecraft/class_3218;Ljava/lang/Object;)Ljava/util/Optional;
+			ARG 1 world
+			ARG 2 entity