summaryrefslogtreecommitdiffstats
path: root/src/BlockID.h
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2014-10-11 19:32:21 +0200
committerAlexander Harkness <bearbin@gmail.com>2014-10-11 19:32:21 +0200
commit93833069a80fe4aec33a95148df39ad40671ddaf (patch)
tree2e6a335a60e618b5fe456ca8a586a2c5448c8c87 /src/BlockID.h
parentReverted submodule changes. (diff)
parentMerge pull request #1528 from kjanku1/master (diff)
downloadcuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar
cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.gz
cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.bz2
cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.lz
cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.xz
cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.tar.zst
cuberite-93833069a80fe4aec33a95148df39ad40671ddaf.zip
Diffstat (limited to 'src/BlockID.h')
-rw-r--r--src/BlockID.h100
1 files changed, 87 insertions, 13 deletions
diff --git a/src/BlockID.h b/src/BlockID.h
index f1aee3f4a..bb06722d2 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -175,12 +175,39 @@ 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_STANDING_BANNER = 176,
+ E_BLOCK_WALL_BANNER = 177,
+ E_BLOCK_INVERTED_DAYLIGHT_SENSOR = 178,
+ 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,12 +383,28 @@ 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,
E_ITEM_LEAD = 420,
E_ITEM_NAME_TAG = 421,
E_ITEM_MINECART_WITH_COMMAND_BLOCK = 422,
+ E_ITEM_RAW_MUTTON = 423,
+ 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!
@@ -417,7 +460,7 @@ enum
E_BLOCK_BED_OCCUPIED = 4,
E_BLOCK_BED_BED_HEAD = 8,
- // E_BLOCK_BIG_FLOWER metas
+ // E_BLOCK_BIG_FLOWER metas:
E_META_BIG_FLOWER_SUNFLOWER = 0,
E_META_BIG_FLOWER_LILAC = 1,
E_META_BIG_FLOWER_DOUBLE_TALL_GRASS = 2,
@@ -466,6 +509,7 @@ enum
// E_BLOCK_DIRT metas:
E_META_DIRT_NORMAL = 0,
E_META_DIRT_GRASSLESS = 1,
+ E_META_DIRT_COARSE = 1,
E_META_DIRT_PODZOL = 2,
// E_BLOCK_DISPENSER / E_BLOCK_DROPPER metas:
@@ -489,7 +533,7 @@ enum
E_META_DOUBLE_STONE_SLAB_SMOOTH_SANDSTONE = 9,
E_META_DOUBLE_STONE_SLAB_TILE_QUARTZ = 10,
- // E_BLOCK_FLOWER metas
+ // E_BLOCK_FLOWER metas:
E_META_FLOWER_POPPY = 0,
E_META_FLOWER_BLUE_ORCHID = 1,
E_META_FLOWER_ALLIUM = 2,
@@ -499,7 +543,7 @@ enum
E_META_FLOWER_PINK_TULIP = 7,
E_META_FLOWER_OXEYE_DAISY = 8,
- // E_BLOCK_JUKEBOX metas
+ // E_BLOCK_JUKEBOX metas:
E_META_JUKEBOX_OFF = 0,
E_META_JUKEBOX_ON = 1,
@@ -539,11 +583,11 @@ enum
E_META_LOG_BIRCH = 2,
E_META_LOG_JUNGLE = 3,
- // E_BLOCK_NEW_LEAVES metas
+ // E_BLOCK_NEW_LEAVES metas:
E_META_NEW_LEAVES_ACACIA_WOOD = 0,
E_META_NEW_LEAVES_DARK_OAK_WOOD = 1,
- // E_BLOCK_NEW_LOG metas
+ // E_BLOCK_NEW_LOG metas:
E_META_NEW_LOG_ACACIA_WOOD = 0,
E_META_NEW_LOG_DARK_OAK_WOOD = 1,
@@ -569,6 +613,11 @@ enum
E_META_PRESSURE_PLATE_RAISED = 0,
E_META_PRESSURE_PLATE_DEPRESSED = 1,
+ // E_BLOCK_PRISMARINE_BLOCK metas:
+ E_META_PRISMARINE_BLOCK_ROUGH = 0,
+ E_META_PRISMARINE_BLOCK_BRICKS = 1,
+ E_META_PRISMARINE_BLOCK_DARK = 2,
+
// E_BLOCK_QUARTZ_BLOCK metas:
E_META_QUARTZ_NORMAL = 0,
E_META_QUARTZ_CHISELLED = 1,
@@ -586,6 +635,11 @@ enum
E_META_RAIL_CURVED_ZM_XM = 8,
E_META_RAIL_CURVED_ZM_XP = 9,
+ // E_BLOCK_RED_SANDSTONE metas:
+ E_META_RED_SANDSTONE_NORMAL = 0,
+ E_META_RED_SANDSTONE_ORNAMENT = 1,
+ E_META_RED_SANDSTONE_SMOOTH = 2,
+
// E_BLOCK_SAND metas:
E_META_SAND_NORMAL = 0,
E_META_SAND_RED = 1,
@@ -618,7 +672,7 @@ enum
E_META_SNOW_LAYER_SEVEN = 6,
E_META_SNOW_LAYER_EIGHT = 7,
- // E_BLOCK_STAINED_CLAY metas
+ // E_BLOCK_STAINED_CLAY metas:
E_META_STAINED_CLAY_WHITE = 0,
E_META_STAINED_CLAY_ORANGE = 1,
E_META_STAINED_CLAY_MAGENTA = 2,
@@ -636,7 +690,7 @@ enum
E_META_STAINED_CLAY_RED = 14,
E_META_STAINED_CLAY_BLACK = 15,
- // E_BLOCK_STAINED_GLASS metas
+ // E_BLOCK_STAINED_GLASS metas:
E_META_STAINED_GLASS_WHITE = 0,
E_META_STAINED_GLASS_ORANGE = 1,
E_META_STAINED_GLASS_MAGENTA = 2,
@@ -654,7 +708,7 @@ enum
E_META_STAINED_GLASS_RED = 14,
E_META_STAINED_GLASS_BLACK = 15,
- // E_BLOCK_STAINED_GLASS_PANE metas
+ // E_BLOCK_STAINED_GLASS_PANE metas:
E_META_STAINED_GLASS_PANE_WHITE = 0,
E_META_STAINED_GLASS_PANE_ORANGE = 1,
E_META_STAINED_GLASS_PANE_MAGENTA = 2,
@@ -787,6 +841,24 @@ enum
////////////////////////////////////////////////////////////////////////////////
// Item metas:
+ // E_ITEM_BANNER metas:
+ E_META_BANNER_BLACK = 0,
+ E_META_BANNER_RED = 1,
+ E_META_BANNER_GREEN = 2,
+ E_META_BANNER_BROWN = 3,
+ E_META_BANNER_BLUE = 4,
+ E_META_BANNER_PURPLE = 5,
+ E_META_BANNER_CYAN = 6,
+ E_META_BANNER_LIGHTGRAY = 7,
+ E_META_BANNER_GRAY = 8,
+ E_META_BANNER_PINK = 9,
+ E_META_BANNER_LIGHTGREEN = 10,
+ E_META_BANNER_YELLOW = 11,
+ E_META_BANNER_LIGHTBLUE = 12,
+ E_META_BANNER_MAGENTA = 13,
+ E_META_BANNER_ORANGE = 14,
+ E_META_BANNER_WHITE = 15,
+
// E_ITEM_COAL metas:
E_META_COAL_NORMAL = 0,
E_META_COAL_CHARCOAL = 1,
@@ -813,6 +885,13 @@ enum
E_META_GOLDEN_APPLE_NORMAL = 0,
E_META_GOLDEN_APPLE_ENCHANTED = 1,
+ // E_ITEM_HEAD metas:
+ E_META_HEAD_SKELETON = 0,
+ E_META_HEAD_WITHER = 1,
+ E_META_HEAD_ZOMBIE = 2,
+ E_META_HEAD_PLAYER = 3,
+ E_META_HEAD_CREEPER = 4,
+
// E_ITEM_RAW_FISH metas:
E_META_RAW_FISH_FISH = 0,
E_META_RAW_FISH_SALMON = 1,
@@ -822,8 +901,6 @@ enum
// E_ITEM_COOKED_FISH metas:
E_META_COOKED_FISH_FISH = 0,
E_META_COOKED_FISH_SALMON = 1,
- E_META_COOKED_FISH_CLOWNFISH = 2,
- E_META_COOKED_FISH_PUFFERFISH = 3,
// E_ITEM_MINECART_TRACKS metas:
E_META_TRACKS_X = 1,
@@ -1023,9 +1100,6 @@ extern AString ItemTypeToString(short a_ItemType);
/// Translates a full item into a fully-specified string (including meta and count). If the ItemType is not recognized, the ItemType number is output into the string.
extern AString ItemToFullString(const cItem & a_Item);
-/// Translates a mob string ("ocelot") to mobtype (E_ENTITY_TYPE_OCELOT)
-extern int StringToMobType(const AString & a_MobString);
-
/// Translates a dimension string to dimension enum. Takes either a number or a dimension alias (built-in). Returns dimOverworld on failure
extern eDimension StringToDimension(const AString & a_DimensionString);