From 1a226534c8df5d595a663a1a8b7fd73f2607de6c Mon Sep 17 00:00:00 2001 From: Eli Orona Date: Wed, 17 Mar 2021 11:46:42 -0700 Subject: [PATCH] Finish mappings for dragon and dragon fight (#2142) * Finish mappings for dragon and dragon fight * Update mappings/net/minecraft/entity/LivingEntity.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update SittingFlamingPhase.mapping * Update HoldingPatternPhase.mapping * Update TakeoffPhase.mapping * Update mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/LivingEntity.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> * Update mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> * Update ChargingPlayerPhase.mapping * Update HoldingPatternPhase.mapping * Update LandingApproachPhase.mapping * Update StrafePlayerPhase.mapping * Update TakeoffPhase.mapping * Update ChargingPlayerPhase.mapping * Update mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- mappings/net/minecraft/entity/LivingEntity.mapping | 2 ++ .../entity/boss/dragon/EnderDragonEntity.mapping | 9 +++++++-- .../boss/dragon/phase/ChargingPlayerPhase.mapping | 7 ++++--- .../boss/dragon/phase/HoldingPatternPhase.mapping | 6 +++++- .../boss/dragon/phase/LandingApproachPhase.mapping | 5 ++++- .../minecraft/entity/boss/dragon/phase/Phase.mapping | 3 ++- .../boss/dragon/phase/SittingFlamingPhase.mapping | 2 ++ .../entity/boss/dragon/phase/StrafePlayerPhase.mapping | 10 +++++++++- .../entity/boss/dragon/phase/TakeoffPhase.mapping | 6 +++++- 9 files changed, 40 insertions(+), 10 deletions(-) diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 7bef432349..6f962e9d61 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -224,6 +224,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_32326 getPreferredEquipmentSlot (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1304; ARG 0 stack METHOD method_33190 canTakeDamage ()Z + METHOD method_33579 readFromPacket (Lnet/minecraft/class_2610;)V + ARG 1 packet METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping index 1892c701a1..fc307e9d68 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntity FIELD field_18120 CLOSE_PLAYER_PREDICATE Lnet/minecraft/class_4051; + FIELD field_20865 yawAcceleration F FIELD field_7008 pathHeap Lnet/minecraft/class_5; FIELD field_7009 partTail2 Lnet/minecraft/class_1508; FIELD field_7010 latestSegment I @@ -25,10 +26,12 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit COMMENT (yaw, y, ?) FIELD field_7027 slowedDownByBlock Z FIELD field_7028 phaseManager Lnet/minecraft/class_1526; + FIELD field_7029 damageDuringSitting I FIELD field_7030 wingPosition F FIELD field_7031 ticksSinceDeath I FIELD field_7032 parts [Lnet/minecraft/class_1508; METHOD method_22863 movePart (Lnet/minecraft/class_1508;DDD)V + ARG 1 enderDragonPart ARG 2 dx ARG 4 dy ARG 6 dz @@ -45,12 +48,14 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit METHOD method_6819 parentDamage (Lnet/minecraft/class_1282;F)Z ARG 1 source ARG 2 amount + METHOD method_6820 getHeadVerticalMovement ()F METHOD method_6821 destroyBlocks (Lnet/minecraft/class_238;)Z + ARG 1 box METHOD method_6822 getNearestPathNodeIndex (DDD)I ARG 1 x ARG 3 y ARG 5 z - METHOD method_6823 (I[D[D)F + METHOD method_6823 getChangeInNeckPitch (I[D[D)F ARG 1 segmentOffset ARG 2 segment1 ARG 3 segment2 @@ -79,5 +84,5 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit ARG 1 from ARG 2 to ARG 3 pathNode - METHOD method_6834 (F)Lnet/minecraft/class_243; + METHOD method_6834 getRotationVectorFromPhase (F)Lnet/minecraft/class_243; ARG 1 tickDelta diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping index 6f33f36745..3bc1e755d0 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1513 net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase - FIELD field_7038 target Lnet/minecraft/class_243; + FIELD field_7037 chargingTicks I + FIELD field_7038 pathTarget Lnet/minecraft/class_243; FIELD field_7039 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_6840 setTarget (Lnet/minecraft/class_243;)V - ARG 1 target + METHOD method_6840 setPathTarget (Lnet/minecraft/class_243;)V + ARG 1 pathTarget diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping index 66edadc122..8c0c54be68 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_1517 net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase FIELD field_18121 PLAYERS_IN_RANGE_PREDICATE Lnet/minecraft/class_4051; - FIELD field_7045 target Lnet/minecraft/class_243; + FIELD field_7043 path Lnet/minecraft/class_11; + FIELD field_7044 shouldFindNewPath Z + FIELD field_7045 pathTarget Lnet/minecraft/class_243; + METHOD method_6841 tickInRange ()V + METHOD method_6842 followPath ()V METHOD method_6843 strafePlayer (Lnet/minecraft/class_1657;)V ARG 1 player diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping index 476c9106e3..07620aace0 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_1519 net/minecraft/entity/boss/dragon/phase/LandingApproachPhase FIELD field_18122 PLAYERS_IN_RANGE_PREDICATE Lnet/minecraft/class_4051; - FIELD field_7048 target Lnet/minecraft/class_243; + FIELD field_7047 path Lnet/minecraft/class_11; + FIELD field_7048 pathTarget Lnet/minecraft/class_243; + METHOD method_6844 updatePath ()V + METHOD method_6845 followPath ()V diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping index ca00e1a71e..fa51dccf1a 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1521 net/minecraft/entity/boss/dragon/phase/Phase METHOD method_6846 getMaxYAcceleration ()F + METHOD method_6847 getYawAcceleration ()F METHOD method_6848 isSittingOrHovering ()Z METHOD method_6849 getType ()Lnet/minecraft/class_1527; METHOD method_6850 crystalDestroyed (Lnet/minecraft/class_1511;Lnet/minecraft/class_2338;Lnet/minecraft/class_1282;Lnet/minecraft/class_1657;)V @@ -7,7 +8,7 @@ CLASS net/minecraft/class_1521 net/minecraft/entity/boss/dragon/phase/Phase ARG 2 pos ARG 3 source ARG 4 player - METHOD method_6851 getTarget ()Lnet/minecraft/class_243; + METHOD method_6851 getPathTarget ()Lnet/minecraft/class_243; METHOD method_6852 modifyDamageTaken (Lnet/minecraft/class_1282;F)F ARG 1 damageSource ARG 2 damage diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping index 68f93bc8ac..08cab9c397 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_1523 net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase FIELD field_7051 dragonBreathEntity Lnet/minecraft/class_1295; + FIELD field_7052 timesRun I FIELD field_7053 ticks I + METHOD method_6857 reset ()V diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping index 1a11b82b65..0cdacf2494 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping @@ -1,3 +1,11 @@ CLASS net/minecraft/class_1525 net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase - FIELD field_7057 target Lnet/minecraft/class_243; + FIELD field_7057 pathTarget Lnet/minecraft/class_243; + FIELD field_7058 shouldFindNewPath Z + FIELD field_7059 path Lnet/minecraft/class_11; + FIELD field_7060 seenTargetTimes I FIELD field_7061 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_7062 target Lnet/minecraft/class_1309; + METHOD method_6860 updatePath ()V + METHOD method_6861 followPath ()V + METHOD method_6862 setTargetEntity (Lnet/minecraft/class_1309;)V + ARG 1 targetEntity diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.mapping index abc3e539ef..ffe6a85571 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.mapping @@ -1,2 +1,6 @@ CLASS net/minecraft/class_1524 net/minecraft/entity/boss/dragon/phase/TakeoffPhase - FIELD field_7055 target Lnet/minecraft/class_243; + FIELD field_7054 path Lnet/minecraft/class_11; + FIELD field_7055 pathTarget Lnet/minecraft/class_243; + FIELD field_7056 shouldFindNewPath Z + METHOD method_6858 updatePath ()V + METHOD method_6859 followPath ()V