From 2a4f85107dcefafe44e412fc1ea2247229813b2b Mon Sep 17 00:00:00 2001
From: dktapps <odigiman@gmail.com>
Date: Tue, 12 Jul 2016 19:25:04 +0100
Subject: [PATCH] Less duplication, more consistency

---
 src/pocketmine/block/Block.php        | 240 +--------------
 src/pocketmine/block/BlockIds.php     | 231 ++++++++++++++
 src/pocketmine/block/BrewingStand.php |   2 +-
 src/pocketmine/block/MobHead.php      |   4 +-
 src/pocketmine/item/Item.php          | 415 +-------------------------
 src/pocketmine/item/ItemIds.php       | 217 ++++++++++++++
 6 files changed, 457 insertions(+), 652 deletions(-)
 create mode 100644 src/pocketmine/block/BlockIds.php
 create mode 100644 src/pocketmine/item/ItemIds.php

diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php
index 011b28150..9ce4d84b8 100644
--- a/src/pocketmine/block/Block.php
+++ b/src/pocketmine/block/Block.php
@@ -40,241 +40,7 @@ use pocketmine\Player;
 use pocketmine\plugin\Plugin;
 
 
-class Block extends Position implements Metadatable{
-	const AIR = 0;
-	const STONE = 1;
-	const GRASS = 2;
-	const DIRT = 3;
-	const COBBLESTONE = 4;
-	const COBBLE = 4;
-	const PLANK = 5;
-	const PLANKS = 5;
-	const WOODEN_PLANK = 5;
-	const WOODEN_PLANKS = 5;
-	const SAPLING = 6;
-	const SAPLINGS = 6;
-	const BEDROCK = 7;
-	const WATER = 8;
-	const STILL_WATER = 9;
-	const LAVA = 10;
-	const STILL_LAVA = 11;
-	const SAND = 12;
-	const GRAVEL = 13;
-	const GOLD_ORE = 14;
-	const IRON_ORE = 15;
-	const COAL_ORE = 16;
-	const LOG = 17;
-	const WOOD = 17;
-	const TRUNK = 17;
-	const LEAVES = 18;
-	const LEAVE = 18;
-	const SPONGE = 19;
-	const GLASS = 20;
-	const LAPIS_ORE = 21;
-	const LAPIS_BLOCK = 22;
-
-	const SANDSTONE = 24;
-	const NOTE_BLOCK = 25;
-	const BED_BLOCK = 26;
-	const POWERED_RAIL = 27;
-	const DETECTOR_RAIL = 28;
-	const COBWEB = 30;
-	const TALL_GRASS = 31;
-	const BUSH = 32;
-	const DEAD_BUSH = 32;
-	const WOOL = 35;
-	const DANDELION = 37;
-	const POPPY = 38;
-	const ROSE = 38;
-	const RED_FLOWER = 38;
-	const BROWN_MUSHROOM = 39;
-	const RED_MUSHROOM = 40;
-	const GOLD_BLOCK = 41;
-	const IRON_BLOCK = 42;
-	const DOUBLE_SLAB = 43;
-	const DOUBLE_SLABS = 43;
-	const SLAB = 44;
-	const SLABS = 44;
-	const BRICKS = 45;
-	const BRICKS_BLOCK = 45;
-	const TNT = 46;
-	const BOOKSHELF = 47;
-	const MOSS_STONE = 48;
-	const MOSSY_STONE = 48;
-	const OBSIDIAN = 49;
-	const TORCH = 50;
-	const FIRE = 51;
-	const MONSTER_SPAWNER = 52;
-	const WOOD_STAIRS = 53;
-	const WOODEN_STAIRS = 53;
-	const OAK_WOOD_STAIRS = 53;
-	const OAK_WOODEN_STAIRS = 53;
-	const CHEST = 54;
-	const REDSTONE_WIRE = 55;
-	const DIAMOND_ORE = 56;
-	const DIAMOND_BLOCK = 57;
-	const CRAFTING_TABLE = 58;
-	const WORKBENCH = 58;
-	const WHEAT_BLOCK = 59;
-	const FARMLAND = 60;
-	const FURNACE = 61;
-	const BURNING_FURNACE = 62;
-	const LIT_FURNACE = 62;
-	const SIGN_POST = 63;
-	const DOOR_BLOCK = 64;
-	const WOODEN_DOOR_BLOCK = 64;
-	const WOOD_DOOR_BLOCK = 64;
-	const LADDER = 65;
-	const RAIL = 66;
-	const COBBLE_STAIRS = 67;
-	const COBBLESTONE_STAIRS = 67;
-	const WALL_SIGN = 68;
-	const LEVER = 69;
-	const STONE_PRESSURE_PLATE = 70;
-	const IRON_DOOR_BLOCK = 71;
-	const WOODEN_PRESSURE_PLATE = 72;
-	const REDSTONE_ORE = 73;
-	const GLOWING_REDSTONE_ORE = 74;
-	const LIT_REDSTONE_ORE = 74;
-	const REDSTONE_TORCH = 75;
-	const LIT_REDSTONE_TORCH = 76;
-	const STONE_BUTTON = 77;
-	const SNOW = 78;
-	const SNOW_LAYER = 78;
-	const ICE = 79;
-	const SNOW_BLOCK = 80;
-	const CACTUS = 81;
-	const CLAY_BLOCK = 82;
-	const REEDS = 83;
-	const SUGARCANE_BLOCK = 83;
-
-	const FENCE = 85;
-	const PUMPKIN = 86;
-	const NETHERRACK = 87;
-	const SOUL_SAND = 88;
-	const GLOWSTONE = 89;
-	const GLOWSTONE_BLOCK = 89;
-
-	const PORTAL_BLOCK = 90;
-	const LIT_PUMPKIN = 91;
-	const JACK_O_LANTERN = 91;
-	const CAKE_BLOCK = 92;
-
-	const TRAPDOOR = 96;
-	const MONSTER_EGG_BLOCK = 97;
-	const STONE_BRICKS = 98;
-	const STONE_BRICK = 98;
-	const BROWN_MUSHROOM_BLOCK = 99;
-	const RED_MUSHROOM_BLOCK = 100;
-	const IRON_BAR = 101;
-	const IRON_BARS = 101;
-	const GLASS_PANE = 102;
-	const GLASS_PANEL = 102;
-	const MELON_BLOCK = 103;
-	const PUMPKIN_STEM = 104;
-	const MELON_STEM = 105;
-	const VINE = 106;
-	const VINES = 106;
-	const FENCE_GATE = 107;
-	const BRICK_STAIRS = 108;
-	const STONE_BRICK_STAIRS = 109;
-	const MYCELIUM = 110;
-	const WATER_LILY = 111;
-	const LILY_PAD = 111;
-	const NETHER_BRICKS = 112;
-	const NETHER_BRICK_BLOCK = 112;
-	const NETHER_BRICK_FENCE = 113;
-	const NETHER_BRICKS_STAIRS = 114;
-	const NETHER_WART_BLOCK = 115;
-	const ENCHANTING_TABLE = 116;
-	const ENCHANT_TABLE = 116;
-	const ENCHANTMENT_TABLE = 116;
-	const BREWING_STAND = 117;
-
-	const END_PORTAL_FRAME = 120;
-	const END_STONE = 121;
-	const REDSTONE_LAMP = 122;
-	const LIT_REDSTONE_LAMP = 123;
-
-	const ACTIVATOR_RAIL = 126;
-	const COCOA_BLOCK = 127;
-	const SANDSTONE_STAIRS = 128;
-	const EMERALD_ORE = 129;
-
-	const TRIPWIRE_HOOK = 131;
-	const TRIPWIRE = 132;
-	const EMERALD_BLOCK = 133;
-	const SPRUCE_WOOD_STAIRS = 134;
-	const SPRUCE_WOODEN_STAIRS = 134;
-	const BIRCH_WOOD_STAIRS = 135;
-	const BIRCH_WOODEN_STAIRS = 135;
-	const JUNGLE_WOOD_STAIRS = 136;
-	const JUNGLE_WOODEN_STAIRS = 136;
-
-	const COBBLE_WALL = 139;
-	const STONE_WALL = 139;
-	const COBBLESTONE_WALL = 139;
-	const FLOWER_POT_BLOCK = 140;
-	const CARROT_BLOCK = 141;
-	const POTATO_BLOCK = 142;
-	const WOODEN_BUTTON = 143;
-	const MOB_HEAD = 144;
-	const SKULL = 144;
-	const ANVIL = 145;
-	const TRAPPED_CHEST = 146;
-	const WEIGHTED_PRESSURE_PLATE_LIGHT = 147;
-	const WEIGHTED_PRESSURE_PLATE_HEAVY = 148;
-
-	const DAYLIGHT_SENSOR = 151;
-	const REDSTONE_BLOCK = 152;
-	const NETHER_QUARTZ_ORE = 153;
-
-	const QUARTZ_BLOCK = 155;
-	const QUARTZ_STAIRS = 156;
-	const DOUBLE_WOOD_SLAB = 157;
-	const DOUBLE_WOODEN_SLAB = 157;
-	const DOUBLE_WOOD_SLABS = 157;
-	const DOUBLE_WOODEN_SLABS = 157;
-	const WOOD_SLAB = 158;
-	const WOODEN_SLAB = 158;
-	const WOOD_SLABS = 158;
-	const WOODEN_SLABS = 158;
-	const STAINED_CLAY = 159;
-	const STAINED_HARDENED_CLAY = 159;
-
-	const LEAVES2 = 161;
-	const LEAVE2 = 161;
-	const WOOD2 = 162;
-	const TRUNK2 = 162;
-	const LOG2 = 162;
-	const ACACIA_WOOD_STAIRS = 163;
-	const ACACIA_WOODEN_STAIRS = 163;
-	const DARK_OAK_WOOD_STAIRS = 164;
-	const DARK_OAK_WOODEN_STAIRS = 164;
-
-	const IRON_TRAPDOOR = 167;
-
-	const HAY_BALE = 170;
-	const CARPET = 171;
-	const HARDENED_CLAY = 172;
-	const COAL_BLOCK = 173;
-	const PACKED_ICE = 174;
-	const DOUBLE_PLANT = 175;
-
-	const INVERTED_DAYLIGHT_SENSOR = 178;
-
-	const FENCE_GATE_SPRUCE = 183;
-	const FENCE_GATE_BIRCH = 184;
-	const FENCE_GATE_JUNGLE = 185;
-	const FENCE_GATE_DARK_OAK = 186;
-	const FENCE_GATE_ACACIA = 187;
-
-	const GRASS_PATH = 198;
-
-	const PODZOL = 243;
-	const BEETROOT_BLOCK = 244;
-	const STONECUTTER = 245;
-	const GLOWING_OBSIDIAN = 246;
+class Block extends Position implements BlockIds, Metadatable{
 
 	/** @var \SplFixedArray */
 	public static $list = null;
@@ -421,7 +187,7 @@ class Block extends Position implements Metadatable{
 			self::$list[self::NETHER_BRICKS_STAIRS] = NetherBrickStairs::class;
 
 			self::$list[self::ENCHANTING_TABLE] = EnchantingTable::class;
-			self::$list[self::BREWING_STAND] = BrewingStand::class;
+			self::$list[self::BREWING_STAND_BLOCK] = BrewingStand::class;
 			self::$list[self::END_PORTAL_FRAME] = EndPortalFrame::class;
 			self::$list[self::END_STONE] = EndStone::class;
 			self::$list[self::REDSTONE_LAMP] = RedstoneLamp::class;
@@ -439,7 +205,7 @@ class Block extends Position implements Metadatable{
 			self::$list[self::CARROT_BLOCK] = Carrot::class;
 			self::$list[self::POTATO_BLOCK] = Potato::class;
 			self::$list[self::WOODEN_BUTTON] = WoodenButton::class;
-			self::$list[self::MOB_HEAD] = MobHead::class;
+			self::$list[self::MOB_HEAD_BLOCK] = MobHead::class;
 			self::$list[self::ANVIL] = Anvil::class;
 			self::$list[self::TRAPPED_CHEST] = TrappedChest::class;
 			self::$list[self::WEIGHTED_PRESSURE_PLATE_LIGHT] = WeightedPressurePlateLight::class;
diff --git a/src/pocketmine/block/BlockIds.php b/src/pocketmine/block/BlockIds.php
new file mode 100644
index 000000000..e70289c17
--- /dev/null
+++ b/src/pocketmine/block/BlockIds.php
@@ -0,0 +1,231 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine\block;
+
+interface BlockIds{
+	
+	const AIR = 0;
+	const STONE = 1;
+	const GRASS = 2;
+	const DIRT = 3;
+	const COBBLESTONE = 4;  const COBBLE = 4;
+	const PLANK = 5; const PLANKS = 5; const WOODEN_PLANK = 5; const WOODEN_PLANKS = 5;
+	const SAPLING = 6; const SAPLINGS = 6;
+	const BEDROCK = 7;
+	const WATER = 8;
+	const STILL_WATER = 9;
+	const LAVA = 10;
+	const STILL_LAVA = 11;
+	const SAND = 12;
+	const GRAVEL = 13;
+	const GOLD_ORE = 14;
+	const IRON_ORE = 15;
+	const COAL_ORE = 16;
+	const LOG = 17; const WOOD = 17; const TRUNK = 17;
+	const LEAVES = 18;
+	const SPONGE = 19;
+	const GLASS = 20;
+	const LAPIS_ORE = 21;
+	const LAPIS_BLOCK = 22;
+	const DISPENSER = 23;
+	const SANDSTONE = 24;
+	const NOTE_BLOCK = 25; const NOTEBLOCK = 25;
+	const BED_BLOCK = 26;
+	const POWERED_RAIL = 27;
+	const DETECTOR_RAIL = 28;
+	const STICKY_PISTON = 29;
+	const COBWEB = 30;
+	const TALL_GRASS = 31;
+	const BUSH = 32;
+	const DEAD_BUSH = 32;
+	const PISTON = 33;
+	const PISTON_HEAD = 34;
+	const WOOL = 35;
+
+	const DANDELION = 37;
+	const POPPY = 38; const ROSE = 38; const RED_FLOWER = 38;
+	const BROWN_MUSHROOM = 39;
+	const RED_MUSHROOM = 40;
+	const GOLD_BLOCK = 41;
+	const IRON_BLOCK = 42;
+	const DOUBLE_SLAB = 43; const DOUBLE_SLABS = 43;
+	const SLAB = 44; const SLABS = 44; const STONE_SLAB = 44;
+	const BRICKS = 45; const BRICKS_BLOCK = 45;
+	const TNT = 46;
+	const BOOKSHELF = 47;
+	const MOSS_STONE = 48; const MOSSY_STONE = 48;
+	const OBSIDIAN = 49;
+	const TORCH = 50;
+	const FIRE = 51;
+	const MONSTER_SPAWNER = 52;
+	const WOOD_STAIRS = 53; const WOODEN_STAIRS = 53; const OAK_WOOD_STAIRS = 53; const OAK_WOODEN_STAIRS = 53;
+	const CHEST = 54;
+	const REDSTONE_WIRE = 55;
+	const DIAMOND_ORE = 56;
+	const DIAMOND_BLOCK = 57;
+	const CRAFTING_TABLE = 58; const WORKBENCH = 58;
+	const WHEAT_BLOCK = 59;
+	const FARMLAND = 60;
+	const FURNACE = 61;
+	const BURNING_FURNACE = 62; const LIT_FURNACE = 62;
+	const SIGN_POST = 63;
+	const DOOR_BLOCK = 64; const WOODEN_DOOR_BLOCK = 64; const WOOD_DOOR_BLOCK = 64;
+	const LADDER = 65;
+	const RAIL = 66;
+	const COBBLESTONE_STAIRS = 67; const COBBLE_STAIRS = 67;
+	const WALL_SIGN = 68;
+	const LEVER = 69;
+	const STONE_PRESSURE_PLATE = 70;
+	const IRON_DOOR_BLOCK = 71;
+	const WOODEN_PRESSURE_PLATE = 72;
+	const REDSTONE_ORE = 73;
+	const GLOWING_REDSTONE_ORE = 74; const LIT_REDSTONE_ORE = 74;
+	const UNLIT_REDSTONE_TORCH = 75;
+	const REDSTONE_TORCH = 76; const LIT_REDSTONE_TORCH = 76;
+	const STONE_BUTTON = 77;
+	const SNOW = 78; const SNOW_LAYER = 78;
+	const ICE = 79;
+	const SNOW_BLOCK = 80;
+	const CACTUS = 81;
+	const CLAY_BLOCK = 82;
+	const REEDS = 83; const SUGARCANE_BLOCK = 83;
+
+	const FENCE = 85;
+	const PUMPKIN = 86;
+	const NETHERRACK = 87;
+	const SOUL_SAND = 88;
+	const GLOWSTONE = 89; const GLOWSTONE_BLOCK = 89;
+	const PORTAL_BLOCK = 90; const PORTAL = 90;
+	const JACK_O_LANTERN = 91; const LIT_PUMPKIN = 91;
+	const CAKE_BLOCK = 92;
+	const REPEATER_BLOCK = 93; const UNPOWERED_REPEATER_BLOCK = 93;
+	const POWERED_REPEATER_BLOCK = 94;
+	const INVISIBLE_BEDROCK = 95;
+	const TRAPDOOR = 96; const WOODEN_TRAPDOOR = 96;
+	const MONSTER_EGG_BLOCK = 97;
+	const STONE_BRICKS = 98; const STONE_BRICK = 98;
+	const BROWN_MUSHROOM_BLOCK = 99;
+	const RED_MUSHROOM_BLOCK = 100;
+	const IRON_BARS = 101; const IRON_BAR = 101;
+	const GLASS_PANE = 102; const GLASS_PANEL = 102;
+	const MELON_BLOCK = 103;
+	const PUMPKIN_STEM = 104;
+	const MELON_STEM = 105;
+	const VINES = 106; const VINE = 106;
+	const FENCE_GATE = 107; const OAK_FENCE_GATE = 107;
+	const BRICK_STAIRS = 108;
+	const STONE_BRICK_STAIRS = 109;
+	const MYCELIUM = 110;
+	const LILY_PAD = 111; const WATER_LILY = 111;
+	const NETHER_BRICKS = 112; const NETHER_BRICK_BLOCK = 112;
+	const NETHER_BRICK_FENCE = 113;
+	const NETHER_BRICK_STAIRS = 114; const NETHER_BRICKS_STAIRS = 114;
+	const NETHER_WART_BLOCK = 115;
+	const ENCHANTING_TABLE = 116; const ENCHANT_TABLE = 116; const ENCHANTMENT_TABLE = 116;
+	const BREWING_STAND_BLOCK = 117;
+	const CAULDRON_BLOCK = 118;
+
+	const END_PORTAL_FRAME = 120; const END_PORTAL = 120;
+	const END_STONE = 121;
+
+	const REDSTONE_LAMP = 123; const INACTIVE_REDSTONE_LAMP = 123;
+	const LIT_REDSTONE_LAMP = 124; const ACTIVE_REDSTONE_LAMP = 124;
+	const DROPPER = 125;
+	const ACTIVATOR_RAIL = 126;
+	const COCOA_BLOCK = 127; const COCOA_PODS = 127;
+	const SANDSTONE_STAIRS = 128;
+	const EMERALD_ORE = 129;
+
+	const TRIPWIRE_HOOK = 131;
+	const TRIPWIRE = 132;
+	const EMERALD_BLOCK = 133;
+	const SPRUCE_WOOD_STAIRS = 134; const SPRUCE_WOODEN_STAIRS = 134;
+	const BIRCH_WOOD_STAIRS = 135; const BIRCH_WOODEN_STAIRS = 135;
+	const JUNGLE_WOOD_STAIRS = 136; const JUNGLE_WOODEN_STAIRS = 136;
+
+	const COBBLESTONE_WALL = 139; const COBBLE_WALL = 139; const STONE_WALL = 139;
+	const FLOWER_POT_BLOCK = 140;
+	const CARROT_BLOCK = 141;
+	const POTATO_BLOCK = 142;
+	const WOODEN_BUTTON = 143;
+	const MOB_HEAD_BLOCK = 144; const SKULL_BLOCK = 144;
+	const ANVIL = 145;
+	const TRAPPED_CHEST = 146;
+	const WEIGHTED_PRESSURE_PLATE_LIGHT = 147; const LIGHT_WEIGHTED_PRESSURE_PLATE = 147; const GOLD_PRESSURE_PLATE = 147;
+	const WEIGHTED_PRESSURE_PLATE_HEAVY = 148; const HEAVY_WEIGHTED_PRESSURE_PLATE = 148; const IRON_PRESSURE_PLATE = 148;
+	const COMPARATOR_BLOCK = 149; const UNPOWERED_COMPARATOR_BLOCK = 149;
+	const POWERED_COMPARATOR_BLOCK = 150;
+	const DAYLIGHT_SENSOR = 151;
+	const REDSTONE_BLOCK = 152;
+	const NETHER_QUARTZ_ORE = 153;
+	const HOPPER_BLOCK = 154;
+	const QUARTZ_BLOCK = 155;
+	const QUARTZ_STAIRS = 156;
+	const DOUBLE_WOOD_SLAB = 157; const DOUBLE_WOODEN_SLAB = 157; const DOUBLE_WOOD_SLABS = 157; const DOUBLE_WOODEN_SLABS = 157;
+	const WOOD_SLAB = 158; const WOODEN_SLAB = 158; const WOOD_SLABS = 158; const WOODEN_SLABS = 158;
+	const STAINED_CLAY = 159; const STAINED_HARDENED_CLAY = 159;
+	
+	const LEAVES2 = 161;
+	const WOOD2 = 162; const TRUNK2 = 162; const LOG2 = 162;
+	const ACACIA_WOOD_STAIRS = 163; const ACACIA_WOODEN_STAIRS = 163;
+	const DARK_OAK_WOOD_STAIRS = 164; const DARK_OAK_WOODEN_STAIRS = 164;
+	const SLIME_BLOCK = 165;
+	
+	const IRON_TRAPDOOR = 167;
+	
+	const HAY_BALE = 170;
+	const CARPET = 171;
+	const HARDENED_CLAY = 172;
+	const COAL_BLOCK = 173;
+	const PACKED_ICE = 174;
+	const DOUBLE_PLANT = 175;
+	
+	const INVERTED_DAYLIGHT_SENSOR = 178; const DAYLIGHT_SENSOR_INVERTED = 178;
+	const RED_SANDSTONE = 179;
+	const RED_SANDSTONE_STAIRS = 180;
+	const DOUBLE_RED_SANDSTONE_SLAB = 181;
+	const RED_SANDSTONE_SLAB = 182;
+	const SPRUCE_FENCE_GATE = 183; const FENCE_GATE_SPRUCE = 183;
+	const BIRCH_FENCE_GATE = 184; const FENCE_GATE_BIRCH = 184;
+	const JUNGLE_FENCE_GATE = 185; const FENCE_GATE_JUNGLE = 185;
+	const DARK_OAK_FENCE_GATE = 186; const FENCE_GATE_DARK_OAK = 186;
+	const ACACIA_FENCE_GATE = 187; const FENCE_GATE_ACACIA = 187;
+	
+	const SPRUCE_DOOR_BLOCK = 193;
+	const BIRCH_DOOR_BLOCK = 194;
+	const JUNGLE_DOOR_BLOCK = 195;
+	const ACACIA_DOOR_BLOCK = 196;
+	const DARK_OAK_DOOR_BLOCK = 197;
+	const GRASS_PATH = 198;
+	const ITEM_FRAME_BLOCK = 199;
+	
+	const PODZOL = 243;
+	const BEETROOT_BLOCK = 244;
+	const STONECUTTER = 245;
+	const GLOWING_OBSIDIAN = 246;
+	const NETHER_REACTOR = 247;
+	const UPDATE_BLOCK = 248;
+	const ATEUPD_BLOCK = 249;
+	const BLOCK_MOVED_BY_PISTON = 250;
+	const OBSERVER = 251;
+	const INFO_RESERVED6 = 255;
+}
\ No newline at end of file
diff --git a/src/pocketmine/block/BrewingStand.php b/src/pocketmine/block/BrewingStand.php
index e0e7aaa9a..220b8bd33 100644
--- a/src/pocketmine/block/BrewingStand.php
+++ b/src/pocketmine/block/BrewingStand.php
@@ -26,7 +26,7 @@ use pocketmine\item\Tool;
 
 class BrewingStand extends Transparent{
 
-	protected $id = self::BREWING_STAND;
+	protected $id = self::BREWING_STAND_BLOCK;
 
 	public function __construct(){
 
diff --git a/src/pocketmine/block/MobHead.php b/src/pocketmine/block/MobHead.php
index b2831e3ab..bfe034e32 100644
--- a/src/pocketmine/block/MobHead.php
+++ b/src/pocketmine/block/MobHead.php
@@ -32,7 +32,9 @@ use pocketmine\tile\Spawnable;
 use pocketmine\tile\Tile;
 
 class MobHead extends Solid{
-	protected $id = self::MOB_HEAD;
+
+	protected $id = self::MOB_HEAD_BLOCK;
+
 	protected $type;
 
 	public function __construct($meta = 0){
diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php
index 4430bd3bb..3f4771195 100644
--- a/src/pocketmine/item/Item.php
+++ b/src/pocketmine/item/Item.php
@@ -38,7 +38,8 @@ use pocketmine\Player;
 use pocketmine\Server;
 use pocketmine\utils\Config;
 
-class Item{
+
+class Item implements ItemIds{
 
 	/** @var NBT */
 	private static $cachedParser = null;
@@ -61,418 +62,6 @@ class Item{
 		return self::$cachedParser->write();
 	}
 
-	//All Block IDs are here too
-	const AIR = 0;
-	const STONE = 1;
-	const GRASS = 2;
-	const DIRT = 3;
-	const COBBLESTONE = 4;
-	const COBBLE = 4;
-	const PLANK = 5;
-	const PLANKS = 5;
-	const WOODEN_PLANK = 5;
-	const WOODEN_PLANKS = 5;
-	const SAPLING = 6;
-	const SAPLINGS = 6;
-	const BEDROCK = 7;
-	const WATER = 8;
-	const STILL_WATER = 9;
-	const LAVA = 10;
-	const STILL_LAVA = 11;
-	const SAND = 12;
-	const GRAVEL = 13;
-	const GOLD_ORE = 14;
-	const IRON_ORE = 15;
-	const COAL_ORE = 16;
-	const LOG = 17;
-	const WOOD = 17;
-	const TRUNK = 17;
-	const LEAVES = 18;
-	const LEAVE = 18;
-	const SPONGE = 19;
-	const GLASS = 20;
-	const LAPIS_ORE = 21;
-	const LAPIS_BLOCK = 22;
-
-	const SANDSTONE = 24;
-	const NOTEBLOCK = 25;
-	const BED_BLOCK = 26;
-	const POWERED_RAIL = 27;
-	const DETECTOR_RAIL = 28;
-	const COBWEB = 30;
-	const TALL_GRASS = 31;
-	const BUSH = 32;
-	const DEAD_BUSH = 32;
-	const WOOL = 35;
-	const DANDELION = 37;
-	const POPPY = 38;
-	const ROSE = 38;
-	const RED_FLOWER = 38;
-	const BROWN_MUSHROOM = 39;
-	const RED_MUSHROOM = 40;
-	const GOLD_BLOCK = 41;
-	const IRON_BLOCK = 42;
-	const DOUBLE_SLAB = 43;
-	const DOUBLE_SLABS = 43;
-	const SLAB = 44;
-	const SLABS = 44;
-	const BRICKS = 45;
-	const BRICKS_BLOCK = 45;
-	const TNT = 46;
-	const BOOKSHELF = 47;
-	const MOSS_STONE = 48;
-	const MOSSY_STONE = 48;
-	const OBSIDIAN = 49;
-	const TORCH = 50;
-	const FIRE = 51;
-	const MONSTER_SPAWNER = 52;
-	const WOOD_STAIRS = 53;
-	const WOODEN_STAIRS = 53;
-	const OAK_WOOD_STAIRS = 53;
-	const OAK_WOODEN_STAIRS = 53;
-	const CHEST = 54;
-	const REDSTONE_WIRE = 55;
-	const DIAMOND_ORE = 56;
-	const DIAMOND_BLOCK = 57;
-	const CRAFTING_TABLE = 58;
-	const WORKBENCH = 58;
-	const WHEAT_BLOCK = 59;
-	const FARMLAND = 60;
-	const FURNACE = 61;
-	const BURNING_FURNACE = 62;
-	const LIT_FURNACE = 62;
-	const SIGN_POST = 63;
-	const DOOR_BLOCK = 64;
-	const WOODEN_DOOR_BLOCK = 64;
-	const WOOD_DOOR_BLOCK = 64;
-	const LADDER = 65;
-	const RAIL = 66;
-	const COBBLE_STAIRS = 67;
-	const COBBLESTONE_STAIRS = 67;
-	const WALL_SIGN = 68;
-	const LEVER = 69;
-	const STONE_PRESSURE_PLATE = 70;
-	const IRON_DOOR_BLOCK = 71;
-	const WOODEN_PRESSURE_PLATE = 72;
-	const REDSTONE_ORE = 73;
-	const GLOWING_REDSTONE_ORE = 74;
-	const LIT_REDSTONE_ORE = 74;
-	const REDSTONE_TORCH = 75;
-	const LIT_REDSTONE_TORCH = 76;
-	const STONE_BUTTON = 77;
-	const SNOW = 78;
-	const SNOW_LAYER = 78;
-	const ICE = 79;
-	const SNOW_BLOCK = 80;
-	const CACTUS = 81;
-	const CLAY_BLOCK = 82;
-	const REEDS = 83;
-	const SUGARCANE_BLOCK = 83;
-
-	const FENCE = 85;
-	const PUMPKIN = 86;
-	const NETHERRACK = 87;
-	const SOUL_SAND = 88;
-	const GLOWSTONE = 89;
-	const GLOWSTONE_BLOCK = 89;
-
-	const PORTAL_BLOCK = 90;
-	const LIT_PUMPKIN = 91;
-	const JACK_O_LANTERN = 91;
-	const CAKE_BLOCK = 92;
-
-	const TRAPDOOR = 96;
-	const MONSTER_EGG_BLOCK = 97;
-	const STONE_BRICKS = 98;
-	const STONE_BRICK = 98;
-	const BROWN_MUSHROOM_BLOCK = 99;
-	const RED_MUSHROOM_BLOCK = 100;
-	const IRON_BAR = 101;
-	const IRON_BARS = 101;
-	const GLASS_PANE = 102;
-	const GLASS_PANEL = 102;
-	const MELON_BLOCK = 103;
-	const PUMPKIN_STEM = 104;
-	const MELON_STEM = 105;
-	const VINE = 106;
-	const VINES = 106;
-	const FENCE_GATE = 107;
-	const BRICK_STAIRS = 108;
-	const STONE_BRICK_STAIRS = 109;
-	const MYCELIUM = 110;
-	const WATER_LILY = 111;
-	const LILY_PAD = 111;
-	const NETHER_BRICKS = 112;
-	const NETHER_BRICK_BLOCK = 112;
-	const NETHER_BRICK_FENCE = 113;
-	const NETHER_BRICKS_STAIRS = 114;
-	const NETHER_WART_BLOCK = 115;
-	const ENCHANTING_TABLE = 116;
-	const ENCHANT_TABLE = 116;
-	const ENCHANTMENT_TABLE = 116;
-	const BREWING_STAND_BLOCK = 117;
-
-	const END_PORTAL = 120;
-	const END_STONE = 121;
-	const REDSTONE_LAMP = 122;
-	const LIT_REDSTONE_LAMP = 123;
-
-	const ACTIVATOR_RAIL = 126;
-	const COCOA_BLOCK = 127;
-	const SANDSTONE_STAIRS = 128;
-	const EMERALD_ORE = 129;
-
-	const TRIPWIRE_HOOK = 131;
-	const TRIPWIRE = 132;
-	const EMERALD_BLOCK = 133;
-	const SPRUCE_WOOD_STAIRS = 134;
-	const SPRUCE_WOODEN_STAIRS = 134;
-	const BIRCH_WOOD_STAIRS = 135;
-	const BIRCH_WOODEN_STAIRS = 135;
-	const JUNGLE_WOOD_STAIRS = 136;
-	const JUNGLE_WOODEN_STAIRS = 136;
-
-	const COBBLE_WALL = 139;
-	const STONE_WALL = 139;
-	const COBBLESTONE_WALL = 139;
-	const FLOWER_POT_BLOCK = 140;
-	const CARROT_BLOCK = 141;
-	const POTATO_BLOCK = 142;
-	const WOODEN_BUTTON = 143;
-	const MOB_HEAD_BLOCK = 144;
-	const ANVIL = 145;
-	const SKULL_BLOCK = 144;
-	const TRAPPED_CHEST = 146;
-	const WEIGHTED_PRESSURE_PLATE_LIGHT = 147;
-	const WEIGHTED_PRESSURE_PLATE_HEAVY = 148;
-
-	const DAYLIGHT_SENSOR = 151;
-	const REDSTONE_BLOCK = 152;
-	const NETHER_QUARTZ_ORE = 153;
-
-	const QUARTZ_BLOCK = 155;
-	const QUARTZ_STAIRS = 156;
-	const DOUBLE_WOOD_SLAB = 157;
-	const DOUBLE_WOODEN_SLAB = 157;
-	const DOUBLE_WOOD_SLABS = 157;
-	const DOUBLE_WOODEN_SLABS = 157;
-	const WOOD_SLAB = 158;
-	const WOODEN_SLAB = 158;
-	const WOOD_SLABS = 158;
-	const WOODEN_SLABS = 158;
-	const STAINED_CLAY = 159;
-	const STAINED_HARDENED_CLAY = 159;
-
-	const LEAVES2 = 161;
-	const LEAVE2 = 161;
-	const WOOD2 = 162;
-	const TRUNK2 = 162;
-	const LOG2 = 162;
-	const ACACIA_WOOD_STAIRS = 163;
-	const ACACIA_WOODEN_STAIRS = 163;
-	const DARK_OAK_WOOD_STAIRS = 164;
-	const DARK_OAK_WOODEN_STAIRS = 164;
-
-	const IRON_TRAPDOOR = 167;
-
-	const HAY_BALE = 170;
-	const CARPET = 171;
-	const HARDENED_CLAY = 172;
-	const COAL_BLOCK = 173;
-	const PACKED_ICE = 174;
-	const DOUBLE_PLANT = 175;
-
-	const INVERTED_DAYLIGHT_SENSOR = 178;
-
-	const FENCE_GATE_SPRUCE = 183;
-	const FENCE_GATE_BIRCH = 184;
-	const FENCE_GATE_JUNGLE = 185;
-	const FENCE_GATE_DARK_OAK = 186;
-	const FENCE_GATE_ACACIA = 187;
-
-	const GRASS_PATH = 198;
-
-	const PODZOL = 243;
-	const BEETROOT_BLOCK = 244;
-	const STONECUTTER = 245;
-	const GLOWING_OBSIDIAN = 246;
-
-	//Normal Item IDs
-	const IRON_SHOVEL = 256;
-	const IRON_PICKAXE = 257;
-	const IRON_AXE = 258;
-	const FLINT_STEEL = 259;
-	const FLINT_AND_STEEL = 259;
-	const APPLE = 260;
-	const BOW = 261;
-	const ARROW = 262;
-	const COAL = 263;
-	const DIAMOND = 264;
-	const IRON_INGOT = 265;
-	const GOLD_INGOT = 266;
-	const IRON_SWORD = 267;
-	const WOODEN_SWORD = 268;
-	const WOODEN_SHOVEL = 269;
-	const WOODEN_PICKAXE = 270;
-	const WOODEN_AXE = 271;
-	const STONE_SWORD = 272;
-	const STONE_SHOVEL = 273;
-	const STONE_PICKAXE = 274;
-	const STONE_AXE = 275;
-	const DIAMOND_SWORD = 276;
-	const DIAMOND_SHOVEL = 277;
-	const DIAMOND_PICKAXE = 278;
-	const DIAMOND_AXE = 279;
-	const STICK = 280;
-	const STICKS = 280;
-	const BOWL = 281;
-	const MUSHROOM_STEW = 282;
-	const GOLD_SWORD = 283;
-	const GOLD_SHOVEL = 284;
-	const GOLD_PICKAXE = 285;
-	const GOLD_AXE = 286;
-	const GOLDEN_SWORD = 283;
-	const GOLDEN_SHOVEL = 284;
-	const GOLDEN_PICKAXE = 285;
-	const GOLDEN_AXE = 286;
-	const STRING = 287;
-	const FEATHER = 288;
-	const GUNPOWDER = 289;
-	const WOODEN_HOE = 290;
-	const STONE_HOE = 291;
-	const IRON_HOE = 292;
-	const DIAMOND_HOE = 293;
-	const GOLD_HOE = 294;
-	const GOLDEN_HOE = 294;
-	const SEEDS = 295;
-	const WHEAT_SEEDS = 295;
-	const WHEAT = 296;
-	const BREAD = 297;
-	const LEATHER_CAP = 298;
-	const LEATHER_TUNIC = 299;
-	const LEATHER_PANTS = 300;
-	const LEATHER_BOOTS = 301;
-	const CHAIN_HELMET = 302;
-	const CHAIN_CHESTPLATE = 303;
-	const CHAIN_LEGGINGS = 304;
-	const CHAIN_BOOTS = 305;
-	const IRON_HELMET = 306;
-	const IRON_CHESTPLATE = 307;
-	const IRON_LEGGINGS = 308;
-	const IRON_BOOTS = 309;
-	const DIAMOND_HELMET = 310;
-	const DIAMOND_CHESTPLATE = 311;
-	const DIAMOND_LEGGINGS = 312;
-	const DIAMOND_BOOTS = 313;
-	const GOLD_HELMET = 314;
-	const GOLD_CHESTPLATE = 315;
-	const GOLD_LEGGINGS = 316;
-	const GOLD_BOOTS = 317;
-	const FLINT = 318;
-	const RAW_PORKCHOP = 319;
-	const COOKED_PORKCHOP = 320;
-	const PAINTING = 321;
-	const GOLDEN_APPLE = 322;
-	const SIGN = 323;
-	const WOODEN_DOOR = 324;
-	const BUCKET = 325;
-
-	const MINECART = 328;
-	const SADDLE = 329;
-	const IRON_DOOR = 330;
-	const REDSTONE = 331;
-	const REDSTONE_DUST = 331;
-	const SNOWBALL = 332;
-	const BOAT = 333;
-	const LEATHER = 334;
-
-	const BRICK = 336;
-	const CLAY = 337;
-	const SUGARCANE = 338;
-	const SUGAR_CANE = 338;
-	const SUGAR_CANES = 338;
-	const PAPER = 339;
-	const BOOK = 340;
-	const SLIMEBALL = 341;
-
-	const EGG = 344;
-	const COMPASS = 345;
-	const FISHING_ROD = 346;
-	const CLOCK = 347;
-	const GLOWSTONE_DUST = 348;
-	const RAW_FISH = 349;
-	const COOKED_FISH = 350;
-	const DYE = 351;
-	const BONE = 352;
-	const SUGAR = 353;
-	const CAKE = 354;
-	const BED = 355;
-
-	const COOKIE = 357;
-
-	const SHEARS = 359;
-	const MELON = 360;
-	const MELON_SLICE = 360;
-	const PUMPKIN_SEEDS = 361;
-	const MELON_SEEDS = 362;
-	const RAW_BEEF = 363;
-	const STEAK = 364;
-	const COOKED_BEEF = 364;
-	const RAW_CHICKEN = 365;
-	const COOKED_CHICKEN = 366;
-	const ROTTEN_FLESH = 367;
-
-	const BLAZE_ROD = 369;
-	const GHAST_TEAR = 370;
-	const GOLD_NUGGET = 371;
-	const GOLDEN_NUGGET = 371;
-	const NETHER_WART = 372;
-	const POTION = 373;
-	const GLASS_BOTTLE = 374;
-	const SPIDER_EYE = 375;
-	const FERMENTED_SPIDER_EYE = 376;
-	const BLAZE_POWDER = 377;
-	const MAGMA_CREAM = 378;
-	const BREWING_STAND = 379;
-	const GLISTERING_MELON = 382;
-	const SPAWN_EGG = 383;
-	const BOTTLE_O_ENCHANTING = 384;
-
-	const EMERALD = 388;
-
-	const FLOWER_POT = 390;
-	const CARROT = 391;
-	const CARROTS = 391;
-	const POTATO = 392;
-	const POTATOES = 392;
-	const BAKED_POTATO = 393;
-	const BAKED_POTATOES = 393;
-	const POISONOUS_POTATO = 394;
-	const GOLDEN_CARROT = 396;
-	const MOB_HEAD = 397;
-	const SKULL = 397;
-
-	const PUMPKIN_PIE = 400;
-
-	const ENCHANTED_BOOK = 403;
-
-	const NETHER_BRICK = 405;
-	const QUARTZ = 406;
-	const NETHER_QUARTZ = 406;
-
-	const RAW_RABBIT = 411;
-	const COOKED_RABBIT = 412;
-	const RABBIT_STEW = 413;
-	const RABIT_FOOT = 414;
-	const RABBIT_HIDE = 415;
-	const SPLASH_POTION = 438;
-
-	const CAMERA = 456;
-	const BEETROOT = 457;
-	const BEETROOT_SEEDS = 458;
-	const BEETROOT_SEED = 458;
-	const BEETROOT_SOUP = 459;
-
 	/** @var \SplFixedArray */
 	public static $list = null;
 	protected $block;
diff --git a/src/pocketmine/item/ItemIds.php b/src/pocketmine/item/ItemIds.php
new file mode 100644
index 000000000..190c76d3d
--- /dev/null
+++ b/src/pocketmine/item/ItemIds.php
@@ -0,0 +1,217 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+ 
+namespace pocketmine\item;
+ 
+use pocketmine\block\BlockIds;
+ 
+interface ItemIds extends BlockIds{
+	
+	//All BlockIds are also accessible through this interface.
+	const IRON_SHOVEL = 256;
+	const IRON_PICKAXE = 257;
+	const IRON_AXE = 258;
+	const FLINT_AND_STEEL = 259; const FLINT_STEEL = 259;
+	const APPLE = 260;
+	const BOW = 261;
+	const ARROW = 262;
+	const COAL = 263;
+	const DIAMOND = 264;
+	const IRON_INGOT = 265;
+	const GOLD_INGOT = 266;
+	const IRON_SWORD = 267;
+	const WOODEN_SWORD = 268;
+	const WOODEN_SHOVEL = 269;
+	const WOODEN_PICKAXE = 270;
+	const WOODEN_AXE = 271;
+	const STONE_SWORD = 272;
+	const STONE_SHOVEL = 273;
+	const STONE_PICKAXE = 274;
+	const STONE_AXE = 275;
+	const DIAMOND_SWORD = 276;
+	const DIAMOND_SHOVEL = 277;
+	const DIAMOND_PICKAXE = 278;
+	const DIAMOND_AXE = 279;
+	const STICK = 280; const STICKS = 280;
+	const BOWL = 281;
+	const MUSHROOM_STEW = 282;
+	const GOLD_SWORD = 283; const GOLDEN_SWORD = 283;
+	const GOLD_SHOVEL = 284; const GOLDEN_SHOVEL = 284;
+	const GOLD_PICKAXE = 285; const GOLDEN_PICKAXE = 285;
+	const GOLD_AXE = 286; const GOLDEN_AXE = 286;
+	const STRING = 287;
+	const FEATHER = 288;
+	const GUNPOWDER = 289;
+	const WOODEN_HOE = 290;
+	const STONE_HOE = 291;
+	const IRON_HOE = 292;
+	const DIAMOND_HOE = 293;
+	const GOLD_HOE = 294; const GOLDEN_HOE = 294;
+	const SEEDS = 295; const WHEAT_SEEDS = 295;
+	const WHEAT = 296;
+	const BREAD = 297;
+	const LEATHER_CAP = 298;
+	const LEATHER_TUNIC = 299;
+	const LEATHER_PANTS = 300;
+	const LEATHER_BOOTS = 301;
+	const CHAIN_HELMET = 302;
+	const CHAIN_CHESTPLATE = 303;
+	const CHAIN_LEGGINGS = 304;
+	const CHAIN_BOOTS = 305;
+	const IRON_HELMET = 306;
+	const IRON_CHESTPLATE = 307;
+	const IRON_LEGGINGS = 308;
+	const IRON_BOOTS = 309;
+	const DIAMOND_HELMET = 310;
+	const DIAMOND_CHESTPLATE = 311;
+	const DIAMOND_LEGGINGS = 312;
+	const DIAMOND_BOOTS = 313;
+	const GOLD_HELMET = 314;
+	const GOLD_CHESTPLATE = 315;
+	const GOLD_LEGGINGS = 316;
+	const GOLD_BOOTS = 317;
+	const FLINT = 318;
+	const RAW_PORKCHOP = 319;
+	const COOKED_PORKCHOP = 320;
+	const PAINTING = 321;
+	const GOLDEN_APPLE = 322;
+	const SIGN = 323;
+	const WOODEN_DOOR = 324; const OAK_DOOR = 324;
+	const BUCKET = 325;
+
+	const MINECART = 328;
+	const SADDLE = 329;
+	const IRON_DOOR = 330;
+	const REDSTONE = 331;
+	const REDSTONE_DUST = 331;
+	const SNOWBALL = 332;
+	const BOAT = 333;
+	const LEATHER = 334;
+	
+	const BRICK = 336;
+	const CLAY = 337;
+	const SUGARCANE = 338; const SUGAR_CANE = 338; const SUGAR_CANES = 338;
+	const PAPER = 339;
+	const BOOK = 340;
+	const SLIMEBALL = 341;
+	const MINECART_WITH_CHEST = 342;
+	
+	const EGG = 344;
+	const COMPASS = 345;
+	const FISHING_ROD = 346;
+	const CLOCK = 347;
+	const GLOWSTONE_DUST = 348;
+	const RAW_FISH = 349;
+	const COOKED_FISH = 350;
+	const DYE = 351;
+	const BONE = 352;
+	const SUGAR = 353;
+	const CAKE = 354;
+	const BED = 355;
+	const REPEATER = 356;
+	const COOKIE = 357;
+	const FILLED_MAP = 358;
+	const SHEARS = 359;
+	const MELON = 360; const MELON_SLICE = 360;
+	const PUMPKIN_SEEDS = 361;
+	const MELON_SEEDS = 362;
+	const RAW_BEEF = 363;
+	const STEAK = 364; const COOKED_BEEF = 364;
+	const RAW_CHICKEN = 365;
+	const COOKED_CHICKEN = 366;
+	const ROTTEN_FLESH = 367;
+
+	const BLAZE_ROD = 369;
+	const GHAST_TEAR = 370;
+	const GOLD_NUGGET = 371; const GOLDEN_NUGGET = 371;
+	const NETHER_WART = 372;
+	const POTION = 373;
+	const GLASS_BOTTLE = 374;
+	const SPIDER_EYE = 375;
+	const FERMENTED_SPIDER_EYE = 376;
+	const BLAZE_POWDER = 377;
+	const MAGMA_CREAM = 378;
+	const BREWING_STAND = 379;
+	const CAULDRON = 380;
+
+	const GLISTERING_MELON = 382;
+	const SPAWN_EGG = 383;
+	const BOTTLE_O_ENCHANTING = 384; const ENCHANTING_BOTTLE = 384;
+	const FIRE_CHARGE = 385;
+	
+	const EMERALD = 388;
+	const ITEM_FRAME = 389;
+	const FLOWER_POT = 390;
+	const CARROT = 391; const CARROTS = 391;
+	const POTATO = 392; const POTATOES = 392;
+	const BAKED_POTATO = 393; const BAKED_POTATOES = 393;
+	const POISONOUS_POTATO = 394;
+	const MAP = 395; const EMPTY_MAP = 395;
+	const GOLDEN_CARROT = 396;
+	const MOB_HEAD = 397; const SKULL = 397;
+	const CARROT_ON_A_STICK = 398;
+	
+	const PUMPKIN_PIE = 400;
+
+	const ENCHANTED_BOOK = 403;
+	const COMPARATOR = 404;
+	const NETHER_BRICK = 405;
+	const QUARTZ = 406;
+	const NETHER_QUARTZ = 406;
+	const MINECART_WITH_TNT = 407;
+	const MINECART_WITH_HOPPER = 408;
+	
+	const HOPPER = 410;
+	const RAW_RABBIT = 411;
+	const COOKED_RABBIT = 412;
+	const RABBIT_STEW = 413;
+	const RABBIT_FOOT = 414;
+	const RABBIT_HIDE = 415;
+	const LEATHER_HORSE_ARMOR = 416; //I hate being forced to spell this wrong
+	const IRON_HORSE_ARMOR = 417;
+	const GOLD_HORSE_ARMOR = 418;
+	const DIAMOND_HORSE_ARMOR = 419;
+	const LEAD = 420; const LEASH = 420;
+	const NAMETAG = 421;
+	
+	const RAW_MUTTON = 423;
+	const COOKED_MUTTON = 424;
+	
+	const SPRUCE_DOOR = 427;
+	const BIRCH_DOOR = 428;
+	const JUNGLE_DOOR = 429;
+	const ACACIA_DOOR = 430;
+	const DARK_OAK_DOOR = 431;
+	
+	const SPLASH_POTION = 438;
+	
+	const BEETROOT = 457;
+	const BEETROOT_SEEDS = 458; const BEETROOT_SEED = 458;
+	const BEETROOT_SOUP = 459;
+	const RAW_SALMON = 460;
+	const CLOWN_FISH = 461;
+	const PUFFER_FISH = 462;
+	const COOKED_SALMON = 463;
+
+	const ENCHANTED_GOLDEN_APPLE = 466;
+
+	const CAMERA = 498; #blamemojang
+ }
\ No newline at end of file