From 6c2ce1ff41c3194d11dafb51862f25d168c90bd1 Mon Sep 17 00:00:00 2001 From: Juuxel Date: Tue, 8 Jan 2019 23:14:51 +0200 Subject: [PATCH] Falling blocks and paintings (#383) * More falling block mappings * Change some wording * Painting mappings --- mappings/net/minecraft/block/AnvilBlock.mapping | 8 ++++++-- .../net/minecraft/block/ConcretePowderBlock.mapping | 12 +++++++++++- mappings/net/minecraft/block/FallingBlock.mapping | 8 +++++--- .../network/packet/PaintingSpawnClientPacket.mapping | 4 ++++ .../net/minecraft/entity/FallingBlockEntity.mapping | 1 + .../decoration/{ => painting}/PaintingEntity.mapping | 4 ++-- .../decoration/painting}/PaintingMotive.mapping | 2 +- 7 files changed, 30 insertions(+), 9 deletions(-) rename mappings/net/minecraft/entity/decoration/{ => painting}/PaintingEntity.mapping (81%) rename mappings/net/minecraft/{sortme => entity/decoration/painting}/PaintingMotive.mapping (77%) diff --git a/mappings/net/minecraft/block/AnvilBlock.mapping b/mappings/net/minecraft/block/AnvilBlock.mapping index a44336bfc9..4c5a8ac393 100644 --- a/mappings/net/minecraft/block/AnvilBlock.mapping +++ b/mappings/net/minecraft/block/AnvilBlock.mapping @@ -15,10 +15,12 @@ CLASS bfz net/minecraft/block/AnvilBlock ARG 1 entity METHOD a getPlacementState (Laus;)Lbpm; ARG 1 ctx - METHOD a (Lbbp;Let;)V + METHOD a onDestroyedOnLanding (Lbbp;Let;)V ARG 2 pos - METHOD a (Lbbp;Let;Lbpm;Lbpm;)V + METHOD a onLanding (Lbbp;Let;Lbpm;Lbpm;)V ARG 2 pos + ARG 3 fallingBlockState + ARG 4 currentStateInPos METHOD a getBoundingShape (Lbpm;Lbbb;Let;)Lcmx; ARG 1 state ARG 2 view @@ -42,3 +44,5 @@ CLASS bfz net/minecraft/block/AnvilBlock ARG 2 rotation METHOD a appendProperties (Lbpn$a;)V ARG 1 builder + METHOD a_ getLandingState (Lbpm;)Lbpm; + ARG 0 fallingState diff --git a/mappings/net/minecraft/block/ConcretePowderBlock.mapping b/mappings/net/minecraft/block/ConcretePowderBlock.mapping index 152ff39cb0..10a88daf0f 100644 --- a/mappings/net/minecraft/block/ConcretePowderBlock.mapping +++ b/mappings/net/minecraft/block/ConcretePowderBlock.mapping @@ -1,8 +1,16 @@ CLASS bhm net/minecraft/block/ConcretePowderBlock + FIELD a hardenedState Lbpm; + METHOD (Lbgs;Lbgs$c;)V + ARG 1 hardened METHOD a getPlacementState (Laus;)Lbpm; ARG 1 ctx - METHOD a (Lbbp;Let;Lbpm;Lbpm;)V + METHOD a hardensOnAnySide (Lbbb;Let;)Z + ARG 0 view + ARG 1 pos + METHOD a onLanding (Lbbp;Let;Lbpm;Lbpm;)V ARG 2 pos + ARG 3 fallingBlockState + ARG 4 currentStateInPos METHOD a getStateForNeighborUpdate (Lbpm;Ley;Lbpm;Lbbq;Let;Let;)Lbpm; ARG 1 state ARG 2 facing @@ -10,3 +18,5 @@ CLASS bhm net/minecraft/block/ConcretePowderBlock ARG 4 world ARG 5 pos ARG 6 neighborPos + METHOD s hardensIn (Lbpm;)Z + ARG 0 state diff --git a/mappings/net/minecraft/block/FallingBlock.mapping b/mappings/net/minecraft/block/FallingBlock.mapping index 9c4e37d939..90b92d4f8a 100644 --- a/mappings/net/minecraft/block/FallingBlock.mapping +++ b/mappings/net/minecraft/block/FallingBlock.mapping @@ -4,12 +4,14 @@ CLASS bin net/minecraft/block/FallingBlock ARG 2 stateBuilder METHOD a configureFallingBlockEntity (Laox;)V ARG 1 entity - METHOD a (Lbbp;Let;)V + METHOD a onDestroyedOnLanding (Lbbp;Let;)V ARG 1 world ARG 2 pos - METHOD a (Lbbp;Let;Lbpm;Lbpm;)V + METHOD a onLanding (Lbbp;Let;Lbpm;Lbpm;)V ARG 1 world ARG 2 pos + ARG 3 fallingBlockState + ARG 4 currentStateInPos METHOD a getTickRate (Lbbt;)I ARG 1 world METHOD a onBlockAdded (Lbpm;Lbbp;Let;Lbpm;)V @@ -29,7 +31,7 @@ CLASS bin net/minecraft/block/FallingBlock ARG 4 world ARG 5 pos ARG 6 neighborPos - METHOD b (Lbbp;Let;)V + METHOD b tryStartFalling (Lbbp;Let;)V ARG 1 world ARG 2 pos METHOD b scheduledTick (Lbpm;Lbbp;Let;Ljava/util/Random;)V diff --git a/mappings/net/minecraft/client/network/packet/PaintingSpawnClientPacket.mapping b/mappings/net/minecraft/client/network/packet/PaintingSpawnClientPacket.mapping index b44dc6b5b3..c96c89fa22 100644 --- a/mappings/net/minecraft/client/network/packet/PaintingSpawnClientPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/PaintingSpawnClientPacket.mapping @@ -3,6 +3,9 @@ CLASS jz net/minecraft/client/network/packet/PaintingSpawnClientPacket FIELD b uuid Ljava/util/UUID; FIELD c pos Let; FIELD d facing Ley; + FIELD e motive I + METHOD (Laoq;)V + ARG 1 entity METHOD a read (Lit;)V ARG 1 buf METHOD a apply (Liw;)V @@ -14,3 +17,4 @@ CLASS jz net/minecraft/client/network/packet/PaintingSpawnClientPacket METHOD c getPaintingUuid ()Ljava/util/UUID; METHOD d getPos ()Let; METHOD e getFacing ()Ley; + METHOD f getMotive ()Laop; diff --git a/mappings/net/minecraft/entity/FallingBlockEntity.mapping b/mappings/net/minecraft/entity/FallingBlockEntity.mapping index c530dc5cd6..f5d0a369f5 100644 --- a/mappings/net/minecraft/entity/FallingBlockEntity.mapping +++ b/mappings/net/minecraft/entity/FallingBlockEntity.mapping @@ -7,6 +7,7 @@ CLASS aox net/minecraft/entity/FallingBlockEntity FIELD c blockEntityData Lhs; FIELD d BLOCK_POS Lpr; FIELD e block Lbpm; + FIELD f destroyedOnLanding Z METHOD (Lbbp;DDDLbpm;)V ARG 1 world ARG 2 x diff --git a/mappings/net/minecraft/entity/decoration/PaintingEntity.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping similarity index 81% rename from mappings/net/minecraft/entity/decoration/PaintingEntity.mapping rename to mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping index de4ff5d3d5..088779ff63 100644 --- a/mappings/net/minecraft/entity/decoration/PaintingEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping @@ -1,5 +1,5 @@ -CLASS aoq net/minecraft/entity/decoration/PaintingEntity - FIELD d type Laop; +CLASS aoq net/minecraft/entity/decoration/painting/PaintingEntity + FIELD d motive Laop; METHOD (Lbbp;Let;Ley;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/sortme/PaintingMotive.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingMotive.mapping similarity index 77% rename from mappings/net/minecraft/sortme/PaintingMotive.mapping rename to mappings/net/minecraft/entity/decoration/painting/PaintingMotive.mapping index 42b9767cdd..b629a007aa 100644 --- a/mappings/net/minecraft/sortme/PaintingMotive.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingMotive.mapping @@ -1,4 +1,4 @@ -CLASS aop net/minecraft/sortme/PaintingMotive +CLASS aop net/minecraft/entity/decoration/painting/PaintingMotive FIELD A width I FIELD B height I FIELD C textureX I