From 8619da580fe1db15c22c887d76a354d51407b055 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Sun, 7 Jun 2020 09:33:41 -0500 Subject: [PATCH] A bit entity brain/anger stuff (#1430) * A bit entity brain/anger stuff Signed-off-by: liach * Fix bad name Co-authored-by: liach --- mappings/net/minecraft/class_5354.mapping | 4 ---- .../sensor/NearestVisibleAdultSensor.mapping | 4 ++++ .../ai/brain/task/LookTargetUtil.mapping | 14 +++++++++++ .../ai/brain/task/TakeJobSiteTask.mapping | 20 ++++++++++++++++ .../task/WalkTowardClosestAdultTask.mapping | 8 +++++++ .../brain/task/WalkTowardJobSiteTask.mapping | 4 ++++ .../task/WorkStationCompetitionTask.mapping | 16 +++++++++++++ .../minecraft/entity/mob/Angerable.mapping | 24 +++++++++++++++++++ .../minecraft/entity/mob/HoglinBrain.mapping | 6 +++++ .../server/network/ServerPlayerEntity.mapping | 1 + .../net/minecraft/util/math/IntRange.mapping | 2 ++ 11 files changed, 99 insertions(+), 4 deletions(-) delete mode 100644 mappings/net/minecraft/class_5354.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/sensor/NearestVisibleAdultSensor.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping create mode 100644 mappings/net/minecraft/entity/mob/Angerable.mapping diff --git a/mappings/net/minecraft/class_5354.mapping b/mappings/net/minecraft/class_5354.mapping deleted file mode 100644 index 74abfc0030..0000000000 --- a/mappings/net/minecraft/class_5354.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_5354 - METHOD method_5968 getTarget ()Lnet/minecraft/class_1309; - METHOD method_5980 setTarget (Lnet/minecraft/class_1309;)V - METHOD method_6015 setAttacker (Lnet/minecraft/class_1309;)V diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/NearestVisibleAdultSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/NearestVisibleAdultSensor.mapping new file mode 100644 index 0000000000..fed7aabdab --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/sensor/NearestVisibleAdultSensor.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_5356 net/minecraft/entity/ai/brain/sensor/NearestVisibleAdultSensor + METHOD method_29529 findNearestVisibleAdult (Lnet/minecraft/class_1296;Ljava/util/List;)V + ARG 1 entity + ARG 2 visibleMobs diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping index b33bed15b1..182cb0b648 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil METHOD method_19548 lookAtAndWalkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;F)V ARG 0 first ARG 1 second + ARG 2 speed METHOD method_19550 canSee (Lnet/minecraft/class_4095;Lnet/minecraft/class_1309;)Z ARG 0 brain ARG 1 target @@ -18,9 +19,11 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil METHOD method_19555 walkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;F)V ARG 0 first ARG 1 second + ARG 2 speed METHOD method_19949 give (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_243;)V ARG 0 entity ARG 1 stack + ARG 2 targetLocation METHOD method_20419 getPosClosestToOccupiedPointOfInterest (Lnet/minecraft/class_3218;Lnet/minecraft/class_4076;I)Lnet/minecraft/class_4076; ARG 0 world ARG 1 center @@ -28,6 +31,8 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil METHOD method_24557 walkTowards (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;FI)V ARG 0 entity ARG 1 target + ARG 2 speed + ARG 3 completionRange METHOD method_24558 isNewTargetTooFar (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;D)Z COMMENT Checks if an entity can be a new attack target for the source entity. ARG 0 source @@ -46,10 +51,19 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil METHOD method_24561 walkTowards (Lnet/minecraft/class_1309;Lnet/minecraft/class_2338;FI)V ARG 0 entity ARG 1 target + ARG 2 speed + ARG 3 completionRange METHOD method_24562 getCloserEntity (Lnet/minecraft/class_1309;Ljava/util/Optional;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1309; ARG 0 source ARG 1 first ARG 2 second + METHOD method_24564 canSee (Lnet/minecraft/class_4095;Lnet/minecraft/class_4140;Ljava/util/function/Predicate;)Z + ARG 0 brain + ARG 1 memoryType + ARG 2 filter METHOD method_24565 isVisibleInMemory (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z ARG 0 source ARG 1 target + METHOD method_29248 streamSeenVillagers (Lnet/minecraft/class_1646;Ljava/util/function/Predicate;)Ljava/util/stream/Stream; + ARG 0 villager + ARG 1 filter diff --git a/mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping new file mode 100644 index 0000000000..65892d58ce --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_5327 net/minecraft/entity/ai/brain/task/TakeJobSiteTask + FIELD field_25158 speed F + METHOD (F)V + ARG 1 speed + METHOD method_29260 canUseJobSite (Lnet/minecraft/class_4158;Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;)Z + ARG 1 poiType + ARG 2 villager + ARG 3 pos + METHOD method_29261 forgetJobSiteAndWalkTarget (Lnet/minecraft/class_1646;)V + ARG 1 villager + METHOD method_29262 canReachJobSite (Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)Z + ARG 1 villager + ARG 2 pos + ARG 3 poiType + METHOD method_29266 claimSite (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;Z)V + ARG 1 world + ARG 2 previousOwner + ARG 3 newOwner + ARG 4 pos + ARG 5 jobSitePresent diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping new file mode 100644 index 0000000000..a8a12ab1e6 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_5355 net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask + FIELD field_25357 executionRange Lnet/minecraft/class_4801; + FIELD field_25358 speed F + METHOD (Lnet/minecraft/class_4801;F)V + ARG 1 executionRange + ARG 2 speed + METHOD method_29520 getNearestVisibleAdult (Lnet/minecraft/class_1296;)Lnet/minecraft/class_1296; + ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask.mapping new file mode 100644 index 0000000000..49eb58bd6a --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_5325 net/minecraft/entity/ai/brain/task/WalkTowardJobSiteTask + FIELD field_25155 speed F + METHOD (F)V + ARG 1 speed diff --git a/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping new file mode 100644 index 0000000000..16d60910a5 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_5326 net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask + FIELD field_25156 profession Lnet/minecraft/class_3852; + METHOD (Lnet/minecraft/class_3852;)V + ARG 1 profession + METHOD method_29253 isCompletedWorkStation (Lnet/minecraft/class_4158;Lnet/minecraft/class_3852;)Z + ARG 1 poiType + ARG 2 profession + METHOD method_29254 hasJobSite (Lnet/minecraft/class_1646;)Z + ARG 1 villager + METHOD method_29255 keepJobSiteForMoreExperiencedVillager (Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;)Lnet/minecraft/class_1646; + ARG 0 first + ARG 1 second + METHOD method_29257 isUsingWorkStationAt (Lnet/minecraft/class_4208;Lnet/minecraft/class_4158;Lnet/minecraft/class_1646;)Z + ARG 1 pos + ARG 2 poiType + ARG 3 villager diff --git a/mappings/net/minecraft/entity/mob/Angerable.mapping b/mappings/net/minecraft/entity/mob/Angerable.mapping new file mode 100644 index 0000000000..8073bb03b4 --- /dev/null +++ b/mappings/net/minecraft/entity/mob/Angerable.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable + METHOD method_29507 getAngerTime ()I + METHOD method_29508 getAngryAt ()Ljava/util/UUID; + METHOD method_29509 chooseRandomAngerTime ()V + METHOD method_29510 tickAngerLogic ()V + METHOD method_29511 hasAngerTime ()Z + METHOD method_29512 angerFromTag (Lnet/minecraft/class_1937;Lnet/minecraft/class_2487;)V + ARG 1 world + ARG 2 tag + METHOD method_29513 setAngryAt (Ljava/util/UUID;)V + ARG 1 uuid + METHOD method_29514 setAngerTime (I)V + ARG 1 ticks + METHOD method_29515 shouldAngerAt (Lnet/minecraft/class_1309;)Z + ARG 1 entity + METHOD method_29516 forgive (Lnet/minecraft/class_1657;)V + ARG 1 player + METHOD method_29517 angerToTag (Lnet/minecraft/class_2487;)V + ARG 1 tag + METHOD method_5968 getTarget ()Lnet/minecraft/class_1309; + METHOD method_5980 setTarget (Lnet/minecraft/class_1309;)V + ARG 1 target + METHOD method_6015 setAttacker (Lnet/minecraft/class_1309;)V + ARG 1 attacker diff --git a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping index 709df529d1..f6df518fc6 100644 --- a/mappings/net/minecraft/entity/mob/HoglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinBrain.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain FIELD field_22369 AVOID_MEMORY_DURATION Lnet/minecraft/class_4801; + FIELD field_25383 WALK_TOWARD_CLOSEST_ADULT_RANGE Lnet/minecraft/class_4801; METHOD method_24662 makeRandomWalkTask ()Lnet/minecraft/class_4118; METHOD method_24663 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4760;)V ARG 1 hoglin @@ -9,7 +10,9 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain ARG 0 hoglin ARG 1 target METHOD method_24666 addCoreTasks (Lnet/minecraft/class_4095;)V + ARG 0 brain METHOD method_24668 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; + ARG 0 brain METHOD method_24669 isWarpedFungusAround (Lnet/minecraft/class_4760;Lnet/minecraft/class_2338;)Z ARG 0 hoglin ARG 1 pos @@ -21,16 +24,19 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain ARG 0 hoglin ARG 1 attacker METHOD method_24673 addIdleTasks (Lnet/minecraft/class_4095;)V + ARG 0 brain METHOD method_24675 askAdultsToAvoid (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V ARG 0 hoglin ARG 1 target METHOD method_24676 addFightTasks (Lnet/minecraft/class_4095;)V + ARG 0 brain METHOD method_24677 isNearPlayer (Lnet/minecraft/class_4760;)Z ARG 0 hoglin METHOD method_24678 avoidEnemy (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V ARG 0 hoglin ARG 1 target METHOD method_24679 addAvoidTasks (Lnet/minecraft/class_4095;)V + ARG 0 brain METHOD method_24681 avoid (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V ARG 0 hoglin ARG 1 target diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index b1b0bc0023..6d1c903502 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -124,3 +124,4 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 2 direction METHOD method_26287 isBedTooFarAway (Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_29779 forgiveMobAnger ()V diff --git a/mappings/net/minecraft/util/math/IntRange.mapping b/mappings/net/minecraft/util/math/IntRange.mapping index 125e8eec5a..2329d91588 100644 --- a/mappings/net/minecraft/util/math/IntRange.mapping +++ b/mappings/net/minecraft/util/math/IntRange.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/class_4801 net/minecraft/util/math/IntRange ARG 1 max METHOD method_24503 choose (Ljava/util/Random;)I ARG 1 random + METHOD method_29492 getMin ()I + METHOD method_29493 getMax ()I