1 files changed, 131 insertions, 35 deletions

diff --git a/source/BlockID.h b/source/BlockID.h
index 28725406d..f3cbc46d6 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -3,7 +3,7 @@
 // tolua_begin
 enum ENUM_BLOCK_ID
 {
-	E_BLOCK_AIR	= 0,
+	E_BLOCK_AIR = 0,
 	E_BLOCK_STONE = 1,
 	E_BLOCK_GRASS = 2,
 	E_BLOCK_DIRT = 3,
@@ -14,7 +14,7 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_WATER = 8,
 	E_BLOCK_STATIONARY_WATER = 9,
 	E_BLOCK_LAVA = 10,
-	E_BLOCK_STATIONARY_LAVA = 11,
+	E_BLOCK_STATIONARY_LAVA  = 11,
 	E_BLOCK_SAND = 12,
 	E_BLOCK_GRAVEL = 13,
 	E_BLOCK_GOLD_ORE = 14,
@@ -40,8 +40,8 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_PISTON_EXTENSION = 34,
 	E_BLOCK_WOOL = 35,
 	E_BLOCK_PISTON_MOVED_BLOCK = 36,
-	E_BLOCK_YELLOW_FLOWER = 37,
-	E_BLOCK_RED_ROSE = 38,
+	E_BLOCK_DANDELION = 37,
+	E_BLOCK_FLOWER = 38,
 	E_BLOCK_BROWN_MUSHROOM = 39,
 	E_BLOCK_RED_MUSHROOM = 40,
 	E_BLOCK_GOLD_BLOCK = 41,
@@ -102,7 +102,7 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_CAKE = 92,
 	E_BLOCK_REDSTONE_REPEATER_OFF = 93,
 	E_BLOCK_REDSTONE_REPEATER_ON = 94,
-	E_BLOCK_LOCKED_CHEST = 95,
+	E_BLOCK_STAINED_GLASS = 95,
 	E_BLOCK_TRAPDOOR = 96,
 	E_BLOCK_SILVERFISH_EGG = 97,
 	E_BLOCK_STONE_BRICKS = 98,
@@ -170,22 +170,35 @@ enum ENUM_BLOCK_ID
 	
 	E_BLOCK_DROPPER = 158,
 	E_BLOCK_STAINED_CLAY = 159,
+	E_BLOCK_STAINED_GLASS_PANE = 160,
+	E_BLOCK_NEW_LEAVES = 161, // Acacia and Dark Oak IDs in Minecraft 1.7.x
+	E_BLOCK_NEW_LOG = 162,
+	E_BLOCK_ACACIA_WOOD_STAIRS = 163,
+	E_BLOCK_DARK_OAK_WOOD_STAIRS = 164, /////////////////////////////////
 	E_BLOCK_HAY_BALE = 170,
 	E_BLOCK_CARPET = 171,	
 	E_BLOCK_HARDENED_CLAY = 172,
 	E_BLOCK_BLOCK_OF_COAL = 173,
+	E_BLOCK_PACKED_ICE = 174,
+	E_BLOCK_BIG_FLOWER = 175,
 	
 	// Keep these two as the last values, without a number - they will get their correct number assigned automagically by C++
 	// IsValidBlock() depends on this
 	E_BLOCK_NUMBER_OF_TYPES,  ///< Number of individual (different) blocktypes
-	E_BLOCK_MAX_TYPE_ID = E_BLOCK_NUMBER_OF_TYPES - 1  ///< Maximum BlockType number used
+	E_BLOCK_MAX_TYPE_ID = E_BLOCK_NUMBER_OF_TYPES - 1,  ///< Maximum BlockType number used
+	
+	// Synonym or ID compatibility
+	
+	E_BLOCK_YELLOW_FLOWER = E_BLOCK_DANDELION,
+	E_BLOCK_RED_ROSE = E_BLOCK_FLOWER,
+	E_BLOCK_LOCKED_CHEST = E_BLOCK_STAINED_GLASS,
 };
 // tolua_end
 
 // tolua_begin
 enum ENUM_ITEM_ID
 {
-	E_ITEM_EMPTY	= -1,
+	E_ITEM_EMPTY = -1,
 
 	E_ITEM_FIRST = 256,  // First true item type
 	
@@ -343,7 +356,12 @@ enum ENUM_ITEM_ID
 	E_ITEM_NETHER_QUARTZ = 406,
 	E_ITEM_MINECART_WITH_TNT = 407,
 	E_ITEM_MINECART_WITH_HOPPER = 408,
-	// TODO: Add horse armour/horse paraphernalia
+	E_ITEM_IRON_HORSE_ARMOR = 417,
+	E_ITEM_GOLD_HORSE_ARMOR = 418,
+	E_ITEM_DIAMOND_HORSE_ARMOR = 419,
+	E_ITEM_LEAD = 420,
+	E_ITEM_NAME_TAG = 421,
+	E_ITEM_MINECART_WITH_COMMAND_BLOCK = 422,
 	
 	// Keep these two as the last values of the consecutive list, without a number - they will get their correct number assigned automagically by C++
 	// IsValidItem() depends on this!
@@ -399,12 +417,12 @@ 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_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_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,
 
@@ -448,25 +466,25 @@ enum
 	E_META_SAPLING_JUNGLE  = 3,
 	
 	// E_BLOCK_SILVERFISH_EGG metas:
-	E_META_SILVERFISH_EGG_STONE = 0,
+	E_META_SILVERFISH_EGG_STONE       = 0,
 	E_META_SILVERFISH_EGG_COBBLESTONE = 1,
 	E_META_SILVERFISH_EGG_STONE_BRICK = 2,
 	
 	// 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_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,
-	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,
@@ -485,16 +503,20 @@ enum
 	E_META_TORCH_ZP = 4,  // Torch attached to the ZP side of its block
 	
 	// 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_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_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_BLOCK_WOOL metas:
 	E_META_WOOL_WHITE      = 0,
@@ -549,6 +571,42 @@ enum
 	E_META_STAINED_CLAY_GREEN      = 13,
 	E_META_STAINED_CLAY_RED        = 14,
 	E_META_STAINED_CLAY_BLACK      = 15,
+	
+	// E_BLOCK_STAINED_GLASS metas
+	E_META_STAINED_GLASS_WHITE      = 0,
+	E_META_STAINED_GLASS_ORANGE     = 1,
+	E_META_STAINED_GLASS_MAGENTA    = 2,
+	E_META_STAINED_GLASS_LIGHTBLUE  = 3,
+	E_META_STAINED_GLASS_YELLOW     = 4,
+	E_META_STAINED_GLASS_LIGHTGREEN = 5,
+	E_META_STAINED_GLASS_PINK       = 6,
+	E_META_STAINED_GLASS_GRAY       = 7,
+	E_META_STAINED_GLASS_LIGHTGRAY  = 8,
+	E_META_STAINED_GLASS_CYAN       = 9,
+	E_META_STAINED_GLASS_PURPLE     = 10,
+	E_META_STAINED_GLASS_BLUE       = 11,
+	E_META_STAINED_GLASS_BROWN      = 12,
+	E_META_STAINED_GLASS_GREEN      = 13,
+	E_META_STAINED_GLASS_RED        = 14,
+	E_META_STAINED_GLASS_BLACK      = 15,
+	
+	// E_BLOCK_STAINED_GLASS_PANE metas
+	E_META_STAINED_GLASS_PANE_WHITE      = 0,
+	E_META_STAINED_GLASS_PANE_ORANGE     = 1,
+	E_META_STAINED_GLASS_PANE_MAGENTA    = 2,
+	E_META_STAINED_GLASS_PANE_LIGHTBLUE  = 3,
+	E_META_STAINED_GLASS_PANE_YELLOW     = 4,
+	E_META_STAINED_GLASS_PANE_LIGHTGREEN = 5,
+	E_META_STAINED_GLASS_PANE_PINK       = 6,
+	E_META_STAINED_GLASS_PANE_GRAY       = 7,
+	E_META_STAINED_GLASS_PANE_LIGHTGRAY  = 8,
+	E_META_STAINED_GLASS_PANE_CYAN       = 9,
+	E_META_STAINED_GLASS_PANE_PURPLE     = 10,
+	E_META_STAINED_GLASS_PANE_BLUE       = 11,
+	E_META_STAINED_GLASS_PANE_BROWN      = 12,
+	E_META_STAINED_GLASS_PANE_GREEN      = 13,
+	E_META_STAINED_GLASS_PANE_RED        = 14,
+	E_META_STAINED_GLASS_PANE_BLACK      = 15,
 
 	// E_BLOCK_SNOW metas:
 	E_META_SNOW_LAYER_ONE          = 0,
@@ -571,13 +629,39 @@ enum
 	E_META_RAIL_CURVED_ZP_XM       = 7,
 	E_META_RAIL_CURVED_ZM_XM       = 8,
 	E_META_RAIL_CURVED_ZM_XP       = 9,
+	
+	//E_BLOCK_NEW_LEAVES metas
+	E_META_NEW_LEAVES_ACACIA_WOOD   = 0,
+	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_BLOCK_FLOWER metas
+	E_META_FLOWER_POPPY           = 0,
+	E_META_FLOWER_BLUE_ORCHID     = 1,
+	E_META_FLOWER_ALLIUM          = 2,
+	E_META_FLOWER_RED_TULIP       = 4,
+	E_META_FLOWER_ORANGE_TULIP    = 5,
+	E_META_FLOWER_WHITE_TULIP     = 6,
+	E_META_FLOWER_PINK_TULIP      = 7,
+	E_META_FLOWER_OXEYE_DAISY     = 8,
+	
+	//E_BLOCK_BIG_FLOWER metas
+	E_META_BIG_FLOWER_SUNFLOWER         = 0,
+	E_META_BIG_FLOWER_LILAC             = 1,
+	E_META_BIG_FLOWER_DOUBLE_TALL_GRASS = 2,
+	E_META_BIG_FLOWER_LARGE_FERN        = 3,
+	E_META_BIG_FLOWER_ROSE_BUSH         = 4,
+	E_META_BIG_FLOWER_PEONY             = 5,
 
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Item metas:
 	
 	// E_ITEM_COAL metas:
-	E_META_COAL_NORMAL   = 0,
-	E_META_COAL_CHARCOAL   = 1,
+	E_META_COAL_NORMAL    = 0,
+	E_META_COAL_CHARCOAL  = 1,
 	
 	// E_ITEM_DYE metas:
 	E_META_DYE_BLACK      = 0,
@@ -600,6 +684,18 @@ enum
 	// E_ITEM_GOLDEN_APPLE metas:
 	E_META_GOLDEN_APPLE_NORMAL = 0,
 	E_META_GOLDEN_APPLE_ENCHANTED = 1,
+	
+	// E_ITEM_RAW_FISH metas:
+	E_META_RAW_FISH_FISH       = 0,
+	E_META_RAW_FISH_SALMON     = 1,
+	E_META_RAW_FISH_CLOWNFISH  = 2,
+	E_META_RAW_FISH_PUFFERFISH = 3,
+	
+	// E_ITEM_COOKED_FISH metas:
+	E_META_COOKED_FISH_FISH       = 0,
+	E_META_COOKED_FISH_SALMON     = 1,
+	E_META_COOKED_FISH_CLOWNFISH  = 2,
+	E_META_COOKED_FISH_PUFFERFISH = 3,
 
 	// E_ITEM_MINECART_TRACKS metas:
 	E_META_TRACKS_X = 1,