diff options
Diffstat (limited to '')
| -rw-r--r-- | source/BlockID.h | 149 |
1 files changed, 1 insertions, 148 deletions
diff --git a/source/BlockID.h b/source/BlockID.h index 4cdad6e03..bf6aa1076 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -9,7 +9,6 @@ enum ENUM_BLOCK_ID E_BLOCK_DIRT = 3, E_BLOCK_COBBLESTONE = 4, E_BLOCK_PLANKS = 5, - // E_BLOCK_WOOD = E_BLOCK_PLANKS, // Obsolete - was confused too often: wood = logs or planks? E_BLOCK_SAPLING = 6, E_BLOCK_BEDROCK = 7, E_BLOCK_WATER = 8, @@ -39,7 +38,6 @@ enum ENUM_BLOCK_ID E_BLOCK_DEAD_BUSH = 32, E_BLOCK_PISTON = 33, E_BLOCK_PISTON_EXTENSION = 34, - E_BLOCK_WHITE_CLOTH = 35, // Deprecated, use E_BLOCK_WOOL instead E_BLOCK_WOOL = 35, E_BLOCK_PISTON_MOVED_BLOCK = 36, E_BLOCK_YELLOW_FLOWER = 37, @@ -49,9 +47,7 @@ enum ENUM_BLOCK_ID E_BLOCK_GOLD_BLOCK = 41, E_BLOCK_IRON_BLOCK = 42, E_BLOCK_DOUBLE_STONE_SLAB = 43, - E_BLOCK_DOUBLE_STEP = 43, /// OBSOLETE, use E_BLOCK_DOUBLE_STONE_SLAB instead E_BLOCK_STONE_SLAB = 44, - E_BLOCK_STEP = 44, /// OBSOLETE, use E_BLOCK_STONE_SLAB instead E_BLOCK_BRICK = 45, E_BLOCK_TNT = 46, E_BLOCK_BOOKCASE = 47, @@ -68,7 +64,6 @@ enum ENUM_BLOCK_ID E_BLOCK_CRAFTING_TABLE = 58, E_BLOCK_WORKBENCH = 58, E_BLOCK_CROPS = 59, - E_BLOCK_SOIL = 60, // Deprecated, use E_BLOCK_FARMLAND instead E_BLOCK_FARMLAND = 60, E_BLOCK_FURNACE = 61, E_BLOCK_LIT_FURNACE = 62, @@ -99,11 +94,9 @@ enum ENUM_BLOCK_ID E_BLOCK_JUKEBOX = 84, E_BLOCK_FENCE = 85, E_BLOCK_PUMPKIN = 86, - E_BLOCK_BLOODSTONE = 87, // Deprecated, use E_BLOCK_NETHERRACK E_BLOCK_NETHERRACK = 87, E_BLOCK_SOULSAND = 88, E_BLOCK_GLOWSTONE = 89, - E_BLOCK_PORT = 90, // Deprecated, use E_BLOCK_NETHER_PORTAL instead E_BLOCK_NETHER_PORTAL = 90, E_BLOCK_JACK_O_LANTERN = 91, E_BLOCK_CAKE = 92, @@ -116,9 +109,7 @@ enum ENUM_BLOCK_ID E_BLOCK_HUGE_BROWN_MUSHROOM = 99, E_BLOCK_HUGE_RED_MUSHROOM = 100, E_BLOCK_IRON_BARS = 101, - E_BLOCK_IRON_BAR = 101, // Deprecated, use E_BLOCK_IRON_BARS instead E_BLOCK_GLASS_PANE = 102, - E_BLOCK_GLASS_PLANE = 102, // Deprecated, use E_BLOCK_GLASS_PANE instead E_BLOCK_MELON = 103, E_BLOCK_PUMPKIN_STEM = 104, E_BLOCK_MELON_STEM = 105, @@ -144,7 +135,6 @@ enum ENUM_BLOCK_ID E_BLOCK_DOUBLE_WOODEN_SLAB = 125, E_BLOCK_WOODEN_SLAB = 126, E_BLOCK_COCOA_POD = 127, - E_BLOCK_COCA_PLANT = E_BLOCK_COCOA_POD, // OBSOLETE! E_BLOCK_SANDSTONE_STAIRS = 128, E_BLOCK_EMERALD_ORE = 129, E_BLOCK_ENDER_CHEST = 130, @@ -187,140 +177,6 @@ enum ENUM_BLOCK_ID enum ENUM_ITEM_ID { E_ITEM_EMPTY = -1, - E_ITEM_STONE = 1, - E_ITEM_GRASS = 2, - E_ITEM_DIRT = 3, - E_ITEM_COBBLESTONE = 4, - E_ITEM_PLANKS = 5, - E_ITEM_WOOD = 5, // obsolete, use E_ITEM_PLANKS instead - E_ITEM_SAPLING = 6, - E_ITEM_BEDROCK = 7, - E_ITEM_WATER = 8, - E_ITEM_STATIONARY_WATER = 9, - E_ITEM_LAVA = 10, - E_ITEM_STATIONARY_LAVA = 11, - E_ITEM_SAND = 12, - E_ITEM_GRAVEL = 13, - E_ITEM_GOLD_ORE = 14, - E_ITEM_IRON_ORE = 15, - E_ITEM_COAL_ORE = 16, - E_ITEM_LOG = 17, - E_ITEM_LEAVES = 18, - E_ITEM_SPONGE = 19, - E_ITEM_GLASS = 20, - E_ITEM_LAPIS_ORE = 21, - E_ITEM_LAPIS_BLOCK = 22, - E_ITEM_DISPENSER = 23, - E_ITEM_SANDSTONE = 24, - E_ITEM_NOTE_ITEM = 25, - - E_ITEM_POWERED_RAIL = 27, - E_ITEM_DETECTOR_RAIL = 28, - E_ITEM_STICKY_PISTON = 29, - E_ITEM_COBWEB = 30, - E_ITEM_TALL_GRASS = 31, - E_ITEM_DEAD_BRUSH = 32, - E_ITEM_PISTON = 33, - E_ITEM_PISTON_EXTENSION = 34, - E_ITEM_WOOL = 35, - E_ITEM_WHITE_CLOTH = 35, /// OBSOLETE, use E_ITEM_WOOL - E_ITEM_PISTON_MOVED_BLOCK = 36, - E_ITEM_YELLOW_FLOWER = 37, - E_ITEM_RED_ROSE = 38, - E_ITEM_BROWN_MUSHROOM = 39, - E_ITEM_RED_MUSHROOM = 40, - E_ITEM_GOLD_BLOCK = 41, - E_ITEM_IRON_BLOCK = 42, - E_ITEM_DOUBLE_STONE_SLAB = 43, - E_ITEM_DOUBLE_STEP = 43, /// OBSOLETE, use E_ITEM_DOUBLE_STONE_SLAB - E_ITEM_STONE_SLAB = 44, - E_ITEM_STEP = 44, /// OBSOLETE, use E_ITEM_STONE_SLAB - E_ITEM_BRICK = 45, - E_ITEM_TNT = 46, - E_ITEM_BOOKCASE = 47, - E_ITEM_MOSSY_COBBLESTONE = 48, - E_ITEM_OBSIDIAN = 49, - E_ITEM_TORCH = 50, - E_ITEM_FIRE = 51, - E_ITEM_MOB_SPAWNER = 52, - E_ITEM_WOODEN_STAIRS = 53, - E_ITEM_CHEST = 54, - E_ITEM_REDSTONE_WIRE = 55, - E_ITEM_DIAMOND_ORE = 56, - E_ITEM_DIAMOND_BLOCK = 57, - E_ITEM_WORKBENCH = 58, - E_ITEM_CROPS = 59, - E_ITEM_SOIL = 60, - E_ITEM_FURNACE = 61, - E_ITEM_BURNING_FURNACE = 62, - E_ITEM_SIGN_POST = 63, - - E_ITEM_LADDER = 65, - E_ITEM_MINECART_TRACKS = 66, - E_ITEM_COBBLESTONE_STAIRS = 67, - E_ITEM_WALLSIGN = 68, - E_ITEM_LEVER = 69, - E_ITEM_STONE_PRESSURE_PLATE = 70, - - E_ITEM_WOODEN_PRESSURE_PLATE = 72, - E_ITEM_REDSTONE_ORE = 73, - E_ITEM_REDSTONE_ORE_GLOWING = 74, - E_ITEM_REDSTONE_TORCH_OFF = 75, - E_ITEM_REDSTONE_TORCH_ON = 76, - E_ITEM_STONE_BUTTON = 77, - E_ITEM_SNOW = 78, - E_ITEM_ICE = 79, - E_ITEM_SNOW_BLOCK = 80, - E_ITEM_CACTUS = 81, - - E_ITEM_REEDS = 83, - E_ITEM_JUKEBOX = 84, - E_ITEM_FENCE = 85, - E_ITEM_PUMPKIN = 86, - E_ITEM_BLOODSTONE = 87, - E_ITEM_SOULSAND = 88, - E_ITEM_GLOWSTONE = 89, - E_ITEM_PORT = 90, - E_ITEM_JACK_O_LANTERN = 91, - - E_ITEM_REDSTONE_REPEATER_OFF = 93, - E_ITEM_REDSTONE_REPEATER_ON = 94, - E_ITEM_LOCKED_CHEST = 95, - E_ITEM_TRAPDOOR = 96, - E_ITEM_SILVERFISH_EGG = 97, - E_ITEM_STONE_BRICKS = 98, - E_ITEM_HUGE_BROWN_MUSHROOM = 99, - E_ITEM_HUGE_RED_MUSHROOM = 100, - E_ITEM_IRON_BAR = 101, - E_ITEM_GLASS_PLANE = 102, - E_ITEM_MELON = 103, - E_ITEM_PUMPKIN_STEM = 104, - E_ITEM_MELON_STEM = 105, - E_ITEM_VINES = 106, - E_ITEM_FENCE_GATE = 107, - E_ITEM_BRICK_STAIRS = 108, - E_ITEM_STONE_BRICK_STAIRS = 109, - E_ITEM_MYCELIUM = 110, - E_ITEM_LILY_PAD = 111, - E_ITEM_NETHER_BRICK = 112, - E_ITEM_NETHER_BRICK_FENCE = 113, - E_ITEM_NETHER_BRICK_STAIRS = 114, - - E_ITEM_ENCHANTMENT_TABLE = 116, - - E_ITEM_END_PORTAL = 119, - E_ITEM_END_PORTAL_FRAME = 120, - E_ITEM_END_STONE = 121, - - E_ITEM_DOUBLE_WOODEN_SLAB = 125, - E_ITEM_WOODEN_SLAB = 126, - E_ITEM_COCA_PLANT = 127, - E_ITEM_SANDSTONE_STAIRS = 128, - E_ITEM_EMERALD_ORE = 129, - E_ITEM_ENDER_CHEST = 130, - E_ITEM_TRIPWIRE_HOOK = 131, - E_ITEM_TRIPWIRE = 132, - E_ITEM_EMERALD_BLOCK = 133, E_ITEM_FIRST = 256, // First true item type @@ -329,7 +185,6 @@ enum ENUM_ITEM_ID E_ITEM_IRON_AXE = 258, E_ITEM_FLINT_AND_STEEL = 259, E_ITEM_RED_APPLE = 260, - E_ITEM_APPLE = 260, // OBSOLETE, use E_ITEM_RED_APPLE instead E_ITEM_BOW = 261, E_ITEM_ARROW = 262, E_ITEM_COAL = 263, @@ -389,9 +244,7 @@ enum ENUM_ITEM_ID E_ITEM_GOLD_BOOTS = 317, E_ITEM_FLINT = 318, E_ITEM_RAW_PORKCHOP = 319, - E_ITEM_RAW_MEAT = 319, // OBSOLETE, use E_ITEM_RAW_PORKCHOP instead E_ITEM_COOKED_PORKCHOP = 320, - E_ITEM_COOKED_MEAT = 320, // OBSOLETE, use E_ITEM_COOKED_PORKCHOP instead E_ITEM_PAINTINGS = 321, E_ITEM_GOLDEN_APPLE = 322, E_ITEM_SIGN = 323, @@ -467,7 +320,7 @@ enum ENUM_ITEM_ID E_ITEM_FIREWORK_STAR = 402, E_ITEM_ENCHANTED_BOOK = 403, E_ITEM_COMPARATOR = 404, - // E_ITEM_NETHER_BRICK = 405, // TODO: E_ITEM_NETHER_BRICK is already used for the nether brick block (as an item, #112). What name to use? + E_ITEM_NETHER_BRICK = 405, E_ITEM_NETHER_QUARTZ = 406, // Keep these two as the last values of the consecutive list, without a number - they will get their correct number assigned automagically by C++ |