TargetPredicate + Misc mappings (#577)

* TargetPredicate: Add some argument mappings

* MobSpawnerLogic: Add method mappings

* EntityPredicates: Add getBottommostEntity mapping

If anyone has a better name please let me know

* LivingEntity: Add mapping for teleport method

* AnimalMateGoal: add some mappings

* AvoidGoal: add setMobEntityTarget mapping

* FleeEntityGoal: add many mappings

* FollowTargetGoal: Add many mappings

* IronGolemLookGoal: Add mappings

* TrackTargetGoal: Add argument mapping

* WolfBegGoal: Add mappings

This also changes an incorrect mapping

* EndermanEntity: Add many mappings

* MobEntity: Add looking and angle mappings

* EntityView: Add a bunch of mappings

* MobSpawnerLogic: Add playerInRange method

* CreeperEntity: add some mappings

* Explosion: map DestructionType

* Add various entity mappings

* DolphinEntity: Clarify field

* HorseBaseEntity: add pathToAdult method

* PandaEntity: add some mappings

* TurtleEntity: Add some mappings

* RaiderEntity: Add some mappings

* Describe ALL of the predicates!

I've tried to give each predicate a descriptive name, instead of just naming all
of them, "targetPredicate"

* Fixup names of some mappings

* AvoidGoal: Use better predicate name

* FleeEntityGoal: Use better predicate name, more mappings
This commit is contained in:
Jonathan Frederick 2019-04-03 08:43:01 -07:00 committed by Modmuss50
parent 52007e3ee1
commit d4d42f2976
37 changed files with 209 additions and 3 deletions

View File

@ -70,6 +70,7 @@ CLASS ahz net/minecraft/entity/Entity
FIELD z collided Z
METHOD <init> (Laid;Lbgv;)V
ARG 1 type
ARG 2 world
METHOD E updatePortalCooldown ()V
METHOD N createSpawnPacket ()Lka;
METHOD R detach ()V

View File

@ -41,11 +41,18 @@ CLASS aii net/minecraft/entity/LivingEntity
METHOD C attack (Lahz;)Z
METHOD D pushAway (Lahz;)V
METHOD E canSee (Lahz;)Z
METHOD a teleport (DDDZ)Z
ARG 1 x
ARG 3 y
ARG 5 z
ARG 7 particleEffects
METHOD a swingHand (Lagt;)V
METHOD a setStackInHand (Lagt;Lbbp;)V
ARG 1 hand
METHOD a onDeath (Lahi;)V
METHOD a dropEquipment (Lahi;IZ)V
ARG 2 addedDropChance
ARG 3 dropAllowed
METHOD a dropLoot (Lahi;Z)V
ARG 1 source
ARG 2 killedByPlayer

View File

@ -9,8 +9,12 @@ CLASS app net/minecraft/entity/ai/TargetPredicate
FIELD h predicate Ljava/util/function/Predicate;
METHOD a includeInvulnerable ()Lapp;
METHOD a setBaseMaxDistance (D)Lapp;
ARG 1 baseMaxDistance
METHOD a test (Laii;Laii;)Z
ARG 1 baseEntity
ARG 2 targetEntity
METHOD a setPredicate (Ljava/util/function/Predicate;)Lapp;
ARG 1 predicate
METHOD b includeTeammates ()Lapp;
METHOD c includeHidden ()Lapp;
METHOD d ignoreEntityTargetRules ()Lapp;

View File

@ -1 +1,2 @@
CLASS apg net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor
FIELD b CLOSE_ENTITY_PREDICATE Lapp;

View File

@ -2,8 +2,14 @@ CLASS aly net/minecraft/entity/ai/goal/AnimalMateGoal
FIELD a owner Laqh;
FIELD b world Lbgv;
FIELD c mate Laqh;
FIELD d VALID_MATE_PREDICATE Lapp;
FIELD e entityClass Ljava/lang/Class;
FIELD f timer I
FIELD g chance D
METHOD <init> (Laqh;D)V
ARG 1 owner
ARG 2 chance
METHOD <init> (Laqh;DLjava/lang/Class;)V
ARG 2 chance
ARG 4 entityClass
METHOD h findMate ()Laqh;

View File

@ -1,3 +1,5 @@
CLASS aof net/minecraft/entity/ai/goal/AvoidGoal
FIELD a VALID_AVOIDABLES_PREDICATE Lapp;
FIELD i avoidedEntities [Ljava/lang/Class;
METHOD a setMobEntityTarget (Laij;Laii;)V
METHOD a setAvoidedEntities ([Ljava/lang/Class;)Laof;

View File

@ -1 +1,28 @@
CLASS alt net/minecraft/entity/ai/goal/FleeEntityGoal
FIELD a fleeingEntity Laip;
FIELD b targetEntity Laii;
FIELD c fleeDistance F
FIELD d fleePath Lcmr;
FIELD e fleeingEntityNavigation Laox;
FIELD f classToFleeFrom Ljava/lang/Class;
FIELD i fleeSlowSpeed D
FIELD j fleeFastSpeed D
FIELD k withinRangePredicate Lapp;
METHOD <init> (Laip;Ljava/lang/Class;FDD)V
ARG 1 fleeingEntity
ARG 2 classToFleeFrom
ARG 3 fleeDistance
ARG 4 fleeSlowSpeed
ARG 6 fleeFastSpeed
METHOD <init> (Laip;Ljava/lang/Class;FDDLjava/util/function/Predicate;)V
ARG 1 fleeingEntity
ARG 2 classToFleeFrom
ARG 3 fleeDistance
ARG 4 fleeSlowSpeed
ARG 6 fleeFastSpeed
METHOD <init> (Laip;Ljava/lang/Class;Ljava/util/function/Predicate;FDDLjava/util/function/Predicate;)V
ARG 1 fleeingEntity
ARG 2 classToFleeFrom
ARG 4 fleeDistance
ARG 5 fleeSlowSpeed
ARG 7 fleeFastSpeed

View File

@ -1,4 +1,21 @@
CLASS aog net/minecraft/entity/ai/goal/FollowTargetGoal
FIELD a targetClass Ljava/lang/Class;
FIELD b reciprocalChance I
FIELD c targetEntity Laii;
FIELD d targetPredicate Lapp;
METHOD <init> (Laij;Ljava/lang/Class;IZZLjava/util/function/Predicate;)V
ARG 2 targetEntityClass
ARG 3 reciprocalChance
ARG 4 checkVisibility
ARG 5 checkCanNavigate
ARG 6 targetPredicate
METHOD <init> (Laij;Ljava/lang/Class;Z)V
ARG 2 targetEntityClass
ARG 3 checkVisibility
METHOD <init> (Laij;Ljava/lang/Class;ZZ)V
ARG 2 targetEntityClass
ARG 3 checkVisibility
ARG 4 checkCanNavigate
METHOD a getSearchBox (D)Lcrb;
ARG 1 distance
METHOD g findClosestTarget ()V

View File

@ -1 +1,5 @@
CLASS and net/minecraft/entity/ai/goal/IronGolemLookGoal
FIELD a CLOSE_VILLAGER_PREDICATE Lapp;
FIELD b ironGolemEntity Laqp;
FIELD c targetVillager Lauz;
FIELD d lookCountdown I

View File

@ -3,6 +3,7 @@ CLASS amu net/minecraft/entity/ai/goal/LookAtEntityGoal
FIELD b target Lahz;
FIELD c range F
FIELD d targetType Ljava/lang/Class;
FIELD e targetPredicate Lapp;
FIELD f lookTime I
FIELD g chance F
METHOD <init> (Laij;Ljava/lang/Class;F)V

View File

@ -1 +1,2 @@
CLASS anv net/minecraft/entity/ai/goal/TemptGoal
FIELD c CLOSE_PLAYER_PREDICATE Lapp;

View File

@ -9,6 +9,7 @@ CLASS aom net/minecraft/entity/ai/goal/TrackTargetGoal
FIELD h maxTimeWithoutVisibility I
METHOD <init> (Laij;ZZ)V
ARG 2 checkVisibility
ARG 3 checkNavigable
METHOD a setMaxTimeWithoutVisibility (I)Laom;
METHOD a canNavigateToEntity (Laii;)Z
METHOD a canTrack (Laii;Lapp;)Z

View File

@ -2,7 +2,10 @@ CLASS alu net/minecraft/entity/ai/goal/WolfBegGoal
FIELD a owner Larg;
FIELD b begFrom Lavm;
FIELD c world Lbgv;
FIELD d chance F
FIELD d begDistance F
FIELD e timer I
FIELD f validPlayerPredicate Lapp;
METHOD <init> (Larg;F)V
ARG 1 owner
ARG 2 begDistance
METHOD a isAttractive (Lavm;)Z

View File

@ -1,5 +1,6 @@
CLASS asq net/minecraft/entity/boss/WitherEntity
FIELD bA INVUL_TIMER Lqg;
FIELD bB HEAD_TARGET_PREDICATE Lapp;
FIELD b TRACKED_ENTITY_ID_1 Lqg;
FIELD c TRACKED_ENTITY_ID_2 Lqg;
FIELD d TRACKED_ENTITY_ID_3 Lqg;

View File

@ -9,6 +9,7 @@ CLASS arw net/minecraft/entity/boss/dragon/EnderDragonEntity
FIELD bH partWingLeft Laru;
FIELD b PHASE_TYPE Lqg;
FIELD bN LOGGER Lorg/apache/logging/log4j/Logger;
FIELD bO CLOSE_PLAYER_PREDICATE Lapp;
FIELD bP fight Lbxu;
FIELD bQ phaseManager Lasn;
FIELD bz parts [Laru;

View File

@ -1,3 +1,4 @@
CLASS asc net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase
FIELD b PLAYERS_IN_RANGE_PREDICATE Lapp;
METHOD <init> (Larw;)V
ARG 1 dragon

View File

@ -1,3 +1,4 @@
CLASS ase net/minecraft/entity/boss/dragon/phase/LandingApproachPhase
FIELD b PLAYERS_IN_RANGE_PREDICATE Lapp;
METHOD <init> (Larw;)V
ARG 1 dragon

View File

@ -1,3 +1,5 @@
CLASS asj net/minecraft/entity/boss/dragon/phase/SittingScanningPhase
FIELD b PLAYER_WITHIN_RANGE_PREDICATE Lapp;
FIELD c CLOSE_PLAYER_PREDICATE Lapp;
METHOD <init> (Larw;)V
ARG 1 dragon

View File

@ -1,11 +1,14 @@
CLASS atl net/minecraft/entity/mob/CreeperEntity
FIELD bA currentFuseTime I
FIELD bB fuseTime I
FIELD bC explosionRadius I
FIELD bD headsDropped I
FIELD b FUSE_SPEED Lqg;
FIELD bz lastFuseTime I
FIELD c CHARGED Lqg;
FIELD d IGNITED Lqg;
METHOD a setFuseSpeed (I)V
ARG 1 fuseSpeed
METHOD dQ getFuseSpeed ()I
METHOD dR getIgnited ()Z
METHOD dS setIgnited ()V
@ -14,3 +17,5 @@ CLASS atl net/minecraft/entity/mob/CreeperEntity
METHOD dV explode ()V
METHOD dX spawnEffectsCloud ()V
METHOD l isCharged ()Z
METHOD v getClientFuseTime (F)F
ARG 1 timeDelta

View File

@ -1,11 +1,35 @@
CLASS atp net/minecraft/entity/mob/EndermanEntity
CLASS atp$a ChasePlayerGoal
FIELD a endermanEntity Latp;
METHOD <init> (Latp;)V
ARG 1 endermanEntity
CLASS atp$b PlaceBlockGoal
FIELD a owner Latp;
CLASS atp$c TeleportTowardsPlayerGoal
FIELD i endermanEntity Latp;
FIELD j targetPlayer Lavm;
FIELD k lookAtPlayerWarmup I
FIELD l ticksSinceUnseenTeleport I
FIELD m staringPlayerPredicate Lapp;
FIELD n validTargetPredicate Lapp;
METHOD <init> (Latp;)V
ARG 1 endermanEntity
METHOD a (Latp;Laii;)Z
ARG 1 playerEntity
CLASS atp$d PickUpBlockGoal
FIELD a owner Latp;
FIELD bA PLAYER_ENDERMITE_PREDICATE Ljava/util/function/Predicate;
FIELD bC ageWhenTargetSet I
FIELD bz ANGRY Lqg;
FIELD d CARRIED_BLOCK Lqg;
METHOD a teleportTo (Lahz;)Z
ARG 1 targetEntity
METHOD b setCarriedBlock (Lbuw;)V
METHOD dQ teleportRandomly ()Z
METHOD dR getCarriedBlock ()Lbuw;
METHOD dS isAngry ()Z
METHOD f isPlayerStaring (Lavm;)Z
METHOD k teleport (DDD)Z
ARG 1 x
ARG 3 y
ARG 5 z

View File

@ -1,4 +1,5 @@
CLASS atq net/minecraft/entity/mob/EndermiteEntity
FIELD b CLOSE_PLAYER_PREDICATE Lapp;
FIELD c lifeTime I
FIELD d playerSpawned Z
METHOD l isPlayerSpawned ()Z

View File

@ -6,6 +6,7 @@ CLASS ats net/minecraft/entity/mob/EvokerEntity
ARG 5 warmup
CLASS ats$b LookAtTargetOrWololoTarget
CLASS ats$c SummonVexGoal
FIELD e closeVexPredicate Lapp;
CLASS ats$d WololoGoal
FIELD e purpleSheepPredicate Lapp;
FIELD bz wololoTarget Laqz;

View File

@ -33,9 +33,20 @@ CLASS aij net/minecraft/entity/mob/MobEntity
METHOD H cannotDespawn ()Z
METHOD I checkDespawn ()V
METHOD K mobTick ()V
METHOD a changeAngle (FFF)F
ARG 1 oldAngle
ARG 2 newAngle
ARG 3 maxChangeInAngle
METHOD a initEquipment (Lags;)V
METHOD a lookAtEntity (Lahz;FF)V
ARG 1 targetEntity
ARG 2 maxYawChange
ARG 3 maxPitchChange
METHOD a setEquipmentDropChance (Laie;F)V
ARG 1 slot
METHOD a getEquipmentForSlot (Laie;I)Lbbk;
ARG 0 equipmentSlot
ARG 1 equipmentLevel
METHOD a pickUp (Late;)V
ARG 1 item
METHOD a canBeLeashedBy (Lavm;)Z

View File

@ -1,5 +1,7 @@
CLASS aub net/minecraft/entity/mob/PhantomEntity
CLASS aub$a PhantomMovementType
CLASS aub$b
FIELD b PLAYERS_IN_RANGE_PREDICATE Lapp;
CLASS aub$d PhantomBodyControl
CLASS aub$f PhantomLookControl
CLASS aub$g PhantomMoveControl

View File

@ -1 +1,2 @@
CLASS aui net/minecraft/entity/mob/SilverfishEntity
FIELD b CLOSE_PLAYER_PREDICATE Lapp;

View File

@ -1,6 +1,7 @@
CLASS auo net/minecraft/entity/mob/VexEntity
CLASS auo$a ChargeTargetGoal
CLASS auo$b TrackOwnerTargetGoal
FIELD b TRACK_OWNER_PREDICATE Lapp;
CLASS auo$c VexMoveControl
CLASS auo$d LookAtTargetGoal
FIELD bA lifeTicks I

View File

@ -1,4 +1,5 @@
CLASS aqc net/minecraft/entity/passive/BatEntity
FIELD b BAT_FLAGS Lqg;
FIELD c CLOSE_PLAYER_PREDICATE Lapp;
METHOD l isRoosting ()Z
METHOD r setRoosting (Z)V

View File

@ -1,3 +1,6 @@
CLASS aqm net/minecraft/entity/passive/DolphinEntity
CLASS aqm$a DolphinMoveControl
FIELD i dolphin Laqm;
CLASS aqm$c
FIELD a dolphinEntity Laqm;
FIELD bA CLOSE_PLAYER_PREDICATE Lapp;

View File

@ -7,6 +7,7 @@ CLASS aqo net/minecraft/entity/passive/FoxEntity
FIELD a timer I
CLASS aqo$c WorriableEntityFilter
CLASS aqo$d CalmDownGoal
FIELD b WORRIABLE_ENTITY_PREDICATE Lapp;
METHOD g isAtFavoredLocation ()Z
METHOD h canCalmDown ()Z
CLASS aqo$e MateGoal

View File

@ -2,6 +2,7 @@ CLASS ari net/minecraft/entity/passive/HorseBaseEntity
FIELD bE items Lagz;
FIELD bF temper I
FIELD bJ IS_BRED_HORSE Ljava/util/function/Predicate;
FIELD bK PARENT_HORSE_PREDICATE Lapp;
FIELD bL HORSE_FLAGS Lqg;
FIELD bM OWNER_UUID Lqg;
FIELD bz JUMP_STRENGTH Laiy;
@ -18,6 +19,7 @@ CLASS ari net/minecraft/entity/passive/HorseBaseEntity
METHOD ee isBred ()Z
METHOD ef getTemper ()I
METHOD ek isSaddled ()Z
METHOD em walkToParent ()V
METHOD ep playJumpSound ()V
METHOD g putPlayerOnBack (Lavm;)V
METHOD r getHorseFlag (I)Z

View File

@ -19,6 +19,12 @@ CLASS aqs net/minecraft/entity/passive/PandaEntity
METHOD c isRecessive ()Z
CLASS aqs$c PandaFleeGoal
CLASS aqs$d PandaMateGoal
FIELD d CLOSE_PLAYER_PREDICATE Lapp;
FIELD e pandaEntity Laqs;
METHOD <init> (Laqs;D)V
ARG 1 pandaEntity
ARG 2 chance
METHOD h isBambooClose ()Z
CLASS aqs$e SpawnData
CLASS aqs$i PandaMoveControl
FIELD i panda Laqs;

View File

@ -1,8 +1,13 @@
CLASS are net/minecraft/entity/passive/TurtleEntity
CLASS are$a TurtleMateGoal
FIELD d turtleEntity Lare;
CLASS are$e TurtleMoveControl
FIELD i turtle Lare;
CLASS are$g TurtleSwimNavigation
CLASS are$i
FIELD a CLOSE_PLAYER_PREDICATE Lapp;
FIELD b turtleEntity Lare;
FIELD d targetPlayer Lavm;
FIELD bA HOME_POS Lqg;
FIELD bB HAS_EGG Lqg;
FIELD bE TRAVEL_POS Lqg;

View File

@ -1,8 +1,10 @@
CLASS awr net/minecraft/entity/raid/RaiderEntity
CLASS awr$a PatrolApproachGoal
FIELD a targetPredicate Lapp;
FIELD a closeRaiderPredicate Lapp;
FIELD c raiderEntity Lawr;
FIELD d squaredDistance F
METHOD <init> (Lawr;Lath;F)V
ARG 2 raiderEntity
ARG 3 distance
CLASS awr$b PickupBannerAsLeaderGoal
CLASS awr$c CelebrateGoal

View File

@ -9,3 +9,4 @@ CLASS aic net/minecraft/predicate/entity/EntityPredicates
FIELD f EXCEPT_SPECTATOR Ljava/util/function/Predicate;
METHOD a maximumDistance (DDDD)Ljava/util/function/Predicate;
ARG 0 x
METHOD b getBottommostEntity (Lahz;)Ljava/util/function/Predicate;

View File

@ -11,9 +11,14 @@ CLASS bgd net/minecraft/sortme/MobSpawnerLogic
FIELD l requiredPlayerRange I
FIELD m spawnRange I
METHOD a getWorld ()Lbgv;
METHOD a spawnEntity (Lahz;)V
METHOD a setEntityId (Laid;)V
METHOD a setSpawnEntry (Lbhj;)V
METHOD a deserialize (Lib;)V
METHOD b getPos ()Lev;
METHOD b serialize (Lib;)Lib;
METHOD c update ()V
METHOD d getRenderedEntity ()Lahz;
METHOD g getEntityId ()Lqr;
METHOD h isPlayerInRange ()Z
METHOD i updateSpawns ()V

View File

@ -1,5 +1,29 @@
CLASS bgn net/minecraft/world/EntityView
METHOD A getPlayers ()Ljava/util/List;
METHOD a getClosestPlayer (DDD)Lavm;
ARG 1 x
ARG 3 z
ARG 5 maxDistance
METHOD a isPlayerInRange (DDDD)Z
ARG 1 x
ARG 3 y
ARG 5 z
ARG 7 range
METHOD a getClosestPlayer (DDDDLjava/util/function/Predicate;)Lavm;
ARG 1 x
ARG 3 y
ARG 5 z
ARG 7 maxDistance
ARG 9 targetPredicate
METHOD a getClosestPlayer (DDDDZ)Lavm;
ARG 1 x
ARG 3 y
ARG 5 z
ARG 7 maxDistance
ARG 9 ignoreCreative
METHOD a getClosestPlayer (Lahz;D)Lavm;
ARG 1 entity
ARG 2 maxDistance
METHOD a getEntities (Lahz;Lcrb;)Ljava/util/List;
ARG 1 except
ARG 2 box
@ -13,5 +37,33 @@ CLASS bgn net/minecraft/world/EntityView
ARG 1 entity
ARG 2 entityBoundingBox
ARG 3 otherEntities
METHOD a getEntities (Ljava/lang/Class;Lcrb;Ljava/util/function/Predicate;)Ljava/util/List;
METHOD a getClosestPlayer (Lapp;DDD)Lavm;
ARG 2 x
ARG 4 y
ARG 6 z
METHOD a getClosestPlayer (Lapp;Laii;)Lavm;
METHOD a getClosestPlayer (Lapp;Laii;DDD)Lavm;
ARG 3 x
ARG 5 y
ARG 7 z
METHOD a getPlayersInBox (Lapp;Laii;Lcrb;)Ljava/util/List;
METHOD a getClosestEntity (Ljava/lang/Class;Lapp;Laii;DDDLcrb;)Laii;
ARG 1 entityClass
ARG 4 x
ARG 6 y
ARG 8 z
METHOD a getEntitiesInBox (Ljava/lang/Class;Lapp;Laii;Lcrb;)Ljava/util/List;
ARG 1 entityClass
METHOD a getEntitiesInBox (Ljava/lang/Class;Lcrb;)Ljava/util/List;
ARG 1 entityClass
ARG 2 boundingBox
METHOD a getEntitiesInBox (Ljava/lang/Class;Lcrb;Ljava/util/function/Predicate;)Ljava/util/List;
ARG 1 except
ARG 2 boundingBox
METHOD a getClosestEntity (Ljava/util/List;Lapp;Laii;DDD)Laii;
ARG 1 entityList
ARG 4 x
ARG 6 y
ARG 8 z
METHOD b getPlayerByUuid (Ljava/util/UUID;)Lavm;
ARG 1 uuid

View File

@ -1,4 +1,5 @@
CLASS bgo net/minecraft/world/explosion/Explosion
CLASS bgo$a DestructionType
FIELD a createFire Z
FIELD b blockDestructionType Lbgo$a;
FIELD c random Ljava/util/Random;