diff --git a/src/pocketmine/block/Beetroot.php b/src/pocketmine/block/Beetroot.php index 418f16a4ee..51d05688e8 100644 --- a/src/pocketmine/block/Beetroot.php +++ b/src/pocketmine/block/Beetroot.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use function mt_rand; class Beetroot extends Crops{ @@ -32,17 +32,17 @@ class Beetroot extends Crops{ public function getDropsForCompatibleTool(Item $item) : array{ if($this->age >= 7){ return [ - ItemFactory::get(Item::BEETROOT), - ItemFactory::get(Item::BEETROOT_SEEDS, 0, mt_rand(0, 3)) + VanillaItems::BEETROOT(), + VanillaItems::BEETROOT_SEEDS()->setCount(mt_rand(0, 3)) ]; } return [ - ItemFactory::get(Item::BEETROOT_SEEDS) + VanillaItems::BEETROOT_SEEDS() ]; } public function getPickedItem(bool $addUserData = false) : Item{ - return ItemFactory::get(Item::BEETROOT_SEEDS); + return VanillaItems::BEETROOT_SEEDS(); } } diff --git a/src/pocketmine/block/Bookshelf.php b/src/pocketmine/block/Bookshelf.php index aa49940c39..64844f5d6a 100644 --- a/src/pocketmine/block/Bookshelf.php +++ b/src/pocketmine/block/Bookshelf.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; class Bookshelf extends Solid{ @@ -34,7 +34,7 @@ class Bookshelf extends Solid{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::BOOK, 0, 3) + VanillaItems::BOOK() ]; } diff --git a/src/pocketmine/block/Carrot.php b/src/pocketmine/block/Carrot.php index e344351116..612b967f60 100644 --- a/src/pocketmine/block/Carrot.php +++ b/src/pocketmine/block/Carrot.php @@ -24,18 +24,18 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use function mt_rand; class Carrot extends Crops{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::CARROT, 0, $this->age >= 7 ? mt_rand(1, 4) : 1) + VanillaItems::CARROT()->setCount($this->age >= 7 ? mt_rand(1, 4) : 1) ]; } public function getPickedItem(bool $addUserData = false) : Item{ - return ItemFactory::get(Item::CARROT); + return VanillaItems::CARROT(); } } diff --git a/src/pocketmine/block/Clay.php b/src/pocketmine/block/Clay.php index 277e700f74..41560db3ba 100644 --- a/src/pocketmine/block/Clay.php +++ b/src/pocketmine/block/Clay.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; class Clay extends Solid{ @@ -34,7 +34,7 @@ class Clay extends Solid{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::CLAY_BALL, 0, 4) + VanillaItems::CLAY()->setCount(4) ]; } } diff --git a/src/pocketmine/block/CoalOre.php b/src/pocketmine/block/CoalOre.php index 45a693ee48..b1e58e177c 100644 --- a/src/pocketmine/block/CoalOre.php +++ b/src/pocketmine/block/CoalOre.php @@ -24,8 +24,8 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; use pocketmine\item\TieredTool; +use pocketmine\item\VanillaItems; use function mt_rand; class CoalOre extends Solid{ @@ -36,7 +36,7 @@ class CoalOre extends Solid{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::COAL) + VanillaItems::COAL() ]; } diff --git a/src/pocketmine/block/Cobweb.php b/src/pocketmine/block/Cobweb.php index 012c2cf9d4..82c42422de 100644 --- a/src/pocketmine/block/Cobweb.php +++ b/src/pocketmine/block/Cobweb.php @@ -25,7 +25,7 @@ namespace pocketmine\block; use pocketmine\entity\Entity; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; class Cobweb extends Flowable{ @@ -43,7 +43,7 @@ class Cobweb extends Flowable{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::STRING) + VanillaItems::STRING() ]; } diff --git a/src/pocketmine/block/CocoaBlock.php b/src/pocketmine/block/CocoaBlock.php index 2995390d70..f1ae2a808e 100644 --- a/src/pocketmine/block/CocoaBlock.php +++ b/src/pocketmine/block/CocoaBlock.php @@ -27,7 +27,7 @@ use pocketmine\block\utils\BlockDataValidator; use pocketmine\block\utils\TreeType; use pocketmine\item\Fertilizer; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Bearing; use pocketmine\math\Facing; @@ -115,11 +115,11 @@ class CocoaBlock extends Transparent{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::DYE, 3, $this->age === 2 ? mt_rand(2, 3) : 1) + VanillaItems::COCOA_BEANS()->setCount($this->age === 2 ? mt_rand(2, 3) : 1) ]; } public function getPickedItem(bool $addUserData = false) : Item{ - return ItemFactory::get(Item::DYE, 3); //cocoa beans + return VanillaItems::COCOA_BEANS(); } } diff --git a/src/pocketmine/block/DeadBush.php b/src/pocketmine/block/DeadBush.php index 0239a7afb0..49a6c809e7 100644 --- a/src/pocketmine/block/DeadBush.php +++ b/src/pocketmine/block/DeadBush.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use pocketmine\math\Facing; use pocketmine\math\Vector3; use pocketmine\player\Player; @@ -54,7 +54,7 @@ class DeadBush extends Flowable{ public function getDrops(Item $item) : array{ if(!$this->breakInfo->isToolCompatible($item)){ return [ - ItemFactory::get(Item::STICK, 0, mt_rand(0, 2)) + VanillaItems::STICK()->setCount(mt_rand(0, 2)) ]; } diff --git a/src/pocketmine/block/DiamondOre.php b/src/pocketmine/block/DiamondOre.php index 546e292542..1a03923df3 100644 --- a/src/pocketmine/block/DiamondOre.php +++ b/src/pocketmine/block/DiamondOre.php @@ -24,8 +24,8 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; use pocketmine\item\TieredTool; +use pocketmine\item\VanillaItems; use function mt_rand; class DiamondOre extends Solid{ @@ -36,7 +36,7 @@ class DiamondOre extends Solid{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::DIAMOND) + VanillaItems::DIAMOND() ]; } diff --git a/src/pocketmine/block/DoubleTallGrass.php b/src/pocketmine/block/DoubleTallGrass.php index 662b4ca269..dedf3dc5f7 100644 --- a/src/pocketmine/block/DoubleTallGrass.php +++ b/src/pocketmine/block/DoubleTallGrass.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use function mt_rand; class DoubleTallGrass extends DoublePlant{ @@ -40,7 +40,7 @@ class DoubleTallGrass extends DoublePlant{ public function getDrops(Item $item) : array{ if($this->top and !$this->breakInfo->isToolCompatible($item) and mt_rand(0, 7) === 0){ return [ - ItemFactory::get(Item::SEEDS) + VanillaItems::WHEAT_SEEDS() ]; } return parent::getDrops($item); diff --git a/src/pocketmine/block/EmeraldOre.php b/src/pocketmine/block/EmeraldOre.php index 178b34e2e7..0170efc313 100644 --- a/src/pocketmine/block/EmeraldOre.php +++ b/src/pocketmine/block/EmeraldOre.php @@ -24,8 +24,8 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; use pocketmine\item\TieredTool; +use pocketmine\item\VanillaItems; use function mt_rand; class EmeraldOre extends Solid{ @@ -36,7 +36,7 @@ class EmeraldOre extends Solid{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::EMERALD) + VanillaItems::EMERALD() ]; } diff --git a/src/pocketmine/block/Glowstone.php b/src/pocketmine/block/Glowstone.php index 9b8501fdb2..47785dd722 100644 --- a/src/pocketmine/block/Glowstone.php +++ b/src/pocketmine/block/Glowstone.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use function mt_rand; class Glowstone extends Transparent{ @@ -39,7 +39,7 @@ class Glowstone extends Transparent{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::GLOWSTONE_DUST, 0, mt_rand(2, 4)) + VanillaItems::GLOWSTONE_DUST()->setCount(mt_rand(2, 4)) ]; } } diff --git a/src/pocketmine/block/Gravel.php b/src/pocketmine/block/Gravel.php index 2303883609..a93173ffbd 100644 --- a/src/pocketmine/block/Gravel.php +++ b/src/pocketmine/block/Gravel.php @@ -26,7 +26,7 @@ namespace pocketmine\block; use pocketmine\block\utils\Fallable; use pocketmine\block\utils\FallableTrait; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use function mt_rand; class Gravel extends Solid implements Fallable{ @@ -39,7 +39,7 @@ class Gravel extends Solid implements Fallable{ public function getDropsForCompatibleTool(Item $item) : array{ if(mt_rand(1, 10) === 1){ return [ - ItemFactory::get(Item::FLINT) + VanillaItems::FLINT() ]; } diff --git a/src/pocketmine/block/LapisOre.php b/src/pocketmine/block/LapisOre.php index b401b9c6bf..97a5666b6b 100644 --- a/src/pocketmine/block/LapisOre.php +++ b/src/pocketmine/block/LapisOre.php @@ -24,8 +24,8 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; use pocketmine\item\TieredTool; +use pocketmine\item\VanillaItems; use function mt_rand; class LapisOre extends Solid{ @@ -36,7 +36,7 @@ class LapisOre extends Solid{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::DYE, 4, mt_rand(4, 8)) + VanillaItems::LAPIS_LAZULI()->setCount(mt_rand(4, 8)) ]; } diff --git a/src/pocketmine/block/Leaves.php b/src/pocketmine/block/Leaves.php index 864f0e3d3f..7f0a871ab4 100644 --- a/src/pocketmine/block/Leaves.php +++ b/src/pocketmine/block/Leaves.php @@ -27,6 +27,7 @@ use pocketmine\block\utils\TreeType; use pocketmine\event\block\LeavesDecayEvent; use pocketmine\item\Item; use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use pocketmine\math\Facing; use pocketmine\math\Vector3; use pocketmine\player\Player; @@ -127,7 +128,7 @@ class Leaves extends Transparent{ $drops[] = ItemFactory::get(Item::SAPLING, $this->treeType->getMagicNumber()); } if(($this->treeType->equals(TreeType::OAK()) or $this->treeType->equals(TreeType::DARK_OAK())) and mt_rand(1, 200) === 1){ //Apples - $drops[] = ItemFactory::get(Item::APPLE); + $drops[] = VanillaItems::APPLE(); } return $drops; diff --git a/src/pocketmine/block/Melon.php b/src/pocketmine/block/Melon.php index ee5424ce8c..40bc3a8777 100644 --- a/src/pocketmine/block/Melon.php +++ b/src/pocketmine/block/Melon.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use function mt_rand; class Melon extends Transparent{ @@ -35,7 +35,7 @@ class Melon extends Transparent{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::MELON_SLICE, 0, mt_rand(3, 7)) + VanillaItems::MELON()->setCount(mt_rand(3, 7)) ]; } } diff --git a/src/pocketmine/block/NetherQuartzOre.php b/src/pocketmine/block/NetherQuartzOre.php index f8d4ebdfe4..54efd1a336 100644 --- a/src/pocketmine/block/NetherQuartzOre.php +++ b/src/pocketmine/block/NetherQuartzOre.php @@ -24,8 +24,8 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; use pocketmine\item\TieredTool; +use pocketmine\item\VanillaItems; use function mt_rand; class NetherQuartzOre extends Solid{ @@ -36,7 +36,7 @@ class NetherQuartzOre extends Solid{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::QUARTZ) + VanillaItems::NETHER_QUARTZ() ]; } diff --git a/src/pocketmine/block/NetherReactor.php b/src/pocketmine/block/NetherReactor.php index 47f8048d24..a18907e94e 100644 --- a/src/pocketmine/block/NetherReactor.php +++ b/src/pocketmine/block/NetherReactor.php @@ -25,8 +25,8 @@ namespace pocketmine\block; use pocketmine\block\utils\BlockDataValidator; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; use pocketmine\item\TieredTool; +use pocketmine\item\VanillaItems; class NetherReactor extends Solid{ @@ -51,8 +51,8 @@ class NetherReactor extends Solid{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::IRON_INGOT, 0, 6), - ItemFactory::get(Item::DIAMOND, 0, 3) + VanillaItems::IRON_INGOT()->setCount(6), + VanillaItems::DIAMOND()->setCount(3) ]; } } diff --git a/src/pocketmine/block/Potato.php b/src/pocketmine/block/Potato.php index 937c17ecae..06ac93f81f 100644 --- a/src/pocketmine/block/Potato.php +++ b/src/pocketmine/block/Potato.php @@ -24,18 +24,18 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use function mt_rand; class Potato extends Crops{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::POTATO, 0, $this->age >= 7 ? mt_rand(1, 4) : 1) + VanillaItems::POTATO()->setCount($this->age >= 7 ? mt_rand(1, 4) : 1) ]; } public function getPickedItem(bool $addUserData = false) : Item{ - return ItemFactory::get(Item::POTATO); + return VanillaItems::POTATO(); } } diff --git a/src/pocketmine/block/RedstoneOre.php b/src/pocketmine/block/RedstoneOre.php index b4b42873c3..11b8664240 100644 --- a/src/pocketmine/block/RedstoneOre.php +++ b/src/pocketmine/block/RedstoneOre.php @@ -24,8 +24,8 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; use pocketmine\item\TieredTool; +use pocketmine\item\VanillaItems; use pocketmine\math\Vector3; use pocketmine\player\Player; use function mt_rand; @@ -95,7 +95,7 @@ class RedstoneOre extends Solid{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::REDSTONE_DUST, 0, mt_rand(4, 5)) + VanillaItems::REDSTONE_DUST()->setCount(mt_rand(4, 5)) ]; } diff --git a/src/pocketmine/block/SeaLantern.php b/src/pocketmine/block/SeaLantern.php index bd0c068731..a076fc02d4 100644 --- a/src/pocketmine/block/SeaLantern.php +++ b/src/pocketmine/block/SeaLantern.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; class SeaLantern extends Transparent{ @@ -38,7 +38,7 @@ class SeaLantern extends Transparent{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::PRISMARINE_CRYSTALS, 0, 3) + VanillaItems::PRISMARINE_CRYSTALS()->setCount(3) ]; } } diff --git a/src/pocketmine/block/Snow.php b/src/pocketmine/block/Snow.php index b88474ce18..22279086c0 100644 --- a/src/pocketmine/block/Snow.php +++ b/src/pocketmine/block/Snow.php @@ -24,8 +24,8 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; use pocketmine\item\TieredTool; +use pocketmine\item\VanillaItems; class Snow extends Solid{ @@ -35,7 +35,7 @@ class Snow extends Solid{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::SNOWBALL, 0, 4) + VanillaItems::SNOWBALL()->setCount(4) ]; } } diff --git a/src/pocketmine/block/SnowLayer.php b/src/pocketmine/block/SnowLayer.php index 7023691da3..d861c02971 100644 --- a/src/pocketmine/block/SnowLayer.php +++ b/src/pocketmine/block/SnowLayer.php @@ -27,8 +27,8 @@ use pocketmine\block\utils\BlockDataValidator; use pocketmine\block\utils\Fallable; use pocketmine\block\utils\FallableTrait; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; use pocketmine\item\TieredTool; +use pocketmine\item\VanillaItems; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Facing; use pocketmine\math\Vector3; @@ -99,7 +99,7 @@ class SnowLayer extends Flowable implements Fallable{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::SNOWBALL, 0, max(1, (int) floor($this->layers / 2))) + VanillaItems::SNOWBALL()->setCount(max(1, (int) floor($this->layers / 2))) ]; } diff --git a/src/pocketmine/block/TallGrass.php b/src/pocketmine/block/TallGrass.php index bdc093688d..9e984c1c41 100644 --- a/src/pocketmine/block/TallGrass.php +++ b/src/pocketmine/block/TallGrass.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use pocketmine\math\Facing; use pocketmine\math\Vector3; use pocketmine\player\Player; @@ -63,7 +63,7 @@ class TallGrass extends Flowable{ if(mt_rand(0, 15) === 0){ return [ - ItemFactory::get(Item::WHEAT_SEEDS) + VanillaItems::WHEAT_SEEDS() ]; } diff --git a/src/pocketmine/block/Wheat.php b/src/pocketmine/block/Wheat.php index 664f565a67..5261e38ecd 100644 --- a/src/pocketmine/block/Wheat.php +++ b/src/pocketmine/block/Wheat.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use function mt_rand; class Wheat extends Crops{ @@ -32,17 +32,17 @@ class Wheat extends Crops{ public function getDropsForCompatibleTool(Item $item) : array{ if($this->age >= 7){ return [ - ItemFactory::get(Item::WHEAT), - ItemFactory::get(Item::WHEAT_SEEDS, 0, mt_rand(0, 3)) + VanillaItems::WHEAT(), + VanillaItems::WHEAT_SEEDS()->setCount(mt_rand(0, 3)) ]; }else{ return [ - ItemFactory::get(Item::WHEAT_SEEDS) + VanillaItems::WHEAT_SEEDS() ]; } } public function getPickedItem(bool $addUserData = false) : Item{ - return ItemFactory::get(Item::WHEAT_SEEDS); + return VanillaItems::WHEAT_SEEDS(); } } diff --git a/src/pocketmine/command/defaults/ParticleCommand.php b/src/pocketmine/command/defaults/ParticleCommand.php index 9a04c845f9..22afc6dc67 100644 --- a/src/pocketmine/command/defaults/ParticleCommand.php +++ b/src/pocketmine/command/defaults/ParticleCommand.php @@ -26,8 +26,8 @@ namespace pocketmine\command\defaults; use pocketmine\block\BlockFactory; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\item\Item; use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use pocketmine\lang\TranslationContainer; use pocketmine\math\Vector3; use pocketmine\player\Player; @@ -180,9 +180,9 @@ class ParticleCommand extends VanillaCommand{ case "reddust": return new RedstoneParticle($data ?? 1); case "snowballpoof": - return new ItemBreakParticle(ItemFactory::get(Item::SNOWBALL)); + return new ItemBreakParticle(VanillaItems::SNOWBALL()); case "slime": - return new ItemBreakParticle(ItemFactory::get(Item::SLIMEBALL)); + return new ItemBreakParticle(VanillaItems::SLIMEBALL()); case "itembreak": if($data !== null and $data !== 0){ return new ItemBreakParticle(ItemFactory::get($data)); diff --git a/src/pocketmine/entity/Squid.php b/src/pocketmine/entity/Squid.php index 465975f54d..4fb95b268b 100644 --- a/src/pocketmine/entity/Squid.php +++ b/src/pocketmine/entity/Squid.php @@ -25,8 +25,7 @@ namespace pocketmine\entity; use pocketmine\event\entity\EntityDamageByEntityEvent; use pocketmine\event\entity\EntityDamageEvent; -use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use pocketmine\math\Vector3; use pocketmine\nbt\tag\CompoundTag; use pocketmine\network\mcpe\protocol\EntityEventPacket; @@ -121,7 +120,7 @@ class Squid extends WaterAnimal{ public function getDrops() : array{ return [ - ItemFactory::get(Item::DYE, 0, mt_rand(1, 3)) + VanillaItems::INK_SAC()->setCount(mt_rand(1, 3)) ]; } } diff --git a/src/pocketmine/entity/Zombie.php b/src/pocketmine/entity/Zombie.php index 1a0078d3f1..3eb7f391be 100644 --- a/src/pocketmine/entity/Zombie.php +++ b/src/pocketmine/entity/Zombie.php @@ -23,8 +23,7 @@ declare(strict_types=1); namespace pocketmine\entity; -use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use function mt_rand; class Zombie extends Living{ @@ -39,19 +38,19 @@ class Zombie extends Living{ public function getDrops() : array{ $drops = [ - ItemFactory::get(Item::ROTTEN_FLESH, 0, mt_rand(0, 2)) + VanillaItems::ROTTEN_FLESH()->setCount(mt_rand(0, 2)) ]; if(mt_rand(0, 199) < 5){ switch(mt_rand(0, 2)){ case 0: - $drops[] = ItemFactory::get(Item::IRON_INGOT, 0, 1); + $drops[] = VanillaItems::IRON_INGOT(); break; case 1: - $drops[] = ItemFactory::get(Item::CARROT, 0, 1); + $drops[] = VanillaItems::CARROT(); break; case 2: - $drops[] = ItemFactory::get(Item::POTATO, 0, 1); + $drops[] = VanillaItems::POTATO(); break; } } diff --git a/src/pocketmine/entity/object/Painting.php b/src/pocketmine/entity/object/Painting.php index 9be7bc43d4..0f734a4c1c 100644 --- a/src/pocketmine/entity/object/Painting.php +++ b/src/pocketmine/entity/object/Painting.php @@ -26,8 +26,7 @@ namespace pocketmine\entity\object; use pocketmine\block\VanillaBlocks; use pocketmine\entity\Entity; use pocketmine\event\entity\EntityDamageByEntityEvent; -use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Bearing; use pocketmine\math\Facing; @@ -106,7 +105,7 @@ class Painting extends Entity{ if($drops){ //non-living entities don't have a way to create drops generically yet - $this->world->dropItem($this, ItemFactory::get(Item::PAINTING)); + $this->world->dropItem($this, VanillaItems::PAINTING()); } $this->world->addParticle($this->add(0.5, 0.5, 0.5), new DestroyBlockParticle(VanillaBlocks::OAK_PLANKS())); } diff --git a/src/pocketmine/entity/projectile/Arrow.php b/src/pocketmine/entity/projectile/Arrow.php index ddc39e3a83..b9c55dc795 100644 --- a/src/pocketmine/entity/projectile/Arrow.php +++ b/src/pocketmine/entity/projectile/Arrow.php @@ -27,8 +27,7 @@ use pocketmine\block\Block; use pocketmine\entity\Entity; use pocketmine\event\entity\ProjectileHitEvent; use pocketmine\event\inventory\InventoryPickupArrowEvent; -use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use pocketmine\math\RayTraceResult; use pocketmine\nbt\tag\CompoundTag; use pocketmine\network\mcpe\protocol\EntityEventPacket; @@ -177,7 +176,7 @@ class Arrow extends Projectile{ return; } - $item = ItemFactory::get(Item::ARROW, 0, 1); + $item = VanillaItems::ARROW(); $playerInventory = $player->getInventory(); if($player->hasFiniteResources() and !$playerInventory->canAddItem($item)){ diff --git a/src/pocketmine/entity/projectile/Egg.php b/src/pocketmine/entity/projectile/Egg.php index f643220b25..91d8019787 100644 --- a/src/pocketmine/entity/projectile/Egg.php +++ b/src/pocketmine/entity/projectile/Egg.php @@ -24,8 +24,7 @@ declare(strict_types=1); namespace pocketmine\entity\projectile; use pocketmine\event\entity\ProjectileHitEvent; -use pocketmine\item\Item; -use pocketmine\item\ItemFactory; +use pocketmine\item\VanillaItems; use pocketmine\world\particle\ItemBreakParticle; class Egg extends Throwable{ @@ -35,7 +34,7 @@ class Egg extends Throwable{ protected function onHit(ProjectileHitEvent $event) : void{ for($i = 0; $i < 6; ++$i){ - $this->world->addParticle($this, new ItemBreakParticle(ItemFactory::get(Item::EGG))); + $this->world->addParticle($this, new ItemBreakParticle(VanillaItems::EGG())); } } } diff --git a/src/pocketmine/item/BeetrootSoup.php b/src/pocketmine/item/BeetrootSoup.php index ab274c9259..8f8e5bed1e 100644 --- a/src/pocketmine/item/BeetrootSoup.php +++ b/src/pocketmine/item/BeetrootSoup.php @@ -39,6 +39,6 @@ class BeetrootSoup extends Food{ } public function getResidue(){ - return ItemFactory::get(Item::BOWL); + return VanillaItems::BOWL(); } } diff --git a/src/pocketmine/item/Bow.php b/src/pocketmine/item/Bow.php index 5410844464..0cc6b4f9a4 100644 --- a/src/pocketmine/item/Bow.php +++ b/src/pocketmine/item/Bow.php @@ -45,7 +45,8 @@ class Bow extends Tool{ } public function onReleaseUsing(Player $player) : ItemUseResult{ - if($player->hasFiniteResources() and !$player->getInventory()->contains(ItemFactory::get(Item::ARROW, 0, 1))){ + $arrow = VanillaItems::ARROW(); + if($player->hasFiniteResources() and !$player->getInventory()->contains($arrow)){ return ItemUseResult::FAIL(); } @@ -110,7 +111,7 @@ class Bow extends Tool{ if($player->hasFiniteResources()){ if(!$infinity){ //TODO: tipped arrows are still consumed when Infinity is applied - $player->getInventory()->removeItem(ItemFactory::get(Item::ARROW, 0, 1)); + $player->getInventory()->removeItem($arrow); } $this->applyDamage(1); } diff --git a/src/pocketmine/item/LiquidBucket.php b/src/pocketmine/item/LiquidBucket.php index 4d2d7d7910..8c466f1573 100644 --- a/src/pocketmine/item/LiquidBucket.php +++ b/src/pocketmine/item/LiquidBucket.php @@ -60,7 +60,7 @@ class LiquidBucket extends Item{ //TODO: move this to generic placement logic $resultBlock = clone $this->liquid; - $ev = new PlayerBucketEmptyEvent($player, $blockReplace, $face, $this, ItemFactory::get(Item::BUCKET)); + $ev = new PlayerBucketEmptyEvent($player, $blockReplace, $face, $this, VanillaItems::BUCKET()); $ev->call(); if(!$ev->isCancelled()){ $player->getWorld()->setBlock($blockReplace, $resultBlock->getFlowingForm()); diff --git a/src/pocketmine/item/MilkBucket.php b/src/pocketmine/item/MilkBucket.php index 592308f634..dbdedab937 100644 --- a/src/pocketmine/item/MilkBucket.php +++ b/src/pocketmine/item/MilkBucket.php @@ -32,7 +32,7 @@ class MilkBucket extends Item implements Consumable{ } public function getResidue(){ - return ItemFactory::get(Item::BUCKET, 0, 1); + return VanillaItems::BUCKET(); } public function getAdditionalEffects() : array{ diff --git a/src/pocketmine/item/MushroomStew.php b/src/pocketmine/item/MushroomStew.php index b71dcc1b8a..08a3220628 100644 --- a/src/pocketmine/item/MushroomStew.php +++ b/src/pocketmine/item/MushroomStew.php @@ -38,6 +38,6 @@ class MushroomStew extends Food{ } public function getResidue(){ - return ItemFactory::get(Item::BOWL); + return VanillaItems::BOWL(); } } diff --git a/src/pocketmine/item/Potion.php b/src/pocketmine/item/Potion.php index 9cb0ecd0cd..c45ac84ea3 100644 --- a/src/pocketmine/item/Potion.php +++ b/src/pocketmine/item/Potion.php @@ -269,6 +269,6 @@ class Potion extends Item implements Consumable{ } public function getResidue(){ - return ItemFactory::get(Item::GLASS_BOTTLE); + return VanillaItems::GLASS_BOTTLE(); } } diff --git a/src/pocketmine/item/RabbitStew.php b/src/pocketmine/item/RabbitStew.php index 239973d8a1..6117a0be14 100644 --- a/src/pocketmine/item/RabbitStew.php +++ b/src/pocketmine/item/RabbitStew.php @@ -38,6 +38,6 @@ class RabbitStew extends Food{ } public function getResidue(){ - return ItemFactory::get(Item::BOWL); + return VanillaItems::BOWL(); } } diff --git a/src/pocketmine/item/VanillaItems.php b/src/pocketmine/item/VanillaItems.php new file mode 100644 index 0000000000..2a5f44e24f --- /dev/null +++ b/src/pocketmine/item/VanillaItems.php @@ -0,0 +1,587 @@ +