From 8d8f35a33bb4584763b668ba827ed8a423a55f60 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 23 Nov 2021 02:29:27 +1100 Subject: [PATCH] Mapping Bonanza Part 4: Entity AI stuff (#2848) * Entity AI stuff * Apply suggestions from code review Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com> Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com> --- .../entity/ai/brain/ScheduleBuilder.mapping | 2 ++ .../brain/sensor/HoglinSpecificSensor.mapping | 2 ++ .../ai/brain/sensor/NearestBedSensor.mapping | 2 ++ .../entity/ai/brain/task/BoneMealTask.mapping | 2 ++ .../entity/ai/brain/task/BreedTask.mapping | 2 ++ .../ai/brain/task/CompositeTask.mapping | 24 +++++++++++++++++++ .../task/FindInteractionTargetTask.mapping | 2 ++ .../ai/brain/task/FollowMobTask.mapping | 10 ++++++++ .../task/ForgetAngryAtTargetTask.mapping | 2 ++ .../brain/task/ForgetAttackTargetTask.mapping | 4 ++++ .../entity/ai/brain/task/GoToWorkTask.mapping | 8 +++++++ .../ai/brain/task/HideInHomeTask.mapping | 4 ++++ .../ai/brain/task/LeapingChargeTask.mapping | 2 ++ .../entity/ai/brain/task/LongJumpTask.mapping | 2 ++ .../ai/brain/task/LookAroundTask.mapping | 4 ++++ .../ai/brain/task/LookTargetUtil.mapping | 13 ++++++++++ .../task/PlayWithVillagerBabiesTask.mapping | 2 ++ .../entity/ai/brain/task/SeekSkyTask.mapping | 2 ++ .../task/VillagerWalkTowardsTask.mapping | 2 ++ .../entity/ai/brain/task/WalkHomeTask.mapping | 2 ++ .../ai/brain/task/WanderAroundTask.mapping | 1 + .../ai/brain/task/WanderIndoorsTask.mapping | 6 +++++ .../entity/ai/goal/CatSitOnBlockGoal.mapping | 4 ++++ .../entity/ai/goal/FollowMobGoal.mapping | 2 ++ .../entity/ai/goal/FormCaravanGoal.mapping | 2 ++ .../ai/goal/IronGolemWanderAroundGoal.mapping | 2 ++ .../entity/ai/goal/LookAtEntityGoal.mapping | 7 ++++++ .../ai/goal/MoveThroughVillageGoal.mapping | 2 ++ .../ai/goal/MoveToRaidCenterGoal.mapping | 2 ++ .../ai/pathing/PathNodeNavigator.mapping | 2 ++ 30 files changed, 123 insertions(+) diff --git a/mappings/net/minecraft/entity/ai/brain/ScheduleBuilder.mapping b/mappings/net/minecraft/entity/ai/brain/ScheduleBuilder.mapping index fc2ada32b1..efe85e57a7 100644 --- a/mappings/net/minecraft/entity/ai/brain/ScheduleBuilder.mapping +++ b/mappings/net/minecraft/entity/ai/brain/ScheduleBuilder.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_4171 net/minecraft/entity/ai/brain/ScheduleBuilder METHOD method_19221 withActivity (ILnet/minecraft/class_4168;)Lnet/minecraft/class_4171; ARG 1 startTime ARG 2 activity + METHOD method_19222 (Lnet/minecraft/class_4171$class_4172;)V + ARG 1 activity CLASS class_4172 ActivityEntry FIELD field_18610 startTime I FIELD field_18611 activity Lnet/minecraft/class_4168; diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/HoglinSpecificSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/HoglinSpecificSensor.mapping index 5af0ed38fd..7caf5c2661 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/HoglinSpecificSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/HoglinSpecificSensor.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_4832 net/minecraft/entity/ai/brain/sensor/HoglinSpecificSensor + METHOD method_24640 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 1 pos METHOD method_24641 findNearestWarpedFungus (Lnet/minecraft/class_3218;Lnet/minecraft/class_4760;)Ljava/util/Optional; ARG 1 world ARG 2 hoglin diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/NearestBedSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/NearestBedSensor.mapping index 8699473150..e243d1dfba 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/NearestBedSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/NearestBedSensor.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_4256 net/minecraft/entity/ai/brain/sensor/NearestBedSe FIELD field_30251 REMEMBER_TIME I FIELD field_30252 MAX_TRIES I FIELD field_30253 MAX_EXPIRY_TIME I + METHOD method_21644 (Lnet/minecraft/class_2338;)Z + ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/BoneMealTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BoneMealTask.mapping index cf8fd0a1ae..f9131b5adc 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/BoneMealTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/BoneMealTask.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_4982 net/minecraft/entity/ai/brain/task/BoneMealTask FIELD field_30184 MAX_DURATION I METHOD method_26324 addLookWalkTargets (Lnet/minecraft/class_1646;)V ARG 1 villager + METHOD method_26325 (Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;)V + ARG 1 pos METHOD method_26326 canBoneMeal (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)Z ARG 1 pos ARG 2 world diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping index 60a4a09c26..ff76bd1c3b 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_4806 net/minecraft/entity/ai/brain/task/BreedTask ARG 2 speed METHOD method_24542 getBreedTarget (Lnet/minecraft/class_1429;)Lnet/minecraft/class_1429; ARG 1 animal + METHOD method_24545 (Lnet/minecraft/class_1429;Lnet/minecraft/class_1309;)Z + ARG 2 entity METHOD method_24546 hasBreedTarget (Lnet/minecraft/class_1429;)Z ARG 1 animal METHOD method_24548 findBreedTarget (Lnet/minecraft/class_1429;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping index 393e9af99b..39e3c664db 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping @@ -9,6 +9,20 @@ CLASS net/minecraft/class_4103 net/minecraft/entity/ai/brain/task/CompositeTask ARG 3 order ARG 4 runMode ARG 5 tasks + METHOD method_18928 (Lnet/minecraft/class_4097;)Z + ARG 0 task + METHOD method_18930 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_4097;)V + ARG 4 task + METHOD method_18931 (Lnet/minecraft/class_4097;)Z + ARG 0 task + METHOD method_18932 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_4097;)V + ARG 4 task + METHOD method_18937 (Lnet/minecraft/class_4097;)Z + ARG 0 task + METHOD method_18938 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_4097;)Z + ARG 4 task + METHOD method_19955 (Lnet/minecraft/class_4097;)Z + ARG 0 task CLASS class_4104 Order FIELD field_18350 listModifier Ljava/util/function/Consumer; METHOD (Ljava/lang/String;ILjava/util/function/Consumer;)V @@ -21,3 +35,13 @@ CLASS net/minecraft/class_4103 net/minecraft/entity/ai/brain/task/CompositeTask ARG 2 world ARG 3 entity ARG 4 time + CLASS 1 + METHOD method_19560 (Lnet/minecraft/class_4097;)Z + ARG 0 task + METHOD method_19561 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_4097;)Z + ARG 4 task + CLASS 2 + METHOD method_19562 (Lnet/minecraft/class_4097;)Z + ARG 0 task + METHOD method_19563 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;JLnet/minecraft/class_4097;)V + ARG 4 task diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.mapping index 6bf8d6dd49..62d9a43c3c 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindInteractionTargetTask.mapping @@ -15,3 +15,5 @@ CLASS net/minecraft/class_4109 net/minecraft/entity/ai/brain/task/FindInteractio ARG 1 entity METHOD method_18962 test (Lnet/minecraft/class_1309;)Z ARG 1 entity + METHOD method_38968 (Lnet/minecraft/class_4095;Lnet/minecraft/class_1309;)V + ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping index 0152902003..684a55695c 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_4119 net/minecraft/entity/ai/brain/task/FollowMobTask FIELD field_18376 predicate Ljava/util/function/Predicate; FIELD field_18377 maxDistanceSquared F + FIELD field_35102 target Ljava/util/Optional; METHOD (F)V ARG 1 maxDistance METHOD (Ljava/util/function/Predicate;F)V + ARG 1 predicate ARG 2 maxDistance METHOD (Lnet/minecraft/class_1299;F)V ARG 1 entityType @@ -14,3 +16,11 @@ CLASS net/minecraft/class_4119 net/minecraft/entity/ai/brain/task/FollowMobTask METHOD (Lnet/minecraft/class_3494;F)V ARG 1 entityType ARG 2 maxDistance + METHOD method_18997 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1309;)Z + ARG 1 entity + METHOD method_19000 (Lnet/minecraft/class_1311;Lnet/minecraft/class_1309;)Z + ARG 1 entity + METHOD method_24599 (Lnet/minecraft/class_1309;)Z + ARG 0 entity + METHOD method_35087 (Lnet/minecraft/class_3494;Lnet/minecraft/class_1309;)Z + ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.mapping index aae366d539..3e3ca7dc83 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_4829 net/minecraft/entity/ai/brain/task/ForgetAngryAtTargetTask + METHOD method_29526 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V + ARG 2 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping index 5d03cc0cc9..a878fff9c7 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping @@ -13,9 +13,13 @@ CLASS net/minecraft/class_4828 net/minecraft/entity/ai/brain/task/ForgetAttackTa ARG 0 entity METHOD method_24622 isAttackTargetInAnotherWorld (Lnet/minecraft/class_1308;)Z ARG 1 entity + METHOD method_24624 (Lnet/minecraft/class_1309;)Z + ARG 0 target METHOD method_24625 getAttackTarget (Lnet/minecraft/class_1308;)Lnet/minecraft/class_1309; ARG 1 entity METHOD method_24626 isAttackTargetDead (Lnet/minecraft/class_1308;)Z ARG 1 entity METHOD method_24627 forgetAttackTarget (Lnet/minecraft/class_1308;)V ARG 1 entity + METHOD method_35107 (Lnet/minecraft/class_1309;)Z + ARG 0 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToWorkTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToWorkTask.mapping index 1e99e7ae0c..307b1ff5a2 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToWorkTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToWorkTask.mapping @@ -1 +1,9 @@ CLASS net/minecraft/class_4114 net/minecraft/entity/ai/brain/task/GoToWorkTask + METHOD method_18984 (Lnet/minecraft/class_4158;Lnet/minecraft/class_3852;)Z + ARG 1 profession + METHOD method_18985 (Lnet/minecraft/class_4158;)Ljava/util/Optional; + ARG 0 poiType + METHOD method_18986 (Lnet/minecraft/class_1646;Lnet/minecraft/class_3218;Lnet/minecraft/class_3852;)V + ARG 2 profession + METHOD method_29929 (Lnet/minecraft/class_4208;Lnet/minecraft/class_3218;)Ljava/util/Optional; + ARG 1 world diff --git a/mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping index 250e8452a3..df11a9484e 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping @@ -7,3 +7,7 @@ CLASS net/minecraft/class_4246 net/minecraft/entity/ai/brain/task/HideInHomeTask ARG 1 maxDistance ARG 2 walkSpeed ARG 3 preferredDistance + METHOD method_19983 (Lnet/minecraft/class_4158;)Z + ARG 0 poiType + METHOD method_19985 (Lnet/minecraft/class_4158;)Z + ARG 0 poiType diff --git a/mappings/net/minecraft/entity/ai/brain/task/LeapingChargeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LeapingChargeTask.mapping index df074f04f4..988b96bc35 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LeapingChargeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LeapingChargeTask.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_6029 net/minecraft/entity/ai/brain/task/LeapingChargeTask FIELD field_30132 RUN_TIME I FIELD field_30133 cooldownRange Lnet/minecraft/class_6019; + FIELD field_33459 sound Lnet/minecraft/class_3414; METHOD (Lnet/minecraft/class_6019;Lnet/minecraft/class_3414;)V ARG 1 cooldownRange + ARG 2 sound diff --git a/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping index 1add163f56..09c9b5eb6f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping @@ -12,11 +12,13 @@ CLASS net/minecraft/class_6030 net/minecraft/entity/ai/brain/task/LongJumpTask FIELD field_30144 lastTarget Ljava/util/Optional; FIELD field_30145 cooldown I FIELD field_30146 targetTime J + FIELD field_33460 entityToSound Ljava/util/function/Function; METHOD (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;)V ARG 1 cooldownRange ARG 2 verticalRange ARG 3 horizontalRange ARG 4 maxRange + ARG 5 entityToSound METHOD method_35078 getRammingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;)Ljava/util/Optional; ARG 1 entity ARG 2 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookAroundTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookAroundTask.mapping index 05b1630068..11dbd21b32 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LookAroundTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LookAroundTask.mapping @@ -2,3 +2,7 @@ CLASS net/minecraft/class_4110 net/minecraft/entity/ai/brain/task/LookAroundTask METHOD (II)V ARG 1 minRunTime ARG 2 maxRunTime + METHOD method_18966 (Lnet/minecraft/class_1308;Lnet/minecraft/class_4115;)V + ARG 1 lookTarget + METHOD method_19569 (Lnet/minecraft/class_1308;Lnet/minecraft/class_4115;)Z + ARG 1 lookTarget diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping index 3c62194235..461b7a491e 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil + METHOD method_19547 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1309;)Z + ARG 1 entity METHOD method_19548 lookAtAndWalkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;F)V ARG 0 first ARG 1 second @@ -13,6 +15,8 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil METHOD method_19552 lookAtEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V ARG 0 first ARG 1 second + METHOD method_19553 (Lnet/minecraft/class_4095;Lnet/minecraft/class_1309;)Z + ARG 1 target METHOD method_19554 lookAt (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V ARG 0 entity ARG 1 target @@ -24,6 +28,8 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil ARG 0 entity ARG 1 stack ARG 2 targetLocation + METHOD method_20418 (Lnet/minecraft/class_3218;ILnet/minecraft/class_4076;)Z + ARG 2 sectionPos METHOD method_20419 getPosClosestToOccupiedPointOfInterest (Lnet/minecraft/class_3218;Lnet/minecraft/class_4076;I)Lnet/minecraft/class_4076; ARG 0 world ARG 1 center @@ -57,6 +63,8 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil ARG 0 source ARG 1 first ARG 2 second + METHOD method_24563 (Lnet/minecraft/class_1309;Ljava/util/UUID;)Lnet/minecraft/class_1297; + ARG 1 uuid METHOD method_24564 canSee (Lnet/minecraft/class_4095;Lnet/minecraft/class_4140;Ljava/util/function/Predicate;)Z ARG 0 brain ARG 1 memoryType @@ -65,14 +73,19 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil ARG 0 source ARG 1 target METHOD method_25940 isTargetWithinAttackRange (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;I)Z + ARG 0 mob ARG 1 target ARG 2 rangedWeaponReachReduction METHOD method_25941 isTargetWithinMeleeRange (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)Z ARG 0 source ARG 1 target + METHOD method_29247 (Lnet/minecraft/class_1646;Lnet/minecraft/class_1309;)Z + ARG 1 entity METHOD method_29248 streamSeenVillagers (Lnet/minecraft/class_1646;Ljava/util/function/Predicate;)Ljava/util/stream/Stream; ARG 0 villager ARG 1 filter + METHOD method_31500 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309; + ARG 0 target METHOD method_33193 find (Lnet/minecraft/class_1314;II)Lnet/minecraft/class_243; ARG 0 entity ARG 1 horizontalRange diff --git a/mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping index 15d6ee004c..019a2693df 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping @@ -23,6 +23,8 @@ CLASS net/minecraft/class_4218 net/minecraft/entity/ai/brain/task/PlayWithVillag ARG 1 entity METHOD method_19588 getLeastPopularBabyInteractionTarget (Lnet/minecraft/class_1314;)Ljava/util/Optional; ARG 1 entity + METHOD method_19589 (Lnet/minecraft/class_1314;Lnet/minecraft/class_1309;)V + ARG 1 target METHOD method_19590 hasVisibleVillagerBabies (Lnet/minecraft/class_1314;)Z ARG 1 entity METHOD method_19592 getBabyInteractionTargetCounts (Lnet/minecraft/class_1314;)Ljava/util/Map; diff --git a/mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping index 0ee34afd1c..243cb6de08 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/SeekSkyTask.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_4248 net/minecraft/entity/ai/brain/task/SeekSkyTask FIELD field_18999 speed F METHOD (F)V ARG 1 speed + METHOD method_19986 (Lnet/minecraft/class_243;)Lnet/minecraft/class_4142; + ARG 1 pos METHOD method_19987 findNearbySky (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Lnet/minecraft/class_243; ARG 1 world ARG 2 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping index 9dbd98978b..3d68d792c4 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_4122 net/minecraft/entity/ai/brain/task/VillagerWalkTo ARG 3 completionRange ARG 4 maxRange ARG 5 maxRunTime + METHOD method_19004 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;JLnet/minecraft/class_4095;Lnet/minecraft/class_4208;)V + ARG 6 pos METHOD method_19597 exceedsMaxRange (Lnet/minecraft/class_1646;Lnet/minecraft/class_4208;)Z ARG 1 villager ARG 2 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping index cbd15d7b31..a644fe53e8 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkHomeTask.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/class_4290 net/minecraft/entity/ai/brain/task/WalkHomeTask FIELD field_30164 MAX_DISTANCE I METHOD (F)V ARG 1 speed + METHOD method_21639 (Lnet/minecraft/class_2338;)Z + ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping index 11f753f5bb..3d83f2c9ea 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_4112 net/minecraft/entity/ai/brain/task/WanderAroundTa ARG 2 maxRunTime METHOD method_18977 hasFinishedPath (Lnet/minecraft/class_1308;Lnet/minecraft/class_4142;J)Z ARG 1 entity + ARG 2 walkTarget ARG 3 time METHOD method_18980 hasReached (Lnet/minecraft/class_1308;Lnet/minecraft/class_4142;)Z ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping index 7c78457a2f..94f4b9d15a 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WanderIndoorsTask.mapping @@ -2,3 +2,9 @@ CLASS net/minecraft/class_4289 net/minecraft/entity/ai/brain/task/WanderIndoorsT FIELD field_19258 speed F METHOD (F)V ARG 1 speed + METHOD method_20420 (Lnet/minecraft/class_1314;Lnet/minecraft/class_2338;)V + ARG 2 pos + METHOD method_20424 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_20425 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;Lnet/minecraft/class_2338;)Z + ARG 2 pos diff --git a/mappings/net/minecraft/entity/ai/goal/CatSitOnBlockGoal.mapping b/mappings/net/minecraft/entity/ai/goal/CatSitOnBlockGoal.mapping index c42007c0b0..dcdea28bdf 100644 --- a/mappings/net/minecraft/entity/ai/goal/CatSitOnBlockGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/CatSitOnBlockGoal.mapping @@ -3,3 +3,7 @@ CLASS net/minecraft/class_1373 net/minecraft/entity/ai/goal/CatSitOnBlockGoal METHOD (Lnet/minecraft/class_1451;D)V ARG 1 cat ARG 2 speed + METHOD method_27793 (Lnet/minecraft/class_4970$class_4971;)Z + ARG 0 state + METHOD method_27794 (Lnet/minecraft/class_2742;)Ljava/lang/Boolean; + ARG 0 part diff --git a/mappings/net/minecraft/entity/ai/goal/FollowMobGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowMobGoal.mapping index 865c4220b3..62c2eb0fe5 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowMobGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowMobGoal.mapping @@ -13,3 +13,5 @@ CLASS net/minecraft/class_1348 net/minecraft/entity/ai/goal/FollowMobGoal ARG 2 speed ARG 4 minDistance ARG 5 maxDistance + METHOD method_6259 (Lnet/minecraft/class_1308;Lnet/minecraft/class_1308;)Z + ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping index e3fd4cf74d..5e923dc625 100644 --- a/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_1362 net/minecraft/entity/ai/goal/FormCaravanGoal METHOD (Lnet/minecraft/class_1501;D)V ARG 1 llama ARG 2 speed + METHOD method_19616 (Lnet/minecraft/class_1297;)Z + ARG 0 entity METHOD method_6285 canFollow (Lnet/minecraft/class_1501;I)Z ARG 1 llama ARG 2 length diff --git a/mappings/net/minecraft/entity/ai/goal/IronGolemWanderAroundGoal.mapping b/mappings/net/minecraft/entity/ai/goal/IronGolemWanderAroundGoal.mapping index fc51b2f455..cf27345994 100644 --- a/mappings/net/minecraft/entity/ai/goal/IronGolemWanderAroundGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/IronGolemWanderAroundGoal.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_5274 net/minecraft/entity/ai/goal/IronGolemWanderAroun ARG 1 villager METHOD method_27923 findRandomPosInChunk (Lnet/minecraft/class_4076;)Lnet/minecraft/class_2338; ARG 1 pos + METHOD method_27924 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4076;)Z + ARG 1 sectionPos METHOD method_27925 findRandomInRange ()Lnet/minecraft/class_243; METHOD method_27926 findVillagerPos ()Lnet/minecraft/class_243; METHOD method_27927 findRandomBlockPos ()Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping b/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping index 1900547a0b..ec05027ad2 100644 --- a/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping @@ -15,3 +15,10 @@ CLASS net/minecraft/class_1361 net/minecraft/entity/ai/goal/LookAtEntityGoal ARG 2 targetType ARG 3 range ARG 4 chance + METHOD (Lnet/minecraft/class_1308;Ljava/lang/Class;FFZ)V + ARG 1 mob + ARG 2 targetType + ARG 3 range + ARG 4 chance + METHOD method_18414 (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)Z + ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping index a408f98caf..2fedd5948a 100644 --- a/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping @@ -15,4 +15,6 @@ CLASS net/minecraft/class_1368 net/minecraft/entity/ai/goal/MoveThroughVillageGo ARG 6 doorPassingThroughGetter METHOD method_19052 shouldVisit (Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_19053 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)D + ARG 3 pos METHOD method_6297 forgetOldTarget ()V diff --git a/mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping index a9329067df..28962166db 100644 --- a/mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MoveToRaidCenterGoal.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_3759 net/minecraft/entity/ai/goal/MoveToRaidCenterGoal ARG 1 actor METHOD method_16465 includeFreeRaiders (Lnet/minecraft/class_3765;)V ARG 1 raid + METHOD method_16466 (Lnet/minecraft/class_3765;Lnet/minecraft/class_3763;)Z + ARG 1 raider diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping index 888de56010..066c27ef67 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_13 net/minecraft/entity/ai/pathing/PathNodeNavigator METHOD method_21658 calculateDistances (Lnet/minecraft/class_9;Ljava/util/Set;)F ARG 1 node ARG 2 targets + METHOD method_21659 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_4459; + ARG 1 pos METHOD method_52 findPathToAny (Lnet/minecraft/class_1950;Lnet/minecraft/class_1308;Ljava/util/Set;FIF)Lnet/minecraft/class_11; ARG 1 world ARG 2 mob