diff options
Diffstat (limited to '')
| -rw-r--r-- | src/BlockID.h | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/src/BlockID.h b/src/BlockID.h index 1a43d4b64..05dc42f3c 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -163,7 +163,7 @@ enum BLOCKTYPE E_BLOCK_TRAPPED_CHEST = 146, E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE = 147, E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE = 148, - + E_BLOCK_INACTIVE_COMPARATOR = 149, E_BLOCK_ACTIVE_COMPARATOR = 150, E_BLOCK_DAYLIGHT_SENSOR = 151, @@ -174,7 +174,7 @@ enum BLOCKTYPE E_BLOCK_QUARTZ_BLOCK = 155, E_BLOCK_QUARTZ_STAIRS = 156, E_BLOCK_ACTIVATOR_RAIL = 157, - + E_BLOCK_DROPPER = 158, E_BLOCK_STAINED_CLAY = 159, E_BLOCK_STAINED_GLASS_PANE = 160, @@ -215,12 +215,12 @@ enum BLOCKTYPE E_BLOCK_JUNGLE_DOOR = 195, E_BLOCK_ACACIA_DOOR = 196, E_BLOCK_DARK_OAK_DOOR = 197, - + // Keep these two as the last values. Update the last block value when adding another block // IsValidBlock() depends on this E_BLOCK_NUMBER_OF_TYPES = E_BLOCK_DARK_OAK_DOOR + 1, ///< Number of individual (different) blocktypes E_BLOCK_MAX_TYPE_ID = E_BLOCK_NUMBER_OF_TYPES - 1, ///< Maximum BlockType number used - + // Synonym or ID compatibility E_BLOCK_YELLOW_FLOWER = E_BLOCK_DANDELION, E_BLOCK_RED_ROSE = E_BLOCK_FLOWER, @@ -244,7 +244,7 @@ enum ENUM_ITEM_ID E_ITEM_EMPTY = -1, E_ITEM_FIRST = 256, // First true item type - + E_ITEM_IRON_SHOVEL = 256, E_ITEM_IRON_PICKAXE = 257, E_ITEM_IRON_AXE = 258, @@ -422,7 +422,7 @@ enum ENUM_ITEM_ID E_ITEM_JUNGLE_DOOR = 429, E_ITEM_ACACIA_DOOR = 430, E_ITEM_DARK_OAK_DOOR = 431, - + // 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! E_ITEM_NUMBER_OF_CONSECUTIVE_TYPES, ///< Number of individual (different) consecutive itemtypes @@ -441,12 +441,12 @@ enum ENUM_ITEM_ID E_ITEM_WARD_DISC = 2265, E_ITEM_11_DISC = 2266, E_ITEM_WAIT_DISC = 2267, - + // Keep these two as the last values of the disc list, without a number - they will get their correct number assigned automagically by C++ // IsValidItem() depends on this! E_ITEM_LAST_DISC_PLUS_ONE, ///< Useless, really, but needs to be present for the following value E_ITEM_LAST_DISC = E_ITEM_LAST_DISC_PLUS_ONE - 1, ///< Maximum disc itemtype number used - + E_ITEM_LAST = E_ITEM_LAST_DISC, ///< Maximum valid ItemType }; @@ -458,7 +458,7 @@ enum { // Please keep this list alpha-sorted by the blocktype / itemtype part // then number-sorted for the same block / item - + //////////////////////////////////////////////////////////////////////////////// // Block metas: @@ -516,19 +516,19 @@ enum E_META_CARPET_GREEN = 13, E_META_CARPET_RED = 14, E_META_CARPET_BLACK = 15, - + // 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_DIRT metas: E_META_DIRT_NORMAL = 0, E_META_DIRT_GRASSLESS = 1, E_META_DIRT_COARSE = 1, E_META_DIRT_PODZOL = 2, - + // E_BLOCK_DISPENSER / E_BLOCK_DROPPER metas: E_META_DROPSPENSER_FACING_YM = 0, E_META_DROPSPENSER_FACING_YP = 1, @@ -549,7 +549,7 @@ enum E_META_DOUBLE_STONE_SLAB_SMOOTH_STONE = 8, E_META_DOUBLE_STONE_SLAB_SMOOTH_SANDSTONE = 9, E_META_DOUBLE_STONE_SLAB_TILE_QUARTZ = 10, - + // E_BLOCK_FLOWER metas: E_META_FLOWER_POPPY = 0, E_META_FLOWER_BLUE_ORCHID = 1, @@ -559,11 +559,11 @@ enum E_META_FLOWER_WHITE_TULIP = 6, E_META_FLOWER_PINK_TULIP = 7, E_META_FLOWER_OXEYE_DAISY = 8, - + // E_BLOCK_JUKEBOX metas: E_META_JUKEBOX_OFF = 0, E_META_JUKEBOX_ON = 1, - + // E_BLOCK_HOPPER metas: E_META_HOPPER_FACING_YM = 0, E_META_HOPPER_UNATTACHED = 1, // Hopper doesn't move items up, there's no YP @@ -593,21 +593,21 @@ enum E_META_NEWLEAVES_DARK_OAK_NO_DECAY = 5, E_META_NEWLEAVES_ACACIA_CHECK_DECAY = 8, E_META_NEWLEAVES_DARK_OAK_CHECK_DECAY = 9, - + // 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_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_PISTON metas: E_META_PISTON_DOWN = 0, E_META_PISTON_U = 1, @@ -629,12 +629,12 @@ enum // E_BLOCK_(XXX_WEIGHTED)_PRESSURE_PLATE metas: E_META_PRESSURE_PLATE_RAISED = 0, E_META_PRESSURE_PLATE_DEPRESSED = 1, - + // E_BLOCK_PRISMARINE_BLOCK metas: E_META_PRISMARINE_BLOCK_ROUGH = 0, E_META_PRISMARINE_BLOCK_BRICKS = 1, E_META_PRISMARINE_BLOCK_DARK = 2, - + // E_BLOCK_QUARTZ_BLOCK metas: E_META_QUARTZ_NORMAL = 0, E_META_QUARTZ_CHISELLED = 1, @@ -651,21 +651,21 @@ enum E_META_RAIL_CURVED_ZP_XM = 7, E_META_RAIL_CURVED_ZM_XM = 8, E_META_RAIL_CURVED_ZM_XP = 9, - + // E_BLOCK_RED_SANDSTONE metas: E_META_RED_SANDSTONE_NORMAL = 0, E_META_RED_SANDSTONE_ORNAMENT = 1, E_META_RED_SANDSTONE_SMOOTH = 2, - + // E_BLOCK_SAND metas: E_META_SAND_NORMAL = 0, E_META_SAND_RED = 1, - + // 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, @@ -673,12 +673,12 @@ enum E_META_SAPLING_JUNGLE = 3, E_META_SAPLING_ACACIA = 4, E_META_SAPLING_DARK_OAK = 5, - + // 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_SNOW metas: E_META_SNOW_LAYER_ONE = 0, E_META_SNOW_LAYER_TWO = 1, @@ -706,7 +706,7 @@ enum E_META_STAINED_CLAY_GREEN = 13, 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, @@ -724,7 +724,7 @@ enum 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, @@ -768,19 +768,19 @@ enum E_META_STONE_SLAB_STONE_BRICK = 5, E_META_STONE_SLAB_NETHER_BRICK = 6, E_META_STONE_SLAB_QUARTZ = 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_META_TALL_GRASS_DEAD_SHRUB = 0, E_META_TALL_GRASS_GRASS = 1, E_META_TALL_GRASS_FERN = 2, E_META_TALL_GRASS_BIOME = 3, - + // 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, @@ -827,7 +827,7 @@ enum 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_OAK = 0, E_META_WOODEN_SLAB_SPRUCE = 1, @@ -854,10 +854,10 @@ enum E_META_WOOL_GREEN = 13, E_META_WOOL_RED = 14, E_META_WOOL_BLACK = 15, - + //////////////////////////////////////////////////////////////////////////////// // Item metas: - + // E_ITEM_BANNER metas: E_META_BANNER_BLACK = 0, E_META_BANNER_RED = 1, @@ -875,11 +875,11 @@ enum E_META_BANNER_MAGENTA = 13, E_META_BANNER_ORANGE = 14, E_META_BANNER_WHITE = 15, - + // E_ITEM_COAL metas: E_META_COAL_NORMAL = 0, E_META_COAL_CHARCOAL = 1, - + // E_ITEM_DYE metas: E_META_DYE_BLACK = 0, E_META_DYE_RED = 1, @@ -901,20 +901,20 @@ enum // E_ITEM_GOLDEN_APPLE metas: E_META_GOLDEN_APPLE_NORMAL = 0, E_META_GOLDEN_APPLE_ENCHANTED = 1, - + // E_ITEM_HEAD metas: E_META_HEAD_SKELETON = 0, E_META_HEAD_WITHER = 1, E_META_HEAD_ZOMBIE = 2, E_META_HEAD_PLAYER = 3, E_META_HEAD_CREEPER = 4, - + // E_ITEM_RAW_FISH metas: E_META_RAW_FISH_FISH = 0, E_META_RAW_FISH_SALMON = 1, E_META_RAW_FISH_CLOWNFISH = 2, E_META_RAW_FISH_PUFFERFISH = 3, - + // E_ITEM_COOKED_FISH metas: E_META_COOKED_FISH_FISH = 0, E_META_COOKED_FISH_SALMON = 1, @@ -922,7 +922,7 @@ enum // E_ITEM_MINECART_TRACKS metas: E_META_TRACKS_X = 1, E_META_TRACKS_Z = 0, - + // E_ITEM_SPAWN_EGG metas: // See also cMonster::eType, since monster type and spawn egg meta are the same E_META_SPAWN_EGG_PICKUP = 1, @@ -1022,7 +1022,7 @@ enum eDamageType dtEnderPearl, // Thrown an ender pearl, teleported by it dtAdmin, // Damage applied by an admin command dtExplosion, // Damage applied by an explosion - + // Some common synonyms: dtPawnAttack = dtAttack, dtEntityAttack = dtAttack, |