diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 0f0f5e4b92..f1b097b017 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -70,6 +70,7 @@ CLASS ahz net/minecraft/entity/Entity FIELD z collided Z METHOD (Laid;Lbgv;)V ARG 1 type + ARG 2 world METHOD E updatePortalCooldown ()V METHOD N createSpawnPacket ()Lka; METHOD R detach ()V diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index fe590377a5..93e475d3b0 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/ai/TargetPredicate.mapping b/mappings/net/minecraft/entity/ai/TargetPredicate.mapping index eba5dc93f7..a3f1f0fdeb 100644 --- a/mappings/net/minecraft/entity/ai/TargetPredicate.mapping +++ b/mappings/net/minecraft/entity/ai/TargetPredicate.mapping @@ -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; diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor.mapping index fdd54db8a3..5aa0f4155a 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor.mapping @@ -1 +1,2 @@ CLASS apg net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor + FIELD b CLOSE_ENTITY_PREDICATE Lapp; diff --git a/mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping b/mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping index a2e53835e7..1acf4bdaa9 100644 --- a/mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/AnimalMateGoal.mapping @@ -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 (Laqh;D)V ARG 1 owner + ARG 2 chance + METHOD (Laqh;DLjava/lang/Class;)V + ARG 2 chance + ARG 4 entityClass METHOD h findMate ()Laqh; diff --git a/mappings/net/minecraft/entity/ai/goal/AvoidGoal.mapping b/mappings/net/minecraft/entity/ai/goal/AvoidGoal.mapping index 6ceb49c8cb..fccf6ea0fe 100644 --- a/mappings/net/minecraft/entity/ai/goal/AvoidGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/AvoidGoal.mapping @@ -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; diff --git a/mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping index 777d11d68f..f5cea028b2 100644 --- a/mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FleeEntityGoal.mapping @@ -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 (Laip;Ljava/lang/Class;FDD)V + ARG 1 fleeingEntity + ARG 2 classToFleeFrom + ARG 3 fleeDistance + ARG 4 fleeSlowSpeed + ARG 6 fleeFastSpeed + METHOD (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 (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 diff --git a/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping index ba6baa7451..8444a755f2 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowTargetGoal.mapping @@ -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 (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 (Laij;Ljava/lang/Class;Z)V + ARG 2 targetEntityClass + ARG 3 checkVisibility + METHOD (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 diff --git a/mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping b/mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping index 7f808d749f..ecb969eb24 100644 --- a/mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/IronGolemLookGoal.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping b/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping index 1d3dbfdbd3..e902ed1365 100644 --- a/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping @@ -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 (Laij;Ljava/lang/Class;F)V diff --git a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping index ca1bf404da..9fdaf54d97 100644 --- a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping @@ -1 +1,2 @@ CLASS anv net/minecraft/entity/ai/goal/TemptGoal + FIELD c CLOSE_PLAYER_PREDICATE Lapp; diff --git a/mappings/net/minecraft/entity/ai/goal/TrackTargetGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TrackTargetGoal.mapping index 22d77a3415..0a52e71d51 100644 --- a/mappings/net/minecraft/entity/ai/goal/TrackTargetGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/TrackTargetGoal.mapping @@ -9,6 +9,7 @@ CLASS aom net/minecraft/entity/ai/goal/TrackTargetGoal FIELD h maxTimeWithoutVisibility I METHOD (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 diff --git a/mappings/net/minecraft/entity/ai/goal/WolfBegGoal.mapping b/mappings/net/minecraft/entity/ai/goal/WolfBegGoal.mapping index 6818e5d56c..b980e4bd50 100644 --- a/mappings/net/minecraft/entity/ai/goal/WolfBegGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/WolfBegGoal.mapping @@ -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 (Larg;F)V ARG 1 owner + ARG 2 begDistance + METHOD a isAttractive (Lavm;)Z diff --git a/mappings/net/minecraft/entity/boss/WitherEntity.mapping b/mappings/net/minecraft/entity/boss/WitherEntity.mapping index 2250021abb..9152ceaa6c 100644 --- a/mappings/net/minecraft/entity/boss/WitherEntity.mapping +++ b/mappings/net/minecraft/entity/boss/WitherEntity.mapping @@ -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; diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping index 010ce68eda..9c54fae145 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping @@ -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; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping index def8a016d4..3d14ac1823 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping @@ -1,3 +1,4 @@ CLASS asc net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase + FIELD b PLAYERS_IN_RANGE_PREDICATE Lapp; METHOD (Larw;)V ARG 1 dragon diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping index 6ae69d0901..15e34c0b29 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping @@ -1,3 +1,4 @@ CLASS ase net/minecraft/entity/boss/dragon/phase/LandingApproachPhase + FIELD b PLAYERS_IN_RANGE_PREDICATE Lapp; METHOD (Larw;)V ARG 1 dragon diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping index d7433041c3..5c49514ec7 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping @@ -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 (Larw;)V ARG 1 dragon diff --git a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping index 69ffb3f2df..585593709f 100644 --- a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping +++ b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index 2eebbbcfd3..31df4c77b4 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -1,11 +1,35 @@ CLASS atp net/minecraft/entity/mob/EndermanEntity + CLASS atp$a ChasePlayerGoal + FIELD a endermanEntity Latp; + METHOD (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 (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 diff --git a/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping b/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping index 550bee9bd9..6556cf0f4f 100644 --- a/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/mob/EvokerEntity.mapping b/mappings/net/minecraft/entity/mob/EvokerEntity.mapping index 9e0dd8fcc2..7a5e7cda36 100644 --- a/mappings/net/minecraft/entity/mob/EvokerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EvokerEntity.mapping @@ -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; diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index a7739f3d87..09473c7bf4 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping index 3a860724cb..407b0ed7f6 100644 --- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping b/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping index 32a2acf33c..f40a3125c3 100644 --- a/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping @@ -1 +1,2 @@ CLASS aui net/minecraft/entity/mob/SilverfishEntity + FIELD b CLOSE_PLAYER_PREDICATE Lapp; diff --git a/mappings/net/minecraft/entity/mob/VexEntity.mapping b/mappings/net/minecraft/entity/mob/VexEntity.mapping index dd63c7cddc..0d3850ddc3 100644 --- a/mappings/net/minecraft/entity/mob/VexEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VexEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/passive/BatEntity.mapping b/mappings/net/minecraft/entity/passive/BatEntity.mapping index 6cd58bfee3..ace63e280c 100644 --- a/mappings/net/minecraft/entity/passive/BatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BatEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping index b47a946950..8188f7d9df 100644 --- a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping +++ b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping @@ -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; diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 89175aca16..3b518b36a5 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index 06390b02de..afcb445b28 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index ad78c0e5e4..e4ed7bc22a 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -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 (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; diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping index 32fdc5fed3..9e32e96f7c 100644 --- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping @@ -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; diff --git a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping index 141a7683f8..955e3dbe4a 100644 --- a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping +++ b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping @@ -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 (Lawr;Lath;F)V + ARG 2 raiderEntity ARG 3 distance CLASS awr$b PickupBannerAsLeaderGoal CLASS awr$c CelebrateGoal diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping index ed65bdc875..79dcafe5d7 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping @@ -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; diff --git a/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping b/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping index e7ee04b6b3..0172faeb2f 100644 --- a/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping +++ b/mappings/net/minecraft/sortme/MobSpawnerLogic.mapping @@ -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 diff --git a/mappings/net/minecraft/world/EntityView.mapping b/mappings/net/minecraft/world/EntityView.mapping index 6b51ed781f..67be9f88eb 100644 --- a/mappings/net/minecraft/world/EntityView.mapping +++ b/mappings/net/minecraft/world/EntityView.mapping @@ -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 diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index 4a055120bb..3f7248ceb7 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -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;