From 2081b6dfdeff7ee8253c97fc78c1a44191a09871 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat, 24 Aug 2013 18:54:03 +0100
Subject: Fixed inconsistent metas and added snow metas

---
 source/BlockID.h | 70 +++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 29 deletions(-)

(limited to 'source/BlockID.h')

diff --git a/source/BlockID.h b/source/BlockID.h
index 3c4381ae1..0eb3df96d 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -396,15 +396,17 @@ enum
 	E_META_DROPSPENSER_FACING_XM = 4,
 	E_META_DROPSPENSER_FACING_XP = 5,
 
-	// E_BLOCK_DOUBLE_STEP metas:
-	E_META_DOUBLE_STEP_STONE = 0,
-	E_META_DOUBLE_STEP_SANDSTONE = 1,
-	E_META_DOUBLE_STEP_WOODEN = 2,
-	E_META_DOUBLE_STEP_COBBLESTONE = 3,
-	E_META_DOUBLE_STEP_BRICK = 4,
-	E_META_DOUBLE_STEP_STONE_BRICK = 5,
-	E_META_DOUBLE_STEP_NETHER_BRICK = 6,
-	E_META_DOUBLE_STEP_STONE_SECRET = 7,
+	// E_BLOCK_DOUBLE_STONE_SLAB metas:
+	E_META_DOUBLE_STONE_SLAB_STONE = 0,
+	E_META_DOUBLE_STONE_SLAB_SANDSTONE = 1,
+	E_META_DOUBLE_STONE_SLAB_WOODEN = 2,
+	E_META_DOUBLE_STONE_SLAB_COBBLESTONE = 3,
+	E_META_DOUBLE_STONE_SLAB_BRICK = 4,
+	E_META_DOUBLE_STONE_SLAB_STONE_BRICK = 5,
+	E_META_DOUBLE_STONE_SLAB_NETHER_BRICK = 6,
+	E_META_DOUBLE_STONE_SLAB_STONE_SECRET = 7,
+
+
 	
 	// E_BLOCK_HOPPER metas:
 	E_META_HOPPER_FACING_YM  = 0,
@@ -448,15 +450,15 @@ enum
 	E_META_SILVERFISH_EGG_COBBLESTONE = 1,
 	E_META_SILVERFISH_EGG_STONE_BRICK = 2,
 	
-	// E_BLOCK_STEP metas:
-	E_META_STEP_STONE = 0,
-	E_META_STEP_SANDSTONE = 1,
-	E_META_STEP_PLANKS = 2,
-	E_META_STEP_COBBLESTONE = 3,
-	E_META_STEP_BRICK = 4,
-	E_META_STEP_STONE_BRICK = 5,
-	E_META_STEP_NETHER_BRICK = 6,
-	E_META_STEP_STONE_SECRET = 7,
+	// E_BLOCK_STONE_SLAB metas:
+	E_META_STONE_SLAB_STONE = 0,
+	E_META_STONE_SLAB_SANDSTONE = 1,
+	E_META_STONE_SLAB_PLANKS = 2,
+	E_META_STONE_SLAB_COBBLESTONE = 3,
+	E_META_STONE_SLAB_BRICK = 4,
+	E_META_STONE_SLAB_STONE_BRICK = 5,
+	E_META_STONE_SLAB_NETHER_BRICK = 6,
+	E_META_STONE_SLAB_STONE_SECRET = 7,
 	
 	// E_BLOCK_STONE_BRICKS metas:
 	E_META_STONE_BRICK_NORMAL = 0,
@@ -480,17 +482,17 @@ enum
 	E_META_TORCH_ZM = 3,  // Torch attached to the ZM side of its block
 	E_META_TORCH_ZP = 4,  // Torch attached to the ZP side of its block
 	
-	// E_BLOCK_WOODEN_DOUBLE_STEP metas:
-	E_META_WOODEN_DOUBLE_STEP_APPLE = 0,
-	E_META_WOODEN_DOUBLE_STEP_CONIFER = 1,
-	E_META_WOODEN_DOUBLE_STEP_BIRCH = 2,
-	E_META_WOODEN_DOUBLE_STEP_JUNGLE = 3,
+	// E_BLOCK_WOODEN_DOUBLE_SLAB metas:
+	E_META_WOODEN_DOUBLE_SLAB_APPLE = 0,
+	E_META_WOODEN_DOUBLE_SLAB_CONIFER = 1,
+	E_META_WOODEN_DOUBLE_SLAB_BIRCH = 2,
+	E_META_WOODEN_DOUBLE_SLAB_JUNGLE = 3,
 	
-	// E_BLOCK_WOODEN_STEP metas:
-	E_META_WOODEN_STEP_APPLE = 0,
-	E_META_WOODEN_STEP_CONIFER = 1,
-	E_META_WOODEN_STEP_BIRCH = 2,
-	E_META_WOODEN_STEP_JUNGLE = 3,
+	// E_BLOCK_WOODEN_SLAB metas:
+	E_META_WOODEN_SLAB_APPLE = 0,
+	E_META_WOODEN_SLAB_CONIFER = 1,
+	E_META_WOODEN_SLAB_BIRCH = 2,
+	E_META_WOODEN_SLAB_JUNGLE = 3,
 
 	// E_BLOCK_WOOL metas:
 	E_META_WOOL_WHITE      = 0,
@@ -545,7 +547,17 @@ enum
 	E_META_STAINED_CLAY_GREEN      = 13,
 	E_META_STAINED_CLAY_RED        = 14,
 	E_META_STAINED_CLAY_BLACK      = 15,
-	
+
+	// E_BLOCK_SNOW metas:
+	E_META_SNOW_LAYER_ONE          = 0,
+	E_META_SNOW_LAYER_TWO          = 1,
+	E_META_SNOW_LAYER_THREE        = 2,
+	E_META_SNOW_LAYER_FOUR         = 3,
+	E_META_SNOW_LAYER_FIVE         = 4,
+	E_META_SNOW_LAYER_SIX          = 5,
+	E_META_SNOW_LAYER_SEVEN        = 6,
+	E_META_SNOW_LAYER_EIGHT        = 7,
+
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Item metas:
 	
-- 
cgit v1.2.3