1 files changed, 57 insertions, 32 deletions

diff --git a/source/BlockID.h b/source/BlockID.h
index 7971b4f84..c2bf8dbdf 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -323,17 +323,17 @@ enum ENUM_ITEM_ID
 	E_ITEM_BOOK_AND_QUILL = 386,
 	E_ITEM_WRITTEN_BOOK = 387,
 	E_ITEM_EMERALD = 388,
-	// TODO: missing an item: item frame
+	E_ITEM_ITEM_FRAME = 389,
 	E_ITEM_FLOWER_POT = 390,
 	E_ITEM_CARROT = 391,
 	E_ITEM_POTATO = 392,
 	E_ITEM_BAKED_POTATO = 393,
 	E_ITEM_POISONOUS_POTATO = 394,
-	// TODO: missing an item: empty map
+	E_ITEM_EMPTY_MAP = 395,
 	E_ITEM_GOLDEN_CARROT = 396,
 	E_ITEM_HEAD = 397,
 	E_ITEM_CARROT_ON_STICK = 398,
-	// TODO: missing an item: nether star
+	E_ITEM_NETHER_STAR = 399,
 	E_ITEM_PUMPKIN_PIE = 400,
 	E_ITEM_FIREWORK_ROCKET = 401,
 	E_ITEM_FIREWORK_STAR = 402,
@@ -607,35 +607,60 @@ enum
 		
 	// E_ITEM_SPAWN_EGG metas:
 	// See also cMonster::eType, since monster 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_ENDER_DRAGON  = 63,
-	E_META_SPAWN_EGG_WITHER        = 64,
-	E_META_SPAWN_EGG_BAT           = 65,
-	E_META_SPAWN_EGG_WITCH         = 66,
-	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_HORSE         = 100,
-	E_META_SPAWN_EGG_VILLAGER      = 120,
+	E_META_SPAWN_EGG_PICKUP           = 1,
+	E_META_SPAWN_EGG_EXPERIENCE_ORB   = 2,
+	E_META_SPAWN_EGG_LEASH_KNOT       = 8,
+	E_META_SPAWN_EGG_PAINTING         = 9,
+	E_META_SPAWN_EGG_ARROW            = 10,
+	E_META_SPAWN_EGG_SNOWBALL         = 11,
+	E_META_SPAWN_EGG_FIREBALL         = 12,
+	E_META_SPAWN_EGG_SMALL_FIREBALL   = 13,
+	E_META_SPAWN_EGG_ENDER_PEARL      = 14,
+	E_META_SPAWN_EGG_EYE_OF_ENDER     = 15,
+	E_META_SPAWN_EGG_SPLASH_POTION    = 16,
+	E_META_SPAWN_EGG_EXP_BOTTLE       = 17,
+	E_META_SPAWN_EGG_ITEM_FRAME       = 18,
+	E_META_SPAWN_EGG_WITHER_SKULL     = 19,
+	E_META_SPAWN_EGG_PRIMED_TNT       = 20,
+	E_META_SPAWN_EGG_FALLING_BLOCK    = 21,
+	E_META_SPAWN_EGG_FIREWORK         = 22,
+	E_META_SPAWN_EGG_BOAT             = 41,
+	E_META_SPAWN_EGG_MINECART         = 42,
+	E_META_SPAWN_EGG_MINECART_CHEST   = 43,
+	E_META_SPAWN_EGG_MINECART_FURNACE = 44,
+	E_META_SPAWN_EGG_MINECART_TNT     = 45,
+	E_META_SPAWN_EGG_MINECART_HOPPER  = 46,
+	E_META_SPAWN_EGG_MINECART_SPAWNER = 47,
+	E_META_SPAWN_EGG_CREEPER          = 50,
+	E_META_SPAWN_EGG_SKELETON         = 51,
+	E_META_SPAWN_EGG_SPIDER           = 52,
+	E_META_SPAWN_EGG_GIANT            = 53,
+	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,
+	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_ENDER_DRAGON     = 63,
+	E_META_SPAWN_EGG_WITHER           = 64,
+	E_META_SPAWN_EGG_BAT              = 65,
+	E_META_SPAWN_EGG_WITCH            = 66,
+	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_HORSE            = 100,
+	E_META_SPAWN_EGG_VILLAGER         = 120,
+	E_META_SPAWN_EGG_ENDER_CRYSTAL    = 200,
 } ;