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

Fixed Formmating

Browse Source
This commit is contained in:
narroo 2014-04-28 15:49:34 -04:00
parent ff18400535
commit f4fa3985b5
1 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/BlockID.h
View File

@ -455,17 +455,17 @@ enum
E_META_DROPSPENSER_FACING_XP = 5, E_META_DROPSPENSER_FACING_XP = 5,
// E_BLOCK_DOUBLE_STONE_SLAB metas: // E_BLOCK_DOUBLE_STONE_SLAB metas:
E_META_DOUBLE_STONE_SLAB_STONE = 0, E_META_DOUBLE_STONE_SLAB_STONE = 0,
E_META_DOUBLE_STONE_SLAB_SANDSTONE = 1, E_META_DOUBLE_STONE_SLAB_SANDSTON = 1,
E_META_DOUBLE_STONE_SLAB_WOODEN = 2, E_META_DOUBLE_STONE_SLAB_WOODEN = 2,
E_META_DOUBLE_STONE_SLAB_COBBLESTONE = 3, E_META_DOUBLE_STONE_SLAB_COBBLESTONE = 3,
E_META_DOUBLE_STONE_SLAB_BRICK = 4, E_META_DOUBLE_STONE_SLAB_BRICK = 4,
E_META_DOUBLE_STONE_SLAB_STONE_BRICK = 5, E_META_DOUBLE_STONE_SLAB_STONE_BRICK = 5,
E_META_DOUBLE_STONE_SLAB_NETHER_BRICK = 6, E_META_DOUBLE_STONE_SLAB_NETHER_BRICK = 6,
E_META_DOUBLE_STONE_SLAB_QUARTZ = 7, E_META_DOUBLE_STONE_SLAB_QUARTZ = 7,
E_META_DOUBLE_STONE_SLAB_SMOOTH_STONE = 8, E_META_DOUBLE_STONE_SLAB_SMOOTH_STONE = 8,
E_META_DOUBLE_STONE_SLAB_SMOOTH_SANDSTONE = 9, E_META_DOUBLE_STONE_SLAB_SMOOTH_SANDSTONE = 9,
E_META_DOUBLE_STONE_SLAB_TILE_QUARTZ = 10, E_META_DOUBLE_STONE_SLAB_TILE_QUARTZ = 10,
// E_BLOCK_FLOWER metas // E_BLOCK_FLOWER metas
E_META_FLOWER_POPPY = 0, E_META_FLOWER_POPPY = 0,
@ -508,14 +508,14 @@ enum
E_META_LEAVES_JUNGLE_NO_DECAY_AND_CHECK_DECAY = 15, E_META_LEAVES_JUNGLE_NO_DECAY_AND_CHECK_DECAY = 15,
// E_BLOCK_LEAVES meta cont. (Block ID 161): // E_BLOCK_LEAVES meta cont. (Block ID 161):
E_META_LEAVES_ACACIA = 0, E_META_LEAVES_ACACIA = 0,
E_META_LEAVES_DARK_OAK = 1, E_META_LEAVES_DARK_OAK = 1,
E_META_LEAVES_ACACIA_NO_DECAY = 4, E_META_LEAVES_ACACIA_NO_DECAY = 4,
E_META_LEAVES_DARK_OAK_NO_DECAY = 5, E_META_LEAVES_DARK_OAK_NO_DECAY = 5,
E_META_LEAVES_ACACIA_CHECK_DECAY = 8, E_META_LEAVES_ACACIA_CHECK_DECAY = 8,
E_META_LEAVES_DARK_OAK_CHECK_DECAY = 9, E_META_LEAVES_DARK_OAK_CHECK_DECAY = 9,
E_META_LEAVES_ACACIA_NO_DECAY_CHECK_DECAY = 12, E_META_LEAVES_ACACIA_NO_DECAY_CHECK_DECAY = 12,
E_META_LEAVES_DARK_OAK_NO_DECAY_CHECK_DECAY = 13, E_META_LEAVES_DARK_OAK_NO_DECAY_CHECK_DECAY = 13,
// E_BLOCK_LOG metas: // E_BLOCK_LOG metas:
E_META_LOG_APPLE = 0, E_META_LOG_APPLE = 0,
@ -532,14 +532,14 @@ enum
E_META_NEW_LOG_DARK_OAK_WOOD = 1, E_META_NEW_LOG_DARK_OAK_WOOD = 1,
// E_BLOCK_PISTON metas: // E_BLOCK_PISTON metas:
E_META_PISTON_DOWN = 0, E_META_PISTON_DOWN = 0,
E_META_PISTON_UP = 1, E_META_PISTON_UP = 1,
E_META_PISTON_NORTH = 2, E_META_PISTON_NORTH = 2,
E_META_PISTON_SOUTH = 3, E_META_PISTON_SOUTH = 3,
E_META_PISTON_WEST = 4, E_META_PISTON_WEST = 4,
E_META_PISTON_EAST = 5, E_META_PISTON_EAST = 5,
E_META_PISTON_HEAD_STICKY = 8, E_META_PISTON_HEAD_STICKY = 8,
E_META_PISTON_EXTENDED = 8, E_META_PISTON_EXTENDED = 8,
// E_BLOCK_PLANKS metas: // E_BLOCK_PLANKS metas:
E_META_PLANKS_APPLE = 0, E_META_PLANKS_APPLE = 0,
@ -657,30 +657,30 @@ enum
E_META_STAINED_GLASS_PANE_BLACK = 15, E_META_STAINED_GLASS_PANE_BLACK = 15,
// E_BLOCK_STAIRS metas: // E_BLOCK_STAIRS metas:
E_BLOCK_STAIRS_EAST = 0, E_BLOCK_STAIRS_EAST = 0,
E_BLOCK_STAIRS_WEST = 1, E_BLOCK_STAIRS_WEST = 1,
E_BLOCK_STAIRS_SOUTH = 2, E_BLOCK_STAIRS_SOUTH = 2,
E_BLOCK_STAIRS_NORTH = 3, E_BLOCK_STAIRS_NORTH = 3,
E_BLOCK_STAIRS_UPSIDE_DOWN = 4, E_BLOCK_STAIRS_UPSIDE_DOWN = 4,
// E_BLOCK_STONE metas: // E_BLOCK_STONE metas:
E_META_STONE_STONE = 0, E_META_STONE_STONE = 0,
E_META_STONE_GRANITE = 1, E_META_STONE_GRANITE = 1,
E_META_STONE_POLISHED_GRANITE = 2, E_META_STONE_POLISHED_GRANITE = 2,
E_META_STONE_DIORITE = 3, E_META_STONE_DIORITE = 3,
E_META_STONE_POLISHED_DIORITE = 4, E_META_STONE_POLISHED_DIORITE = 4,
E_META_STONE_ANDESITE = 5, E_META_STONE_ANDESITE = 5,
E_META_STONE_POLISHED_ANDESITE = 6, E_META_STONE_POLISHED_ANDESITE = 6,
// E_BLOCK_STONE_SLAB metas: // E_BLOCK_STONE_SLAB metas:
E_META_STONE_SLAB_STONE = 0, E_META_STONE_SLAB_STONE = 0,
E_META_STONE_SLAB_SANDSTONE = 1, E_META_STONE_SLAB_SANDSTONE = 1,
E_META_STONE_SLAB_PLANKS = 2, E_META_STONE_SLAB_PLANKS = 2,
E_META_STONE_SLAB_COBBLESTONE = 3, E_META_STONE_SLAB_COBBLESTONE = 3,
E_META_STONE_SLAB_BRICK = 4, E_META_STONE_SLAB_BRICK = 4,
E_META_STONE_SLAB_STONE_BRICK = 5, E_META_STONE_SLAB_STONE_BRICK = 5,
E_META_STONE_SLAB_NETHER_BRICK = 6, E_META_STONE_SLAB_NETHER_BRICK = 6,
E_META_STONE_SLAB_QUARTZ = 7, E_META_STONE_SLAB_QUARTZ = 7,
// E_BLOCK_STONE_BRICKS metas: // E_BLOCK_STONE_BRICKS metas:
E_META_STONE_BRICK_NORMAL = 0, E_META_STONE_BRICK_NORMAL = 0,
@ -689,10 +689,10 @@ enum
E_META_STONE_BRICK_ORNAMENT = 3, 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_META_TALL_GRASS_BIOME = 3, E_META_TALL_GRASS_BIOME = 3,
// E_BLOCK_TORCH, E_BLOCK_REDSTONE_TORCH_OFF, E_BLOCK_REDSTONE_TORCH_ON metas: // 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_EAST = 1, // east face of the block, pointing east
@ -706,22 +706,22 @@ enum
E_META_TORCH_ZP = 4, // Torch attached to the ZP side of its block E_META_TORCH_ZP = 4, // Torch attached to the ZP side of its block
// E_BLOCK_WOOD metas: // E_BLOCK_WOOD metas:
E_BLOCK_WOOD_OAK_UP_DOWN = 0, E_BLOCK_WOOD_OAK_UP_DOWN = 0,
E_BLOCK_WOOD_SPRUCE_UP_DOWN = 1, E_BLOCK_WOOD_SPRUCE_UP_DOWN = 1,
E_BLOCK_WOOD_BIRCH_UP_DOWN = 2, E_BLOCK_WOOD_BIRCH_UP_DOWN = 2,
E_BLOCK_WOOD_JUNGLE_UP_DOWN = 3, E_BLOCK_WOOD_JUNGLE_UP_DOWN = 3,
E_BLOCK_WOOD_OAK_EAST_WEST = 4, E_BLOCK_WOOD_OAK_EAST_WEST = 4,
E_BLOCK_WOOD_SPRUCE_EAST_WEST = 5, E_BLOCK_WOOD_SPRUCE_EAST_WEST = 5,
E_BLOCK_WOOD_BIRCH_EAST_WEST = 6, E_BLOCK_WOOD_BIRCH_EAST_WEST = 6,
E_BLOCK_WOOD_JUNGLE_EAST_WEST = 7, E_BLOCK_WOOD_JUNGLE_EAST_WEST = 7,
E_BLOCK_WOOD_OAK_NORTH_SOUTH = 8, E_BLOCK_WOOD_OAK_NORTH_SOUTH = 8,
E_BLOCK_WOOD_SPRUCE_NORTH_SOUTH = 9, E_BLOCK_WOOD_SPRUCE_NORTH_SOUTH = 9,
E_BLOCK_WOOD_BIRCH_NORTH_SOUTH = 10, E_BLOCK_WOOD_BIRCH_NORTH_SOUTH = 10,
E_BLOCK_WOOD_JUNGLE_NORTH_SOUTH = 11, E_BLOCK_WOOD_JUNGLE_NORTH_SOUTH = 11,
E_BLOCK_WOOD_OAK_BARK_ONLY = 12, E_BLOCK_WOOD_OAK_BARK_ONLY = 12,
E_BLOCK_WOOD_SPRUCE_BARK_ONLY = 13, E_BLOCK_WOOD_SPRUCE_BARK_ONLY = 13,
E_BLOCK_WOOD_BIRCH_BARK_ONLY = 14, E_BLOCK_WOOD_BIRCH_BARK_ONLY = 14,
E_BLOCK_WOOD_JUNGLE_BARK_ONLY = 15, E_BLOCK_WOOD_JUNGLE_BARK_ONLY = 15,
// E_BLOCK_WOOD metas cont. (Block ID 162): // E_BLOCK_WOOD metas cont. (Block ID 162):
E_BLOCK_WOOD_ACACIA_UP_DOWN = 0, E_BLOCK_WOOD_ACACIA_UP_DOWN = 0,
@ -756,8 +756,8 @@ enum
E_META_WOODEN_SLAB_JUNGLE = 3, E_META_WOODEN_SLAB_JUNGLE = 3,
E_META_WOODEN_SLAB_ACACIA = 4, E_META_WOODEN_SLAB_ACACIA = 4,
E_META_WOODEN_SLAB_DARK_OAK = 5, E_META_WOODEN_SLAB_DARK_OAK = 5,
E_META_WOODEN_SLAB_RIGHT_SIDE_UP = 0, E_META_WOODEN_SLAB_RIGHT_SIDE_UP = 0,
E_META_WOODWN_SLAB_UPSIDE_DOWN = 8, E_META_WOODWN_SLAB_UPSIDE_DOWN = 8,
// E_BLOCK_WOOL metas: // E_BLOCK_WOOL metas:
E_META_WOOL_WHITE = 0, E_META_WOOL_WHITE = 0,