diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
index 1abf65b590..1641ef278c 100644
--- a/mappings/net/minecraft/block/Block.mapping
+++ b/mappings/net/minecraft/block/Block.mapping
@@ -8,6 +8,8 @@ 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 lightEmissionLevel I
+	FIELD q hardness F
 	FIELD t tickRandomly Z
 	FIELD u hasTileEntity Z
 	FIELD v soundGroup Lnone/apu;
@@ -20,6 +22,8 @@ CLASS none/akw net/minecraft/block/Block
 		ARG 0 material
 		ARG 1 color
 	METHOD a getTranslationKey ()Ljava/lang/String;
+	METHOD a setLightEmission (F)Lnone/akw;
+		ARG 0 emission
 	METHOD a deserializeState (I)Lnone/asj;
 		ARG 0 meta
 	METHOD a register (ILjava/lang/String;Lnone/akw;)V
@@ -151,7 +155,7 @@ CLASS none/akw net/minecraft/block/Block
 		ARG 1 player
 		ARG 2 world
 		ARG 3 pos
-	METHOD a (Lnone/asj;Lnone/aiu;Lnone/cn;)F
+	METHOD a getHardness (Lnone/asj;Lnone/aiu;Lnone/cn;)F
 		ARG 0 state
 		ARG 1 world
 		ARG 2 pos
diff --git a/mappings/none/ald.mapping b/mappings/net/minecraft/block/BlockButtonBase.mapping
similarity index 92%
rename from mappings/none/ald.mapping
rename to mappings/net/minecraft/block/BlockButtonBase.mapping
index 5561dc1c1b..6cb62acca6 100644
--- a/mappings/none/ald.mapping
+++ b/mappings/net/minecraft/block/BlockButtonBase.mapping
@@ -1,4 +1,4 @@
-CLASS none/ald
+CLASS none/ald net/minecraft/block/BlockButtonBase
 	METHOD a deserializeState (I)Lnone/asj;
 	METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z
 	METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj;
diff --git a/mappings/none/aml.mapping b/mappings/net/minecraft/block/BlockFalling.mapping
similarity index 60%
rename from mappings/none/aml.mapping
rename to mappings/net/minecraft/block/BlockFalling.mapping
index bb875c926c..1ce6ed0e45 100644
--- a/mappings/none/aml.mapping
+++ b/mappings/net/minecraft/block/BlockFalling.mapping
@@ -1,2 +1,2 @@
-CLASS none/aml
+CLASS none/aml net/minecraft/block/BlockFalling
 	METHOD b randomTick (Lnone/aiu;Lnone/cn;Lnone/asj;Ljava/util/Random;)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/BlockLeavesBase.mapping b/mappings/net/minecraft/block/BlockLeavesBase.mapping
similarity index 85%
rename from mappings/net/minecraft/block/impl/BlockLeavesBase.mapping
rename to mappings/net/minecraft/block/BlockLeavesBase.mapping
index 5b4f5a9247..5f46b24757 100644
--- a/mappings/net/minecraft/block/impl/BlockLeavesBase.mapping
+++ b/mappings/net/minecraft/block/BlockLeavesBase.mapping
@@ -1,4 +1,4 @@
-CLASS none/anp net/minecraft/block/impl/BlockLeavesBase
+CLASS none/anp net/minecraft/block/BlockLeavesBase
 	FIELD a DECAYABLE Lnone/asv;
 	FIELD b CHECK_DECAY Lnone/asv;
 	METHOD a getDropAmount (Ljava/util/Random;)I
diff --git a/mappings/none/ans.mapping b/mappings/net/minecraft/block/BlockLiquidBase.mapping
similarity index 88%
rename from mappings/none/ans.mapping
rename to mappings/net/minecraft/block/BlockLiquidBase.mapping
index d7d158fca0..03c0463fb2 100644
--- a/mappings/none/ans.mapping
+++ b/mappings/net/minecraft/block/BlockLiquidBase.mapping
@@ -1,4 +1,4 @@
-CLASS none/ans
+CLASS none/ans net/minecraft/block/BlockLiquidBase
 	METHOD a deserializeState (I)Lnone/asj;
 	METHOD a getDropAmount (Ljava/util/Random;)I
 	METHOD a getDropItem (Lnone/asj;Ljava/util/Random;I)Lnone/aeo;
diff --git a/mappings/none/ant.mapping b/mappings/net/minecraft/block/BlockLogBase.mapping
similarity index 80%
rename from mappings/none/ant.mapping
rename to mappings/net/minecraft/block/BlockLogBase.mapping
index 5ddb865341..09f17533d9 100644
--- a/mappings/none/ant.mapping
+++ b/mappings/net/minecraft/block/BlockLogBase.mapping
@@ -1,4 +1,4 @@
-CLASS none/ant
+CLASS none/ant net/minecraft/block/BlockLogBase
 	CLASS none/ant$a
 		METHOD m asString ()Ljava/lang/String;
 	METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj;
diff --git a/mappings/net/minecraft/block/impl/BlockOre.mapping b/mappings/net/minecraft/block/BlockOre.mapping
similarity index 75%
rename from mappings/net/minecraft/block/impl/BlockOre.mapping
rename to mappings/net/minecraft/block/BlockOre.mapping
index 0730a7d65b..10d1effd08 100644
--- a/mappings/net/minecraft/block/impl/BlockOre.mapping
+++ b/mappings/net/minecraft/block/BlockOre.mapping
@@ -1,4 +1,6 @@
-CLASS none/aom net/minecraft/block/impl/BlockOre
+CLASS none/aom net/minecraft/block/BlockOre
+	METHOD <init> (Lnone/ayp;)V
+		ARG 0 color
 	METHOD a getDropAmount (Ljava/util/Random;)I
 	METHOD a getDropStack (Lnone/aiu;Lnone/cn;Lnone/asj;)Lnone/aeq;
 	METHOD a dropItems (Lnone/aiu;Lnone/cn;Lnone/asj;FI)V
diff --git a/mappings/net/minecraft/block/impl/BlockGlassPane.mapping b/mappings/net/minecraft/block/BlockPane.mapping
similarity index 79%
rename from mappings/net/minecraft/block/impl/BlockGlassPane.mapping
rename to mappings/net/minecraft/block/BlockPane.mapping
index 9439762117..f51ed8654e 100644
--- a/mappings/net/minecraft/block/impl/BlockGlassPane.mapping
+++ b/mappings/net/minecraft/block/BlockPane.mapping
@@ -1,4 +1,8 @@
-CLASS none/aqj net/minecraft/block/impl/BlockGlassPane
+CLASS none/aqj net/minecraft/block/BlockPane
+	FIELD a harvestable Z
+	METHOD <init> (Lnone/ayo;Z)V
+		ARG 0 material
+		ARG 1 harvestable
 	METHOD a getDropItem (Lnone/asj;Ljava/util/Random;I)Lnone/aeo;
 	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/BlockPlant.mapping b/mappings/net/minecraft/block/BlockPlant.mapping
similarity index 90%
rename from mappings/net/minecraft/block/impl/BlockPlant.mapping
rename to mappings/net/minecraft/block/BlockPlant.mapping
index 99528786e1..b47ca9f41b 100644
--- a/mappings/net/minecraft/block/impl/BlockPlant.mapping
+++ b/mappings/net/minecraft/block/BlockPlant.mapping
@@ -1,4 +1,4 @@
-CLASS none/alc net/minecraft/block/impl/BlockPlant
+CLASS none/alc net/minecraft/block/BlockPlant
 	FIELD b BOX Lnone/bcp;
 	METHOD a getCollisionBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp;
 	METHOD b randomTick (Lnone/aiu;Lnone/cn;Lnone/asj;Ljava/util/Random;)V
diff --git a/mappings/none/akr.mapping b/mappings/net/minecraft/block/BlockPressurePlateBase.mapping
similarity index 78%
rename from mappings/none/akr.mapping
rename to mappings/net/minecraft/block/BlockPressurePlateBase.mapping
index d8778c263d..9624a3d525 100644
--- a/mappings/none/akr.mapping
+++ b/mappings/net/minecraft/block/BlockPressurePlateBase.mapping
@@ -1,4 +1,4 @@
-CLASS none/akr
+CLASS none/akr net/minecraft/block/BlockPressurePlateBase
 	METHOD a getCollisionBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp;
 	METHOD b randomTick (Lnone/aiu;Lnone/cn;Lnone/asj;Ljava/util/Random;)V
 	METHOD b getBoundingBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp;
diff --git a/mappings/net/minecraft/block/BlockRedstoneGate.mapping b/mappings/net/minecraft/block/BlockRedstoneGateBase.mapping
similarity index 72%
rename from mappings/net/minecraft/block/BlockRedstoneGate.mapping
rename to mappings/net/minecraft/block/BlockRedstoneGateBase.mapping
index aa5c599cb2..188339d13c 100644
--- a/mappings/net/minecraft/block/BlockRedstoneGate.mapping
+++ b/mappings/net/minecraft/block/BlockRedstoneGateBase.mapping
@@ -1,5 +1,8 @@
-CLASS none/alv net/minecraft/block/BlockRedstoneGate
+CLASS none/alv net/minecraft/block/BlockRedstoneGateBase
 	FIELD c BOUNDING_BOX Lnone/bcp;
+	FIELD d powered Z
+	METHOD <init> (Z)V
+		ARG 0 powered
 	METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj;
 	METHOD b randomTick (Lnone/aiu;Lnone/cn;Lnone/asj;Ljava/util/Random;)V
 	METHOD b getBoundingBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp;
diff --git a/mappings/net/minecraft/block/impl/BlockSlab.mapping b/mappings/net/minecraft/block/BlockSlabBase.mapping
similarity index 83%
rename from mappings/net/minecraft/block/impl/BlockSlab.mapping
rename to mappings/net/minecraft/block/BlockSlabBase.mapping
index ce3cc00550..d3f34984f4 100644
--- a/mappings/net/minecraft/block/impl/BlockSlab.mapping
+++ b/mappings/net/minecraft/block/BlockSlabBase.mapping
@@ -1,4 +1,4 @@
-CLASS none/and net/minecraft/block/impl/BlockSlab
+CLASS none/and net/minecraft/block/BlockSlabBase
 	CLASS none/and$a
 		METHOD m asString ()Ljava/lang/String;
 	METHOD a getDropAmount (Ljava/util/Random;)I
diff --git a/mappings/net/minecraft/block/impl/BlockStairs.mapping b/mappings/net/minecraft/block/BlockStairs.mapping
similarity index 85%
rename from mappings/net/minecraft/block/impl/BlockStairs.mapping
rename to mappings/net/minecraft/block/BlockStairs.mapping
index ecf8949cb4..3d79372bc4 100644
--- a/mappings/net/minecraft/block/impl/BlockStairs.mapping
+++ b/mappings/net/minecraft/block/BlockStairs.mapping
@@ -1,8 +1,12 @@
-CLASS none/apy net/minecraft/block/impl/BlockStairs
+CLASS none/apy net/minecraft/block/BlockStairs
 	CLASS none/apy$a
 		METHOD m asString ()Ljava/lang/String;
 	CLASS none/apy$b
 		METHOD m asString ()Ljava/lang/String;
+	FIELD P baseBlock Lnone/akw;
+	FIELD Q baseBlockState Lnone/asj;
+	METHOD <init> (Lnone/asj;)V
+		ARG 0 base
 	METHOD a deserializeState (I)Lnone/asj;
 	METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z
 	METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj;
diff --git a/mappings/net/minecraft/block/BlockTransparent.mapping b/mappings/net/minecraft/block/BlockTransparent.mapping
new file mode 100644
index 0000000000..31ad3ec325
--- /dev/null
+++ b/mappings/net/minecraft/block/BlockTransparent.mapping
@@ -0,0 +1,6 @@
+CLASS none/anf net/minecraft/block/BlockTransparent
+	METHOD <init> (Lnone/ayo;Z)V
+		ARG 0 material
+	METHOD <init> (Lnone/ayo;ZLnone/ayp;)V
+		ARG 0 material
+		ARG 2 color
diff --git a/mappings/net/minecraft/block/impl/BlockWallCobblestone.mapping b/mappings/net/minecraft/block/BlockWall.mapping
similarity index 91%
rename from mappings/net/minecraft/block/impl/BlockWallCobblestone.mapping
rename to mappings/net/minecraft/block/BlockWall.mapping
index 63c139ee26..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;
@@ -15,6 +15,8 @@ CLASS none/aqq net/minecraft/block/impl/BlockWallCobblestone
 	FIELD d SOUTH Lnone/asv;
 	FIELD e WEST Lnone/asv;
 	FIELD f VARIANT Lnone/asx;
+	METHOD <init> (Lnone/akw;)V
+		ARG 0 base
 	METHOD a deserializeState (I)Lnone/asj;
 	METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V
 	METHOD a getCollisionBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp;
diff --git a/mappings/net/minecraft/block/impl/BlockButtonStone.mapping b/mappings/net/minecraft/block/impl/BlockButtonStone.mapping
new file mode 100644
index 0000000000..ee0d4942f1
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockButtonStone.mapping
@@ -0,0 +1 @@
+CLASS none/aqe net/minecraft/block/impl/BlockButtonStone
diff --git a/mappings/net/minecraft/block/impl/BlockButtonWood.mapping b/mappings/net/minecraft/block/impl/BlockButtonWood.mapping
new file mode 100644
index 0000000000..a7ec852e97
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockButtonWood.mapping
@@ -0,0 +1 @@
+CLASS none/aqv net/minecraft/block/impl/BlockButtonWood
diff --git a/mappings/net/minecraft/block/impl/BlockFenceGate.mapping b/mappings/net/minecraft/block/impl/BlockFenceGate.mapping
index 65a4be77bf..7e9111a971 100644
--- a/mappings/net/minecraft/block/impl/BlockFenceGate.mapping
+++ b/mappings/net/minecraft/block/impl/BlockFenceGate.mapping
@@ -1,4 +1,6 @@
 CLASS none/amo net/minecraft/block/impl/BlockFenceGate
+	METHOD <init> (Lnone/aoo$a;)V
+		ARG 0 type
 	METHOD a deserializeState (I)Lnone/asj;
 	METHOD a activate (Lnone/aiu;Lnone/cn;Lnone/asj;Lnone/aak;Lnone/qz;Lnone/cu;FFF)Z
 	METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj;
diff --git a/mappings/net/minecraft/block/impl/BlockFlowerDandelion.mapping b/mappings/net/minecraft/block/impl/BlockFlowerDandelion.mapping
new file mode 100644
index 0000000000..ae92328fc6
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockFlowerDandelion.mapping
@@ -0,0 +1 @@
+CLASS none/aqy net/minecraft/block/impl/BlockFlowerDandelion
diff --git a/mappings/net/minecraft/block/impl/BlockFlowerPoppy.mapping b/mappings/net/minecraft/block/impl/BlockFlowerPoppy.mapping
new file mode 100644
index 0000000000..22a16c02cd
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockFlowerPoppy.mapping
@@ -0,0 +1 @@
+CLASS none/aoz net/minecraft/block/impl/BlockFlowerPoppy
diff --git a/mappings/none/anl.mapping b/mappings/net/minecraft/block/impl/BlockMushroomHuge.mapping
similarity index 76%
rename from mappings/none/anl.mapping
rename to mappings/net/minecraft/block/impl/BlockMushroomHuge.mapping
index 4fb78822f1..fda77a5dbe 100644
--- a/mappings/none/anl.mapping
+++ b/mappings/net/minecraft/block/impl/BlockMushroomHuge.mapping
@@ -1,6 +1,11 @@
-CLASS none/anl
+CLASS none/anl net/minecraft/block/impl/BlockMushroomHuge
 	CLASS none/anl$a
 		METHOD m asString ()Ljava/lang/String;
+	FIELD b plantBlock Lnone/akw;
+	METHOD <init> (Lnone/ayo;Lnone/ayp;Lnone/akw;)V
+		ARG 0 material
+		ARG 1 color
+		ARG 2 plantBlock
 	METHOD a deserializeState (I)Lnone/asj;
 	METHOD a getDropAmount (Ljava/util/Random;)I
 	METHOD a getDropStack (Lnone/aiu;Lnone/cn;Lnone/asj;)Lnone/aeq;
diff --git a/mappings/none/anz.mapping b/mappings/net/minecraft/block/impl/BlockMushroomPlant.mapping
similarity index 74%
rename from mappings/none/anz.mapping
rename to mappings/net/minecraft/block/impl/BlockMushroomPlant.mapping
index e2ab6e75e2..4798508d08 100644
--- a/mappings/none/anz.mapping
+++ b/mappings/net/minecraft/block/impl/BlockMushroomPlant.mapping
@@ -1,4 +1,4 @@
-CLASS none/anz
+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
diff --git a/mappings/net/minecraft/block/impl/BlockNetherBrick.mapping b/mappings/net/minecraft/block/impl/BlockNetherBrick.mapping
new file mode 100644
index 0000000000..c526666638
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockNetherBrick.mapping
@@ -0,0 +1 @@
+CLASS none/aob net/minecraft/block/impl/BlockNetherBrick
diff --git a/mappings/net/minecraft/block/impl/BlockNetherrack.mapping b/mappings/net/minecraft/block/impl/BlockNetherrack.mapping
new file mode 100644
index 0000000000..fa2105c353
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockNetherrack.mapping
@@ -0,0 +1 @@
+CLASS none/aod net/minecraft/block/impl/BlockNetherrack
diff --git a/mappings/net/minecraft/block/impl/BlockPressurePlate.mapping b/mappings/net/minecraft/block/impl/BlockPressurePlate.mapping
index 318bfc5de8..9db3d26465 100644
--- a/mappings/net/minecraft/block/impl/BlockPressurePlate.mapping
+++ b/mappings/net/minecraft/block/impl/BlockPressurePlate.mapping
@@ -1,4 +1,6 @@
 CLASS none/aot net/minecraft/block/impl/BlockPressurePlate
+	METHOD <init> (Lnone/ayo;Lnone/aot$a;)V
+		ARG 0 material
 	METHOD a deserializeState (I)Lnone/asj;
 	METHOD b createStateFactory ()Lnone/ask;
 	METHOD e serializeState (Lnone/asj;)I
diff --git a/mappings/net/minecraft/block/impl/BlockPressurePlateWeighted.mapping b/mappings/net/minecraft/block/impl/BlockPressurePlateWeighted.mapping
index b176c29ad5..30240889d2 100644
--- a/mappings/net/minecraft/block/impl/BlockPressurePlateWeighted.mapping
+++ b/mappings/net/minecraft/block/impl/BlockPressurePlateWeighted.mapping
@@ -1,4 +1,12 @@
 CLASS none/aqu net/minecraft/block/impl/BlockPressurePlateWeighted
+	FIELD e maxWeight I
+	METHOD <init> (Lnone/ayo;I)V
+		ARG 0 material
+		ARG 1 maxWeight
+	METHOD <init> (Lnone/ayo;ILnone/ayp;)V
+		ARG 0 material
+		ARG 1 maxWeight
+		ARG 2 color
 	METHOD a deserializeState (I)Lnone/asj;
 	METHOD b createStateFactory ()Lnone/ask;
 	METHOD e serializeState (Lnone/asj;)I
diff --git a/mappings/net/minecraft/block/impl/BlockRedstoneLamp.mapping b/mappings/net/minecraft/block/impl/BlockRedstoneLamp.mapping
index f2cffa3a8f..81919c05d8 100644
--- a/mappings/net/minecraft/block/impl/BlockRedstoneLamp.mapping
+++ b/mappings/net/minecraft/block/impl/BlockRedstoneLamp.mapping
@@ -1,4 +1,7 @@
 CLASS none/apd net/minecraft/block/impl/BlockRedstoneLamp
+	FIELD a lit Z
+	METHOD <init> (Z)V
+		ARG 0 lit
 	METHOD a getDropStack (Lnone/aiu;Lnone/cn;Lnone/asj;)Lnone/aeq;
 	METHOD a getDropItem (Lnone/asj;Ljava/util/Random;I)Lnone/aeo;
 	METHOD b randomTick (Lnone/aiu;Lnone/cn;Lnone/asj;Ljava/util/Random;)V
diff --git a/mappings/net/minecraft/block/impl/BlockRedstoneOre.mapping b/mappings/net/minecraft/block/impl/BlockRedstoneOre.mapping
index 95af9d8cde..0a2b16e70b 100644
--- a/mappings/net/minecraft/block/impl/BlockRedstoneOre.mapping
+++ b/mappings/net/minecraft/block/impl/BlockRedstoneOre.mapping
@@ -1,4 +1,7 @@
 CLASS none/apb net/minecraft/block/impl/BlockRedstoneOre
+	FIELD a lit Z
+	METHOD <init> (Z)V
+		ARG 0 lit
 	METHOD a getDropAmount (Ljava/util/Random;)I
 	METHOD a getDropStack (Lnone/aiu;Lnone/cn;Lnone/asj;)Lnone/aeq;
 	METHOD a dropItems (Lnone/aiu;Lnone/cn;Lnone/asj;FI)V
diff --git a/mappings/none/aow.mapping b/mappings/net/minecraft/block/impl/BlockSlabPurpurBase.mapping
similarity index 73%
rename from mappings/none/aow.mapping
rename to mappings/net/minecraft/block/impl/BlockSlabPurpurBase.mapping
index 78ba0f4525..758ec872a9 100644
--- a/mappings/none/aow.mapping
+++ b/mappings/net/minecraft/block/impl/BlockSlabPurpurBase.mapping
@@ -1,4 +1,6 @@
-CLASS none/aow
+CLASS none/aow net/minecraft/block/impl/BlockSlabPurpurBase
+	CLASS none/aow$a Double
+	CLASS none/aow$b Single
 	CLASS none/aow$c
 		METHOD m asString ()Ljava/lang/String;
 	METHOD a deserializeState (I)Lnone/asj;
diff --git a/mappings/none/aog.mapping b/mappings/net/minecraft/block/impl/BlockSlabStone2Base.mapping
similarity index 89%
rename from mappings/none/aog.mapping
rename to mappings/net/minecraft/block/impl/BlockSlabStone2Base.mapping
index 02bc9b1b21..76947aec9d 100644
--- a/mappings/none/aog.mapping
+++ b/mappings/net/minecraft/block/impl/BlockSlabStone2Base.mapping
@@ -1,4 +1,4 @@
-CLASS none/aog
+CLASS none/aog net/minecraft/block/impl/BlockSlabStone2Base
 	CLASS none/aog$a
 		METHOD m asString ()Ljava/lang/String;
 	METHOD a deserializeState (I)Lnone/asj;
diff --git a/mappings/net/minecraft/block/impl/BlockSlabStone2Double.mapping b/mappings/net/minecraft/block/impl/BlockSlabStone2Double.mapping
new file mode 100644
index 0000000000..e7c9f3d076
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockSlabStone2Double.mapping
@@ -0,0 +1 @@
+CLASS none/amt net/minecraft/block/impl/BlockSlabStone2Double
diff --git a/mappings/net/minecraft/block/impl/BlockSlabStone2Single.mapping b/mappings/net/minecraft/block/impl/BlockSlabStone2Single.mapping
new file mode 100644
index 0000000000..046fe7854a
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockSlabStone2Single.mapping
@@ -0,0 +1 @@
+CLASS none/anc net/minecraft/block/impl/BlockSlabStone2Single
diff --git a/mappings/none/aqf.mapping b/mappings/net/minecraft/block/impl/BlockSlabStoneBase.mapping
similarity index 88%
rename from mappings/none/aqf.mapping
rename to mappings/net/minecraft/block/impl/BlockSlabStoneBase.mapping
index c9d157ba30..80c896243f 100644
--- a/mappings/none/aqf.mapping
+++ b/mappings/net/minecraft/block/impl/BlockSlabStoneBase.mapping
@@ -1,4 +1,4 @@
-CLASS none/aqf
+CLASS none/aqf net/minecraft/block/impl/BlockSlabStoneBase
 	CLASS none/aqf$a
 		METHOD m asString ()Ljava/lang/String;
 	METHOD a deserializeState (I)Lnone/asj;
diff --git a/mappings/net/minecraft/block/impl/BlockSlabStoneDouble.mapping b/mappings/net/minecraft/block/impl/BlockSlabStoneDouble.mapping
new file mode 100644
index 0000000000..241c1a870d
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockSlabStoneDouble.mapping
@@ -0,0 +1 @@
+CLASS none/amu net/minecraft/block/impl/BlockSlabStoneDouble
diff --git a/mappings/net/minecraft/block/impl/BlockSlabStoneSingle.mapping b/mappings/net/minecraft/block/impl/BlockSlabStoneSingle.mapping
new file mode 100644
index 0000000000..b4993e5a61
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockSlabStoneSingle.mapping
@@ -0,0 +1 @@
+CLASS none/ane net/minecraft/block/impl/BlockSlabStoneSingle
diff --git a/mappings/none/aqw.mapping b/mappings/net/minecraft/block/impl/BlockSlabWoodBase.mapping
similarity index 87%
rename from mappings/none/aqw.mapping
rename to mappings/net/minecraft/block/impl/BlockSlabWoodBase.mapping
index 2777b457a3..7fc19991e5 100644
--- a/mappings/none/aqw.mapping
+++ b/mappings/net/minecraft/block/impl/BlockSlabWoodBase.mapping
@@ -1,4 +1,4 @@
-CLASS none/aqw
+CLASS none/aqw net/minecraft/block/impl/BlockSlabWoodBase
 	METHOD a deserializeState (I)Lnone/asj;
 	METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V
 	METHOD a getDropStack (Lnone/aiu;Lnone/cn;Lnone/asj;)Lnone/aeq;
diff --git a/mappings/net/minecraft/block/impl/BlockSlabWoodDouble.mapping b/mappings/net/minecraft/block/impl/BlockSlabWoodDouble.mapping
new file mode 100644
index 0000000000..ecfb2613a8
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockSlabWoodDouble.mapping
@@ -0,0 +1 @@
+CLASS none/amv net/minecraft/block/impl/BlockSlabWoodDouble
diff --git a/mappings/net/minecraft/block/impl/BlockSlabWoodSingle.mapping b/mappings/net/minecraft/block/impl/BlockSlabWoodSingle.mapping
new file mode 100644
index 0000000000..f3d94635f4
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockSlabWoodSingle.mapping
@@ -0,0 +1 @@
+CLASS none/ang net/minecraft/block/impl/BlockSlabWoodSingle