summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-11-29 18:38:27 +0100
committermadmaxoft <github@xoft.cz>2013-11-29 18:38:27 +0100
commitf027b71a3104171e864c0adc8fae9c2205593892 (patch)
tree1e188fc86048e0368c14439ddccd7329e3895081
parentTrees will generate in the new biomes. (diff)
downloadcuberite-f027b71a3104171e864c0adc8fae9c2205593892.tar
cuberite-f027b71a3104171e864c0adc8fae9c2205593892.tar.gz
cuberite-f027b71a3104171e864c0adc8fae9c2205593892.tar.bz2
cuberite-f027b71a3104171e864c0adc8fae9c2205593892.tar.lz
cuberite-f027b71a3104171e864c0adc8fae9c2205593892.tar.xz
cuberite-f027b71a3104171e864c0adc8fae9c2205593892.tar.zst
cuberite-f027b71a3104171e864c0adc8fae9c2205593892.zip
Diffstat (limited to '')
-rw-r--r--src/BlockID.h253
1 files changed, 128 insertions, 125 deletions
diff --git a/src/BlockID.h b/src/BlockID.h
index 667ce4765..e5f49fe2c 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -402,9 +402,31 @@ enum
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Block metas:
- E_META_DIRT_NORMAL = 0,
- E_META_DIRT_GRASSLESS = 1,
- E_META_DIRT_PODZOL = 2,
+ // E_BLOCK_BIG_FLOWER metas
+ E_META_BIG_FLOWER_SUNFLOWER = 0,
+ E_META_BIG_FLOWER_LILAC = 1,
+ E_META_BIG_FLOWER_DOUBLE_TALL_GRASS = 2,
+ E_META_BIG_FLOWER_LARGE_FERN = 3,
+ E_META_BIG_FLOWER_ROSE_BUSH = 4,
+ E_META_BIG_FLOWER_PEONY = 5,
+
+ // E_BLOCK_CARPET metas:
+ E_META_CARPET_WHITE = 0,
+ E_META_CARPET_ORANGE = 1,
+ E_META_CARPET_MAGENTA = 2,
+ E_META_CARPET_LIGHTBLUE = 3,
+ E_META_CARPET_YELLOW = 4,
+ E_META_CARPET_LIGHTGREEN = 5,
+ E_META_CARPET_PINK = 6,
+ E_META_CARPET_GRAY = 7,
+ E_META_CARPET_LIGHTGRAY = 8,
+ E_META_CARPET_CYAN = 9,
+ E_META_CARPET_PURPLE = 10,
+ E_META_CARPET_BLUE = 11,
+ E_META_CARPET_BROWN = 12,
+ 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,
@@ -412,6 +434,11 @@ enum
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_PODZOL = 2,
+
// E_BLOCK_DISPENSER / E_BLOCK_DROPPER metas:
E_META_DROPSPENSER_FACING_YM = 0,
E_META_DROPSPENSER_FACING_YP = 1,
@@ -429,8 +456,16 @@ enum
E_META_DOUBLE_STONE_SLAB_STONE_BRICK = 5,
E_META_DOUBLE_STONE_SLAB_NETHER_BRICK = 6,
E_META_DOUBLE_STONE_SLAB_STONE_SECRET = 7,
-
-
+
+ // E_BLOCK_FLOWER metas
+ E_META_FLOWER_POPPY = 0,
+ E_META_FLOWER_BLUE_ORCHID = 1,
+ E_META_FLOWER_ALLIUM = 2,
+ E_META_FLOWER_RED_TULIP = 4,
+ E_META_FLOWER_ORANGE_TULIP = 5,
+ E_META_FLOWER_WHITE_TULIP = 6,
+ E_META_FLOWER_PINK_TULIP = 7,
+ E_META_FLOWER_OXEYE_DAISY = 8,
// E_BLOCK_HOPPER metas:
E_META_HOPPER_FACING_YM = 0,
@@ -452,12 +487,36 @@ enum
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_PLANKS metas:
E_META_PLANKS_APPLE = 0,
E_META_PLANKS_CONIFER = 1,
E_META_PLANKS_BIRCH = 2,
E_META_PLANKS_JUNGLE = 3,
+ // E_BLOCK_RAIL metas
+ E_META_RAIL_ZM_ZP = 0,
+ E_META_RAIL_XM_XP = 1,
+ E_META_RAIL_ASCEND_XP = 2,
+ E_META_RAIL_ASCEND_XM = 3,
+ E_META_RAIL_ASCEND_ZM = 4,
+ E_META_RAIL_ASCEND_ZP = 5,
+ E_META_RAIL_CURVED_ZP_XP = 6,
+ E_META_RAIL_CURVED_ZP_XM = 7,
+ E_META_RAIL_CURVED_ZM_XM = 8,
+ E_META_RAIL_CURVED_ZM_XP = 9,
+
+ // 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,
@@ -474,6 +533,70 @@ enum
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,
+ E_META_SNOW_LAYER_THREE = 2,
+ E_META_SNOW_LAYER_FOUR = 3,
+ E_META_SNOW_LAYER_FIVE = 4,
+ E_META_SNOW_LAYER_SIX = 5,
+ E_META_SNOW_LAYER_SEVEN = 6,
+ E_META_SNOW_LAYER_EIGHT = 7,
+
+ // E_BLOCK_STAINED_CLAY metas
+ E_META_STAINED_CLAY_WHITE = 0,
+ E_META_STAINED_CLAY_ORANGE = 1,
+ E_META_STAINED_CLAY_MAGENTA = 2,
+ E_META_STAINED_CLAY_LIGHTBLUE = 3,
+ E_META_STAINED_CLAY_YELLOW = 4,
+ E_META_STAINED_CLAY_LIGHTGREEN = 5,
+ E_META_STAINED_CLAY_PINK = 6,
+ E_META_STAINED_CLAY_GRAY = 7,
+ E_META_STAINED_CLAY_LIGHTGRAY = 8,
+ E_META_STAINED_CLAY_CYAN = 9,
+ E_META_STAINED_CLAY_PURPLE = 10,
+ E_META_STAINED_CLAY_BLUE = 11,
+ E_META_STAINED_CLAY_BROWN = 12,
+ 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,
+ E_META_STAINED_GLASS_MAGENTA = 2,
+ E_META_STAINED_GLASS_LIGHTBLUE = 3,
+ E_META_STAINED_GLASS_YELLOW = 4,
+ E_META_STAINED_GLASS_LIGHTGREEN = 5,
+ E_META_STAINED_GLASS_PINK = 6,
+ E_META_STAINED_GLASS_GRAY = 7,
+ E_META_STAINED_GLASS_LIGHTGRAY = 8,
+ E_META_STAINED_GLASS_CYAN = 9,
+ E_META_STAINED_GLASS_PURPLE = 10,
+ E_META_STAINED_GLASS_BLUE = 11,
+ E_META_STAINED_GLASS_BROWN = 12,
+ 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,
+ E_META_STAINED_GLASS_PANE_MAGENTA = 2,
+ E_META_STAINED_GLASS_PANE_LIGHTBLUE = 3,
+ E_META_STAINED_GLASS_PANE_YELLOW = 4,
+ E_META_STAINED_GLASS_PANE_LIGHTGREEN = 5,
+ E_META_STAINED_GLASS_PANE_PINK = 6,
+ E_META_STAINED_GLASS_PANE_GRAY = 7,
+ E_META_STAINED_GLASS_PANE_LIGHTGRAY = 8,
+ E_META_STAINED_GLASS_PANE_CYAN = 9,
+ E_META_STAINED_GLASS_PANE_PURPLE = 10,
+ E_META_STAINED_GLASS_PANE_BLUE = 11,
+ E_META_STAINED_GLASS_PANE_BROWN = 12,
+ E_META_STAINED_GLASS_PANE_GREEN = 13,
+ E_META_STAINED_GLASS_PANE_RED = 14,
+ E_META_STAINED_GLASS_PANE_BLACK = 15,
+
// E_BLOCK_STONE_SLAB metas:
E_META_STONE_SLAB_STONE = 0,
E_META_STONE_SLAB_SANDSTONE = 1,
@@ -540,126 +663,6 @@ enum
E_META_WOOL_RED = 14,
E_META_WOOL_BLACK = 15,
- // E_BLOCK_CARPET metas:
- E_META_CARPET_WHITE = 0,
- E_META_CARPET_ORANGE = 1,
- E_META_CARPET_MAGENTA = 2,
- E_META_CARPET_LIGHTBLUE = 3,
- E_META_CARPET_YELLOW = 4,
- E_META_CARPET_LIGHTGREEN = 5,
- E_META_CARPET_PINK = 6,
- E_META_CARPET_GRAY = 7,
- E_META_CARPET_LIGHTGRAY = 8,
- E_META_CARPET_CYAN = 9,
- E_META_CARPET_PURPLE = 10,
- E_META_CARPET_BLUE = 11,
- E_META_CARPET_BROWN = 12,
- E_META_CARPET_GREEN = 13,
- E_META_CARPET_RED = 14,
- E_META_CARPET_BLACK = 15,
-
- // E_BLOCK_STAINED_CLAY metas
- E_META_STAINED_CLAY_WHITE = 0,
- E_META_STAINED_CLAY_ORANGE = 1,
- E_META_STAINED_CLAY_MAGENTA = 2,
- E_META_STAINED_CLAY_LIGHTBLUE = 3,
- E_META_STAINED_CLAY_YELLOW = 4,
- E_META_STAINED_CLAY_LIGHTGREEN = 5,
- E_META_STAINED_CLAY_PINK = 6,
- E_META_STAINED_CLAY_GRAY = 7,
- E_META_STAINED_CLAY_LIGHTGRAY = 8,
- E_META_STAINED_CLAY_CYAN = 9,
- E_META_STAINED_CLAY_PURPLE = 10,
- E_META_STAINED_CLAY_BLUE = 11,
- E_META_STAINED_CLAY_BROWN = 12,
- 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,
- E_META_STAINED_GLASS_MAGENTA = 2,
- E_META_STAINED_GLASS_LIGHTBLUE = 3,
- E_META_STAINED_GLASS_YELLOW = 4,
- E_META_STAINED_GLASS_LIGHTGREEN = 5,
- E_META_STAINED_GLASS_PINK = 6,
- E_META_STAINED_GLASS_GRAY = 7,
- E_META_STAINED_GLASS_LIGHTGRAY = 8,
- E_META_STAINED_GLASS_CYAN = 9,
- E_META_STAINED_GLASS_PURPLE = 10,
- E_META_STAINED_GLASS_BLUE = 11,
- E_META_STAINED_GLASS_BROWN = 12,
- 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,
- E_META_STAINED_GLASS_PANE_MAGENTA = 2,
- E_META_STAINED_GLASS_PANE_LIGHTBLUE = 3,
- E_META_STAINED_GLASS_PANE_YELLOW = 4,
- E_META_STAINED_GLASS_PANE_LIGHTGREEN = 5,
- E_META_STAINED_GLASS_PANE_PINK = 6,
- E_META_STAINED_GLASS_PANE_GRAY = 7,
- E_META_STAINED_GLASS_PANE_LIGHTGRAY = 8,
- E_META_STAINED_GLASS_PANE_CYAN = 9,
- E_META_STAINED_GLASS_PANE_PURPLE = 10,
- E_META_STAINED_GLASS_PANE_BLUE = 11,
- E_META_STAINED_GLASS_PANE_BROWN = 12,
- E_META_STAINED_GLASS_PANE_GREEN = 13,
- E_META_STAINED_GLASS_PANE_RED = 14,
- E_META_STAINED_GLASS_PANE_BLACK = 15,
-
- // E_BLOCK_SNOW metas:
- E_META_SNOW_LAYER_ONE = 0,
- E_META_SNOW_LAYER_TWO = 1,
- E_META_SNOW_LAYER_THREE = 2,
- E_META_SNOW_LAYER_FOUR = 3,
- E_META_SNOW_LAYER_FIVE = 4,
- E_META_SNOW_LAYER_SIX = 5,
- E_META_SNOW_LAYER_SEVEN = 6,
- E_META_SNOW_LAYER_EIGHT = 7,
-
- // E_BLOCK_RAIL metas
- E_META_RAIL_ZM_ZP = 0,
- E_META_RAIL_XM_XP = 1,
- E_META_RAIL_ASCEND_XP = 2,
- E_META_RAIL_ASCEND_XM = 3,
- E_META_RAIL_ASCEND_ZM = 4,
- E_META_RAIL_ASCEND_ZP = 5,
- E_META_RAIL_CURVED_ZP_XP = 6,
- E_META_RAIL_CURVED_ZP_XM = 7,
- E_META_RAIL_CURVED_ZM_XM = 8,
- E_META_RAIL_CURVED_ZM_XP = 9,
-
- //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_FLOWER metas
- E_META_FLOWER_POPPY = 0,
- E_META_FLOWER_BLUE_ORCHID = 1,
- E_META_FLOWER_ALLIUM = 2,
- E_META_FLOWER_RED_TULIP = 4,
- E_META_FLOWER_ORANGE_TULIP = 5,
- E_META_FLOWER_WHITE_TULIP = 6,
- E_META_FLOWER_PINK_TULIP = 7,
- E_META_FLOWER_OXEYE_DAISY = 8,
-
- //E_BLOCK_BIG_FLOWER metas
- E_META_BIG_FLOWER_SUNFLOWER = 0,
- E_META_BIG_FLOWER_LILAC = 1,
- E_META_BIG_FLOWER_DOUBLE_TALL_GRASS = 2,
- E_META_BIG_FLOWER_LARGE_FERN = 3,
- E_META_BIG_FLOWER_ROSE_BUSH = 4,
- E_META_BIG_FLOWER_PEONY = 5,
-
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Item metas: