From 7d5de74139dfe144329771061df6dc0b9004d87c Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Sat, 18 May 2019 21:45:50 +0200 Subject: [PATCH] Block.isOpaque, Phase tick mappings (#708) --- mappings/net/minecraft/block/Block.mapping | 2 +- mappings/net/minecraft/block/BlockState.mapping | 4 ++-- .../net/minecraft/entity/boss/dragon/phase/DyingPhase.mapping | 1 + mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping | 2 ++ .../entity/boss/dragon/phase/SittingAttackingPhase.mapping | 1 + .../entity/boss/dragon/phase/SittingFlamingPhase.mapping | 1 + .../entity/boss/dragon/phase/SittingScanningPhase.mapping | 1 + 7 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 7c8264667c..7bffa38681 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -418,7 +418,7 @@ CLASS bmm net/minecraft/block/Block ARG 1 state ARG 2 view ARG 3 pos - METHOD f isFullBoundsCubeForCulling (Lbvk;)Z + METHOD f isOpaque (Lbvk;)Z ARG 1 state METHOD f getHardness (Lbvk;Lbgs;Lev;)F ARG 1 state diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 27e5225fc4..2e10a8e3a7 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -1,7 +1,7 @@ CLASS bvk net/minecraft/block/BlockState CLASS bvk$a ShapeCache FIELD a DIRECTIONS [Lfa; - FIELD b cull Z + FIELD b opaque Z FIELD c fullOpaque Z FIELD d translucent Z FIELD e lightSubtracted I @@ -198,7 +198,7 @@ CLASS bvk net/minecraft/block/BlockState METHOD n shouldPostProcess (Lbgs;Lev;)Z ARG 1 view ARG 2 pos - METHOD o isFullBoundsCubeForCulling ()Z + METHOD o isOpaque ()Z METHOD p getFluidState ()Lclb; METHOD q hasRandomTicks ()Z METHOD r getSoundGroup ()Lbrp; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/DyingPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/DyingPhase.mapping index f11a49f679..402b153ced 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/DyingPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/DyingPhase.mapping @@ -1,3 +1,4 @@ CLASS asm net/minecraft/entity/boss/dragon/phase/DyingPhase + FIELD c ticks I METHOD (Lash;)V ARG 1 dragon diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping index 55ad02b100..4b3bceee91 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping @@ -5,6 +5,8 @@ CLASS asr net/minecraft/entity/boss/dragon/phase/Phase ARG 2 pos ARG 3 source ARG 4 player + METHOD b clientTick ()V + METHOD c serverTick ()V METHOD d beginPhase ()V METHOD e endPhase ()V METHOD g getTarget ()Lcrx; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.mapping index 30551ef350..90a0d9a7f9 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase.mapping @@ -1,3 +1,4 @@ CLASS ass net/minecraft/entity/boss/dragon/phase/SittingAttackingPhase + FIELD b ticks I METHOD (Lash;)V ARG 1 dragon diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping index 059df0e4af..806c4b4de1 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase.mapping @@ -1,3 +1,4 @@ CLASS ast net/minecraft/entity/boss/dragon/phase/SittingFlamingPhase + FIELD b ticks I METHOD (Lash;)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 17388e822a..cb3ac84a61 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/SittingScanningPhase.mapping @@ -1,5 +1,6 @@ CLASS asu net/minecraft/entity/boss/dragon/phase/SittingScanningPhase FIELD b PLAYER_WITHIN_RANGE_PREDICATE Laqa; FIELD c CLOSE_PLAYER_PREDICATE Laqa; + FIELD d ticks I METHOD (Lash;)V ARG 1 dragon