From 116bd7ce34e37941f457749e8eb955104922c1b3 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Wed, 6 Jun 2012 19:46:49 +0000 Subject: BlockIDs, ItemIDs and Metas updated, courtesy of Taugeshtu git-svn-id: http://mc-server.googlecode.com/svn/trunk@560 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/BlockID.h | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 168 insertions(+), 5 deletions(-) diff --git a/source/BlockID.h b/source/BlockID.h index ebe089f09..3e0b261cf 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -48,8 +48,10 @@ enum ENUM_BLOCK_ID E_BLOCK_RED_MUSHROOM = 40, E_BLOCK_GOLD_BLOCK = 41, E_BLOCK_IRON_BLOCK = 42, - E_BLOCK_DOUBLE_STEP = 43, - E_BLOCK_STEP = 44, + E_BLOCK_DOUBLE_STONE_SLAB = 43, + E_BLOCK_DOUBLE_STEP = 43, /// OBSOLETE, use E_BLOCK_DOUBLE_STONE_SLAB instead + E_BLOCK_STONE_SLAB = 44, + E_BLOCK_STEP = 44, /// OBSOLETE, use E_BLOCK_STONE_SLAB instead E_BLOCK_BRICK = 45, E_BLOCK_TNT = 46, E_BLOCK_BOOKCASE = 47, @@ -63,15 +65,18 @@ enum ENUM_BLOCK_ID E_BLOCK_REDSTONE_WIRE = 55, E_BLOCK_DIAMOND_ORE = 56, E_BLOCK_DIAMOND_BLOCK = 57, + E_BLOCK_CRAFTING_TABLE = 58, E_BLOCK_WORKBENCH = 58, E_BLOCK_CROPS = 59, E_BLOCK_SOIL = 60, // Deprecated, use E_BLOCK_FARMLAND instead E_BLOCK_FARMLAND = 60, E_BLOCK_FURNACE = 61, + E_BLOCK_LIT_FURNACE = 62, E_BLOCK_BURNING_FURNACE = 62, E_BLOCK_SIGN_POST = 63, E_BLOCK_WOODEN_DOOR = 64, E_BLOCK_LADDER = 65, + E_BLOCK_RAIL = 66, E_BLOCK_MINECART_TRACKS = 66, E_BLOCK_COBBLESTONE_STAIRS = 67, E_BLOCK_WALLSIGN = 68, @@ -89,6 +94,7 @@ enum ENUM_BLOCK_ID E_BLOCK_SNOW_BLOCK = 80, E_BLOCK_CACTUS = 81, E_BLOCK_CLAY = 82, + E_BLOCK_SUGARCANE = 83, E_BLOCK_REEDS = 83, E_BLOCK_JUKEBOX = 84, E_BLOCK_FENCE = 85, @@ -133,6 +139,15 @@ enum ENUM_BLOCK_ID E_BLOCK_DRAGON_EGG = 122, E_BLOCK_REDSTONE_LAMP_OFF = 123, E_BLOCK_REDSTONE_LAMP_ON = 124, + E_BLOCK_DOUBLE_WOODEN_SLAB = 125, + E_BLOCK_WOODEN_SLAB = 126, + E_BLOCK_COCA_PLANT = 127, + E_BLOCK_SANDSTONE_STAIRS = 128, + E_BLOCK_EMERALD_ORE = 129, + E_BLOCK_ENDER_CHEST = 130, + E_BLOCK_TRIPWIRE_HOOK = 131, + E_BLOCK_TRIPWIRE = 132, + E_BLOCK_EMERALD_BLOCK = 133, E_BLOCK_ = 121, }; //tolua_end @@ -184,8 +199,10 @@ enum ENUM_ITEM_ID E_ITEM_RED_MUSHROOM = 40, E_ITEM_GOLD_BLOCK = 41, E_ITEM_IRON_BLOCK = 42, - E_ITEM_DOUBLE_STEP = 43, - E_ITEM_STEP = 44, + E_ITEM_DOUBLE_STONE_SLAB = 43, + E_ITEM_DOUBLE_STEP = 43, /// OBSOLETE, use E_ITEM_DOUBLE_STONE_SLAB + E_ITEM_STONE_SLAB = 44, + E_ITEM_STEP = 44, /// OBSOLETE, use E_ITEM_STONE_SLAB E_ITEM_BRICK = 45, E_ITEM_TNT = 46, E_ITEM_BOOKCASE = 47, @@ -262,12 +279,23 @@ enum ENUM_ITEM_ID E_ITEM_END_PORTAL = 119, E_ITEM_END_PORTAL_FRAME = 120, E_ITEM_END_STONE = 121, + + E_ITEM_DOUBLE_WOODEN_SLAB = 125, + E_ITEM_WOODEN_SLAB = 126, + E_ITEM_COCA_PLANT = 127, + E_ITEM_SANDSTONE_STAIRS = 128, + E_ITEM_EMERALD_ORE = 129, + E_ITEM_ENDER_CHEST = 130, + E_ITEM_TRIPWIRE_HOOK = 131, + E_ITEM_TRIPWIRE = 132, + E_ITEM_EMERALD_BLOCK = 133, E_ITEM_IRON_SHOVEL = 256, E_ITEM_IRON_PICKAXE = 257, E_ITEM_IRON_AXE = 258, E_ITEM_FLINT_AND_STEEL = 259, - E_ITEM_APPLE = 260, + E_ITEM_RED_APPLE = 260, + E_ITEM_APPLE = 260, // OBSOLETE, use E_ITEM_RED_APPLE instead E_ITEM_BOW = 261, E_ITEM_ARROW = 262, E_ITEM_COAL = 263, @@ -345,6 +373,7 @@ enum ENUM_ITEM_ID E_ITEM_MILK = 335, E_ITEM_CLAY_BRICK = 336, E_ITEM_CLAY = 337, + E_ITEM_SUGARCANE = 338, E_ITEM_SUGAR_CANE = 338, E_ITEM_PAPER = 339, E_ITEM_BOOK = 340, @@ -390,6 +419,13 @@ enum ENUM_ITEM_ID E_ITEM_CAULDRON = 380, E_ITEM_EYE_OF_ENDER = 381, E_ITEM_GLISTERING_MELON = 382, + + E_ITEM_SPAWN_EGG = 383, + E_ITEM_BOTTLE_O_ENCHANTING = 384, + E_ITEM_FIRE_CHARGE = 385, + E_ITEM_BOOK_AND_QUILL = 386, + E_ITEM_WRITTEN_BOOK = 387, + E_ITEM_EMERALD = 388, E_ITEM_13_DISC = 2256, E_ITEM_CAT_DISC = 2257, @@ -438,6 +474,133 @@ enum E_META_TALL_GRASS_DEAD_SHRUB = 0, E_META_TALL_GRASS_GRASS = 1, E_META_TALL_GRASS_FERN = 2, + + // E_BLOCK_SANDSTONE metas: + E_META_SANDSTONE_NORMAL = 0, + E_META_SANDSTONE_ORNAMENT = 1, + E_META_SANDSTONE_SMOOTH = 2, + + // E_BLOCK_WOOL metas: + E_META_WOOL_WHITE = 0, + E_META_WOOL_ORANGE = 1, + E_META_WOOL_MAGENTA = 2, + E_META_WOOL_LIGHTBLUE = 3, + E_META_WOOL_YELLOW = 4, + E_META_WOOL_LIGHTGREEN = 5, + E_META_WOOL_PINK = 6, + E_META_WOOL_GRAY = 7, + E_META_WOOL_LIGHTGRAY = 8, + E_META_WOOL_CYAN = 9, + E_META_WOOL_PURPLE = 10, + E_META_WOOL_BLUE = 11, + E_META_WOOL_BROWN = 12, + E_META_WOOL_GREEN = 13, + E_META_WOOL_RED = 14, + E_META_WOOL_BLACK = 15, + + // 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_STONE_SECRET = 6, + + // 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_STONE_SECRET = 6, + + // E_BLOCK_SILVERFISH_EGG metas: + E_META_SILVERFISH_EGG_STONE = 0, + E_META_SILVERFISH_EGG_COBBLESTONE = 1, + E_META_SILVERFISH_EGG_STONE_BRICK = 2, + + // 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_BLOCK_WOODEN_DOUBLE_STEP metas: + E_BLOCK_WOODEN_DOUBLE_STEP_APPLE = 0, + E_BLOCK_WOODEN_DOUBLE_STEP_CONIFER = 1, + E_BLOCK_WOODEN_DOUBLE_STEP_BIRCH = 2, + E_BLOCK_WOODEN_DOUBLE_STEP_JUNGLE = 3, + + // E_BLOCK_WOODEN_STEP metas: + E_BLOCK_WOODEN_STEP_APPLE = 0, + E_BLOCK_WOODEN_STEP_CONIFER = 1, + E_BLOCK_WOODEN_STEP_BIRCH = 2, + E_BLOCK_WOODEN_STEP_JUNGLE = 3, +} ; + + + + + + + +enum +{ + // E_ITEM_COAL metas: + E_META_COAL_NORMAL = 0, + E_META_COAL_CHARCOAL = 1, + + // E_ITEM_GOLDEN_APPLE metas: + E_META_GOLDEN_APPLE_NORMAL = 0, + E_META_GOLDEN_APPLE_ENCHANTED = 1, + + // E_ITEM_DYE metas: + E_META_DYE_BLACK = 0, + E_META_DYE_RED = 1, + E_META_DYE_GREEN = 2, + E_META_DYE_BROWN = 3, + E_META_DYE_BLUE = 4, + E_META_DYE_PURPLE = 5, + E_META_DYE_CYAN = 6, + E_META_DYE_LIGHTGRAY = 7, + E_META_DYE_GRAY = 8, + E_META_DYE_PINK = 9, + E_META_DYE_LIGHTGREEN = 10, + E_META_DYE_YELLOW = 11, + E_META_DYE_LIGHTBLUE = 12, + E_META_DYE_MAGENTA = 13, + E_META_DYE_ORANGE = 14, + E_META_DYE_WHITE = 15, + + // E_ITEM_SPAWN_EGG spawn EntityIDs: + // hostile: + E_META_SPAWN_EGG_CREEPER = 50, + E_META_SPAWN_EGG_SKELETON = 51, + E_META_SPAWN_EGG_SPIDER = 52, + E_META_SPAWN_EGG_ZOMBIE = 54, + E_META_SPAWN_EGG_SLIME = 55, + E_META_SPAWN_EGG_GHAST = 56, + E_META_SPAWN_EGG_ZOMBIE_PIGMAN = 57, + E_META_SPAWN_EGG_ENDERMAN = 58, + E_META_SPAWN_EGG_CAVE_SPIDER = 59, + E_META_SPAWN_EGG_SILVERFISH = 60, + E_META_SPAWN_EGG_BLAZE = 61, + E_META_SPAWN_EGG_MAGMA_CUBE = 62, + E_META_SPAWN_EGG_GIANT = 53, + E_META_SPAWN_EGG_ENDER_DRAGON = 63, + E_META_SPAWN_EGG_PIG = 90, + E_META_SPAWN_EGG_SHEEP = 91, + E_META_SPAWN_EGG_COW = 92, + E_META_SPAWN_EGG_CHICKEN = 93, + E_META_SPAWN_EGG_SQUID = 94, + E_META_SPAWN_EGG_WOLF = 95, + E_META_SPAWN_EGG_MOOSHROOM = 96, + E_META_SPAWN_EGG_OCELOT = 98, + E_META_SPAWN_EGG_VILLAGER = 120, + E_META_SPAWN_EGG_SNOW_GOLEM = 97, + E_META_SPAWN_EGG_IRON_GOLEM = 99, } ; //tolua_end -- cgit v1.2.3