diff options
Diffstat (limited to 'src/BlockID.h')
| -rw-r--r-- | src/BlockID.h | 56 |
1 files changed, 55 insertions, 1 deletions
diff --git a/src/BlockID.h b/src/BlockID.h index 0f66026b6..8454cd3da 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -248,12 +248,30 @@ enum ENUM_BLOCK_ID : BLOCKTYPE E_BLOCK_GREEN_SHULKER_BOX = 232, E_BLOCK_RED_SHULKER_BOX = 233, E_BLOCK_BLACK_SHULKER_BOX = 234, + E_BLOCK_WHITE_GLAZED_TERRACOTTA = 235, + E_BLOCK_ORANGE_GLAZED_TERRACOTTA = 236, + E_BLOCK_MAGENTA_GLAZED_TERRACOTTA = 237, + E_BLOCK_LIGHT_BLUE_GLAZED_TERRACOTTA = 238, + E_BLOCK_YELLOW_GLAZED_TERRACOTTA = 239, + E_BLOCK_LIME_GLAZED_TERRACOTTA = 240, + E_BLOCK_PINK_GLAZED_TERRACOTTA = 241, + E_BLOCK_GRAY_GLAZED_TERRACOTTA = 242, + E_BLOCK_LIGHT_GRAY_GLAZED_TERRACOTTA = 243, + E_BLOCK_CYAN_GLAZED_TERRACOTTA = 244, + E_BLOCK_PURPLE_GLAZED_TERRACOTTA = 245, + E_BLOCK_BLUE_GLAZED_TERRACOTTA = 246, + E_BLOCK_BROWN_GLAZED_TERRACOTTA = 247, + E_BLOCK_GREEN_GLAZED_TERRACOTTA = 248, + E_BLOCK_RED_GLAZED_TERRACOTTA = 249, + E_BLOCK_BLACK_GLAZED_TERRACOTTA = 250, + E_BLOCK_CONCRETE = 251, + E_BLOCK_CONCRETE_POWDER = 252, // ... E_BLOCK_STRUCTURE_BLOCK = 255, // Keep these two as the last values. Update the last block value to the last block with an id less than 255 when adding another block // IsValidBlock() depends on this (255 gets checked additionally because there is a gap. See http://minecraft.gamepedia.com/Data_values#Block_IDs - E_BLOCK_NUMBER_OF_TYPES = E_BLOCK_BLACK_SHULKER_BOX + 1, ///< Number of individual (different) blocktypes + E_BLOCK_NUMBER_OF_TYPES = E_BLOCK_CONCRETE_POWDER + 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 @@ -573,6 +591,42 @@ enum ENUM_BLOCK_META : NIBBLETYPE E_META_CHEST_FACING_XM = 4, E_META_CHEST_FACING_XP = 5, + // E_BLOCK_CONCRETE metas: + E_META_CONCRETE_WHITE = 0, + E_META_CONCRETE_ORANGE = 1, + E_META_CONCRETE_MAGENTA = 2, + E_META_CONCRETE_LIGHTBLUE = 3, + E_META_CONCRETE_YELLOW = 4, + E_META_CONCRETE_LIGHTGREEN = 5, + E_META_CONCRETE_PINK = 6, + E_META_CONCRETE_GRAY = 7, + E_META_CONCRETE_LIGHTGRAY = 8, + E_META_CONCRETE_CYAN = 9, + E_META_CONCRETE_PURPLE = 10, + E_META_CONCRETE_BLUE = 11, + E_META_CONCRETE_BROWN = 12, + E_META_CONCRETE_GREEN = 13, + E_META_CONCRETE_RED = 14, + E_META_CONCRETE_BLACK = 15, + + // E_BLOCK_CONCRETE_POWDER metas: + E_META_CONCRETE_POWDER_WHITE = 0, + E_META_CONCRETE_POWDER_ORANGE = 1, + E_META_CONCRETE_POWDER_MAGENTA = 2, + E_META_CONCRETE_POWDER_LIGHTBLUE = 3, + E_META_CONCRETE_POWDER_YELLOW = 4, + E_META_CONCRETE_POWDER_LIGHTGREEN = 5, + E_META_CONCRETE_POWDER_PINK = 6, + E_META_CONCRETE_POWDER_GRAY = 7, + E_META_CONCRETE_POWDER_LIGHTGRAY = 8, + E_META_CONCRETE_POWDER_CYAN = 9, + E_META_CONCRETE_POWDER_PURPLE = 10, + E_META_CONCRETE_POWDER_BLUE = 11, + E_META_CONCRETE_POWDER_BROWN = 12, + E_META_CONCRETE_POWDER_GREEN = 13, + E_META_CONCRETE_POWDER_RED = 14, + E_META_CONCRETE_POWDER_BLACK = 15, + // E_BLOCK_DIRT metas: E_META_DIRT_NORMAL = 0, E_META_DIRT_GRASSLESS = 1, |