diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-06-20 20:29:34 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-06-20 20:29:34 +0200 |
| commit | c867bdac240d67f9d187ff09a721c6cc39c41963 (patch) | |
| tree | 9b922e91e6c39a3a211573eccb1e3ea72ec4444d /source | |
| parent | Furnace window progressbars are initialized when the window is opened (diff) | |
| download | cuberite-c867bdac240d67f9d187ff09a721c6cc39c41963.tar cuberite-c867bdac240d67f9d187ff09a721c6cc39c41963.tar.gz cuberite-c867bdac240d67f9d187ff09a721c6cc39c41963.tar.bz2 cuberite-c867bdac240d67f9d187ff09a721c6cc39c41963.tar.lz cuberite-c867bdac240d67f9d187ff09a721c6cc39c41963.tar.xz cuberite-c867bdac240d67f9d187ff09a721c6cc39c41963.tar.zst cuberite-c867bdac240d67f9d187ff09a721c6cc39c41963.zip | |
Diffstat (limited to 'source')
| -rw-r--r-- | source/BlockID.h | 6 | ||||
| -rw-r--r-- | source/Items/ItemHandler.cpp | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/source/BlockID.h b/source/BlockID.h index 19dbb29da..cc89ad503 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -317,16 +317,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_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 + // TODO: missing an item: empty map E_ITEM_GOLDEN_CARROT = 396, E_ITEM_HEAD = 397, E_ITEM_CARROT_ON_STICK = 398, - // TODO: missing an item + // TODO: missing an item: nether star E_ITEM_PUMPKIN_PIE = 400, E_ITEM_FIREWORK_ROCKET = 401, E_ITEM_FIREWORK_STAR = 402, @@ -336,6 +337,7 @@ enum ENUM_ITEM_ID E_ITEM_NETHER_QUARTZ = 406, E_ITEM_MINECART_WITH_TNT = 407, E_ITEM_MINECART_WITH_HOPPER = 408, + // TODO: Add horse armour/horse paraphernalia // 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! diff --git a/source/Items/ItemHandler.cpp b/source/Items/ItemHandler.cpp index 3f5d460b3..d99457029 100644 --- a/source/Items/ItemHandler.cpp +++ b/source/Items/ItemHandler.cpp @@ -272,6 +272,7 @@ char cItemHandler::GetMaxStackSize(void) switch (m_ItemType) //sorted by id
{
case E_ITEM_ARROW: return 64;
+ case E_ITEM_BAKED_POTATO: return 64;
case E_ITEM_BLAZE_POWDER: return 64;
case E_ITEM_BLAZE_ROD: return 64;
case E_ITEM_BONE: return 64;
@@ -281,10 +282,13 @@ char cItemHandler::GetMaxStackSize(void) case E_ITEM_BREAD: return 64;
case E_ITEM_BREWING_STAND: return 64;
case E_ITEM_BUCKET: return 1; // TODO: change this to 16 when turning compatibility to 1.3
+ case E_ITEM_CARROT: return 64;
+ case E_ITEM_CAULDRON: return 64;
case E_ITEM_CLAY: return 64;
case E_ITEM_CLAY_BRICK: return 64;
case E_ITEM_CLOCK: return 64;
case E_ITEM_COAL: return 64;
+ case E_ITEM_COMPARATOR: return 64;
case E_ITEM_COMPASS: return 64;
case E_ITEM_COOKED_CHICKEN: return 64;
case E_ITEM_COOKED_FISH: return 64;
@@ -299,22 +303,33 @@ char cItemHandler::GetMaxStackSize(void) case E_ITEM_FEATHER: return 64;
case E_ITEM_FERMENTED_SPIDER_EYE: return 64;
case E_ITEM_FIRE_CHARGE: return 64;
+ case E_ITEM_FIREWORK_ROCKET: return 64;
+ case E_ITEM_FIREWORK_STAR: return 64;
case E_ITEM_FLINT: return 64;
+ case E_ITEM_FLOWER_POT: return 64;
case E_ITEM_GHAST_TEAR: return 64;
case E_ITEM_GLASS_BOTTLE: return 64;
case E_ITEM_GLISTERING_MELON: return 64;
case E_ITEM_GLOWSTONE_DUST: return 64;
case E_ITEM_GOLD: return 64;
case E_ITEM_GOLDEN_APPLE: return 64;
+ case E_ITEM_GOLDEN_CARROT: return 64;
case E_ITEM_GOLD_NUGGET: return 64;
case E_ITEM_GUNPOWDER: return 64;
+ case E_ITEM_HEAD: return 64;
case E_ITEM_IRON: return 64;
case E_ITEM_LEATHER: return 64;
case E_ITEM_MAGMA_CREAM: return 64;
+ case E_ITEM_MAP: return 64;
case E_ITEM_MELON_SEEDS: return 64;
case E_ITEM_MELON_SLICE: return 64;
+ case E_ITEM_NETHER_BRICK: return 64;
+ case E_ITEM_NETHER_WART: return 64;
case E_ITEM_PAINTINGS: return 64;
case E_ITEM_PAPER: return 64;
+ case E_ITEM_POISONOUS_POTATO: return 64;
+ case E_ITEM_POTATO: return 64;
+ case E_ITEM_PUMPKIN_PIE: return 64;
case E_ITEM_PUMPKIN_SEEDS: return 64;
case E_ITEM_RAW_BEEF: return 64;
case E_ITEM_RAW_CHICKEN: return 64;
@@ -328,6 +343,7 @@ char cItemHandler::GetMaxStackSize(void) case E_ITEM_SIGN: return 16;
case E_ITEM_SLIMEBALL: return 64;
case E_ITEM_SNOWBALL: return 16;
+ case E_ITEM_SPAWN_EGG: return 64;
case E_ITEM_SPIDER_EYE: return 64;
case E_ITEM_STEAK: return 64;
case E_ITEM_STICK: return 64;
|