summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-26 16:32:25 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-26 16:32:25 +0200
commit96d5986733b7b396e6e3511b2e35d111440e59a6 (patch)
treedca704320ac88a4e269baed373c9b83532dcfc43 /source
parentMore CodeBlocks project tweaks (diff)
downloadcuberite-96d5986733b7b396e6e3511b2e35d111440e59a6.tar
cuberite-96d5986733b7b396e6e3511b2e35d111440e59a6.tar.gz
cuberite-96d5986733b7b396e6e3511b2e35d111440e59a6.tar.bz2
cuberite-96d5986733b7b396e6e3511b2e35d111440e59a6.tar.lz
cuberite-96d5986733b7b396e6e3511b2e35d111440e59a6.tar.xz
cuberite-96d5986733b7b396e6e3511b2e35d111440e59a6.tar.zst
cuberite-96d5986733b7b396e6e3511b2e35d111440e59a6.zip
Diffstat (limited to 'source')
-rw-r--r--source/BlockID.h171
1 files changed, 96 insertions, 75 deletions
diff --git a/source/BlockID.h b/source/BlockID.h
index c61906701..0cea35f12 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -167,6 +167,8 @@ enum ENUM_BLOCK_ID
E_BLOCK_QUARTZ_BLOCK = 155,
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++
// IsValidBlock() depends on this
E_BLOCK_NUMBER_OF_TYPES, ///< Number of individual (different) blocktypes
@@ -366,74 +368,26 @@ enum ENUM_ITEM_ID
enum
{
- // 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_LOG metas:
- E_META_LOG_APPLE = 0,
- E_META_LOG_CONIFER = 1,
- E_META_LOG_BIRCH = 2,
- E_META_LOG_JUNGLE = 3,
-
- // E_BLOCK_LEAVES metas:
- E_META_LEAVES_APPLE = 0,
- E_META_LEAVES_CONIFER = 1,
- E_META_LEAVES_BIRCH = 2,
- E_META_LEAVES_JUNGLE = 3,
-
- // E_BLOCK_SAPLING metas (lowest 3 bits):
- E_META_SAPLING_APPLE = 0,
- E_META_SAPLING_CONIFER = 1,
- E_META_SAPLING_BIRCH = 2,
- E_META_SAPLING_JUNGLE = 3,
-
- // E_BLOCK_TALL_GRASS metas:
- 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_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
+ // Please keep this list alpha-sorted by the blocktype / itemtype part
+ // then number-sorted for the same block / item
+ ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // Block metas:
+
// E_BLOCK_CHEST metas:
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,
@@ -445,6 +399,40 @@ enum
E_META_DOUBLE_STEP_NETHER_BRICK = 6,
E_META_DOUBLE_STEP_STONE_SECRET = 7,
+ // E_BLOCK_LEAVES metas:
+ E_META_LEAVES_APPLE = 0,
+ E_META_LEAVES_CONIFER = 1,
+ E_META_LEAVES_BIRCH = 2,
+ 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_META_SAPLING_APPLE = 0,
+ E_META_SAPLING_CONIFER = 1,
+ E_META_SAPLING_BIRCH = 2,
+ 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,
@@ -455,17 +443,28 @@ enum
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_TALL_GRASS metas:
+ E_META_TALL_GRASS_DEAD_SHRUB = 0,
+ E_META_TALL_GRASS_GRASS = 1,
+ E_META_TALL_GRASS_FERN = 2,
+
+ // 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_WOODEN_DOUBLE_STEP metas:
E_BLOCK_WOODEN_DOUBLE_STEP_APPLE = 0,
E_BLOCK_WOODEN_DOUBLE_STEP_CONIFER = 1,
@@ -478,18 +477,32 @@ enum
E_BLOCK_WOODEN_STEP_BIRCH = 2,
E_BLOCK_WOODEN_STEP_JUNGLE = 3,
+ // 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,
+
+
+ ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // Item metas:
+
// 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_MINECART_TRACKS metas:
- E_META_TRACKS_X = 1,
- E_META_TRACKS_Z = 0,
-
// E_ITEM_DYE metas:
E_META_DYE_BLACK = 0,
E_META_DYE_RED = 1,
@@ -508,6 +521,14 @@ enum
E_META_DYE_ORANGE = 14,
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:
// See also E_ENTITY_TYPE_XXX, since entity type and spawn egg meta are the same
E_META_SPAWN_EGG_CREEPER = 50,