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

Alpha-sorted the block meta list

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1512 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2013-05-26 14:32:25 +00:00
parent 40d049e9c6
commit 96d5986733
1 changed files with 103 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

185
source/BlockID.h
View File

@ -167,6 +167,8 @@ enum ENUM_BLOCK_ID
E_BLOCK_QUARTZ_BLOCK = 155, E_BLOCK_QUARTZ_BLOCK = 155,
E_BLOCK_ACTIVATOR_RAIL = 157, E_BLOCK_ACTIVATOR_RAIL = 157,
E_BLOCK_DROPPER = 158,
// Keep these two as the last values, without a number - they will get their correct number assigned automagically by C++ // Keep these two as the last values, without a number - they will get their correct number assigned automagically by C++
// IsValidBlock() depends on this // IsValidBlock() depends on this
E_BLOCK_NUMBER_OF_TYPES, ///< Number of individual (different) blocktypes E_BLOCK_NUMBER_OF_TYPES, ///< Number of individual (different) blocktypes
@ -366,17 +368,36 @@ enum ENUM_ITEM_ID
enum enum
{ {
// E_BLOCK_PLANKS metas: // Please keep this list alpha-sorted by the blocktype / itemtype part
E_META_PLANKS_APPLE = 0, // then number-sorted for the same block / item
E_META_PLANKS_CONIFER = 1,
E_META_PLANKS_BIRCH = 2,
E_META_PLANKS_JUNGLE = 3,
// E_BLOCK_LOG metas: ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
E_META_LOG_APPLE = 0, // Block metas:
E_META_LOG_CONIFER = 1,
E_META_LOG_BIRCH = 2, // E_BLOCK_CHEST metas:
E_META_LOG_JUNGLE = 3, E_META_CHEST_FACING_ZM = 2,
E_META_CHEST_FACING_ZP = 3,
E_META_CHEST_FACING_XM = 4,
E_META_CHEST_FACING_XP = 5,
// E_BLOCK_DISPENSER / E_BLOCK_DROPPER / E_BLOCK_HOPPER metas:
E_META_DISPENSER_FACING_YM = 0,
E_META_DISPENSER_FACING_YP = 1,
E_META_HOPPER_UNATTACHED = 1, // Hopper doesn't move items up
E_META_DISPENSER_FACING_ZM = 2,
E_META_DISPENSER_FACING_ZP = 3,
E_META_DISPENSER_FACING_XM = 4,
E_META_DISPENSER_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_LEAVES metas: // E_BLOCK_LEAVES metas:
E_META_LEAVES_APPLE = 0, E_META_LEAVES_APPLE = 0,
@ -384,21 +405,77 @@ enum
E_META_LEAVES_BIRCH = 2, E_META_LEAVES_BIRCH = 2,
E_META_LEAVES_JUNGLE = 3, E_META_LEAVES_JUNGLE = 3,
// E_BLOCK_LOG metas:
E_META_LOG_APPLE = 0,
E_META_LOG_CONIFER = 1,
E_META_LOG_BIRCH = 2,
E_META_LOG_JUNGLE = 3,
// 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_BLOCK_SANDSTONE metas:
E_META_SANDSTONE_NORMAL = 0,
E_META_SANDSTONE_ORNAMENT = 1,
E_META_SANDSTONE_SMOOTH = 2,
// E_BLOCK_SAPLING metas (lowest 3 bits): // E_BLOCK_SAPLING metas (lowest 3 bits):
E_META_SAPLING_APPLE = 0, E_META_SAPLING_APPLE = 0,
E_META_SAPLING_CONIFER = 1, E_META_SAPLING_CONIFER = 1,
E_META_SAPLING_BIRCH = 2, E_META_SAPLING_BIRCH = 2,
E_META_SAPLING_JUNGLE = 3, E_META_SAPLING_JUNGLE = 3,
// 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_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_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_TALL_GRASS metas: // E_BLOCK_TALL_GRASS metas:
E_META_TALL_GRASS_DEAD_SHRUB = 0, E_META_TALL_GRASS_DEAD_SHRUB = 0,
E_META_TALL_GRASS_GRASS = 1, E_META_TALL_GRASS_GRASS = 1,
E_META_TALL_GRASS_FERN = 2, E_META_TALL_GRASS_FERN = 2,
// E_BLOCK_SANDSTONE metas: // E_BLOCK_TORCH, E_BLOCK_REDSTONE_TORCH_OFF, E_BLOCK_REDSTONE_TORCH_ON metas:
E_META_SANDSTONE_NORMAL = 0, E_META_TORCH_EAST = 1, // east face of the block, pointing east
E_META_SANDSTONE_ORNAMENT = 1, E_META_TORCH_WEST = 2,
E_META_SANDSTONE_SMOOTH = 2, 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_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,
// E_BLOCK_WOOL metas: // E_BLOCK_WOOL metas:
E_META_WOOL_WHITE = 0, E_META_WOOL_WHITE = 0,
@ -418,78 +495,14 @@ enum
E_META_WOOL_RED = 14, E_META_WOOL_RED = 14,
E_META_WOOL_BLACK = 15, E_META_WOOL_BLACK = 15,
// 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
E_META_TORCH_WEST = 2,
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_BLOCK_CHEST metas: ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
E_META_CHEST_FACING_ZM = 2, // Item metas:
E_META_CHEST_FACING_ZP = 3,
E_META_CHEST_FACING_XM = 4,
E_META_CHEST_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_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_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,
// E_ITEM_COAL metas: // E_ITEM_COAL metas:
E_META_COAL_NORMAL = 0, E_META_COAL_NORMAL = 0,
E_META_COAL_CHARCOAL = 1, E_META_COAL_CHARCOAL = 1,
// E_ITEM_GOLDEN_APPLE metas:
E_META_GOLDEN_APPLE_NORMAL = 0,
E_META_GOLDEN_APPLE_ENCHANTED = 1,
// E_ITEM_MINECART_TRACKS metas:
E_META_TRACKS_X = 1,
E_META_TRACKS_Z = 0,
// E_ITEM_DYE metas: // E_ITEM_DYE metas:
E_META_DYE_BLACK = 0, E_META_DYE_BLACK = 0,
E_META_DYE_RED = 1, E_META_DYE_RED = 1,
@ -508,6 +521,14 @@ enum
E_META_DYE_ORANGE = 14, E_META_DYE_ORANGE = 14,
E_META_DYE_WHITE = 15, E_META_DYE_WHITE = 15,
// E_ITEM_GOLDEN_APPLE metas:
E_META_GOLDEN_APPLE_NORMAL = 0,
E_META_GOLDEN_APPLE_ENCHANTED = 1,
// E_ITEM_MINECART_TRACKS metas:
E_META_TRACKS_X = 1,
E_META_TRACKS_Z = 0,
// E_ITEM_SPAWN_EGG spawn EntityIDs: // E_ITEM_SPAWN_EGG spawn EntityIDs:
// See also E_ENTITY_TYPE_XXX, since entity type and spawn egg meta are the same // See also E_ENTITY_TYPE_XXX, since entity type and spawn egg meta are the same
E_META_SPAWN_EGG_CREEPER = 50, E_META_SPAWN_EGG_CREEPER = 50,