From 1f9002714ee4a3584a42525a13a4f9fa92e3ad3c Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Thu, 20 Dec 2018 00:41:05 -0800 Subject: [PATCH] Mapped a few goals (#333) * Mapped a few goals Signed-off-by: liach --- mappings/ain.mapping | 6 ------ mappings/aip.mapping | 2 ++ mappings/aiq.mapping | 1 + mappings/ajd.mapping | 1 + mappings/aji.mapping | 5 ----- mappings/ajl.mapping | 6 ------ mappings/ajp.mapping | 5 ----- mappings/akk.mapping | 6 ------ mappings/akn.mapping | 3 --- .../entity/ai/control/MoveControl.mapping | 1 + .../entity/ai/goal/AcceptPoppyGoal.mapping} | 4 +++- .../entity/ai/goal/BreatheAirGoal.mapping | 9 +++++++++ .../entity/ai/goal/FollowTargetGoal.mapping | 5 +++++ .../entity/ai/goal/FormCaravanGoal.mapping | 10 ++++++++++ .../minecraft/entity/ai/goal/Goals.mapping | 2 +- .../entity/ai/goal/MoveIntoWaterGoal.mapping | 4 ++++ .../ai/goal/MoveToTargetPosGoal.mapping | 20 +++++++++++++++++++ .../ai/goal/StepAndDestroyBlockGoal.mapping | 14 +++++++++++++ .../entity/ai/goal/VillagerBreedGoal.mapping | 13 ++++++++++++ .../entity/mob/DrownedEntity.mapping | 1 + .../entity/mob/ShulkerEntity.mapping | 17 ++++++++++++---- .../minecraft/entity/mob/ZombieEntity.mapping | 4 ++++ .../entity/passive/IronGolemEntity.mapping | 1 + .../entity/passive/LlamaEntity.mapping | 2 ++ .../entity/passive/RabbitEntity.mapping | 1 + .../entity/passive/TurtleEntity.mapping | 3 +++ 26 files changed, 109 insertions(+), 37 deletions(-) delete mode 100644 mappings/ain.mapping delete mode 100644 mappings/aji.mapping delete mode 100644 mappings/ajl.mapping delete mode 100644 mappings/ajp.mapping delete mode 100644 mappings/akk.mapping delete mode 100644 mappings/akn.mapping rename mappings/{ake.mapping => net/minecraft/entity/ai/goal/AcceptPoppyGoal.mapping} (54%) create mode 100644 mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/MoveIntoWaterGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/VillagerBreedGoal.mapping diff --git a/mappings/ain.mapping b/mappings/ain.mapping deleted file mode 100644 index a9773b82b9..0000000000 --- a/mappings/ain.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS ain - METHOD a canStart ()Z - METHOD b shouldContinue ()Z - METHOD c start ()V - METHOD e tick ()V - METHOD f canStop ()Z diff --git a/mappings/aip.mapping b/mappings/aip.mapping index ac02ba4f03..d1e3ec661b 100644 --- a/mappings/aip.mapping +++ b/mappings/aip.mapping @@ -1,5 +1,7 @@ CLASS aip METHOD a canStart ()Z + METHOD a getInterval (Lahl;)I + METHOD a isTargetPos (Lbbt;Let;)Z METHOD c start ()V METHOD d onRemove ()V METHOD e tick ()V diff --git a/mappings/aiq.mapping b/mappings/aiq.mapping index a82444b686..6a02da3996 100644 --- a/mappings/aiq.mapping +++ b/mappings/aiq.mapping @@ -1,5 +1,6 @@ CLASS aiq METHOD a canStart ()Z + METHOD a isTargetPos (Lbbt;Let;)Z METHOD c start ()V METHOD d onRemove ()V METHOD e tick ()V diff --git a/mappings/ajd.mapping b/mappings/ajd.mapping index 344895c959..0c5a336152 100644 --- a/mappings/ajd.mapping +++ b/mappings/ajd.mapping @@ -1,4 +1,5 @@ CLASS ajd METHOD a canStart ()Z + METHOD a isTargetPos (Lbbt;Let;)Z METHOD b shouldContinue ()Z METHOD e tick ()V diff --git a/mappings/aji.mapping b/mappings/aji.mapping deleted file mode 100644 index fe54095966..0000000000 --- a/mappings/aji.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS aji - METHOD a canStart ()Z - METHOD b shouldContinue ()Z - METHOD d onRemove ()V - METHOD e tick ()V diff --git a/mappings/ajl.mapping b/mappings/ajl.mapping deleted file mode 100644 index 778fa15c75..0000000000 --- a/mappings/ajl.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS ajl - METHOD a canStart ()Z - METHOD b shouldContinue ()Z - METHOD c start ()V - METHOD d onRemove ()V - METHOD e tick ()V diff --git a/mappings/ajp.mapping b/mappings/ajp.mapping deleted file mode 100644 index 0e3702878b..0000000000 --- a/mappings/ajp.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS ajp - METHOD a canStart ()Z - METHOD b shouldContinue ()Z - METHOD c start ()V - METHOD e tick ()V diff --git a/mappings/akk.mapping b/mappings/akk.mapping deleted file mode 100644 index 79332c4daf..0000000000 --- a/mappings/akk.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS akk - METHOD a canStart ()Z - METHOD b shouldContinue ()Z - METHOD c start ()V - METHOD d onRemove ()V - METHOD e tick ()V diff --git a/mappings/akn.mapping b/mappings/akn.mapping deleted file mode 100644 index 6560c73a22..0000000000 --- a/mappings/akn.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS akn - METHOD a canStart ()Z - METHOD c start ()V diff --git a/mappings/net/minecraft/entity/ai/control/MoveControl.mapping b/mappings/net/minecraft/entity/ai/control/MoveControl.mapping index e3574ec14c..cf46cbea63 100644 --- a/mappings/net/minecraft/entity/ai/control/MoveControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/MoveControl.mapping @@ -1,3 +1,4 @@ CLASS aih net/minecraft/entity/ai/control/MoveControl + CLASS aih$a FIELD a entity Lahf; METHOD a tick ()V diff --git a/mappings/ake.mapping b/mappings/net/minecraft/entity/ai/goal/AcceptPoppyGoal.mapping similarity index 54% rename from mappings/ake.mapping rename to mappings/net/minecraft/entity/ai/goal/AcceptPoppyGoal.mapping index 5f084c6105..5df996e1e0 100644 --- a/mappings/ake.mapping +++ b/mappings/net/minecraft/entity/ai/goal/AcceptPoppyGoal.mapping @@ -1,4 +1,6 @@ -CLASS ake +CLASS akk net/minecraft/entity/ai/goal/AcceptPoppyGoal + FIELD a owner Laqr; + FIELD b golem Lamh; METHOD a canStart ()Z METHOD b shouldContinue ()Z METHOD c start ()V diff --git a/mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping b/mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping new file mode 100644 index 0000000000..aca02480f4 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/BreatheAirGoal.mapping @@ -0,0 +1,9 @@ +CLASS ain net/minecraft/entity/ai/goal/BreatheAirGoal + FIELD a owner Lahl; + METHOD a canStart ()Z + METHOD a isAirPos (Lbbt;Let;)Z + METHOD b shouldContinue ()Z + METHOD c start ()V + METHOD e tick ()V + METHOD f canStop ()Z + METHOD g moveToAir ()V diff --git a/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping index 1ccbbc2a6e..d63c89f773 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping @@ -1,3 +1,8 @@ CLASS akx net/minecraft/entity/ai/goal/FollowTargetGoal + CLASS akx$a ClosestSelector + FIELD a target Lagv; + METHOD a compare (Lagv;Lagv;)I METHOD a canStart ()Z + METHOD a getSearchBox (D)Lclz; + ARG 1 distance METHOD c start ()V diff --git a/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping new file mode 100644 index 0000000000..ff2a04d0b1 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/FormCaravanGoal.mapping @@ -0,0 +1,10 @@ +CLASS aji net/minecraft/entity/ai/goal/FormCaravanGoal + FIELD a owner Lane; + FIELD b speed D + FIELD c counter I + METHOD a canStart ()Z + METHOD a canFollow (Lane;I)Z + ARG 2 length + METHOD b shouldContinue ()Z + METHOD d onRemove ()V + METHOD e tick ()V diff --git a/mappings/net/minecraft/entity/ai/goal/Goals.mapping b/mappings/net/minecraft/entity/ai/goal/Goals.mapping index de6d6b63f7..f981a1a6e6 100644 --- a/mappings/net/minecraft/entity/ai/goal/Goals.mapping +++ b/mappings/net/minecraft/entity/ai/goal/Goals.mapping @@ -19,7 +19,7 @@ CLASS ajc net/minecraft/entity/ai/goal/Goals METHOD a shouldContinueExecution (Lajc$a;)Z METHOD a areCompatible (Lajc$a;Lajc$a;)Z ARG 1 a1 - METHOD b canAddTask (I)Z + METHOD b isControlBitUsed (I)Z METHOD b canStart (Lajc$a;)Z METHOD c addBits (I)V METHOD d removeBits (I)V diff --git a/mappings/net/minecraft/entity/ai/goal/MoveIntoWaterGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveIntoWaterGoal.mapping new file mode 100644 index 0000000000..9477fd6567 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/MoveIntoWaterGoal.mapping @@ -0,0 +1,4 @@ +CLASS akn net/minecraft/entity/ai/goal/MoveIntoWaterGoal + FIELD a owner Lahl; + METHOD a canStart ()Z + METHOD c start ()V diff --git a/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping new file mode 100644 index 0000000000..5f2fd3a6ee --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping @@ -0,0 +1,20 @@ +CLASS ajp net/minecraft/entity/ai/goal/MoveToTargetPosGoal + FIELD a speed D + FIELD b counter I + FIELD c tryingTime I + FIELD d targetPos Let; + FIELD f owner Lahl; + FIELD g safeWaitingTime I + FIELD h reached Z + FIELD j maxYDifference I + METHOD a canStart ()Z + METHOD a getInterval (Lahl;)I + METHOD a isTargetPos (Lbbt;Let;)Z + METHOD b shouldContinue ()Z + METHOD c start ()V + METHOD e tick ()V + METHOD g startMovingToTarget ()V + METHOD i getDesiredSquaredDistanceToTarget ()D + METHOD j shouldResetPath ()Z + METHOD k hasReached ()Z + METHOD l findTargetPos ()Z diff --git a/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping b/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping new file mode 100644 index 0000000000..21203de5b6 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal.mapping @@ -0,0 +1,14 @@ +CLASS ake net/minecraft/entity/ai/goal/StepAndDestroyBlockGoal + FIELD f targetBlock Lbgs; + FIELD g owner Lahf; + FIELD h counter I + METHOD a canStart ()Z + METHOD a getInterval (Lahl;)I + METHOD a onDestroyBlock (Lbbp;Let;)V + METHOD a tickStepping (Lbbq;Let;)V + METHOD a isTargetPos (Lbbt;Let;)Z + METHOD a tweakToProperPos (Let;Lbbb;)Let; + METHOD b shouldContinue ()Z + METHOD c start ()V + METHOD d onRemove ()V + METHOD e tick ()V diff --git a/mappings/net/minecraft/entity/ai/goal/VillagerBreedGoal.mapping b/mappings/net/minecraft/entity/ai/goal/VillagerBreedGoal.mapping new file mode 100644 index 0000000000..034ca595ec --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/VillagerBreedGoal.mapping @@ -0,0 +1,13 @@ +CLASS ajl net/minecraft/entity/ai/goal/VillagerBreedGoal + FIELD a owner Laqr; + FIELD b mate Laqr; + FIELD c world Lbbp; + FIELD d delay I + FIELD e foundVillage Lalq; + METHOD a canStart ()Z + METHOD b shouldContinue ()Z + METHOD c start ()V + METHOD d onRemove ()V + METHOD e tick ()V + METHOD g needsMoreVillager ()Z + METHOD i spawnBabyVillager ()V diff --git a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping index b30f5f2580..545d2eecf6 100644 --- a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping +++ b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping @@ -4,6 +4,7 @@ CLASS aph net/minecraft/entity/mob/DrownedEntity METHOD b shouldContinue ()Z CLASS aph$c METHOD a canStart ()Z + METHOD a isTargetPos (Lbbt;Let;)Z METHOD b shouldContinue ()Z METHOD c start ()V METHOD d onRemove ()V diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index c64fe9dc59..8facd34fbd 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -1,22 +1,31 @@ CLASS aqb net/minecraft/entity/mob/ShulkerEntity - CLASS aqb$a + CLASS aqb$a ShootBulletGoal + FIELD b counter I METHOD a canStart ()Z METHOD c start ()V METHOD d onRemove ()V METHOD e tick ()V - CLASS aqb$c + CLASS aqb$b + CLASS aqb$c SearchForTargetGoal METHOD a canStart ()Z + METHOD a getSearchBox (D)Lclz; + ARG 1 distance METHOD a (Lahe;)Z ARG 0 entity - CLASS aqb$d + CLASS aqb$d SearchForPlayerGoal METHOD a canStart ()Z - CLASS aqb$e + METHOD a getSearchBox (D)Lclz; + ARG 1 distance + CLASS aqb$e PeekGoal + FIELD b counter I METHOD a canStart ()Z METHOD b shouldContinue ()Z METHOD c start ()V METHOD d onRemove ()V METHOD e tick ()V FIELD a ATTACHED_FACE Lpr; + FIELD bE ATTR_COVERED_ARMOR_BONUS_UUID Ljava/util/UUID; + FIELD bF ATTR_COVERED_ARMOR_BONUS Lahu; FIELD b ATTACHED_BLOCK Lpr; FIELD c PEEK_AMOUNT Lpr; METHOD A playAmbientSound ()V diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 4ff8408f86..4e2fc35aad 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -1,4 +1,8 @@ CLASS aqm net/minecraft/entity/mob/ZombieEntity + CLASS aqm$a DestroyEggGoal + METHOD a onDestroyBlock (Lbbp;Let;)V + METHOD a tickStepping (Lbbq;Let;)V + METHOD i getDesiredSquaredDistanceToTarget ()D FIELD a BABY_SPEED_ID Ljava/util/UUID; FIELD bD BABY Lpr; FIELD bF ARMS_RAISED Lpr; diff --git a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping index bb8aeeec9e..d4da372266 100644 --- a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping @@ -1,5 +1,6 @@ CLASS amh net/minecraft/entity/passive/IronGolemEntity FIELD a IRON_GOLEM_FLAGS Lpr; + FIELD b findVillageDelay I FIELD c villageProperties Lalq; METHOD C pushAway (Lagv;)V METHOD I mobTick ()V diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index 78ee236afa..a44dc546c5 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -28,6 +28,8 @@ CLASS ane net/minecraft/entity/passive/LlamaEntity METHOD e getHurtSound (Lage;)Lxm; METHOD eh getStrength ()I METHOD ei getVariant ()I + METHOD en isFollowing ()Z + METHOD eo getFollowing ()Lane; METHOD n ()V METHOD s setArmsRaised (Z)V METHOD t setVariant (I)V diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index 468e6e8ed2..1c3c6e691c 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -12,6 +12,7 @@ CLASS amp net/minecraft/entity/passive/RabbitEntity METHOD e tick ()V CLASS amp$g METHOD a canStart ()Z + METHOD a isTargetPos (Lbbt;Let;)Z METHOD b shouldContinue ()Z METHOD e tick ()V FIELD bD RABBIT_TYPE Lpr; diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping index 003b17602d..89f190f4f4 100644 --- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping @@ -9,9 +9,12 @@ CLASS amw net/minecraft/entity/passive/TurtleEntity METHOD e tick ()V CLASS amw$c METHOD a canStart ()Z + METHOD a isTargetPos (Lbbt;Let;)Z METHOD b shouldContinue ()Z + METHOD j shouldResetPath ()Z CLASS amw$d METHOD a canStart ()Z + METHOD a isTargetPos (Lbbt;Let;)Z METHOD b shouldContinue ()Z METHOD e tick ()V CLASS amw$e TurtleMoveControl