From dcf8bb0e965081a644c2e4cc9cb0a360a564e05c Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Wed, 25 Mar 2020 22:49:17 +0100 Subject: [PATCH] Some block mappings (#1223) * Some block mappings * Update mappings/net/minecraft/block/Blocks.mapping Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Update Blocks.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- .../net/minecraft/block/BellBlock.mapping | 1 + mappings/net/minecraft/block/Blocks.mapping | 22 +++++++++++++++++++ .../net/minecraft/block/PistonBlock.mapping | 4 ++-- .../net/minecraft/block/TorchBlock.mapping | 2 ++ .../block/WallRedstoneTorchBlock.mapping | 2 +- .../dispenser/BoatDispenserBehavior.mapping | 2 ++ .../ProjectileDispenserBehavior.mapping | 5 +++-- 7 files changed, 33 insertions(+), 5 deletions(-) diff --git a/mappings/net/minecraft/block/BellBlock.mapping b/mappings/net/minecraft/block/BellBlock.mapping index 1c3433eff1..6f0f189453 100644 --- a/mappings/net/minecraft/block/BellBlock.mapping +++ b/mappings/net/minecraft/block/BellBlock.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_3709 net/minecraft/block/BellBlock FIELD field_17092 EAST_WALL_SHAPE Lnet/minecraft/class_265; FIELD field_17093 SOUTH_WALL_SHAPE Lnet/minecraft/class_265; FIELD field_17094 HANGING_SHAPE Lnet/minecraft/class_265; + FIELD field_20648 POWERED Lnet/minecraft/class_2746; METHOD method_16115 getPlacementSide (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2350; ARG 0 state METHOD method_16116 getShape (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index 154eb703ba..53bdbec5b3 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -1,4 +1,26 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks + METHOD method_26106 createLeavesBlock ()Lnet/minecraft/class_2397; + METHOD method_26107 createLightLevelFromBlockState (I)Ljava/util/function/ToIntFunction; + ARG 0 litLevel + METHOD method_26109 createBedBlock (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2244; + ARG 0 color + METHOD method_26110 createShulkerBoxBlock (Lnet/minecraft/class_1767;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2480; + ARG 0 color + ARG 1 settings + METHOD method_26115 createNetherStemBlock (Lnet/minecraft/class_3620;)Lnet/minecraft/class_2248; + ARG 0 materialColor + METHOD method_26117 createLogBlock (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;)Lnet/minecraft/class_2465; + ARG 0 topMaterialColor + ARG 1 sideMaterialColor + METHOD method_26119 createPistonBlock (Z)Lnet/minecraft/class_2665; + ARG 0 sticky + METHOD method_26120 createStainedGlassBlock (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2506; + ARG 0 color + METHOD method_26126 canSpawnOnLeaves (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Ljava/lang/Boolean; + ARG 0 state + ARG 1 world + ARG 2 pos + ARG 3 type METHOD method_9492 register (Ljava/lang/String;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; ARG 0 id ARG 1 block diff --git a/mappings/net/minecraft/block/PistonBlock.mapping b/mappings/net/minecraft/block/PistonBlock.mapping index 9b487cf20f..7b8810ea07 100644 --- a/mappings/net/minecraft/block/PistonBlock.mapping +++ b/mappings/net/minecraft/block/PistonBlock.mapping @@ -2,13 +2,13 @@ CLASS net/minecraft/class_2665 net/minecraft/block/PistonBlock FIELD field_12184 EXTENDED_WEST_SHAPE Lnet/minecraft/class_265; FIELD field_12185 EXTENDED_UP_SHAPE Lnet/minecraft/class_265; FIELD field_12186 EXTENDED_SOUTH_SHAPE Lnet/minecraft/class_265; - FIELD field_12187 isSticky Z + FIELD field_12187 sticky Z FIELD field_12188 EXTENDED_EAST_SHAPE Lnet/minecraft/class_265; FIELD field_12189 EXTENDED_NORTH_SHAPE Lnet/minecraft/class_265; FIELD field_12190 EXTENDED_DOWN_SHAPE Lnet/minecraft/class_265; FIELD field_12191 EXTENDED Lnet/minecraft/class_2746; METHOD (ZLnet/minecraft/class_4970$class_2251;)V - ARG 1 isSticky + ARG 1 sticky ARG 2 settings METHOD method_11481 move (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Z)Z ARG 1 world diff --git a/mappings/net/minecraft/block/TorchBlock.mapping b/mappings/net/minecraft/block/TorchBlock.mapping index c85d20bc3e..b427dc33b5 100644 --- a/mappings/net/minecraft/block/TorchBlock.mapping +++ b/mappings/net/minecraft/block/TorchBlock.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_2527 net/minecraft/block/TorchBlock FIELD field_11618 BOUNDING_SHAPE Lnet/minecraft/class_265; + FIELD field_22155 particle Lnet/minecraft/class_2394; METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_2394;)V ARG 1 settings + ARG 2 particle diff --git a/mappings/net/minecraft/block/WallRedstoneTorchBlock.mapping b/mappings/net/minecraft/block/WallRedstoneTorchBlock.mapping index fca5522682..9f27ab1927 100644 --- a/mappings/net/minecraft/block/WallRedstoneTorchBlock.mapping +++ b/mappings/net/minecraft/block/WallRedstoneTorchBlock.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_2458 net/minecraft/block/WallRedstoneTorchBlock FIELD field_11443 FACING Lnet/minecraft/class_2753; - FIELD field_11444 LIT_2 Lnet/minecraft/class_2746; + FIELD field_11444 LIT Lnet/minecraft/class_2746; diff --git a/mappings/net/minecraft/block/dispenser/BoatDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/BoatDispenserBehavior.mapping index 6e2162d232..f489e8005e 100644 --- a/mappings/net/minecraft/block/dispenser/BoatDispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/BoatDispenserBehavior.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2967 net/minecraft/block/dispenser/BoatDispenserBehavior FIELD field_13360 itemDispenser Lnet/minecraft/class_2347; FIELD field_13361 boatType Lnet/minecraft/class_1690$class_1692; + METHOD (Lnet/minecraft/class_1690$class_1692;)V + ARG 1 type diff --git a/mappings/net/minecraft/block/dispenser/ProjectileDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/ProjectileDispenserBehavior.mapping index 7ab911363b..8c4fb6f7e3 100644 --- a/mappings/net/minecraft/block/dispenser/ProjectileDispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/ProjectileDispenserBehavior.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2965 net/minecraft/block/dispenser/ProjectileDispenserBehavior METHOD method_12844 createProjectile (Lnet/minecraft/class_1937;Lnet/minecraft/class_2374;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1676; - ARG 1 position - ARG 2 stack + ARG 1 world + ARG 2 position + ARG 3 stack METHOD method_12845 getVariation ()F METHOD method_12846 getForce ()F