summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--source/BlockID.h70
1 files changed, 35 insertions, 35 deletions
diff --git a/source/BlockID.h b/source/BlockID.h
index b105ecc85..f4e7b412d 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -3,7 +3,7 @@
// tolua_begin
enum ENUM_BLOCK_ID
{
- E_BLOCK_AIR = 0,
+ E_BLOCK_AIR = 0,
E_BLOCK_STONE = 1,
E_BLOCK_GRASS = 2,
E_BLOCK_DIRT = 3,
@@ -14,7 +14,7 @@ enum ENUM_BLOCK_ID
E_BLOCK_WATER = 8,
E_BLOCK_STATIONARY_WATER = 9,
E_BLOCK_LAVA = 10,
- E_BLOCK_STATIONARY_LAVA = 11,
+ E_BLOCK_STATIONARY_LAVA = 11,
E_BLOCK_SAND = 12,
E_BLOCK_GRAVEL = 13,
E_BLOCK_GOLD_ORE = 14,
@@ -192,7 +192,7 @@ enum ENUM_BLOCK_ID
// tolua_begin
enum ENUM_ITEM_ID
{
- E_ITEM_EMPTY = -1,
+ E_ITEM_EMPTY = -1,
E_ITEM_FIRST = 256, // First true item type
@@ -411,12 +411,12 @@ 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_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,
@@ -460,25 +460,25 @@ enum
E_META_SAPLING_JUNGLE = 3,
// E_BLOCK_SILVERFISH_EGG metas:
- E_META_SILVERFISH_EGG_STONE = 0,
+ E_META_SILVERFISH_EGG_STONE = 0,
E_META_SILVERFISH_EGG_COBBLESTONE = 1,
E_META_SILVERFISH_EGG_STONE_BRICK = 2,
// E_BLOCK_STONE_SLAB metas:
- E_META_STONE_SLAB_STONE = 0,
- E_META_STONE_SLAB_SANDSTONE = 1,
- E_META_STONE_SLAB_PLANKS = 2,
- E_META_STONE_SLAB_COBBLESTONE = 3,
- E_META_STONE_SLAB_BRICK = 4,
- E_META_STONE_SLAB_STONE_BRICK = 5,
+ E_META_STONE_SLAB_STONE = 0,
+ E_META_STONE_SLAB_SANDSTONE = 1,
+ E_META_STONE_SLAB_PLANKS = 2,
+ E_META_STONE_SLAB_COBBLESTONE = 3,
+ 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_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,
@@ -497,19 +497,19 @@ enum
E_META_TORCH_ZP = 4, // Torch attached to the ZP side of its block
// 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_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_BLOCK_WOOL metas:
@@ -635,7 +635,7 @@ enum
//E_BLOCK_FLOWER metas
E_META_FLOWER_POPPY = 0,
E_META_FLOWER_BLUE_ORCHID = 1,
- E_META_FLOWER_ALLIUM = 2,
+ E_META_FLOWER_ALLIUM = 2,
E_META_FLOWER_RED_TULIP = 4,
E_META_FLOWER_ORANGE_TULIP = 5,
E_META_FLOWER_WHITE_TULIP = 6,
@@ -644,10 +644,10 @@ enum
//E_BLOCK_BIG_FLOWER metas
E_META_BIG_FLOWER_SUNFLOWER = 0,
- E_META_BIG_FLOWER_LILAC = 1,
+ 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_LARGE_FERN = 3,
+ E_META_BIG_FLOWER_ROSE_BUSH = 4,
E_META_BIG_FLOWER_PEONY = 5,
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////