summaryrefslogtreecommitdiffstats
path: root/source/BlockID.h
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-03-03 15:00:49 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-03-03 15:00:49 +0100
commit0e2340ee345b9b62b3790ef98f2888f943c826e6 (patch)
tree8a1290619fd62e91a4bba8d70ac52fb63e1ca005 /source/BlockID.h
parentSandSimulator: Fixed sand dropping on half-slabs; added more blocks that break falling sand into pickups, fixed instant-fall (diff)
downloadcuberite-0e2340ee345b9b62b3790ef98f2888f943c826e6.tar
cuberite-0e2340ee345b9b62b3790ef98f2888f943c826e6.tar.gz
cuberite-0e2340ee345b9b62b3790ef98f2888f943c826e6.tar.bz2
cuberite-0e2340ee345b9b62b3790ef98f2888f943c826e6.tar.lz
cuberite-0e2340ee345b9b62b3790ef98f2888f943c826e6.tar.xz
cuberite-0e2340ee345b9b62b3790ef98f2888f943c826e6.tar.zst
cuberite-0e2340ee345b9b62b3790ef98f2888f943c826e6.zip
Diffstat (limited to 'source/BlockID.h')
-rw-r--r--source/BlockID.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/source/BlockID.h b/source/BlockID.h
index cd886d535..5110c86ad 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -309,7 +309,6 @@ enum ENUM_ITEM_ID
E_ITEM_CAULDRON = 380,
E_ITEM_EYE_OF_ENDER = 381,
E_ITEM_GLISTERING_MELON = 382,
-
E_ITEM_SPAWN_EGG = 383,
E_ITEM_BOTTLE_O_ENCHANTING = 384,
E_ITEM_FIRE_CHARGE = 385,
@@ -317,12 +316,24 @@ enum ENUM_ITEM_ID
E_ITEM_WRITTEN_BOOK = 387,
E_ITEM_EMERALD = 388,
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
+ E_ITEM_GOLDEN_CARROT = 396,
+ E_ITEM_HEAD = 397,
+ E_ITEM_CARROT_ON_STICK = 398,
+ // TODO: missing an item
+ E_ITEM_PUMPKIN_PIE = 400,
E_ITEM_FIREWORK_ROCKET = 401,
E_ITEM_FIREWORK_STAR = 402,
E_ITEM_ENCHANTED_BOOK = 403,
E_ITEM_COMPARATOR = 404,
E_ITEM_NETHER_BRICK = 405,
E_ITEM_NETHER_QUARTZ = 406,
+ E_ITEM_MINECART_WITH_TNT = 407,
+ E_ITEM_MINECART_WITH_HOPPER = 408,
// Keep these two as the last values of the consecutive list, without a number - they will get their correct number assigned automagically by C++
// IsValidItem() depends on this!