summaryrefslogtreecommitdiffstats
path: root/source/BlockID.h
diff options
context:
space:
mode:
Diffstat (limited to 'source/BlockID.h')
-rw-r--r--source/BlockID.h116
1 files changed, 76 insertions, 40 deletions
diff --git a/source/BlockID.h b/source/BlockID.h
index ea448ecd5..b82341a8a 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -579,50 +579,86 @@ enum
E_META_GOLDEN_APPLE_ENCHANTED = 1,
// E_ITEM_DYE metas:
- E_META_DYE_BLACK = 0,
- E_META_DYE_RED = 1,
- E_META_DYE_GREEN = 2,
- E_META_DYE_BROWN = 3,
- E_META_DYE_BLUE = 4,
- E_META_DYE_PURPLE = 5,
- E_META_DYE_CYAN = 6,
- E_META_DYE_LIGHTGRAY = 7,
- E_META_DYE_GRAY = 8,
- E_META_DYE_PINK = 9,
+ E_META_DYE_BLACK = 0,
+ E_META_DYE_RED = 1,
+ E_META_DYE_GREEN = 2,
+ E_META_DYE_BROWN = 3,
+ E_META_DYE_BLUE = 4,
+ E_META_DYE_PURPLE = 5,
+ E_META_DYE_CYAN = 6,
+ E_META_DYE_LIGHTGRAY = 7,
+ E_META_DYE_GRAY = 8,
+ E_META_DYE_PINK = 9,
E_META_DYE_LIGHTGREEN = 10,
- E_META_DYE_YELLOW = 11,
- E_META_DYE_LIGHTBLUE = 12,
- E_META_DYE_MAGENTA = 13,
- E_META_DYE_ORANGE = 14,
- E_META_DYE_WHITE = 15,
+ E_META_DYE_YELLOW = 11,
+ E_META_DYE_LIGHTBLUE = 12,
+ E_META_DYE_MAGENTA = 13,
+ E_META_DYE_ORANGE = 14,
+ E_META_DYE_WHITE = 15,
// E_ITEM_SPAWN_EGG spawn EntityIDs:
- // hostile:
- E_META_SPAWN_EGG_CREEPER = 50,
- E_META_SPAWN_EGG_SKELETON = 51,
- E_META_SPAWN_EGG_SPIDER = 52,
- E_META_SPAWN_EGG_ZOMBIE = 54,
- E_META_SPAWN_EGG_SLIME = 55,
- E_META_SPAWN_EGG_GHAST = 56,
- E_META_SPAWN_EGG_ZOMBIE_PIGMAN = 57,
- E_META_SPAWN_EGG_ENDERMAN = 58,
+ // See also E_ENTITY_TYPE_XXX, since entity type and spawn egg meta are the same
+ E_META_SPAWN_EGG_CREEPER = 50,
+ E_META_SPAWN_EGG_SKELETON = 51,
+ E_META_SPAWN_EGG_SPIDER = 52,
+ E_META_SPAWN_EGG_ZOMBIE = 54,
+ E_META_SPAWN_EGG_GIANT = 53,
+ E_META_SPAWN_EGG_SLIME = 55,
+ E_META_SPAWN_EGG_GHAST = 56,
+ E_META_SPAWN_EGG_ZOMBIE_PIGMAN = 57,
+ E_META_SPAWN_EGG_ENDERMAN = 58,
E_META_SPAWN_EGG_CAVE_SPIDER = 59,
- E_META_SPAWN_EGG_SILVERFISH = 60,
- E_META_SPAWN_EGG_BLAZE = 61,
- E_META_SPAWN_EGG_MAGMA_CUBE = 62,
- E_META_SPAWN_EGG_GIANT = 53,
- E_META_SPAWN_EGG_ENDER_DRAGON = 63,
- E_META_SPAWN_EGG_PIG = 90,
- E_META_SPAWN_EGG_SHEEP = 91,
- E_META_SPAWN_EGG_COW = 92,
- E_META_SPAWN_EGG_CHICKEN = 93,
- E_META_SPAWN_EGG_SQUID = 94,
- E_META_SPAWN_EGG_WOLF = 95,
- E_META_SPAWN_EGG_MOOSHROOM = 96,
- E_META_SPAWN_EGG_OCELOT = 98,
- E_META_SPAWN_EGG_VILLAGER = 120,
- E_META_SPAWN_EGG_SNOW_GOLEM = 97,
- E_META_SPAWN_EGG_IRON_GOLEM = 99
+ E_META_SPAWN_EGG_SILVERFISH = 60,
+ E_META_SPAWN_EGG_BLAZE = 61,
+ E_META_SPAWN_EGG_MAGMA_CUBE = 62,
+ E_META_SPAWN_EGG_ENDER_DRAGON = 63,
+ E_META_SPAWN_EGG_PIG = 90,
+ E_META_SPAWN_EGG_SHEEP = 91,
+ E_META_SPAWN_EGG_COW = 92,
+ E_META_SPAWN_EGG_CHICKEN = 93,
+ E_META_SPAWN_EGG_SQUID = 94,
+ E_META_SPAWN_EGG_WOLF = 95,
+ E_META_SPAWN_EGG_MOOSHROOM = 96,
+ E_META_SPAWN_EGG_SNOW_GOLEM = 97,
+ E_META_SPAWN_EGG_OCELOT = 98,
+ E_META_SPAWN_EGG_IRON_GOLEM = 99,
+ E_META_SPAWN_EGG_VILLAGER = 120,
+} ;
+
+
+
+
+enum
+{
+ // See also E_META_SPAWN_EGG_XXX, since entity type and spawn egg meta are the same
+ E_ENTITY_TYPE_CREEPER = 50,
+ E_ENTITY_TYPE_SKELETON = 51,
+ E_ENTITY_TYPE_SPIDER = 52,
+ E_ENTITY_TYPE_GIANT = 53,
+ E_ENTITY_TYPE_ZOMBIE = 54,
+ E_ENTITY_TYPE_SLIME = 55,
+ E_ENTITY_TYPE_GHAST = 56,
+ E_ENTITY_TYPE_ZOMBIE_PIGMAN = 57,
+ E_ENTITY_TYPE_ENDERMAN = 58,
+ E_ENTITY_TYPE_CAVE_SPIDER = 59,
+ E_ENTITY_TYPE_SILVERFISH = 60,
+ E_ENTITY_TYPE_BLAZE = 61,
+ E_ENTITY_TYPE_MAGMA_CUBE = 62,
+ E_ENTITY_TYPE_ENDER_DRAGON = 63,
+ E_ENTITY_TYPE_WITHER = 64,
+ E_ENTITY_TYPE_BAT = 65,
+ E_ENTITY_TYPE_WITCH = 66,
+ E_ENTITY_TYPE_PIG = 90,
+ E_ENTITY_TYPE_SHEEP = 91,
+ E_ENTITY_TYPE_COW = 92,
+ E_ENTITY_TYPE_CHICKEN = 93,
+ E_ENTITY_TYPE_SQUID = 94,
+ E_ENTITY_TYPE_WOLF = 95,
+ E_ENTITY_TYPE_MOOSHROOM = 96,
+ E_ENTITY_TYPE_SNOW_GOLEM = 97,
+ E_ENTITY_TYPE_OCELOT = 98,
+ E_ENTITY_TYPE_IRON_GOLEM = 99,
+ E_ENTITY_TYPE_VILLAGER = 120,
} ;
//tolua_end