summaryrefslogtreecommitdiffstats
path: root/src/BlockID.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-09-26 22:24:45 +0200
committerMattes D <github@xoft.cz>2014-09-26 22:24:45 +0200
commit2c5b0f23788f027ebcb6e38d26036a04d011e1fd (patch)
tree0fde79c6cc466306eb042e88728c209cbc94f789 /src/BlockID.h
parentMerge pull request #1455 from mc-server/includes (diff)
parentMoved curly brace to seperate line (diff)
downloadcuberite-2c5b0f23788f027ebcb6e38d26036a04d011e1fd.tar
cuberite-2c5b0f23788f027ebcb6e38d26036a04d011e1fd.tar.gz
cuberite-2c5b0f23788f027ebcb6e38d26036a04d011e1fd.tar.bz2
cuberite-2c5b0f23788f027ebcb6e38d26036a04d011e1fd.tar.lz
cuberite-2c5b0f23788f027ebcb6e38d26036a04d011e1fd.tar.xz
cuberite-2c5b0f23788f027ebcb6e38d26036a04d011e1fd.tar.zst
cuberite-2c5b0f23788f027ebcb6e38d26036a04d011e1fd.zip
Diffstat (limited to 'src/BlockID.h')
-rw-r--r--src/BlockID.h40
1 files changed, 39 insertions, 1 deletions
diff --git a/src/BlockID.h b/src/BlockID.h
index d835f9518..45e71d85d 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -175,12 +175,36 @@ enum ENUM_BLOCK_ID
E_BLOCK_NEW_LOG = 162,
E_BLOCK_ACACIA_WOOD_STAIRS = 163,
E_BLOCK_DARK_OAK_WOOD_STAIRS = 164,
+ E_BLOCK_SLIME_BLOCK = 165,
+ E_BLOCK_BARRIER = 166,
+ E_BLOCK_IRON_TRAPDOOR = 167,
+ E_BLOCK_PRISMARINE_BLOCK = 168,
+ E_BLOCK_SEA_LANTERN = 169,
E_BLOCK_HAY_BALE = 170,
E_BLOCK_CARPET = 171,
E_BLOCK_HARDENED_CLAY = 172,
E_BLOCK_BLOCK_OF_COAL = 173,
E_BLOCK_PACKED_ICE = 174,
E_BLOCK_BIG_FLOWER = 175,
+ E_BLOCK_RED_SANDSTONE = 179,
+ E_BLOCK_RED_SANDSTONE_STAIRS = 180,
+ E_BLOCK_DOUBLE_NEW_STONE_SLAB= 181,
+ E_BLOCK_NEW_STONE_SLAB = 182,
+ E_BLOCK_SPRUCE_FENCE_GATE = 183,
+ E_BLOCK_BIRCH_FENCE_GATE = 184,
+ E_BLOCK_JUNGLE_FENCE_GATE = 185,
+ E_BLOCK_DARK_OAK_FENCE_GATE = 186,
+ E_BLOCK_ACACIA_FENCE_GATE = 187,
+ E_BLOCK_SPRUCE_FENCE = 188,
+ E_BLOCK_BIRCH_FENCE = 189,
+ E_BLOCK_JUNGLE_FENCE = 190,
+ E_BLOCK_DARK_OAK_FENCE = 191,
+ E_BLOCK_ACACIA_FENCE = 192,
+ E_BLOCK_SPRUCE_DOOR = 193,
+ E_BLOCK_BIRCH_DOOR = 194,
+ E_BLOCK_JUNGLE_DOOR = 195,
+ E_BLOCK_ACACIA_DOOR = 196,
+ E_BLOCK_DARK_OAK_DOOR = 197,
// Keep these two as the last values, without a number - they will get their correct number assigned automagically by C++
// IsValidBlock() depends on this
@@ -356,6 +380,14 @@ enum ENUM_ITEM_ID
E_ITEM_NETHER_QUARTZ = 406,
E_ITEM_MINECART_WITH_TNT = 407,
E_ITEM_MINECART_WITH_HOPPER = 408,
+ E_ITEM_PRISMARINE_SHARD = 409,
+ E_ITEM_PRISMARINE_CRYSTALS = 410,
+ E_ITEM_RAW_RABBIT = 411,
+ E_ITEM_COOKED_RABBIT = 412,
+ E_ITEM_RABBIT_STEW = 413,
+ E_ITEM_RABBITS_FOOT = 414,
+ E_ITEM_RABBIT_HIDE = 415,
+ E_ITEM_ARMOR_STAND = 416,
E_ITEM_IRON_HORSE_ARMOR = 417,
E_ITEM_GOLD_HORSE_ARMOR = 418,
E_ITEM_DIAMOND_HORSE_ARMOR = 419,
@@ -363,7 +395,13 @@ enum ENUM_ITEM_ID
E_ITEM_NAME_TAG = 421,
E_ITEM_MINECART_WITH_COMMAND_BLOCK = 422,
E_ITEM_RAW_MUTTON = 423,
- E_ITEM_MUTTON = 424,
+ E_ITEM_COOKED_MUTTON = 424,
+ E_ITEM_BANNER = 425,
+ E_ITEM_SPRUCE_DOOR = 427,
+ E_ITEM_BIRCH_DOOR = 428,
+ E_ITEM_JUNGLE_DOOR = 429,
+ E_ITEM_ACACIA_DOOR = 430,
+ E_ITEM_DARK_OAK_DOOR = 431,
// 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!