From c96828595353f03f9b0a4f04733d8075a970294c Mon Sep 17 00:00:00 2001 From: Noah van der Aa Date: Fri, 28 Jan 2022 21:10:24 +0100 Subject: [PATCH] Map some fields and params based around the dragon battle (#2985) * Map some fields and params based around the dragon battle * SPAWN_HEIGHT -> SPAWN_Y Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../net/minecraft/entity/boss/dragon/EnderDragonFight.mapping | 3 +++ .../minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping | 1 + .../entity/boss/dragon/phase/ChargingPlayerPhase.mapping | 1 + .../entity/boss/dragon/phase/SittingAttackingPhase.mapping | 1 + .../entity/boss/dragon/phase/SittingFlamingPhase.mapping | 1 + .../entity/boss/dragon/phase/SittingScanningPhase.mapping | 3 +++ .../entity/boss/dragon/phase/StrafePlayerPhase.mapping | 1 + 7 files changed, 11 insertions(+) diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping index 6c8bfb1ae9..46241e25d4 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping @@ -17,8 +17,11 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight FIELD field_13120 dragonSpawnState Lnet/minecraft/class_2876; FIELD field_13121 gateways Ljava/util/List; FIELD field_13122 playerUpdateTimer I + FIELD field_31442 SPAWN_Y I FIELD field_31443 CHECK_DRAGON_SEEN_INTERVAL I FIELD field_31444 CRYSTAL_COUNTING_INTERVAL I + FIELD field_31446 ISLAND_SIZE I + FIELD field_31447 PLAYER_COUNTING_INTERVAL I METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2487;)V ARG 1 world ARG 2 gatewaysSeed diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping index ac4fa2f110..f75a7713fa 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping @@ -3,4 +3,5 @@ CLASS net/minecraft/class_2876 net/minecraft/entity/boss/dragon/EnderDragonSpawn ARG 1 world ARG 2 fight ARG 3 crystals + ARG 4 tick ARG 5 pos diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping index d83ca1663b..3791d00703 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1513 net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase + FIELD field_30431 DURATION I FIELD field_7037 chargingTicks I FIELD field_7038 pathTarget Lnet/minecraft/class_243; FIELD field_7039 LOGGER Lorg/slf4j/Logger; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.mapping index bef85fac5e..eed20dbf31 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_1520 net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase + FIELD field_30432 DURATION I FIELD field_7049 ticks I diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping index 08cab9c397..2e8d621cf4 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1523 net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase + FIELD field_30433 DURATION 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 d367d688e4..da6706b626 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1522 net/minecraft/entity/boss/dragon/phase/SittingScanningPhase 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_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/boss/dragon/phase/StrafePlayerPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping index 304e10d30e..93cffec5b5 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1525 net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase + FIELD field_30440 MINIMUM_TARGET_SPOT_AMOUNT I FIELD field_7057 pathTarget Lnet/minecraft/class_243; FIELD field_7058 shouldFindNewPath Z FIELD field_7059 path Lnet/minecraft/class_11;