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

Remove ItemFactory::get(), use ItemFactory::fromTypeId() for VanillaItems

Browse Source 
soon we'll invert the dependency and set up all this stuff in VanillaItems directly, rendering ItemFactory (mostly) unnecessary.
This commit is contained in:
Dylan K. Taylor
2022-07-05 14:26:02 +01:00
parent 6be92ea6f7
commit 4e71cc7d79
4 changed files with 263 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/phpunit/data/bedrock/item/ItemSerializerDeserializerTest.php
View File

@ -39,7 +39,7 @@ final class ItemSerializerDeserializerTest extends TestCase{
}
public function testAllVanillaItemsSerializableAndDeserializable() : void{
foreach(ItemFactory::getInstance()->getAllRegistered() as $item){
foreach(ItemFactory::getInstance()->getAllKnownTypes() as $item){
if($item->isNull()){
continue;
}

46
tests/phpunit/item/ItemFactoryTest.php
View File

@ -1,46 +0,0 @@
<?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/
*
*
*/
declare(strict_types=1);
namespace pocketmine\item;
use PHPUnit\Framework\TestCase;
class ItemFactoryTest extends TestCase{
/**
* Test that durable items are correctly created by the item factory
*/
public function testGetDurableItem() : void{
self::assertInstanceOf(Sword::class, $i1 = ItemFactory::getInstance()->get(ItemIds::WOODEN_SWORD));
/** @var Sword $i1 */
self::assertSame(0, $i1->getDamage());
self::assertInstanceOf(Sword::class, $i2 = ItemFactory::getInstance()->get(ItemIds::WOODEN_SWORD, 1));
/** @var Sword $i2 */
self::assertSame(1, $i2->getDamage());
}
public function testGetDurableItemWithTooLargeDurability() : void{
self::assertInstanceOf(Sword::class, ItemFactory::getInstance()->get(ItemIds::WOODEN_SWORD, ToolTier::WOOD()->getMaxDurability()));
ItemFactory::getInstance()->get(ItemIds::WOODEN_SWORD, ToolTier::WOOD()->getMaxDurability() + 1);
}
}