From 63c12440dce53c696aa3e03baa29a9f6d7dafb86 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 3 Aug 2017 17:48:56 +0100 Subject: [PATCH] Fixed items ordering --- src/pocketmine/item/Item.php | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php index f87575688..01b7973e5 100644 --- a/src/pocketmine/item/Item.php +++ b/src/pocketmine/item/Item.php @@ -44,7 +44,6 @@ use pocketmine\utils\Binary; use pocketmine\utils\Config; class Item implements ItemIds, \JsonSerializable{ - /** @var NBT */ private static $cachedParser = null; @@ -96,6 +95,7 @@ class Item implements ItemIds, \JsonSerializable{ public static function init(){ if(self::$list === null){ self::$list = new \SplFixedArray(65536); + self::$list[self::IRON_SHOVEL] = IronShovel::class; self::$list[self::IRON_PICKAXE] = IronPickaxe::class; self::$list[self::IRON_AXE] = IronAxe::class; @@ -166,18 +166,22 @@ class Item implements ItemIds, \JsonSerializable{ self::$list[self::SIGN] = Sign::class; self::$list[self::WOODEN_DOOR] = WoodenDoor::class; self::$list[self::BUCKET] = Bucket::class; + self::$list[self::MINECART] = Minecart::class; + self::$list[self::IRON_DOOR] = IronDoor::class; self::$list[self::REDSTONE] = Redstone::class; self::$list[self::SNOWBALL] = Snowball::class; self::$list[self::BOAT] = Boat::class; self::$list[self::LEATHER] = Leather::class; + self::$list[self::BRICK] = Brick::class; self::$list[self::CLAY] = Clay::class; self::$list[self::SUGARCANE] = Sugarcane::class; self::$list[self::PAPER] = Paper::class; self::$list[self::BOOK] = Book::class; self::$list[self::SLIMEBALL] = Slimeball::class; + self::$list[self::EGG] = Egg::class; self::$list[self::COMPASS] = Compass::class; self::$list[self::FISHING_ROD] = FishingRod::class; @@ -190,7 +194,9 @@ class Item implements ItemIds, \JsonSerializable{ self::$list[self::SUGAR] = Sugar::class; self::$list[self::CAKE] = Cake::class; self::$list[self::BED] = Bed::class; + self::$list[self::COOKIE] = Cookie::class; + self::$list[self::SHEARS] = Shears::class; self::$list[self::MELON] = Melon::class; self::$list[self::PUMPKIN_SEEDS] = PumpkinSeeds::class; @@ -199,6 +205,7 @@ class Item implements ItemIds, \JsonSerializable{ self::$list[self::STEAK] = Steak::class; self::$list[self::RAW_CHICKEN] = RawChicken::class; self::$list[self::COOKED_CHICKEN] = CookedChicken::class; + self::$list[self::GOLD_NUGGET] = GoldNugget::class; self::$list[self::NETHER_WART] = NetherWart::class; self::$list[self::POTION] = Potion::class; @@ -208,27 +215,36 @@ class Item implements ItemIds, \JsonSerializable{ self::$list[self::BLAZE_POWDER] = BlazePowder::class; self::$list[self::MAGMA_CREAM] = MagmaCream::class; self::$list[self::BREWING_STAND] = BrewingStand::class; + self::$list[self::GLISTERING_MELON] = GlisteringMelon::class; self::$list[self::SPAWN_EGG] = SpawnEgg::class; + self::$list[self::EMERALD] = Emerald::class; self::$list[self::ITEM_FRAME] = ItemFrame::class; self::$list[self::FLOWER_POT] = FlowerPot::class; self::$list[self::CARROT] = Carrot::class; self::$list[self::POTATO] = Potato::class; self::$list[self::BAKED_POTATO] = BakedPotato::class; + self::$list[self::GOLDEN_CARROT] = GoldenCarrot::class; self::$list[self::MOB_HEAD] = MobHead::class; + + self::$list[self::NETHER_STAR] = NetherStar::class; self::$list[self::PUMPKIN_PIE] = PumpkinPie::class; + self::$list[self::NETHER_BRICK] = NetherBrick::class; self::$list[self::NETHER_QUARTZ] = NetherQuartz::class; + + self::$list[self::PRISMARINE_SHARD] = PrismarineShard::class; + self::$list[self::COOKED_RABBIT] = CookedRabbit::class; - // self::$list[self::CAMERA] = Camera::class; + + self::$list[self::PRISMARINE_CRYSTALS] = PrismarineCrystals::class; + self::$list[self::BEETROOT] = Beetroot::class; self::$list[self::BEETROOT_SEEDS] = BeetrootSeeds::class; self::$list[self::BEETROOT_SOUP] = BeetrootSoup::class; - self::$list[self::PRISMARINE_CRYSTALS] = PrismarineCrystals::class; - self::$list[self::PRISMARINE_SHARD] = PrismarineShard::class; - self::$list[self::NETHER_STAR] = NetherStar::class; + self::$list[self::ENCHANTED_GOLDEN_APPLE] = GoldenAppleEnchanted::class; for($i = 0; $i < 256; ++$i){