flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Renamed NEWLEAVES and NEWLOG to LEAVES and LOG.

Browse Source
This commit is contained in:
archshift 2014-07-29 13:14:48 -07:00
parent a9b597087b
commit 12012d0c80
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/BlockID.h
View File

@ -512,18 +512,18 @@ enum
E_META_HOPPER_FACING_XP = 5,
// E_BLOCK_LEAVES metas:
E_META_NEWLEAVES_APPLE = 0,
E_META_NEWLEAVES_CONIFER = 1,
E_META_NEWLEAVES_BIRCH = 2,
E_META_NEWLEAVES_JUNGLE = 3,
E_META_NEWLEAVES_APPLE_NO_DECAY = 4,
E_META_NEWLEAVES_CONIFER_NO_DECAY = 5,
E_META_NEWLEAVES_BIRCH_NO_DECAY = 6,
E_META_NEWLEAVES_JUNGLE_NO_DECAY = 7,
E_META_NEWLEAVES_APPLE_CHECK_DECAY = 8,
E_META_NEWLEAVES_CONIFER_CHECK_DECAY = 9,
E_META_NEWLEAVES_BIRCH_CHECK_DECAY = 10,
E_META_NEWLEAVES_JUNGLE_CHECK_DECAY = 11,
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,
@ -534,10 +534,10 @@ enum
E_META_NEWLEAVES_DARK_OAK_CHECK_DECAY = 9,
// E_BLOCK_LOG metas:
E_META_NEWLOG_APPLE = 0,
E_META_NEWLOG_CONIFER = 1,
E_META_NEWLOG_BIRCH = 2,
E_META_NEWLOG_JUNGLE = 3,
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,
@ -722,24 +722,24 @@ enum
E_META_TORCH_ZP = 4, // Torch attached to the ZP side of its block
// E_META_LOG metas:
E_META_NEWLOG_OAK_UP_DOWN = 0,
E_META_NEWLOG_SPRUCE_UP_DOWN = 1,
E_META_NEWLOG_BIRCH_UP_DOWN = 2,
E_META_NEWLOG_JUNGLE_UP_DOWN = 3,
E_META_NEWLOG_OAK_X = 4,
E_META_NEWLOG_SPRUCE_X = 5,
E_META_NEWLOG_BIRCH_X = 6,
E_META_NEWLOG_JUNGLE_X = 7,
E_META_NEWLOG_OAK_Z = 8,
E_META_NEWLOG_SPRUCE_Z = 9,
E_META_NEWLOG_BIRCH_Z = 10,
E_META_NEWLOG_JUNGLE_Z = 11,
E_META_NEWLOG_OAK_BARK_ONLY = 12,
E_META_NEWLOG_SPRUCE_BARK_ONLY = 13,
E_META_NEWLOG_BIRCH_BARK_ONLY = 14,
E_META_NEWLOG_JUNGLE_BARK_ONLY = 15,
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_NEWLOG metas cont. (Block ID 162):
// 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,