1 files changed, 152 insertions, 131 deletions

diff --git a/src/BlockID.h b/src/BlockID.h
index 4f6b1afcc..655c8c712 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -401,13 +401,20 @@ enum
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Block metas:
 
+	// E_BLOCK_ANVIL metas
+	E_BLOCK_ANVIL_Z = 0,
+	E_BLOCK_ANVIL_X = 1,
+	E_BLOCK_ANVIL_NO_DAMAGE = 0,
+	E_BLOCK_ANVIL_LOW_DAMAGE = 4,
+	E_BLOCK_ANVIL_HIGH_DAMAGE = 8,
+
 	// E_BLOCK_BED metas:
-	E_BLOCK_BED_SOUTH	= 0,
-	E_BLOCK_BED_WEST	= 1,
-	E_BLOCK_BED_NORTH	= 2,
-	E_BLOCK_BED_EAST	= 3,
-	E_BLOCK_BED_OCCUPIED	= 4,
-	E_BLOCK_BED_BED_HEAD	= 8,
+	E_BLOCK_BED_ZP = 0,
+	E_BLOCK_BED_XM = 1,
+	E_BLOCK_BED_ZM = 2,
+	E_BLOCK_BED_XP = 3,
+	E_BLOCK_BED_OCCUPIED = 4,
+	E_BLOCK_BED_BED_HEAD = 8,
 
 	// E_BLOCK_BIG_FLOWER metas
 	E_META_BIG_FLOWER_SUNFLOWER         = 0,
@@ -417,6 +424,20 @@ enum
 	E_META_BIG_FLOWER_ROSE_BUSH         = 4,
 	E_META_BIG_FLOWER_PEONY             = 5,
 
+	// E_BLOCK_BREWING_STAND metas
+	E_META_BREWING_STAND_FILLED_SLOT_XP    = 1,
+	E_META_BREWING_STAND_FILLED_SLOT_XM_ZP = 2,
+	E_META_BREWING_STAND_FILLED_SLOT_XM_ZM = 4,
+
+	// E_BLOCK_BUTTON metas
+	E_BLOCK_BUTTON_YM      = 0,
+	E_BLOCK_BUTTON_XP      = 1,
+	E_BLOCK_BUTTON_XM      = 2,
+	E_BLOCK_BUTTON_ZP      = 3,
+	E_BLOCK_BUTTON_ZM      = 4,
+	E_BLOCK_BUTTON_YP      = 5,
+	E_BLOCK_BUTTON_PRESSED = 8,
+
 	// E_BLOCK_CARPET metas:
 	E_META_CARPET_WHITE      = 0,
 	E_META_CARPET_ORANGE     = 1,
@@ -455,17 +476,17 @@ enum
 	E_META_DROPSPENSER_FACING_XP = 5,
 
 	// E_BLOCK_DOUBLE_STONE_SLAB metas:
-	E_META_DOUBLE_STONE_SLAB_STONE          = 0,
-	E_META_DOUBLE_STONE_SLAB_SANDSTON       = 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_QUARTZ         = 7,
-	E_META_DOUBLE_STONE_SLAB_SMOOTH_STONE   = 8,
-	E_META_DOUBLE_STONE_SLAB_SMOOTH_SANDSTONE   = 9,
-	E_META_DOUBLE_STONE_SLAB_TILE_QUARTZ    = 10,
+	E_META_DOUBLE_STONE_SLAB_STONE            = 0,
+	E_META_DOUBLE_STONE_SLAB_SANDSTON         = 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_QUARTZ           = 7,
+	E_META_DOUBLE_STONE_SLAB_SMOOTH_STONE     = 8,
+	E_META_DOUBLE_STONE_SLAB_SMOOTH_SANDSTONE = 9,
+	E_META_DOUBLE_STONE_SLAB_TILE_QUARTZ      = 10,
 	
 	// E_BLOCK_FLOWER metas
 	E_META_FLOWER_POPPY           = 0,
@@ -478,8 +499,8 @@ enum
 	E_META_FLOWER_OXEYE_DAISY     = 8,
 	
 	// E_BLOCK_JUKEBOX metas
-	E_META_JUKEBOX_OFF            = 0,
-	E_META_JUKEBOX_ON             = 1,
+	E_META_JUKEBOX_OFF = 0,
+	E_META_JUKEBOX_ON  = 1,
 	
 	// E_BLOCK_HOPPER metas:
 	E_META_HOPPER_FACING_YM  = 0,
@@ -490,26 +511,26 @@ enum
 	E_META_HOPPER_FACING_XP  = 5,
 
 	// E_BLOCK_LEAVES metas:
-	E_META_NEWLEAVES_APPLE   = 0,
-	E_META_NEWLEAVES_CONIFER = 1,
-	E_META_NEWLEAVES_BIRCH   = 2,
-	E_META_NEWLEAVES_JUNGLE  = 3,
-	E_META_NEWLEAVES_APPLE_NO_DECAY = 4,
-	E_META_NEWLEAVES_CONIFER_NO_DECAY = 5,
-	E_META_NEWLEAVES_BIRCH_NO_DECAY = 6,
-	E_META_NEWLEAVES_JUNGLE_NO_DECAY = 7,
-	E_META_NEWLEAVES_APPLE_CHECK_DECAY = 8,
+	E_META_NEWLEAVES_APPLE               = 0,
+	E_META_NEWLEAVES_CONIFER             = 1,
+	E_META_NEWLEAVES_BIRCH               = 2,
+	E_META_NEWLEAVES_JUNGLE              = 3,
+	E_META_NEWLEAVES_APPLE_NO_DECAY      = 4,
+	E_META_NEWLEAVES_CONIFER_NO_DECAY    = 5,
+	E_META_NEWLEAVES_BIRCH_NO_DECAY      = 6,
+	E_META_NEWLEAVES_JUNGLE_NO_DECAY     = 7,
+	E_META_NEWLEAVES_APPLE_CHECK_DECAY   = 8,
 	E_META_NEWLEAVES_CONIFER_CHECK_DECAY = 9,
-	E_META_NEWLEAVES_BIRCH_CHECK_DECAY = 10,
-	E_META_NEWLEAVES_JUNGLE_CHECK_DECAY = 11,
+	E_META_NEWLEAVES_BIRCH_CHECK_DECAY   = 10,
+	E_META_NEWLEAVES_JUNGLE_CHECK_DECAY  = 11,
 
 	// E_BLOCK_LEAVES meta cont. (Block ID 161):
-	E_META_NEWLEAVES_ACACIA        = 0,
-	E_META_NEWLEAVES_DARK_OAK      = 1,
+	E_META_NEWLEAVES_ACACIA               = 0,
+	E_META_NEWLEAVES_DARK_OAK             = 1,
 	E_META_NEWLEAVES_ACACIA_NO_DECAY      = 4,
 	E_META_NEWLEAVES_DARK_OAK_NO_DECAY    = 5,
-	E_META_NEWLEAVES_ACACIA_CHECK_DECAY         = 8,
-	E_META_NEWLEAVES_DARK_OAK_CHECK_DECAY       = 9,
+	E_META_NEWLEAVES_ACACIA_CHECK_DECAY   = 8,
+	E_META_NEWLEAVES_DARK_OAK_CHECK_DECAY = 9,
 	
 	// E_BLOCK_LOG metas:
 	E_META_NEWLOG_APPLE   = 0,
@@ -522,47 +543,47 @@ enum
 	E_META_NEW_LEAVES_DARK_OAK_WOOD = 1,
 	
 	// E_BLOCK_NEW_LOG metas
-	E_META_NEW_LOG_ACACIA_WOOD    = 0,
-	E_META_NEW_LOG_DARK_OAK_WOOD  = 1,
+	E_META_NEW_LOG_ACACIA_WOOD   = 0,
+	E_META_NEW_LOG_DARK_OAK_WOOD = 1,
 	
 	// E_BLOCK_PISTON metas:
-	E_META_PISTON_DOWN  = 0,
-	E_META_PISTON_UP    = 1,
-	E_META_PISTON_ZM = 2,
-	E_META_PISTON_ZP = 3,
-	E_META_PISTON_XM  = 4,
-	E_META_PISTON_XP  = 5,
-	E_META_PISTON_HEAD_STICKY   = 8,
-	E_META_PISTON_EXTENDED      = 8,
+	E_META_PISTON_DOWN        = 0,
+	E_META_PISTON_U           = 1,
+	E_META_PISTON_ZM          = 2,
+	E_META_PISTON_ZP          = 3,
+	E_META_PISTON_XM          = 4,
+	E_META_PISTON_XP          = 5,
+	E_META_PISTON_HEAD_STICKY = 8,
+	E_META_PISTON_EXTENDED    = 8,
 
 	// E_BLOCK_PLANKS metas:
-	E_META_PLANKS_APPLE   = 0,
-	E_META_PLANKS_CONIFER = 1,
-	E_META_PLANKS_BIRCH   = 2,
-	E_META_PLANKS_JUNGLE  = 3,
-	E_META_PLANKS_ACACIA  = 4,
-	E_META_PLANKS_DARK_OAK= 5,
+	E_META_PLANKS_APPLE    = 0,
+	E_META_PLANKS_CONIFER  = 1,
+	E_META_PLANKS_BIRCH    = 2,
+	E_META_PLANKS_JUNGLE   = 3,
+	E_META_PLANKS_ACACIA   = 4,
+	E_META_PLANKS_DARK_OAK = 5,
 
 	// E_BLOCK_(XXX_WEIGHTED)_PRESSURE_PLATE metas:
-	E_META_PRESSURE_PLATE_RAISED = 0,
+	E_META_PRESSURE_PLATE_RAISED    = 0,
 	E_META_PRESSURE_PLATE_DEPRESSED = 1,
 	
 	// E_BLOCK_QUARTZ_BLOCK metas:
-	E_META_QUARTZ_NORMAL = 0,
+	E_META_QUARTZ_NORMAL    = 0,
 	E_META_QUARTZ_CHISELLED = 1,
-	E_META_QUARTZ_PILLAR = 2,
+	E_META_QUARTZ_PILLAR    = 2,
 
 	// E_BLOCK_RAIL metas
-	E_META_RAIL_ZM_ZP              = 0,
-	E_META_RAIL_XM_XP              = 1,
-	E_META_RAIL_ASCEND_XP          = 2,
-	E_META_RAIL_ASCEND_XM          = 3,
-	E_META_RAIL_ASCEND_ZM          = 4,
-	E_META_RAIL_ASCEND_ZP          = 5,
-	E_META_RAIL_CURVED_ZP_XP       = 6,
-	E_META_RAIL_CURVED_ZP_XM       = 7,
-	E_META_RAIL_CURVED_ZM_XM       = 8,
-	E_META_RAIL_CURVED_ZM_XP       = 9,
+	E_META_RAIL_ZM_ZP        = 0,
+	E_META_RAIL_XM_XP        = 1,
+	E_META_RAIL_ASCEND_XP    = 2,
+	E_META_RAIL_ASCEND_XM    = 3,
+	E_META_RAIL_ASCEND_ZM    = 4,
+	E_META_RAIL_ASCEND_ZP    = 5,
+	E_META_RAIL_CURVED_ZP_XP = 6,
+	E_META_RAIL_CURVED_ZP_XM = 7,
+	E_META_RAIL_CURVED_ZM_XM = 8,
+	E_META_RAIL_CURVED_ZM_XP = 9,
 	
 	// E_BLOCK_SAND metas:
 	E_META_SAND_NORMAL = 0,
@@ -651,42 +672,42 @@ enum
 	E_META_STAINED_GLASS_PANE_BLACK      = 15,
 
 	// E_BLOCK_STAIRS metas:
-	E_BLOCK_STAIRS_XP    = 0,
-	E_BLOCK_STAIRS_XM     = 1,
-	E_BLOCK_STAIRS_ZP    = 2,
-	E_BLOCK_STAIRS_ZM    = 3,
+	E_BLOCK_STAIRS_XP          = 0,
+	E_BLOCK_STAIRS_XM          = 1,
+	E_BLOCK_STAIRS_ZP          = 2,
+	E_BLOCK_STAIRS_ZM          = 3,
 	E_BLOCK_STAIRS_UPSIDE_DOWN = 4,
 
 	// E_BLOCK_STONE metas:
-	E_META_STONE_STONE              = 0,
-	E_META_STONE_GRANITE            = 1,
-	E_META_STONE_POLISHED_GRANITE   = 2,
-	E_META_STONE_DIORITE            = 3,
-	E_META_STONE_POLISHED_DIORITE   = 4,
-	E_META_STONE_ANDESITE           = 5,
-	E_META_STONE_POLISHED_ANDESITE  = 6,
+	E_META_STONE_STONE             = 0,
+	E_META_STONE_GRANITE           = 1,
+	E_META_STONE_POLISHED_GRANITE  = 2,
+	E_META_STONE_DIORITE           = 3,
+	E_META_STONE_POLISHED_DIORITE  = 4,
+	E_META_STONE_ANDESITE          = 5,
+	E_META_STONE_POLISHED_ANDESITE = 6,
 
 	// 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_QUARTZ        = 7,
+	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_QUARTZ       = 7,
 	
 	// E_BLOCK_STONE_BRICKS metas:
-	E_META_STONE_BRICK_NORMAL     = 0,
-	E_META_STONE_BRICK_MOSSY      = 1,
-	E_META_STONE_BRICK_CRACKED    = 2,
-	E_META_STONE_BRICK_ORNAMENT   = 3,
+	E_META_STONE_BRICK_NORMAL   = 0,
+	E_META_STONE_BRICK_MOSSY    = 1,
+	E_META_STONE_BRICK_CRACKED  = 2,
+	E_META_STONE_BRICK_ORNAMENT = 3,
 	
 	// E_BLOCK_TALL_GRASS metas:
-	E_META_TALL_GRASS_DEAD_SHRUB    = 0,
-	E_META_TALL_GRASS_GRASS         = 1,
-	E_META_TALL_GRASS_FERN          = 2,
-	E_META_TALL_GRASS_BIOME         = 3,
+	E_META_TALL_GRASS_DEAD_SHRUB = 0,
+	E_META_TALL_GRASS_GRASS      = 1,
+	E_META_TALL_GRASS_FERN       = 2,
+	E_META_TALL_GRASS_BIOME      = 3,
 	
 	// E_BLOCK_TORCH, E_BLOCK_REDSTONE_TORCH_OFF, E_BLOCK_REDSTONE_TORCH_ON metas:
 	E_META_TORCH_EAST  = 1,  // east face of the block, pointing east
@@ -694,56 +715,56 @@ enum
 	E_META_TORCH_SOUTH = 3,
 	E_META_TORCH_NORTH = 4,
 	E_META_TORCH_FLOOR = 5,
-	E_META_TORCH_XM = 1,  // Torch attached to the XM side of its block
-	E_META_TORCH_XP = 2,  // Torch attached to the XP side of its block
-	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_META_TORCH_XM    = 1,  // Torch attached to the XM side of its block
+	E_META_TORCH_XP    = 2,  // Torch attached to the XP side of its block
+	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_META_LOG metas:
-	E_META_NEWLOG_OAK_UP_DOWN        = 0,
-	E_META_NEWLOG_SPRUCE_UP_DOWN     = 1,
-	E_META_NEWLOG_BIRCH_UP_DOWN      = 2,
-	E_META_NEWLOG_JUNGLE_UP_DOWN     = 3,
-	E_META_NEWLOG_OAK_X      = 4,
-	E_META_NEWLOG_SPRUCE_X   = 5,
-	E_META_NEWLOG_BIRCH_X    = 6,
-	E_META_NEWLOG_JUNGLE_X   = 7,
-	E_META_NEWLOG_OAK_Z    = 8,
-	E_META_NEWLOG_SPRUCE_Z = 9,
-	E_META_NEWLOG_BIRCH_Z  = 10,
-	E_META_NEWLOG_JUNGLE_Z = 11,
-	E_META_NEWLOG_OAK_BARK_ONLY      = 12,
-	E_META_NEWLOG_SPRUCE_BARK_ONLY   = 13,
-	E_META_NEWLOG_BIRCH_BARK_ONLY    = 14,
-	E_META_NEWLOG_JUNGLE_BARK_ONLY   = 15,
+	E_META_NEWLOG_OAK_UP_DOWN      = 0,
+	E_META_NEWLOG_SPRUCE_UP_DOWN   = 1,
+	E_META_NEWLOG_BIRCH_UP_DOWN    = 2,
+	E_META_NEWLOG_JUNGLE_UP_DOWN   = 3,
+	E_META_NEWLOG_OAK_X            = 4,
+	E_META_NEWLOG_SPRUCE_X         = 5,
+	E_META_NEWLOG_BIRCH_X          = 6,
+	E_META_NEWLOG_JUNGLE_X         = 7,
+	E_META_NEWLOG_OAK_Z            = 8,
+	E_META_NEWLOG_SPRUCE_Z         = 9,
+	E_META_NEWLOG_BIRCH_Z          = 10,
+	E_META_NEWLOG_JUNGLE_Z         = 11,
+	E_META_NEWLOG_OAK_BARK_ONLY    = 12,
+	E_META_NEWLOG_SPRUCE_BARK_ONLY = 13,
+	E_META_NEWLOG_BIRCH_BARK_ONLY  = 14,
+	E_META_NEWLOG_JUNGLE_BARK_ONLY = 15,
 
 	// E_META_NEWLOG metas cont. (Block ID 162):
-	E_META_NEWLOG_ACACIA_UP_DOWN = 0,
-	E_META_NEWLOG_DARK_OAK_UP_DOWN = 1,
-	E_META_NEWLOG_ACACIA_X = 4,
-	E_META_NEWLOG_DARK_OAK_X = 5,
-	E_META_NEWLOG_ACACIA_Z = 8,
-	E_META_NEWLOG_DARK_OAK_Z = 9,
-	E_META_NEWLOG_ACACIA_BARK_ONLY = 12,
+	E_META_NEWLOG_ACACIA_UP_DOWN     = 0,
+	E_META_NEWLOG_DARK_OAK_UP_DOWN   = 1,
+	E_META_NEWLOG_ACACIA_X           = 4,
+	E_META_NEWLOG_DARK_OAK_X         = 5,
+	E_META_NEWLOG_ACACIA_Z           = 8,
+	E_META_NEWLOG_DARK_OAK_Z         = 9,
+	E_META_NEWLOG_ACACIA_BARK_ONLY   = 12,
 	E_META_NEWLOG_DARK_OAK_BARK_ONLY = 13,
 
 	// 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_META_WOODEN_DOUBLE_SLAB_ACACIA    = 4,
-	E_META_WOODEN_DOUBLE_SLAB_DARK_OAK  = 5,
+	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_META_WOODEN_DOUBLE_SLAB_ACACIA   = 4,
+	E_META_WOODEN_DOUBLE_SLAB_DARK_OAK = 5,
 	
 	// 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_META_WOODEN_SLAB_ACACIA   = 4,
-	E_META_WOODEN_SLAB_DARK_OAK = 5,
-	E_META_WOODEN_SLAB_RIGHT_SIDE_UP   = 0,
-	E_META_WOODWN_SLAB_UPSIDE_DOWN     = 8,
+	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_META_WOODEN_SLAB_ACACIA        = 4,
+	E_META_WOODEN_SLAB_DARK_OAK      = 5,
+	E_META_WOODEN_SLAB_RIGHT_SIDE_UP = 0,
+	E_META_WOODWN_SLAB_UPSIDE_DOWN   = 8,
 
 	// E_BLOCK_WOOL metas:
 	E_META_WOOL_WHITE      = 0,