From 8b51f948f8de6ed96436520c634d86dcc23102fb Mon Sep 17 00:00:00 2001 From: frqnny <45723631+frqnny@users.noreply.github.com> Date: Wed, 20 Apr 2022 08:21:20 -0400 Subject: [PATCH] A few entity mappings (#3095) * A few entity mappings * Remove WorldAccess changes as they appear to be already applied * a tiny amount of more mappings * a tinsy itsy bit of changes --- mappings/net/minecraft/entity/Entity.mapping | 1 + mappings/net/minecraft/entity/LivingEntity.mapping | 7 +++++++ mappings/net/minecraft/entity/ai/brain/Schedule.mapping | 1 + .../ai/brain/sensor/AxolotlAttackablesSensor.mapping | 1 + .../ai/brain/sensor/NearestLivingEntitiesSensor.mapping | 2 ++ .../entity/ai/brain/sensor/WardenAttackablesSensor.mapping | 3 +++ .../net/minecraft/entity/ai/brain/task/CroakTask.mapping | 2 ++ .../entity/ai/brain/task/FindPointOfInterestTask.mapping | 1 + .../entity/ai/brain/task/ForgetAttackTargetTask.mapping | 2 ++ .../entity/ai/brain/task/LayFrogSpawnTask.mapping | 2 ++ .../minecraft/entity/ai/brain/task/LongJumpTask.mapping | 1 + .../minecraft/entity/ai/brain/task/SeekWaterTask.mapping | 1 + .../net/minecraft/entity/ai/brain/task/SniffTask.mapping | 2 ++ .../entity/ai/brain/task/VillagerTaskListProvider.mapping | 1 + .../entity/ai/brain/task/WalkTowardsLandTask.mapping | 2 ++ .../entity/ai/brain/task/WalkTowardsWaterTask.mapping | 1 + .../net/minecraft/entity/ai/control/MoveControl.mapping | 4 ++++ .../net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping | 1 + .../net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping | 1 + .../net/minecraft/entity/ai/goal/FollowParentGoal.mapping | 1 + .../net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping | 3 +++ .../minecraft/entity/ai/pathing/LandPathNodeMaker.mapping | 1 + .../minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping | 6 ++++++ .../entity/boss/dragon/phase/SittingFlamingPhase.mapping | 2 ++ .../entity/boss/dragon/phase/SittingScanningPhase.mapping | 3 +++ mappings/net/minecraft/entity/damage/DamageTracker.mapping | 2 ++ mappings/net/minecraft/entity/data/DataTracker.mapping | 2 ++ mappings/net/minecraft/entity/mob/PathAwareEntity.mapping | 1 + mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping | 5 ++++- mappings/net/minecraft/entity/passive/AllayBrain.mapping | 2 +- mappings/net/minecraft/entity/passive/TadpoleBrain.mapping | 2 +- .../net/minecraft/entity/projectile/ArrowEntity.mapping | 3 +++ .../entity/projectile/DragonFireballEntity.mapping | 1 + .../entity/projectile/ShulkerBulletEntity.mapping | 2 +- .../entity/vehicle/AbstractMinecartEntity.mapping | 1 + mappings/net/minecraft/entity/vehicle/BoatEntity.mapping | 7 +++++++ .../entity/vehicle/CommandBlockMinecartEntity.mapping | 1 + 37 files changed, 77 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 8c7b807db7..2f2281f9bf 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT The factor by which an entity's speed is reduced every tick. COMMENT

COMMENT For example: {@code horizontalSpeed = velocity.horizontalSpeed() * FRICTION_RATE} + FIELD field_29974 MIN_RISING_BUBBLE_COLUMN_SPEED F FIELD field_29975 SNEAKING_FLAG_INDEX I FIELD field_29976 SPRINTING_FLAG_INDEX I FIELD field_29977 SWIMMING_FLAG_INDEX I diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 407ce093f6..6c8867f2cc 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -11,7 +11,14 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_30064 USING_ITEM_FLAG I FIELD field_30065 OFF_HAND_ACTIVE_FLAG I FIELD field_30066 USING_RIPTIDE_FLAG I + FIELD field_30068 BABY_SCALE_FACTOR F + FIELD field_30071 EQUIPMENT_SLOT_ID I + FIELD field_30073 GLOWING_FLAG I + FIELD field_30076 GRAVITY D + FIELD field_30077 DEATH_TICKS I + FIELD field_30079 FALL_FLYING_FLAG I FIELD field_30082 noDrag Z + FIELD field_33908 MAX_ENTITY_VIEWING_DISTANCE D FIELD field_37421 experienceDroppingDisabled Z FIELD field_6210 bodyTrackingIncrements I FIELD field_6211 lastLimbDistance F diff --git a/mappings/net/minecraft/entity/ai/brain/Schedule.mapping b/mappings/net/minecraft/entity/ai/brain/Schedule.mapping index b6b94d2d8f..cfe7df0a07 100644 --- a/mappings/net/minecraft/entity/ai/brain/Schedule.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Schedule.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_4170 net/minecraft/entity/ai/brain/Schedule FIELD field_18605 VILLAGER_BABY Lnet/minecraft/class_4170; FIELD field_18606 VILLAGER_DEFAULT Lnet/minecraft/class_4170; FIELD field_18607 scheduleRules Ljava/util/Map; + FIELD field_30692 WORK_TIME I METHOD method_19213 getActivityForTime (I)Lnet/minecraft/class_4168; ARG 1 time METHOD method_19215 addActivity (Lnet/minecraft/class_4168;)V diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/AxolotlAttackablesSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/AxolotlAttackablesSensor.mapping index 3120c0ffed..bf98d69285 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/AxolotlAttackablesSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/AxolotlAttackablesSensor.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_6044 net/minecraft/entity/ai/brain/sensor/AxolotlAttackablesSensor + FIELD field_30248 TARGET_RANGE F METHOD method_35144 canHunt (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z ARG 1 axolotl ARG 2 target diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor.mapping index 80075dc9d3..ea5e6bd580 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_4146 net/minecraft/entity/ai/brain/sensor/NearestLivingEntitiesSensor METHOD method_19097 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z ARG 1 e + METHOD method_43081 getHorizontalExpansion ()I + METHOD method_43082 getHeightExpansion ()I diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/WardenAttackablesSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/WardenAttackablesSensor.mapping index 2b1df95db0..721fab659e 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/WardenAttackablesSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/WardenAttackablesSensor.mapping @@ -3,3 +3,6 @@ CLASS net/minecraft/class_7252 net/minecraft/entity/ai/brain/sensor/WardenAttack ARG 1 entity METHOD method_42166 (Lnet/minecraft/class_1309;)Z ARG 0 entity + METHOD method_43086 findNearestTarget (Lnet/minecraft/class_7260;Ljava/util/function/Predicate;)Ljava/util/Optional; + ARG 0 warden + ARG 1 targetPredicate diff --git a/mappings/net/minecraft/entity/ai/brain/task/CroakTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/CroakTask.mapping index 3ed148a5dd..b19842c187 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/CroakTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/CroakTask.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_7095 net/minecraft/entity/ai/brain/task/CroakTask + FIELD field_37424 MAX_RUN_TICK I + FIELD field_37425 RUN_TIME I FIELD field_37426 runningTicks I diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping index d1cef8090c..ea76e377ab 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInt FIELD field_25602 nextScheduledAttemptAt J FIELD field_25603 currentDelay I FIELD field_30101 MIN_DELAY I + FIELD field_30102 MAX_EXTRA_DELAY I FIELD field_30103 ATTEMPT_DURATION I METHOD (Lnet/minecraft/class_5819;J)V ARG 1 random diff --git a/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping index c6dc172d02..d6342f31ff 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/ForgetAttackTargetTask.mapping @@ -2,10 +2,12 @@ CLASS net/minecraft/class_4828 net/minecraft/entity/ai/brain/task/ForgetAttackTa FIELD field_22329 alternativeCondition Ljava/util/function/Predicate; FIELD field_30177 REMEMBER_TIME I FIELD field_30178 forgetCallback Ljava/util/function/BiConsumer; + FIELD field_38102 shouldForgetIfTargetUnreachable Z METHOD (Ljava/util/function/Predicate;)V ARG 1 alternativeCondition METHOD (Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;Z)V ARG 1 condition + ARG 3 shouldForgetIfTargetUnreachable METHOD method_24621 cannotReachTarget (Lnet/minecraft/class_1309;)Z ARG 0 entity METHOD method_24622 isAttackTargetInAnotherWorld (Lnet/minecraft/class_1308;)Z diff --git a/mappings/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.mapping index 5cd47ab8f6..4210df5819 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LayFrogSpawnTask.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_7099 net/minecraft/entity/ai/brain/task/LayFrogSpawnTask FIELD field_37440 frogSpawn Lnet/minecraft/class_2248; + FIELD field_37441 triggerMemory Lnet/minecraft/class_4140; METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4140;)V ARG 1 frogSpawn + ARG 2 triggerMemory diff --git a/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping index 555dce3a51..b54fb1826e 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_6030 net/minecraft/entity/ai/brain/task/LongJumpTask FIELD field_30145 cooldown I FIELD field_30146 targetTime J FIELD field_33460 entityToSound Ljava/util/function/Function; + FIELD field_37431 RAM_RANGES Ljava/util/List; FIELD field_37432 jumpToPredicate Ljava/util/function/Predicate; METHOD (Lnet/minecraft/class_6019;IIFLjava/util/function/Function;)V ARG 1 cooldownRange diff --git a/mappings/net/minecraft/entity/ai/brain/task/SeekWaterTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/SeekWaterTask.mapping index 3737af4c9c..5ca70f3686 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/SeekWaterTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/SeekWaterTask.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_5756 net/minecraft/entity/ai/brain/task/SeekWaterTask FIELD field_28317 range I FIELD field_28318 speed F + FIELD field_33759 seekWaterTime J METHOD (IF)V ARG 1 range ARG 2 speed diff --git a/mappings/net/minecraft/entity/ai/brain/task/SniffTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/SniffTask.mapping index 04c76e0152..e939361340 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/SniffTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/SniffTask.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_7251 net/minecraft/entity/ai/brain/task/SniffTask + FIELD field_38708 HORIZONTAL_RADIUS D + FIELD field_38848 VERTICAL_RADIUS D diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping index b323faf6e9..0b1ed41d22 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_4129 net/minecraft/entity/ai/brain/task/VillagerTaskListProvider + FIELD field_30189 JOB_WALKING_SPEED F METHOD method_19020 createCoreTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; ARG 0 profession ARG 1 speed diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLandTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLandTask.mapping index 8c1adee447..90b783bb89 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLandTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLandTask.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_7097 net/minecraft/entity/ai/brain/task/WalkTowardsLandTask + FIELD field_37433 TASK_COOLDOWN I FIELD field_37434 range I FIELD field_37435 speed F + FIELD field_37436 walkTowardsLandTime J METHOD (IF)V ARG 1 range ARG 2 speed diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsWaterTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsWaterTask.mapping index 0749eeb442..9597068a5b 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsWaterTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsWaterTask.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_7098 net/minecraft/entity/ai/brain/task/WalkTowardsWaterTask FIELD field_37437 range I FIELD field_37438 speed F + FIELD field_37439 walkTowardsWaterTime J METHOD (IF)V ARG 1 range ARG 2 speed diff --git a/mappings/net/minecraft/entity/ai/control/MoveControl.mapping b/mappings/net/minecraft/entity/ai/control/MoveControl.mapping index e04adf51b1..1ec67ecc4f 100644 --- a/mappings/net/minecraft/entity/ai/control/MoveControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/MoveControl.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1335 net/minecraft/entity/ai/control/MoveControl + FIELD field_30198 REACHED_DESTINATION_DISTANCE_SQUARED F FIELD field_6367 targetZ D FIELD field_6368 forwardMovement F FIELD field_6369 targetY D @@ -9,6 +10,9 @@ CLASS net/minecraft/class_1335 net/minecraft/entity/ai/control/MoveControl FIELD field_6374 state Lnet/minecraft/class_1335$class_1336; METHOD (Lnet/minecraft/class_1308;)V ARG 1 entity + METHOD method_25946 isPosWalkable (FF)Z + ARG 1 x + ARG 2 z METHOD method_6235 getTargetY ()D METHOD method_6236 getTargetX ()D METHOD method_6237 getTargetZ ()D diff --git a/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping index 17f30bf68e..3085f0c5c7 100644 --- a/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1374 net/minecraft/entity/ai/goal/EscapeDangerGoal FIELD field_23227 active Z + FIELD field_36271 RANGE_Y I FIELD field_6546 targetY D FIELD field_6547 targetX D FIELD field_6548 speed D diff --git a/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping index 4a043c927d..75d8b34a77 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowOwnerGoal.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1350 net/minecraft/entity/ai/goal/FollowOwnerGoal FIELD field_21078 leavesAllowed Z + FIELD field_30205 TELEPORT_DISTANCE I FIELD field_30206 HORIZONTAL_RANGE I FIELD field_30207 HORIZONTAL_VARIATION I FIELD field_30208 VERTICAL_VARIATION I diff --git a/mappings/net/minecraft/entity/ai/goal/FollowParentGoal.mapping b/mappings/net/minecraft/entity/ai/goal/FollowParentGoal.mapping index 0049770a5d..6089ee5309 100644 --- a/mappings/net/minecraft/entity/ai/goal/FollowParentGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/FollowParentGoal.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1353 net/minecraft/entity/ai/goal/FollowParentGoal FIELD field_30209 HORIZONTAL_CHECK_RANGE I FIELD field_30210 VERTICAL_CHECK_RANGE I + FIELD field_30211 MIN_DISTANCE I FIELD field_6452 parent Lnet/minecraft/class_1429; FIELD field_6453 speed D FIELD field_6454 delay I diff --git a/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping b/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping index ec05027ad2..c613ecf1a0 100644 --- a/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/LookAtEntityGoal.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_1361 net/minecraft/entity/ai/goal/LookAtEntityGoal FIELD field_18087 targetPredicate Lnet/minecraft/class_4051; + FIELD field_33760 DEFAULT_CHANCE F + FIELD field_33761 lookForward Z FIELD field_6481 chance F FIELD field_6482 range F FIELD field_6483 lookTime I @@ -20,5 +22,6 @@ CLASS net/minecraft/class_1361 net/minecraft/entity/ai/goal/LookAtEntityGoal ARG 2 targetType ARG 3 range ARG 4 chance + ARG 5 lookForward METHOD method_18414 (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)Z ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping index 83bd1d2bf2..e7f25042b5 100644 --- a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker ARG 4 zDiagNode METHOD method_37003 getFeetY (Lnet/minecraft/class_2338;)D ARG 1 pos + METHOD method_37004 isAmphibious ()Z METHOD method_58 getCommonNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping index 724d587bd9..396bb8762d 100644 --- a/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping @@ -1,4 +1,10 @@ CLASS net/minecraft/class_12 net/minecraft/entity/ai/pathing/WaterPathNodeMaker + FIELD field_34767 nodePosToType Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_58 canJumpOutOfWater Z METHOD (Z)V ARG 1 canJumpOutOfWater + METHOD method_38487 hasNotVisited (Lnet/minecraft/class_9;)Z + METHOD method_38489 addPathNodePos (III)Lnet/minecraft/class_7; + ARG 1 x + ARG 2 y + ARG 3 z diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping index 2e8d621cf4..33ff73a44b 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_1523 net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase FIELD field_30433 DURATION I + FIELD field_30434 MAX_TIMES_RUN I + FIELD field_30435 DRAGON_BREATH_MAX_TICK I FIELD field_7051 dragonBreathEntity Lnet/minecraft/class_1295; FIELD field_7052 timesRun I FIELD field_7053 ticks I diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping index da6706b626..209ef04231 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_1522 net/minecraft/entity/boss/dragon/phase/SittingSca FIELD field_18123 PLAYER_WITHIN_RANGE_PREDICATE Lnet/minecraft/class_4051; FIELD field_18124 CLOSE_PLAYER_PREDICATE Lnet/minecraft/class_4051; FIELD field_30436 DURATION I + FIELD field_30437 MAX_HEIGHT_CLOSE_PLAYER_RANGE I + FIELD field_30438 MAX_HORIZONTAL_CLOSE_PLAYER_RANGE I + FIELD field_30439 MAX_PLAYER_RANGE I FIELD field_7050 ticks I METHOD method_18447 (Lnet/minecraft/class_1510;Lnet/minecraft/class_1309;)Z ARG 1 player diff --git a/mappings/net/minecraft/entity/damage/DamageTracker.mapping b/mappings/net/minecraft/entity/damage/DamageTracker.mapping index 7c2ab0368c..2f8e9551ab 100644 --- a/mappings/net/minecraft/entity/damage/DamageTracker.mapping +++ b/mappings/net/minecraft/entity/damage/DamageTracker.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1283 net/minecraft/entity/damage/DamageTracker + FIELD field_29967 DAMAGE_COOLDOWN I + FIELD field_29968 ATTACK_DAMAGE_COOLDOWN I FIELD field_5870 recentDamage Ljava/util/List; FIELD field_5871 fallDeathSuffix Ljava/lang/String; FIELD field_5872 hasDamage Z diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index 5f3ad7a080..afbc3e0357 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker FIELD field_13333 trackedEntity Lnet/minecraft/class_1297; FIELD field_13334 LOGGER Lorg/slf4j/Logger; FIELD field_13335 lock Ljava/util/concurrent/locks/ReadWriteLock; + FIELD field_33377 END_PACKET_WRITE I + FIELD field_33378 MAX_DATA_VALUE_ID I METHOD (Lnet/minecraft/class_1297;)V ARG 1 trackedEntity METHOD method_12776 addTrackedData (Lnet/minecraft/class_2940;Ljava/lang/Object;)V diff --git a/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping b/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping index 82f64c1b9f..68ab86160b 100644 --- a/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PathAwareEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1314 net/minecraft/entity/mob/PathAwareEntity + FIELD field_35670 DEFAULT_PATHFINDING_FAVOR F METHOD method_6142 updateForLeashLength (F)V ARG 1 leashLength METHOD method_6144 getPathfindingFavor (Lnet/minecraft/class_2338;Lnet/minecraft/class_4538;)F diff --git a/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping index 624daf9bf8..09179e2eb9 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping @@ -4,8 +4,9 @@ CLASS net/minecraft/class_5420 net/minecraft/entity/mob/PiglinBruteBrain METHOD method_30248 isTarget (Lnet/minecraft/class_5418;Lnet/minecraft/class_1309;)Z ARG 0 piglin ARG 1 entity - METHOD method_30249 (Lnet/minecraft/class_5418;Lnet/minecraft/class_4140;)Ljava/util/Optional; + METHOD method_30249 getTargetIfInRange (Lnet/minecraft/class_5418;Lnet/minecraft/class_4140;)Ljava/util/Optional; ARG 0 piglin + ARG 1 targetMemoryModule METHOD method_30250 setCurrentPosAsHome (Lnet/minecraft/class_5419;)V ARG 0 piglinBrute METHOD method_30251 tryRevenge (Lnet/minecraft/class_5419;Lnet/minecraft/class_1309;)V @@ -16,6 +17,8 @@ CLASS net/minecraft/class_5420 net/minecraft/entity/mob/PiglinBruteBrain ARG 1 brain METHOD method_30253 (Lnet/minecraft/class_5419;Lnet/minecraft/class_4168;)V ARG 1 activity + METHOD method_30255 (Lnet/minecraft/class_5418;Lnet/minecraft/class_1309;)Z + ARG 1 target METHOD method_30256 tick (Lnet/minecraft/class_5419;)V ARG 0 piglinBrute METHOD method_30257 addCoreActivities (Lnet/minecraft/class_5419;Lnet/minecraft/class_4095;)V diff --git a/mappings/net/minecraft/entity/passive/AllayBrain.mapping b/mappings/net/minecraft/entity/passive/AllayBrain.mapping index 1ee9c754e7..3c7ae81e6b 100644 --- a/mappings/net/minecraft/entity/passive/AllayBrain.mapping +++ b/mappings/net/minecraft/entity/passive/AllayBrain.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_7299 net/minecraft/entity/passive/AllayBrain ARG 1 pos METHOD method_42660 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 brain - METHOD method_42661 resetIdleActivities (Lnet/minecraft/class_7298;)V + METHOD method_42661 updateActivities (Lnet/minecraft/class_7298;)V ARG 0 allay METHOD method_42662 getLikedLookTarget (Lnet/minecraft/class_1309;)Ljava/util/Optional; ARG 0 allay diff --git a/mappings/net/minecraft/entity/passive/TadpoleBrain.mapping b/mappings/net/minecraft/entity/passive/TadpoleBrain.mapping index f5223846ba..af0dc41fb8 100644 --- a/mappings/net/minecraft/entity/passive/TadpoleBrain.mapping +++ b/mappings/net/minecraft/entity/passive/TadpoleBrain.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_7111 net/minecraft/entity/passive/TadpoleBrain METHOD method_41400 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 brain - METHOD method_41401 (Lnet/minecraft/class_7110;)V + METHOD method_41401 updateActivities (Lnet/minecraft/class_7110;)V ARG 0 tadpole METHOD method_41402 addCoreActivities (Lnet/minecraft/class_4095;)V ARG 0 brain diff --git a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping index e79736fa99..4adfd1a3af 100644 --- a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1667 net/minecraft/entity/projectile/ArrowEntity + FIELD field_30658 NO_POTION_COLOR I + FIELD field_30659 PARTICLE_EFFECT_STATUS B + FIELD field_30660 MAX_POTION_DURATION_TICKS I FIELD field_7595 COLOR Lnet/minecraft/class_2940; FIELD field_7596 colorSet Z FIELD field_7597 potion Lnet/minecraft/class_1842; diff --git a/mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping index 553cdfa1bf..a4a4cd7fb0 100644 --- a/mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/DragonFireballEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1670 net/minecraft/entity/projectile/DragonFireballEntity + FIELD field_30661 DAMAGE_RANGE F METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;DDD)V ARG 1 world ARG 2 owner diff --git a/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping index 3d75d2ce0d..bb959dddae 100644 --- a/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_1678 net/minecraft/entity/projectile/ShulkerBulletEnti ARG 3 target ARG 4 axis METHOD method_35208 getDirection ()Lnet/minecraft/class_2350; - METHOD method_7486 (Lnet/minecraft/class_2350$class_2351;)V + METHOD method_7486 changeTargetDirection (Lnet/minecraft/class_2350$class_2351;)V ARG 1 axis METHOD method_7487 setDirection (Lnet/minecraft/class_2350;)V ARG 1 direction diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index ed6531c5f9..e56223afac 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEntity FIELD field_24464 DISMOUNT_FREE_Y_SPACES_NEEDED Lcom/google/common/collect/ImmutableMap; + FIELD field_30694 VELOCITY_SLOWDOWN_MULTIPLIER F FIELD field_7655 clientYVelocity D FIELD field_7656 clientZVelocity D FIELD field_7657 clientPitch D diff --git a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping index bc173a7e8c..2c6c88dedc 100644 --- a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity + FIELD field_30696 NEXT_PADDLE_PHASE F + FIELD field_30699 EMIT_SOUND_EVENT_PADDLE_ROTATION D + COMMENT A boat will emit a sound event every time a paddle is near this rotation. FIELD field_7684 boatPitch D FIELD field_7685 z D FIELD field_7686 x D @@ -28,6 +31,7 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity FIELD field_7711 lastBubbleWobble F FIELD field_7712 bubbleWobbleStrength F FIELD field_7713 RIGHT_PADDLE_MOVING Lnet/minecraft/class_2940; + FIELD field_7714 nearbySlipperiness F METHOD (Lnet/minecraft/class_1937;DDD)V ARG 1 world ARG 2 x @@ -65,11 +69,13 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity METHOD method_7542 setDamageWobbleStrength (F)V ARG 1 wobbleStrength METHOD method_7543 getDamageWobbleSide ()I + METHOD method_7544 getWaterHeightBelow ()F METHOD method_7545 checkBoatInWater ()Z METHOD method_7546 copyEntityData (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_7547 interpolateBubbleWobble (F)F ARG 1 tickDelta + METHOD method_7548 getNearbySlipperiness ()F METHOD method_7549 updatePaddles ()V METHOD method_7550 handleBubbleColumn ()V METHOD method_7551 interpolatePaddlePhase (IF)F @@ -79,6 +85,7 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity METHOD method_7553 setDamageWobbleTicks (I)V ARG 1 wobbleTicks METHOD method_7554 getDamageWobbleStrength ()F + METHOD method_7555 updatePositionAndRotation ()V METHOD method_7556 isPaddleMoving (I)Z ARG 1 paddle METHOD method_7557 asItem ()Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.mapping index 347cea5858..da2449db00 100644 --- a/mappings/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1697 net/minecraft/entity/vehicle/CommandBlockMinecartEntity + FIELD field_30701 EXECUTE_TICK_COOLDOWN I FIELD field_7741 LAST_OUTPUT Lnet/minecraft/class_2940; FIELD field_7742 lastExecuted I FIELD field_7743 COMMAND Lnet/minecraft/class_2940;