From 82d2c760d9eb8189f2b5e4daa3149dce56e9ee37 Mon Sep 17 00:00:00 2001 From: copygirl Date: Fri, 19 Aug 2016 15:24:13 +0200 Subject: [PATCH] Additional Block mapping changes --- mappings/net/minecraft/block/Block.mapping | 4 ++-- mappings/net/minecraft/block/{impl => }/BlockFence.mapping | 2 +- mappings/net/minecraft/block/{impl => }/BlockOre.mapping | 2 +- .../block/{BlockWindow.mapping => BlockPane.mapping} | 2 +- .../{impl/BlockWallCobblestone.mapping => BlockWall.mapping} | 2 +- .../impl/{BlockMushroom.mapping => BlockMushroomHuge.mapping} | 2 +- ...{BlockPlantMushroom.mapping => BlockMushroomPlant.mapping} | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename mappings/net/minecraft/block/{impl => }/BlockFence.mapping (90%) rename mappings/net/minecraft/block/{impl => }/BlockOre.mapping (86%) rename mappings/net/minecraft/block/{BlockWindow.mapping => BlockPane.mapping} (92%) rename mappings/net/minecraft/block/{impl/BlockWallCobblestone.mapping => BlockWall.mapping} (94%) rename mappings/net/minecraft/block/impl/{BlockMushroom.mapping => BlockMushroomHuge.mapping} (92%) rename mappings/net/minecraft/block/impl/{BlockPlantMushroom.mapping => BlockMushroomPlant.mapping} (74%) diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 686984228a..1641ef278c 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -8,7 +8,7 @@ CLASS none/akw net/minecraft/block/Block FIELD i blockstateList Lnone/cx; FIELD j FULL_BLOCK_BOX Lnone/bcp; FIELD k NULL_BOX Lnone/bcp; - FIELD o lightLevel I + FIELD o lightEmissionLevel I FIELD q hardness F FIELD t tickRandomly Z FIELD u hasTileEntity Z @@ -23,7 +23,7 @@ CLASS none/akw net/minecraft/block/Block ARG 1 color METHOD a getTranslationKey ()Ljava/lang/String; METHOD a setLightEmission (F)Lnone/akw; - ARG 0 light + ARG 0 emission METHOD a deserializeState (I)Lnone/asj; ARG 0 meta METHOD a register (ILjava/lang/String;Lnone/akw;)V diff --git a/mappings/net/minecraft/block/impl/BlockFence.mapping b/mappings/net/minecraft/block/BlockFence.mapping similarity index 90% rename from mappings/net/minecraft/block/impl/BlockFence.mapping rename to mappings/net/minecraft/block/BlockFence.mapping index a6045f8965..533319a942 100644 --- a/mappings/net/minecraft/block/impl/BlockFence.mapping +++ b/mappings/net/minecraft/block/BlockFence.mapping @@ -1,4 +1,4 @@ -CLASS none/amn net/minecraft/block/impl/BlockFence +CLASS none/amn net/minecraft/block/BlockFence METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z METHOD a addBoundingBoxes (Lnone/asj;Lnone/aiu;Lnone/cn;Lnone/bcp;Ljava/util/List;Lnone/se;)V METHOD a applyMirror (Lnone/asj;Lnone/anw;)Lnone/asj; diff --git a/mappings/net/minecraft/block/impl/BlockOre.mapping b/mappings/net/minecraft/block/BlockOre.mapping similarity index 86% rename from mappings/net/minecraft/block/impl/BlockOre.mapping rename to mappings/net/minecraft/block/BlockOre.mapping index 21ebcf346b..10d1effd08 100644 --- a/mappings/net/minecraft/block/impl/BlockOre.mapping +++ b/mappings/net/minecraft/block/BlockOre.mapping @@ -1,4 +1,4 @@ -CLASS none/aom net/minecraft/block/impl/BlockOre +CLASS none/aom net/minecraft/block/BlockOre METHOD (Lnone/ayp;)V ARG 0 color METHOD a getDropAmount (Ljava/util/Random;)I diff --git a/mappings/net/minecraft/block/BlockWindow.mapping b/mappings/net/minecraft/block/BlockPane.mapping similarity index 92% rename from mappings/net/minecraft/block/BlockWindow.mapping rename to mappings/net/minecraft/block/BlockPane.mapping index 7a517f76fa..f51ed8654e 100644 --- a/mappings/net/minecraft/block/BlockWindow.mapping +++ b/mappings/net/minecraft/block/BlockPane.mapping @@ -1,4 +1,4 @@ -CLASS none/aqj net/minecraft/block/BlockWindow +CLASS none/aqj net/minecraft/block/BlockPane FIELD a harvestable Z METHOD (Lnone/ayo;Z)V ARG 0 material diff --git a/mappings/net/minecraft/block/impl/BlockWallCobblestone.mapping b/mappings/net/minecraft/block/BlockWall.mapping similarity index 94% rename from mappings/net/minecraft/block/impl/BlockWallCobblestone.mapping rename to mappings/net/minecraft/block/BlockWall.mapping index a7fcaebb73..d17800da16 100644 --- a/mappings/net/minecraft/block/impl/BlockWallCobblestone.mapping +++ b/mappings/net/minecraft/block/BlockWall.mapping @@ -1,4 +1,4 @@ -CLASS none/aqq net/minecraft/block/impl/BlockWallCobblestone +CLASS none/aqq net/minecraft/block/BlockWall CLASS none/aqq$a Variant FIELD a NORMAL Lnone/aqq$a; FIELD b MOSSY Lnone/aqq$a; diff --git a/mappings/net/minecraft/block/impl/BlockMushroom.mapping b/mappings/net/minecraft/block/impl/BlockMushroomHuge.mapping similarity index 92% rename from mappings/net/minecraft/block/impl/BlockMushroom.mapping rename to mappings/net/minecraft/block/impl/BlockMushroomHuge.mapping index fb3efcf55d..fda77a5dbe 100644 --- a/mappings/net/minecraft/block/impl/BlockMushroom.mapping +++ b/mappings/net/minecraft/block/impl/BlockMushroomHuge.mapping @@ -1,4 +1,4 @@ -CLASS none/anl net/minecraft/block/impl/BlockMushroom +CLASS none/anl net/minecraft/block/impl/BlockMushroomHuge CLASS none/anl$a METHOD m asString ()Ljava/lang/String; FIELD b plantBlock Lnone/akw; diff --git a/mappings/net/minecraft/block/impl/BlockPlantMushroom.mapping b/mappings/net/minecraft/block/impl/BlockMushroomPlant.mapping similarity index 74% rename from mappings/net/minecraft/block/impl/BlockPlantMushroom.mapping rename to mappings/net/minecraft/block/impl/BlockMushroomPlant.mapping index e3e51472e0..4798508d08 100644 --- a/mappings/net/minecraft/block/impl/BlockPlantMushroom.mapping +++ b/mappings/net/minecraft/block/impl/BlockMushroomPlant.mapping @@ -1,4 +1,4 @@ -CLASS none/anz net/minecraft/block/impl/BlockPlantMushroom +CLASS none/anz net/minecraft/block/impl/BlockMushroomPlant METHOD b randomTick (Lnone/aiu;Lnone/cn;Lnone/asj;Ljava/util/Random;)V METHOD b getBoundingBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp; METHOD i isValidSoil (Lnone/asj;)Z