flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Update in progress to minecraft 1.7

Browse Source
This commit is contained in:
nesco 2013-11-12 14:32:23 +01:00
parent 047995ef25
commit 6cbf205b94
1 changed files with 82 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
source/BlockID.h
View File

@ -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,10 +170,17 @@ 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
@ -343,7 +350,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!
@ -489,12 +501,16 @@ enum
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_BLOCK_WOOL metas:
E_META_WOOL_WHITE = 0,
@ -550,6 +566,42 @@ enum
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,
E_META_SNOW_LAYER_TWO = 1,
@ -572,6 +624,32 @@ enum
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: