summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-11 22:08:37 +0200
committerMattes D <github@xoft.cz>2014-10-11 22:08:37 +0200
commit2bfe7b76a132fbd50c10418fdff1d632ebd578f4 (patch)
treef17fa29aa1487e961949c29329dce727fc5a92fc /src
parentMore README changes. (diff)
parentFixed compilation. (diff)
downloadcuberite-2bfe7b76a132fbd50c10418fdff1d632ebd578f4.tar
cuberite-2bfe7b76a132fbd50c10418fdff1d632ebd578f4.tar.gz
cuberite-2bfe7b76a132fbd50c10418fdff1d632ebd578f4.tar.bz2
cuberite-2bfe7b76a132fbd50c10418fdff1d632ebd578f4.tar.lz
cuberite-2bfe7b76a132fbd50c10418fdff1d632ebd578f4.tar.xz
cuberite-2bfe7b76a132fbd50c10418fdff1d632ebd578f4.tar.zst
cuberite-2bfe7b76a132fbd50c10418fdff1d632ebd578f4.zip
Diffstat (limited to 'src')
-rw-r--r--src/BlockID.h203
-rw-r--r--src/Blocks/BlockStone.h2
2 files changed, 150 insertions, 55 deletions
diff --git a/src/BlockID.h b/src/BlockID.h
index e36843422..bb06722d2 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -445,6 +445,21 @@ enum
////////////////////////////////////////////////////////////////////////////////
// Block metas:
+ // E_BLOCK_ANVIL metas
+ E_BLOCK_ANVIL_Z = 0,
+ E_BLOCK_ANVIL_X = 1,
+ E_BLOCK_ANVIL_NO_DAMAGE = 0,
+ E_BLOCK_ANVIL_LOW_DAMAGE = 4,
+ E_BLOCK_ANVIL_HIGH_DAMAGE = 8,
+
+ // E_BLOCK_BED metas:
+ E_BLOCK_BED_ZP = 0,
+ E_BLOCK_BED_XM = 1,
+ E_BLOCK_BED_ZM = 2,
+ E_BLOCK_BED_XP = 3,
+ E_BLOCK_BED_OCCUPIED = 4,
+ E_BLOCK_BED_BED_HEAD = 8,
+
// E_BLOCK_BIG_FLOWER metas:
E_META_BIG_FLOWER_SUNFLOWER = 0,
E_META_BIG_FLOWER_LILAC = 1,
@@ -453,6 +468,20 @@ enum
E_META_BIG_FLOWER_ROSE_BUSH = 4,
E_META_BIG_FLOWER_PEONY = 5,
+ // E_BLOCK_BREWING_STAND metas
+ E_META_BREWING_STAND_FILLED_SLOT_XP = 1,
+ E_META_BREWING_STAND_FILLED_SLOT_XM_ZP = 2,
+ E_META_BREWING_STAND_FILLED_SLOT_XM_ZM = 4,
+
+ // E_BLOCK_BUTTON metas
+ E_BLOCK_BUTTON_YM = 0,
+ E_BLOCK_BUTTON_XP = 1,
+ E_BLOCK_BUTTON_XM = 2,
+ E_BLOCK_BUTTON_ZP = 3,
+ E_BLOCK_BUTTON_ZM = 4,
+ E_BLOCK_BUTTON_YP = 5,
+ E_BLOCK_BUTTON_PRESSED = 8,
+
// E_BLOCK_CARPET metas:
E_META_CARPET_WHITE = 0,
E_META_CARPET_ORANGE = 1,
@@ -492,14 +521,17 @@ enum
E_META_DROPSPENSER_FACING_XP = 5,
// E_BLOCK_DOUBLE_STONE_SLAB metas:
- E_META_DOUBLE_STONE_SLAB_STONE = 0,
- E_META_DOUBLE_STONE_SLAB_SANDSTONE = 1,
- E_META_DOUBLE_STONE_SLAB_WOODEN = 2,
- E_META_DOUBLE_STONE_SLAB_COBBLESTONE = 3,
- E_META_DOUBLE_STONE_SLAB_BRICK = 4,
- 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_META_DOUBLE_STONE_SLAB_STONE = 0,
+ E_META_DOUBLE_STONE_SLAB_SANDSTON = 1,
+ E_META_DOUBLE_STONE_SLAB_WOODEN = 2,
+ E_META_DOUBLE_STONE_SLAB_COBBLESTONE = 3,
+ E_META_DOUBLE_STONE_SLAB_BRICK = 4,
+ E_META_DOUBLE_STONE_SLAB_STONE_BRICK = 5,
+ E_META_DOUBLE_STONE_SLAB_NETHER_BRICK = 6,
+ E_META_DOUBLE_STONE_SLAB_QUARTZ = 7,
+ 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,
@@ -512,8 +544,8 @@ enum
E_META_FLOWER_OXEYE_DAISY = 8,
// E_BLOCK_JUKEBOX metas:
- E_META_JUKEBOX_OFF = 0,
- E_META_JUKEBOX_ON = 1,
+ E_META_JUKEBOX_OFF = 0,
+ E_META_JUKEBOX_ON = 1,
// E_BLOCK_HOPPER metas:
E_META_HOPPER_FACING_YM = 0,
@@ -524,10 +556,26 @@ enum
E_META_HOPPER_FACING_XP = 5,
// 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_META_LEAVES_APPLE = 0,
+ E_META_LEAVES_CONIFER = 1,
+ E_META_LEAVES_BIRCH = 2,
+ E_META_LEAVES_JUNGLE = 3,
+ E_META_LEAVES_APPLE_NO_DECAY = 4,
+ E_META_LEAVES_CONIFER_NO_DECAY = 5,
+ E_META_LEAVES_BIRCH_NO_DECAY = 6,
+ E_META_LEAVES_JUNGLE_NO_DECAY = 7,
+ E_META_LEAVES_APPLE_CHECK_DECAY = 8,
+ E_META_LEAVES_CONIFER_CHECK_DECAY = 9,
+ E_META_LEAVES_BIRCH_CHECK_DECAY = 10,
+ E_META_LEAVES_JUNGLE_CHECK_DECAY = 11,
+
+ // E_BLOCK_LEAVES meta cont. (Block ID 161):
+ E_META_NEWLEAVES_ACACIA = 0,
+ E_META_NEWLEAVES_DARK_OAK = 1,
+ E_META_NEWLEAVES_ACACIA_NO_DECAY = 4,
+ 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,
@@ -540,9 +588,19 @@ enum
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_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,
+ E_META_PISTON_ZM = 2,
+ E_META_PISTON_ZP = 3,
+ E_META_PISTON_XM = 4,
+ E_META_PISTON_XP = 5,
+ E_META_PISTON_HEAD_STICKY = 8,
+ E_META_PISTON_EXTENDED = 8,
+
// E_BLOCK_PLANKS metas:
E_META_PLANKS_APPLE = 0,
E_META_PLANKS_CONIFER = 1,
@@ -552,7 +610,7 @@ enum
E_META_PLANKS_DARK_OAK = 5,
// E_BLOCK_(XXX_WEIGHTED)_PRESSURE_PLATE metas:
- E_META_PRESSURE_PLATE_RAISED = 0,
+ E_META_PRESSURE_PLATE_RAISED = 0,
E_META_PRESSURE_PLATE_DEPRESSED = 1,
// E_BLOCK_PRISMARINE_BLOCK metas:
@@ -561,21 +619,21 @@ enum
E_META_PRISMARINE_BLOCK_DARK = 2,
// E_BLOCK_QUARTZ_BLOCK metas:
- E_META_QUARTZ_NORMAL = 0,
+ E_META_QUARTZ_NORMAL = 0,
E_META_QUARTZ_CHISELLED = 1,
- E_META_QUARTZ_PILLAR = 2,
-
- // 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_META_QUARTZ_PILLAR = 2,
+
+ // 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_RED_SANDSTONE metas:
E_META_RED_SANDSTONE_NORMAL = 0,
@@ -668,8 +726,15 @@ enum
E_META_STAINED_GLASS_PANE_RED = 14,
E_META_STAINED_GLASS_PANE_BLACK = 15,
+ // E_BLOCK_STAIRS metas:
+ E_BLOCK_STAIRS_XP = 0,
+ E_BLOCK_STAIRS_XM = 1,
+ E_BLOCK_STAIRS_ZP = 2,
+ E_BLOCK_STAIRS_ZM = 3,
+ E_BLOCK_STAIRS_UPSIDE_DOWN = 4,
+
// E_BLOCK_STONE metas:
- E_META_STONE = 0,
+ E_META_STONE_STONE = 0,
E_META_STONE_GRANITE = 1,
E_META_STONE_POLISHED_GRANITE = 2,
E_META_STONE_DIORITE = 3,
@@ -685,18 +750,19 @@ enum
E_META_STONE_SLAB_BRICK = 4,
E_META_STONE_SLAB_STONE_BRICK = 5,
E_META_STONE_SLAB_NETHER_BRICK = 6,
- E_META_STONE_SLAB_STONE_SECRET = 7,
+ 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_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
@@ -704,26 +770,55 @@ enum
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_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_META_LOG metas:
+ E_META_LOG_OAK_UP_DOWN = 0,
+ E_META_LOG_SPRUCE_UP_DOWN = 1,
+ E_META_LOG_BIRCH_UP_DOWN = 2,
+ E_META_LOG_JUNGLE_UP_DOWN = 3,
+ E_META_LOG_OAK_X = 4,
+ E_META_LOG_SPRUCE_X = 5,
+ E_META_LOG_BIRCH_X = 6,
+ E_META_LOG_JUNGLE_X = 7,
+ E_META_LOG_OAK_Z = 8,
+ E_META_LOG_SPRUCE_Z = 9,
+ E_META_LOG_BIRCH_Z = 10,
+ E_META_LOG_JUNGLE_Z = 11,
+ E_META_LOG_OAK_BARK_ONLY = 12,
+ E_META_LOG_SPRUCE_BARK_ONLY = 13,
+ E_META_LOG_BIRCH_BARK_ONLY = 14,
+ E_META_LOG_JUNGLE_BARK_ONLY = 15,
+
+ // E_META_LOG metas cont. (Block ID 162):
+ E_META_NEWLOG_ACACIA_UP_DOWN = 0,
+ E_META_NEWLOG_DARK_OAK_UP_DOWN = 1,
+ E_META_NEWLOG_ACACIA_X = 4,
+ E_META_NEWLOG_DARK_OAK_X = 5,
+ E_META_NEWLOG_ACACIA_Z = 8,
+ E_META_NEWLOG_DARK_OAK_Z = 9,
+ E_META_NEWLOG_ACACIA_BARK_ONLY = 12,
+ E_META_NEWLOG_DARK_OAK_BARK_ONLY = 13,
+
// E_BLOCK_WOODEN_DOUBLE_SLAB metas:
- E_META_WOODEN_DOUBLE_SLAB_APPLE = 0,
- E_META_WOODEN_DOUBLE_SLAB_CONIFER = 1,
- E_META_WOODEN_DOUBLE_SLAB_BIRCH = 2,
- E_META_WOODEN_DOUBLE_SLAB_JUNGLE = 3,
- E_META_WOODEN_DOUBLE_SLAB_ACACIA = 4,
- E_META_WOODEN_DOUBLE_SLAB_DARK_OAK = 5,
+ E_META_WOODEN_DOUBLE_SLAB_APPLE = 0,
+ E_META_WOODEN_DOUBLE_SLAB_CONIFER = 1,
+ E_META_WOODEN_DOUBLE_SLAB_BIRCH = 2,
+ 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_APPLE = 0,
- E_META_WOODEN_SLAB_CONIFER = 1,
- E_META_WOODEN_SLAB_BIRCH = 2,
- E_META_WOODEN_SLAB_JUNGLE = 3,
- E_META_WOODEN_SLAB_ACACIA = 4,
- E_META_WOODEN_SLAB_DARK_OAK = 5,
+ E_META_WOODEN_SLAB_APPLE = 0,
+ E_META_WOODEN_SLAB_CONIFER = 1,
+ E_META_WOODEN_SLAB_BIRCH = 2,
+ E_META_WOODEN_SLAB_JUNGLE = 3,
+ E_META_WOODEN_SLAB_ACACIA = 4,
+ E_META_WOODEN_SLAB_DARK_OAK = 5,
+ E_META_WOODEN_SLAB_UPSIDE_DOWN = 8,
// E_BLOCK_WOOL metas:
E_META_WOOL_WHITE = 0,
diff --git a/src/Blocks/BlockStone.h b/src/Blocks/BlockStone.h
index e52599c0f..69cc8301b 100644
--- a/src/Blocks/BlockStone.h
+++ b/src/Blocks/BlockStone.h
@@ -18,7 +18,7 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
- if (a_BlockMeta == E_META_STONE)
+ if (a_BlockMeta == E_META_STONE_STONE)
{
a_Pickups.push_back(cItem(E_BLOCK_COBBLESTONE, 1, 0));
return;