mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-09 19:24:12 +00:00
Code Issues Projects Releases Wiki Activity

Replace all legacy blockID references with BlockIds::

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-03-23 19:36:09 +00:00
parent f84d7ad70d
commit 79ef8e0803
79 changed files with 526 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/pocketmine/item/ItemFactory.php
View File

@ -23,8 +23,8 @@ declare(strict_types=1);
namespace pocketmine\item;
use pocketmine\block\Block;
use pocketmine\block\BlockFactory;
use pocketmine\block\BlockIds;
use pocketmine\block\utils\DyeColor;
use pocketmine\block\utils\SkullType;
use pocketmine\block\utils\TreeType;
@ -156,23 +156,23 @@ class ItemFactory{
self::register(new Item(Item::SUGAR, 0, "Sugar"));
self::register(new Item(Item::TURTLE_SHELL_PIECE, 0, "Scute"));
self::register(new Item(Item::WHEAT, 0, "Wheat"));
self::register(new ItemBlock(Block::ACACIA_DOOR_BLOCK, 0, Item::ACACIA_DOOR));
self::register(new ItemBlock(Block::BIRCH_DOOR_BLOCK, 0, Item::BIRCH_DOOR));
self::register(new ItemBlock(Block::BREWING_STAND_BLOCK, 0, Item::BREWING_STAND));
self::register(new ItemBlock(Block::CAKE_BLOCK, 0, Item::CAKE));
self::register(new ItemBlock(Block::CAULDRON_BLOCK, 0, Item::CAULDRON));
self::register(new ItemBlock(Block::COMPARATOR_BLOCK, 0, Item::COMPARATOR));
self::register(new ItemBlock(Block::DARK_OAK_DOOR_BLOCK, 0, Item::DARK_OAK_DOOR));
self::register(new ItemBlock(Block::FLOWER_POT_BLOCK, 0, Item::FLOWER_POT));
self::register(new ItemBlock(Block::HOPPER_BLOCK, 0, Item::HOPPER));
self::register(new ItemBlock(Block::IRON_DOOR_BLOCK, 0, Item::IRON_DOOR));
self::register(new ItemBlock(Block::ITEM_FRAME_BLOCK, 0, Item::ITEM_FRAME));
self::register(new ItemBlock(Block::JUNGLE_DOOR_BLOCK, 0, Item::JUNGLE_DOOR));
self::register(new ItemBlock(Block::NETHER_WART_PLANT, 0, Item::NETHER_WART));
self::register(new ItemBlock(Block::OAK_DOOR_BLOCK, 0, Item::OAK_DOOR));
self::register(new ItemBlock(Block::REPEATER_BLOCK, 0, Item::REPEATER));
self::register(new ItemBlock(Block::SPRUCE_DOOR_BLOCK, 0, Item::SPRUCE_DOOR));
self::register(new ItemBlock(Block::SUGARCANE_BLOCK, 0, Item::SUGARCANE));
self::register(new ItemBlock(BlockIds::ACACIA_DOOR_BLOCK, 0, Item::ACACIA_DOOR));
self::register(new ItemBlock(BlockIds::BIRCH_DOOR_BLOCK, 0, Item::BIRCH_DOOR));
self::register(new ItemBlock(BlockIds::BREWING_STAND_BLOCK, 0, Item::BREWING_STAND));
self::register(new ItemBlock(BlockIds::CAKE_BLOCK, 0, Item::CAKE));
self::register(new ItemBlock(BlockIds::CAULDRON_BLOCK, 0, Item::CAULDRON));
self::register(new ItemBlock(BlockIds::COMPARATOR_BLOCK, 0, Item::COMPARATOR));
self::register(new ItemBlock(BlockIds::DARK_OAK_DOOR_BLOCK, 0, Item::DARK_OAK_DOOR));
self::register(new ItemBlock(BlockIds::FLOWER_POT_BLOCK, 0, Item::FLOWER_POT));
self::register(new ItemBlock(BlockIds::HOPPER_BLOCK, 0, Item::HOPPER));
self::register(new ItemBlock(BlockIds::IRON_DOOR_BLOCK, 0, Item::IRON_DOOR));
self::register(new ItemBlock(BlockIds::ITEM_FRAME_BLOCK, 0, Item::ITEM_FRAME));
self::register(new ItemBlock(BlockIds::JUNGLE_DOOR_BLOCK, 0, Item::JUNGLE_DOOR));
self::register(new ItemBlock(BlockIds::NETHER_WART_PLANT, 0, Item::NETHER_WART));
self::register(new ItemBlock(BlockIds::OAK_DOOR_BLOCK, 0, Item::OAK_DOOR));
self::register(new ItemBlock(BlockIds::REPEATER_BLOCK, 0, Item::REPEATER));
self::register(new ItemBlock(BlockIds::SPRUCE_DOOR_BLOCK, 0, Item::SPRUCE_DOOR));
self::register(new ItemBlock(BlockIds::SUGARCANE_BLOCK, 0, Item::SUGARCANE));
self::register(new Leggings(Item::CHAIN_LEGGINGS, 0, "Chainmail Leggings", new ArmorTypeInfo(4, 226)));
self::register(new Leggings(Item::DIAMOND_LEGGINGS, 0, "Diamond Leggings", new ArmorTypeInfo(6, 496)));
self::register(new Leggings(Item::GOLDEN_LEGGINGS, 0, "Gold Leggings", new ArmorTypeInfo(3, 106)));
@ -180,8 +180,8 @@ class ItemFactory{
self::register(new Leggings(Item::LEATHER_LEGGINGS, 0, "Leather Pants", new ArmorTypeInfo(2, 76)));
//TODO: fix metadata for buckets with still liquid in them
//the meta values are intentionally hardcoded because block IDs will change in the future
self::register(new LiquidBucket(Item::BUCKET, 8, "Water Bucket", Block::FLOWING_WATER));
self::register(new LiquidBucket(Item::BUCKET, 10, "Lava Bucket", Block::FLOWING_LAVA));
self::register(new LiquidBucket(Item::BUCKET, 8, "Water Bucket", BlockIds::FLOWING_WATER));
self::register(new LiquidBucket(Item::BUCKET, 10, "Lava Bucket", BlockIds::FLOWING_LAVA));
self::register(new Melon());
self::register(new MelonSeeds());
self::register(new MilkBucket(Item::BUCKET, 1, "Milk Bucket"));
@ -214,12 +214,12 @@ class ItemFactory{
self::register(new Shovel(Item::IRON_SHOVEL, "Iron Shovel", TieredTool::TIER_IRON));
self::register(new Shovel(Item::STONE_SHOVEL, "Stone Shovel", TieredTool::TIER_STONE));
self::register(new Shovel(Item::WOODEN_SHOVEL, "Wooden Shovel", TieredTool::TIER_WOODEN));
self::register(new Sign(Block::STANDING_SIGN, 0, Item::SIGN));
self::register(new Sign(Block::SPRUCE_STANDING_SIGN, 0, Item::SPRUCE_SIGN));
self::register(new Sign(Block::BIRCH_STANDING_SIGN, 0, Item::BIRCH_SIGN));
self::register(new Sign(Block::JUNGLE_STANDING_SIGN, 0, Item::JUNGLE_SIGN));
self::register(new Sign(Block::ACACIA_STANDING_SIGN, 0, Item::ACACIA_SIGN));
self::register(new Sign(Block::DARKOAK_STANDING_SIGN, 0, Item::DARKOAK_SIGN));
self::register(new Sign(BlockIds::STANDING_SIGN, 0, Item::SIGN));
self::register(new Sign(BlockIds::SPRUCE_STANDING_SIGN, 0, Item::SPRUCE_SIGN));
self::register(new Sign(BlockIds::BIRCH_STANDING_SIGN, 0, Item::BIRCH_SIGN));
self::register(new Sign(BlockIds::JUNGLE_STANDING_SIGN, 0, Item::JUNGLE_SIGN));
self::register(new Sign(BlockIds::ACACIA_STANDING_SIGN, 0, Item::ACACIA_SIGN));
self::register(new Sign(BlockIds::DARKOAK_STANDING_SIGN, 0, Item::DARKOAK_SIGN));
self::register(new Snowball());
self::register(new SpiderEye());
self::register(new Steak());