diff --git a/src/pocketmine/item/Apple.php b/src/pocketmine/item/Apple.php index eea93a02f..82dfcf789 100644 --- a/src/pocketmine/item/Apple.php +++ b/src/pocketmine/item/Apple.php @@ -25,9 +25,6 @@ namespace pocketmine\item; class Apple extends Food{ - public function __construct(){ - parent::__construct(self::APPLE, 0, "Apple"); - } public function getFoodRestore() : int{ return 4; diff --git a/src/pocketmine/item/Arrow.php b/src/pocketmine/item/Arrow.php index dab935e87..592d76141 100644 --- a/src/pocketmine/item/Arrow.php +++ b/src/pocketmine/item/Arrow.php @@ -24,7 +24,5 @@ declare(strict_types=1); namespace pocketmine\item; class Arrow extends Item{ - public function __construct(){ - parent::__construct(self::ARROW, 0, "Arrow"); - } + } diff --git a/src/pocketmine/item/BakedPotato.php b/src/pocketmine/item/BakedPotato.php index 95b45e682..c4527e769 100644 --- a/src/pocketmine/item/BakedPotato.php +++ b/src/pocketmine/item/BakedPotato.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class BakedPotato extends Food{ - public function __construct(){ - parent::__construct(self::BAKED_POTATO, 0, "Baked Potato"); - } public function getFoodRestore() : int{ return 5; diff --git a/src/pocketmine/item/Banner.php b/src/pocketmine/item/Banner.php index 473158f62..f6866880d 100644 --- a/src/pocketmine/item/Banner.php +++ b/src/pocketmine/item/Banner.php @@ -41,8 +41,8 @@ class Banner extends Item{ /** @var DyeColor */ private $color; - public function __construct(int $variant, string $name, DyeColor $color){ - parent::__construct(self::BANNER, $variant, $name); + public function __construct(int $id, int $variant, string $name, DyeColor $color){ + parent::__construct($id, $variant, $name); $this->color = $color; } diff --git a/src/pocketmine/item/Bed.php b/src/pocketmine/item/Bed.php index 3b83cd19f..cf1095ab6 100644 --- a/src/pocketmine/item/Bed.php +++ b/src/pocketmine/item/Bed.php @@ -33,8 +33,8 @@ class Bed extends Item{ /** @var DyeColor */ private $color; - public function __construct(int $variant, string $name, DyeColor $color){ - parent::__construct(self::BED, $variant, $name); + public function __construct(int $id, int $variant, string $name, DyeColor $color){ + parent::__construct($id, $variant, $name); $this->color = $color; } diff --git a/src/pocketmine/item/Beetroot.php b/src/pocketmine/item/Beetroot.php index aa6d2e7a3..63b990a15 100644 --- a/src/pocketmine/item/Beetroot.php +++ b/src/pocketmine/item/Beetroot.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class Beetroot extends Food{ - public function __construct(){ - parent::__construct(self::BEETROOT, 0, "Beetroot"); - } public function getFoodRestore() : int{ return 1; diff --git a/src/pocketmine/item/BeetrootSeeds.php b/src/pocketmine/item/BeetrootSeeds.php index a5f961f60..216148a72 100644 --- a/src/pocketmine/item/BeetrootSeeds.php +++ b/src/pocketmine/item/BeetrootSeeds.php @@ -28,9 +28,6 @@ use pocketmine\block\BlockFactory; use pocketmine\block\BlockLegacyIds; class BeetrootSeeds extends Item{ - public function __construct(){ - parent::__construct(self::BEETROOT_SEEDS, 0, "Beetroot Seeds"); - } public function getBlock() : Block{ return BlockFactory::get(BlockLegacyIds::BEETROOT_BLOCK); diff --git a/src/pocketmine/item/BeetrootSoup.php b/src/pocketmine/item/BeetrootSoup.php index 0f805fb56..ab274c925 100644 --- a/src/pocketmine/item/BeetrootSoup.php +++ b/src/pocketmine/item/BeetrootSoup.php @@ -25,9 +25,6 @@ namespace pocketmine\item; class BeetrootSoup extends Food{ - public function __construct(){ - parent::__construct(self::BEETROOT_SOUP, 0, "Beetroot Soup"); - } public function getMaxStackSize() : int{ return 1; diff --git a/src/pocketmine/item/BlazeRod.php b/src/pocketmine/item/BlazeRod.php index 98e55369b..34a6e1e0d 100644 --- a/src/pocketmine/item/BlazeRod.php +++ b/src/pocketmine/item/BlazeRod.php @@ -25,10 +25,6 @@ namespace pocketmine\item; class BlazeRod extends Item{ - public function __construct(){ - parent::__construct(self::BLAZE_ROD, 0, "Blaze Rod"); - } - public function getFuelTime() : int{ return 2400; } diff --git a/src/pocketmine/item/Boat.php b/src/pocketmine/item/Boat.php index 122e4fa0d..55a521423 100644 --- a/src/pocketmine/item/Boat.php +++ b/src/pocketmine/item/Boat.php @@ -29,8 +29,8 @@ class Boat extends Item{ /** @var TreeType */ private $woodType; - public function __construct(TreeType $woodType){ - parent::__construct(self::BOAT, $woodType->getMagicNumber(), $woodType->getDisplayName() . " Boat"); + public function __construct(int $id, int $variant, string $name, TreeType $woodType){ + parent::__construct($id, $variant, $name); $this->woodType = $woodType; } diff --git a/src/pocketmine/item/Book.php b/src/pocketmine/item/Book.php index 002fb5c84..0020594df 100644 --- a/src/pocketmine/item/Book.php +++ b/src/pocketmine/item/Book.php @@ -24,7 +24,5 @@ declare(strict_types=1); namespace pocketmine\item; class Book extends Item{ - public function __construct(){ - parent::__construct(self::BOOK, 0, "Book"); - } + } diff --git a/src/pocketmine/item/Bow.php b/src/pocketmine/item/Bow.php index 290a220d4..51ed4dcda 100644 --- a/src/pocketmine/item/Bow.php +++ b/src/pocketmine/item/Bow.php @@ -29,15 +29,12 @@ use pocketmine\entity\projectile\Projectile; use pocketmine\event\entity\EntityShootBowEvent; use pocketmine\event\entity\ProjectileLaunchEvent; use pocketmine\item\enchantment\Enchantment; -use pocketmine\world\sound\BowShootSound; use pocketmine\Player; +use pocketmine\world\sound\BowShootSound; use function intdiv; use function min; class Bow extends Tool{ - public function __construct(){ - parent::__construct(self::BOW, 0, "Bow"); - } public function getFuelTime() : int{ return 200; diff --git a/src/pocketmine/item/Bowl.php b/src/pocketmine/item/Bowl.php index e2b4a6bf5..47b93a2a8 100644 --- a/src/pocketmine/item/Bowl.php +++ b/src/pocketmine/item/Bowl.php @@ -25,9 +25,6 @@ namespace pocketmine\item; class Bowl extends Item{ - public function __construct(){ - parent::__construct(self::BOWL, 0, "Bowl"); - } //TODO: check fuel } diff --git a/src/pocketmine/item/Bread.php b/src/pocketmine/item/Bread.php index ad6bd73c1..2687fccff 100644 --- a/src/pocketmine/item/Bread.php +++ b/src/pocketmine/item/Bread.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class Bread extends Food{ - public function __construct(){ - parent::__construct(self::BREAD, 0, "Bread"); - } public function getFoodRestore() : int{ return 5; diff --git a/src/pocketmine/item/Carrot.php b/src/pocketmine/item/Carrot.php index e402f07ee..92491c432 100644 --- a/src/pocketmine/item/Carrot.php +++ b/src/pocketmine/item/Carrot.php @@ -28,9 +28,6 @@ use pocketmine\block\BlockFactory; use pocketmine\block\BlockLegacyIds; class Carrot extends Food{ - public function __construct(){ - parent::__construct(self::CARROT, 0, "Carrot"); - } public function getBlock() : Block{ return BlockFactory::get(BlockLegacyIds::CARROT_BLOCK); diff --git a/src/pocketmine/item/ChorusFruit.php b/src/pocketmine/item/ChorusFruit.php index 5bbb9dd10..72a8b987b 100644 --- a/src/pocketmine/item/ChorusFruit.php +++ b/src/pocketmine/item/ChorusFruit.php @@ -33,10 +33,6 @@ use function mt_rand; class ChorusFruit extends Food{ - public function __construct(){ - parent::__construct(self::CHORUS_FRUIT, 0, "Chorus Fruit"); - } - public function getFoodRestore() : int{ return 4; } diff --git a/src/pocketmine/item/Clock.php b/src/pocketmine/item/Clock.php index 0c3265728..78f9f3ccb 100644 --- a/src/pocketmine/item/Clock.php +++ b/src/pocketmine/item/Clock.php @@ -24,7 +24,5 @@ declare(strict_types=1); namespace pocketmine\item; class Clock extends Item{ - public function __construct(){ - parent::__construct(self::CLOCK, 0, "Clock"); - } + } diff --git a/src/pocketmine/item/Clownfish.php b/src/pocketmine/item/Clownfish.php index e776dbcdf..1dba40e74 100644 --- a/src/pocketmine/item/Clownfish.php +++ b/src/pocketmine/item/Clownfish.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class Clownfish extends Food{ - public function __construct(){ - parent::__construct(self::CLOWNFISH, 0, "Clownfish"); - } public function getFoodRestore() : int{ return 1; diff --git a/src/pocketmine/item/Compass.php b/src/pocketmine/item/Compass.php index 5eccdbfc4..12677ae9a 100644 --- a/src/pocketmine/item/Compass.php +++ b/src/pocketmine/item/Compass.php @@ -24,7 +24,5 @@ declare(strict_types=1); namespace pocketmine\item; class Compass extends Item{ - public function __construct(){ - parent::__construct(self::COMPASS, 0, "Compass"); - } + } diff --git a/src/pocketmine/item/CookedChicken.php b/src/pocketmine/item/CookedChicken.php index d72fd0192..083f20b3c 100644 --- a/src/pocketmine/item/CookedChicken.php +++ b/src/pocketmine/item/CookedChicken.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class CookedChicken extends Food{ - public function __construct(){ - parent::__construct(self::COOKED_CHICKEN, 0, "Cooked Chicken"); - } public function getFoodRestore() : int{ return 6; diff --git a/src/pocketmine/item/CookedFish.php b/src/pocketmine/item/CookedFish.php index bd28be171..872247639 100644 --- a/src/pocketmine/item/CookedFish.php +++ b/src/pocketmine/item/CookedFish.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class CookedFish extends Food{ - public function __construct(){ - parent::__construct(self::COOKED_FISH, 0, "Cooked Fish"); - } public function getFoodRestore() : int{ return 5; diff --git a/src/pocketmine/item/CookedMutton.php b/src/pocketmine/item/CookedMutton.php index 152cb75c6..6e19853cc 100644 --- a/src/pocketmine/item/CookedMutton.php +++ b/src/pocketmine/item/CookedMutton.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class CookedMutton extends Food{ - public function __construct(){ - parent::__construct(self::COOKED_MUTTON, 0, "Cooked Mutton"); - } public function getFoodRestore() : int{ return 6; diff --git a/src/pocketmine/item/CookedPorkchop.php b/src/pocketmine/item/CookedPorkchop.php index 649551c8d..d75528001 100644 --- a/src/pocketmine/item/CookedPorkchop.php +++ b/src/pocketmine/item/CookedPorkchop.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class CookedPorkchop extends Food{ - public function __construct(){ - parent::__construct(self::COOKED_PORKCHOP, 0, "Cooked Porkchop"); - } public function getFoodRestore() : int{ return 8; diff --git a/src/pocketmine/item/CookedRabbit.php b/src/pocketmine/item/CookedRabbit.php index 03e5077fb..40d3830b4 100644 --- a/src/pocketmine/item/CookedRabbit.php +++ b/src/pocketmine/item/CookedRabbit.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class CookedRabbit extends Food{ - public function __construct(){ - parent::__construct(self::COOKED_RABBIT, 0, "Cooked Rabbit"); - } public function getFoodRestore() : int{ return 5; diff --git a/src/pocketmine/item/CookedSalmon.php b/src/pocketmine/item/CookedSalmon.php index f1e701398..7413c382e 100644 --- a/src/pocketmine/item/CookedSalmon.php +++ b/src/pocketmine/item/CookedSalmon.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class CookedSalmon extends Food{ - public function __construct(){ - parent::__construct(self::COOKED_SALMON, 0, "Cooked Salmon"); - } public function getFoodRestore() : int{ return 6; diff --git a/src/pocketmine/item/Cookie.php b/src/pocketmine/item/Cookie.php index 6dc546870..a8082f3f0 100644 --- a/src/pocketmine/item/Cookie.php +++ b/src/pocketmine/item/Cookie.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class Cookie extends Food{ - public function __construct(){ - parent::__construct(self::COOKIE, 0, "Cookie"); - } public function getFoodRestore() : int{ return 2; diff --git a/src/pocketmine/item/DriedKelp.php b/src/pocketmine/item/DriedKelp.php index 24b914db5..935d99679 100644 --- a/src/pocketmine/item/DriedKelp.php +++ b/src/pocketmine/item/DriedKelp.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class DriedKelp extends Food{ - public function __construct(){ - parent::__construct(self::DRIED_KELP, 0, "Dried Kelp"); - } public function getFoodRestore() : int{ return 1; diff --git a/src/pocketmine/item/Dye.php b/src/pocketmine/item/Dye.php index 94452d67b..ba103b519 100644 --- a/src/pocketmine/item/Dye.php +++ b/src/pocketmine/item/Dye.php @@ -30,8 +30,8 @@ class Dye extends Item{ /** @var DyeColor */ private $color; - public function __construct(int $variant, string $name, DyeColor $color){ - parent::__construct(self::DYE, $variant, $name); + public function __construct(int $id, int $variant, string $name, DyeColor $color){ + parent::__construct($id, $variant, $name); $this->color = $color; } diff --git a/src/pocketmine/item/Egg.php b/src/pocketmine/item/Egg.php index bf6d15482..7d3bece76 100644 --- a/src/pocketmine/item/Egg.php +++ b/src/pocketmine/item/Egg.php @@ -26,9 +26,6 @@ namespace pocketmine\item; use pocketmine\entity\projectile\Egg as EggEntity; class Egg extends ProjectileItem{ - public function __construct(){ - parent::__construct(self::EGG, 0, "Egg"); - } public function getMaxStackSize() : int{ return 16; diff --git a/src/pocketmine/item/EnderPearl.php b/src/pocketmine/item/EnderPearl.php index 8417c5806..337b30a7f 100644 --- a/src/pocketmine/item/EnderPearl.php +++ b/src/pocketmine/item/EnderPearl.php @@ -26,9 +26,6 @@ namespace pocketmine\item; use pocketmine\entity\projectile\EnderPearl as EnderPearlEntity; class EnderPearl extends ProjectileItem{ - public function __construct(){ - parent::__construct(self::ENDER_PEARL, 0, "Ender Pearl"); - } public function getMaxStackSize() : int{ return 16; diff --git a/src/pocketmine/item/ExperienceBottle.php b/src/pocketmine/item/ExperienceBottle.php index 21d07cb42..191d932b8 100644 --- a/src/pocketmine/item/ExperienceBottle.php +++ b/src/pocketmine/item/ExperienceBottle.php @@ -26,9 +26,6 @@ namespace pocketmine\item; use pocketmine\entity\projectile\ExperienceBottle as ExperienceBottleEntity; class ExperienceBottle extends ProjectileItem{ - public function __construct(){ - parent::__construct(self::EXPERIENCE_BOTTLE, 0, "Bottle o' Enchanting"); - } public function getProjectileEntityClass() : string{ return ExperienceBottleEntity::class; diff --git a/src/pocketmine/item/FishingRod.php b/src/pocketmine/item/FishingRod.php index 8909de54e..1e9c71e21 100644 --- a/src/pocketmine/item/FishingRod.php +++ b/src/pocketmine/item/FishingRod.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class FishingRod extends Item{ - public function __construct(){ - parent::__construct(self::FISHING_ROD, 0, "Fishing Rod"); - } //TODO } diff --git a/src/pocketmine/item/FlintSteel.php b/src/pocketmine/item/FlintSteel.php index e69df4d41..3478ce5a5 100644 --- a/src/pocketmine/item/FlintSteel.php +++ b/src/pocketmine/item/FlintSteel.php @@ -32,9 +32,6 @@ use pocketmine\world\sound\FlintSteelSound; use function assert; class FlintSteel extends Tool{ - public function __construct(){ - parent::__construct(self::FLINT_STEEL, 0, "Flint and Steel"); - } public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ if($blockReplace->getId() === BlockLegacyIds::AIR){ diff --git a/src/pocketmine/item/GlassBottle.php b/src/pocketmine/item/GlassBottle.php index 895753142..d3ce86a58 100644 --- a/src/pocketmine/item/GlassBottle.php +++ b/src/pocketmine/item/GlassBottle.php @@ -24,7 +24,5 @@ declare(strict_types=1); namespace pocketmine\item; class GlassBottle extends Item{ - public function __construct(){ - parent::__construct(self::GLASS_BOTTLE, 0, "Glass Bottle"); - } + } diff --git a/src/pocketmine/item/GoldenApple.php b/src/pocketmine/item/GoldenApple.php index 3e4482b21..ba0220528 100644 --- a/src/pocketmine/item/GoldenApple.php +++ b/src/pocketmine/item/GoldenApple.php @@ -28,10 +28,6 @@ use pocketmine\entity\effect\EffectInstance; class GoldenApple extends Food{ - public function __construct(){ - parent::__construct(self::GOLDEN_APPLE, 0, "Golden Apple"); - } - public function requiresHunger() : bool{ return false; } diff --git a/src/pocketmine/item/GoldenAppleEnchanted.php b/src/pocketmine/item/GoldenAppleEnchanted.php index 13fe4ee4c..1064373c2 100644 --- a/src/pocketmine/item/GoldenAppleEnchanted.php +++ b/src/pocketmine/item/GoldenAppleEnchanted.php @@ -28,10 +28,6 @@ use pocketmine\entity\effect\EffectInstance; class GoldenAppleEnchanted extends GoldenApple{ - public function __construct(){ - Food::__construct(self::ENCHANTED_GOLDEN_APPLE, 0, "Enchanted Golden Apple"); //skip parent constructor - } - public function getAdditionalEffects() : array{ return [ new EffectInstance(Effect::REGENERATION(), 600, 4), diff --git a/src/pocketmine/item/GoldenCarrot.php b/src/pocketmine/item/GoldenCarrot.php index 06d327bca..9c2acdc89 100644 --- a/src/pocketmine/item/GoldenCarrot.php +++ b/src/pocketmine/item/GoldenCarrot.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class GoldenCarrot extends Food{ - public function __construct(){ - parent::__construct(self::GOLDEN_CARROT, 0, "Golden Carrot"); - } public function getFoodRestore() : int{ return 6; diff --git a/src/pocketmine/item/ItemFactory.php b/src/pocketmine/item/ItemFactory.php index 119682ffe..31e4725b8 100644 --- a/src/pocketmine/item/ItemFactory.php +++ b/src/pocketmine/item/ItemFactory.php @@ -54,59 +54,59 @@ class ItemFactory{ public static function init() : void{ self::$list = []; //in case of re-initializing - self::register(new Apple()); - self::register(new Arrow()); + self::register(new Apple(Item::APPLE, 0, "Apple")); + self::register(new Arrow(Item::ARROW, 0, "Arrow")); self::register(new Axe(Item::DIAMOND_AXE, "Diamond Axe", TieredTool::TIER_DIAMOND)); self::register(new Axe(Item::GOLDEN_AXE, "Gold Axe", TieredTool::TIER_GOLD)); self::register(new Axe(Item::IRON_AXE, "Iron Axe", TieredTool::TIER_IRON)); self::register(new Axe(Item::STONE_AXE, "Stone Axe", TieredTool::TIER_STONE)); self::register(new Axe(Item::WOODEN_AXE, "Wooden Axe", TieredTool::TIER_WOODEN)); - self::register(new BakedPotato()); - self::register(new Beetroot()); - self::register(new BeetrootSeeds()); - self::register(new BeetrootSoup()); - self::register(new BlazeRod()); - self::register(new Book()); + self::register(new BakedPotato(Item::BAKED_POTATO, 0, "Baked Potato")); + self::register(new Beetroot(Item::BEETROOT, 0, "Beetroot")); + self::register(new BeetrootSeeds(Item::BEETROOT_SEEDS, 0, "Beetroot Seeds")); + self::register(new BeetrootSoup(Item::BEETROOT_SOUP, 0, "Beetroot Soup")); + self::register(new BlazeRod(Item::BLAZE_ROD, 0, "Blaze Rod")); + self::register(new Book(Item::BOOK, 0, "Book")); self::register(new Boots(Item::CHAIN_BOOTS, 0, "Chainmail Boots", new ArmorTypeInfo(1, 196))); self::register(new Boots(Item::DIAMOND_BOOTS, 0, "Diamond Boots", new ArmorTypeInfo(3, 430))); self::register(new Boots(Item::GOLDEN_BOOTS, 0, "Gold Boots", new ArmorTypeInfo(1, 92))); self::register(new Boots(Item::IRON_BOOTS, 0, "Iron Boots", new ArmorTypeInfo(2, 196))); self::register(new Boots(Item::LEATHER_BOOTS, 0, "Leather Boots", new ArmorTypeInfo(1, 66))); - self::register(new Bow()); - self::register(new Bowl()); - self::register(new Bread()); + self::register(new Bow(Item::BOW, 0, "Bow")); + self::register(new Bowl(Item::BOWL, 0, "Bowl")); + self::register(new Bread(Item::BREAD, 0, "Bread")); self::register(new Bucket(Item::BUCKET, 0, "Bucket")); - self::register(new Carrot()); + self::register(new Carrot(Item::CARROT, 0, "Carrot")); self::register(new Chestplate(Item::CHAIN_CHESTPLATE, 0, "Chainmail Chestplate", new ArmorTypeInfo(5, 241))); self::register(new Chestplate(Item::DIAMOND_CHESTPLATE, 0, "Diamond Chestplate", new ArmorTypeInfo(8, 529))); self::register(new Chestplate(Item::GOLDEN_CHESTPLATE, 0, "Gold Chestplate", new ArmorTypeInfo(5, 113))); self::register(new Chestplate(Item::IRON_CHESTPLATE, 0, "Iron Chestplate", new ArmorTypeInfo(6, 241))); self::register(new Chestplate(Item::LEATHER_CHESTPLATE, 0, "Leather Tunic", new ArmorTypeInfo(3, 81))); - self::register(new ChorusFruit()); - self::register(new Clock()); - self::register(new Clownfish()); + self::register(new ChorusFruit(Item::CHORUS_FRUIT, 0, "Chorus Fruit")); + self::register(new Clock(Item::CLOCK, 0, "Clock")); + self::register(new Clownfish(Item::CLOWNFISH, 0, "Clownfish")); self::register(new Coal(Item::COAL, 0, "Coal")); self::register(new Coal(Item::COAL, 1, "Charcoal")); self::register(new CocoaBeans(Item::DYE, 3, "Cocoa Beans")); - self::register(new Compass()); - self::register(new CookedChicken()); - self::register(new CookedFish()); - self::register(new CookedMutton()); - self::register(new CookedPorkchop()); - self::register(new CookedRabbit()); - self::register(new CookedSalmon()); - self::register(new Cookie()); - self::register(new DriedKelp()); - self::register(new Egg()); - self::register(new EnderPearl()); - self::register(new ExperienceBottle()); + self::register(new Compass(Item::COMPASS, 0, "Compass")); + self::register(new CookedChicken(Item::COOKED_CHICKEN, 0, "Cooked Chicken")); + self::register(new CookedFish(Item::COOKED_FISH, 0, "Cooked Fish")); + self::register(new CookedMutton(Item::COOKED_MUTTON, 0, "Cooked Mutton")); + self::register(new CookedPorkchop(Item::COOKED_PORKCHOP, 0, "Cooked Porkchop")); + self::register(new CookedRabbit(Item::COOKED_RABBIT, 0, "Cooked Rabbit")); + self::register(new CookedSalmon(Item::COOKED_SALMON, 0, "Cooked Salmon")); + self::register(new Cookie(Item::COOKIE, 0, "Cookie")); + self::register(new DriedKelp(Item::DRIED_KELP, 0, "Dried Kelp")); + self::register(new Egg(Item::EGG, 0, "Egg")); + self::register(new EnderPearl(Item::ENDER_PEARL, 0, "Ender Pearl")); + self::register(new ExperienceBottle(Item::EXPERIENCE_BOTTLE, 0, "Bottle o' Enchanting")); self::register(new Fertilizer(Item::DYE, 15, "Bone Meal")); - self::register(new FishingRod()); - self::register(new FlintSteel()); - self::register(new GlassBottle()); - self::register(new GoldenApple()); - self::register(new GoldenAppleEnchanted()); - self::register(new GoldenCarrot()); + self::register(new FishingRod(Item::FISHING_ROD, 0, "Fishing Rod")); + self::register(new FlintSteel(Item::FLINT_STEEL, 0, "Flint and Steel")); + self::register(new GlassBottle(Item::GLASS_BOTTLE, 0, "Glass Bottle")); + self::register(new GoldenApple(Item::GOLDEN_APPLE, 0, "Golden Apple")); + self::register(new GoldenAppleEnchanted(Item::ENCHANTED_GOLDEN_APPLE, 0, "Enchanted Golden Apple")); + self::register(new GoldenCarrot(Item::GOLDEN_CARROT, 0, "Golden Carrot")); self::register(new Helmet(Item::CHAIN_HELMET, 0, "Chainmail Helmet", new ArmorTypeInfo(2, 166))); self::register(new Helmet(Item::DIAMOND_HELMET, 0, "Diamond Helmet", new ArmorTypeInfo(3, 364))); self::register(new Helmet(Item::GOLDEN_HELMET, 0, "Gold Helmet", new ArmorTypeInfo(2, 78))); @@ -220,33 +220,33 @@ class ItemFactory{ //the meta values are intentionally hardcoded because block IDs will change in the future self::register(new LiquidBucket(Item::BUCKET, 8, "Water Bucket", BlockLegacyIds::FLOWING_WATER)); self::register(new LiquidBucket(Item::BUCKET, 10, "Lava Bucket", BlockLegacyIds::FLOWING_LAVA)); - self::register(new Melon()); - self::register(new MelonSeeds()); + self::register(new Melon(Item::MELON, 0, "Melon")); + self::register(new MelonSeeds(Item::MELON_SEEDS, 0, "Melon Seeds")); self::register(new MilkBucket(Item::BUCKET, 1, "Milk Bucket")); - self::register(new Minecart()); - self::register(new MushroomStew()); - self::register(new PaintingItem()); + self::register(new Minecart(Item::MINECART, 0, "Minecart")); + self::register(new MushroomStew(Item::MUSHROOM_STEW, 0, "Mushroom Stew")); + self::register(new PaintingItem(Item::PAINTING, 0, "Painting")); self::register(new Pickaxe(Item::DIAMOND_PICKAXE, "Diamond Pickaxe", TieredTool::TIER_DIAMOND)); self::register(new Pickaxe(Item::GOLDEN_PICKAXE, "Gold Pickaxe", TieredTool::TIER_GOLD)); self::register(new Pickaxe(Item::IRON_PICKAXE, "Iron Pickaxe", TieredTool::TIER_IRON)); self::register(new Pickaxe(Item::STONE_PICKAXE, "Stone Pickaxe", TieredTool::TIER_STONE)); self::register(new Pickaxe(Item::WOODEN_PICKAXE, "Wooden Pickaxe", TieredTool::TIER_WOODEN)); - self::register(new PoisonousPotato()); - self::register(new Potato()); - self::register(new Pufferfish()); - self::register(new PumpkinPie()); - self::register(new PumpkinSeeds()); - self::register(new RabbitStew()); - self::register(new RawBeef()); - self::register(new RawChicken()); - self::register(new RawFish()); - self::register(new RawMutton()); - self::register(new RawPorkchop()); - self::register(new RawRabbit()); - self::register(new RawSalmon()); - self::register(new Redstone()); - self::register(new RottenFlesh()); - self::register(new Shears()); + self::register(new PoisonousPotato(Item::POISONOUS_POTATO, 0, "Poisonous Potato")); + self::register(new Potato(Item::POTATO, 0, "Potato")); + self::register(new Pufferfish(Item::PUFFERFISH, 0, "Pufferfish")); + self::register(new PumpkinPie(Item::PUMPKIN_PIE, 0, "Pumpkin Pie")); + self::register(new PumpkinSeeds(Item::PUMPKIN_SEEDS, 0, "Pumpkin Seeds")); + self::register(new RabbitStew(Item::RABBIT_STEW, 0, "Rabbit Stew")); + self::register(new RawBeef(Item::RAW_BEEF, 0, "Raw Beef")); + self::register(new RawChicken(Item::RAW_CHICKEN, 0, "Raw Chicken")); + self::register(new RawFish(Item::RAW_FISH, 0, "Raw Fish")); + self::register(new RawMutton(Item::RAW_MUTTON, 0, "Raw Mutton")); + self::register(new RawPorkchop(Item::RAW_PORKCHOP, 0, "Raw Porkchop")); + self::register(new RawRabbit(Item::RAW_RABBIT, 0, "Raw Rabbit")); + self::register(new RawSalmon(Item::RAW_SALMON, 0, "Raw Salmon")); + self::register(new Redstone(Item::REDSTONE, 0, "Redstone")); + self::register(new RottenFlesh(Item::ROTTEN_FLESH, 0, "Rotten Flesh")); + self::register(new Shears(Item::SHEARS, 0, "Shears")); self::register(new Shovel(Item::DIAMOND_SHOVEL, "Diamond Shovel", TieredTool::TIER_DIAMOND)); self::register(new Shovel(Item::GOLDEN_SHOVEL, "Gold Shovel", TieredTool::TIER_GOLD)); self::register(new Shovel(Item::IRON_SHOVEL, "Iron Shovel", TieredTool::TIER_IRON)); @@ -258,20 +258,20 @@ class ItemFactory{ self::register(new Sign(BlockLegacyIds::JUNGLE_STANDING_SIGN, 0, Item::JUNGLE_SIGN)); self::register(new Sign(BlockLegacyIds::ACACIA_STANDING_SIGN, 0, Item::ACACIA_SIGN)); self::register(new Sign(BlockLegacyIds::DARKOAK_STANDING_SIGN, 0, Item::DARKOAK_SIGN)); - self::register(new Snowball()); - self::register(new SpiderEye()); - self::register(new Steak()); - self::register(new Stick()); - self::register(new StringItem()); + self::register(new Snowball(Item::SNOWBALL, 0, "Snowball")); + self::register(new SpiderEye(Item::SPIDER_EYE, 0, "Spider Eye")); + self::register(new Steak(Item::STEAK, 0, "Steak")); + self::register(new Stick(Item::STICK, 0, "Stick")); + self::register(new StringItem(Item::STRING, 0, "String")); self::register(new Sword(Item::DIAMOND_SWORD, "Diamond Sword", TieredTool::TIER_DIAMOND)); self::register(new Sword(Item::GOLDEN_SWORD, "Gold Sword", TieredTool::TIER_GOLD)); self::register(new Sword(Item::IRON_SWORD, "Iron Sword", TieredTool::TIER_IRON)); self::register(new Sword(Item::STONE_SWORD, "Stone Sword", TieredTool::TIER_STONE)); self::register(new Sword(Item::WOODEN_SWORD, "Wooden Sword", TieredTool::TIER_WOODEN)); - self::register(new Totem()); - self::register(new WheatSeeds()); - self::register(new WritableBook()); - self::register(new WrittenBook()); + self::register(new Totem(Item::TOTEM, 0, "Totem of Undying")); + self::register(new WheatSeeds(Item::WHEAT_SEEDS, 0, "Wheat Seeds")); + self::register(new WritableBook(Item::WRITABLE_BOOK, 0, "Book & Quill")); + self::register(new WrittenBook(Item::WRITTEN_BOOK, 0, "Written Book")); foreach(SkullType::getAll() as $skullType){ self::register(new Skull(Item::SKULL, $skullType->getMagicNumber(), $skullType->getDisplayName(), $skullType)); @@ -286,25 +286,25 @@ class ItemFactory{ foreach(DyeColor::getAll() as $color){ //TODO: use colour object directly //TODO: add interface to dye-colour objects - self::register(new Dye($dyeMap[$color] ?? $color->getInvertedMagicNumber(), $color->getDisplayName() . " Dye", $color)); - self::register(new Bed($color->getMagicNumber(), $color->getDisplayName() . " Bed", $color)); - self::register(new Banner($color->getInvertedMagicNumber(), $color->getDisplayName() . " Banner", $color)); + self::register(new Dye(Item::DYE, $dyeMap[$color] ?? $color->getInvertedMagicNumber(), $color->getDisplayName() . " Dye", $color)); + self::register(new Bed(Item::BED, $color->getMagicNumber(), $color->getDisplayName() . " Bed", $color)); + self::register(new Banner(Item::BANNER, $color->getInvertedMagicNumber(), $color->getDisplayName() . " Banner", $color)); } foreach(Potion::ALL as $type){ - self::register(new Potion($type)); - self::register(new SplashPotion($type)); + self::register(new Potion(Item::POTION, $type, "Potion")); + self::register(new SplashPotion(Item::SPLASH_POTION, $type, "Splash Potion")); } foreach(EntityFactory::getKnownTypes() as $className){ /** @var Living|string $className */ if(is_a($className, Living::class, true) and $className::NETWORK_ID !== -1){ - self::register(new SpawnEgg(Item::SPAWN_EGG, $className::NETWORK_ID, $className, "Spawn Egg")); + self::register(new SpawnEgg(Item::SPAWN_EGG, $className::NETWORK_ID, "Spawn Egg", $className)); } } foreach(TreeType::getAll() as $type){ - self::register(new Boat($type)); + self::register(new Boat(Item::BOAT, $type->getMagicNumber(), $type->getDisplayName() . " Boat", $type)); } //TODO: minecraft:acacia_sign diff --git a/src/pocketmine/item/Melon.php b/src/pocketmine/item/Melon.php index 0a4c5cedc..f1807296e 100644 --- a/src/pocketmine/item/Melon.php +++ b/src/pocketmine/item/Melon.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class Melon extends Food{ - public function __construct(){ - parent::__construct(self::MELON, 0, "Melon"); - } public function getFoodRestore() : int{ return 2; diff --git a/src/pocketmine/item/MelonSeeds.php b/src/pocketmine/item/MelonSeeds.php index f7715ed6e..f2d782058 100644 --- a/src/pocketmine/item/MelonSeeds.php +++ b/src/pocketmine/item/MelonSeeds.php @@ -28,9 +28,6 @@ use pocketmine\block\BlockFactory; use pocketmine\block\BlockLegacyIds; class MelonSeeds extends Item{ - public function __construct(){ - parent::__construct(self::MELON_SEEDS, 0, "Melon Seeds"); - } public function getBlock() : Block{ return BlockFactory::get(BlockLegacyIds::MELON_STEM); diff --git a/src/pocketmine/item/Minecart.php b/src/pocketmine/item/Minecart.php index ec9bbcbe9..59e47b98a 100644 --- a/src/pocketmine/item/Minecart.php +++ b/src/pocketmine/item/Minecart.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class Minecart extends Item{ - public function __construct(){ - parent::__construct(self::MINECART, 0, "Minecart"); - } //TODO } diff --git a/src/pocketmine/item/MushroomStew.php b/src/pocketmine/item/MushroomStew.php index abba737a5..b71dcc1b8 100644 --- a/src/pocketmine/item/MushroomStew.php +++ b/src/pocketmine/item/MushroomStew.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class MushroomStew extends Food{ - public function __construct(){ - parent::__construct(self::MUSHROOM_STEW, 0, "Mushroom Stew"); - } public function getMaxStackSize() : int{ return 1; diff --git a/src/pocketmine/item/PaintingItem.php b/src/pocketmine/item/PaintingItem.php index 8d9642c49..7018b181e 100644 --- a/src/pocketmine/item/PaintingItem.php +++ b/src/pocketmine/item/PaintingItem.php @@ -34,9 +34,6 @@ use pocketmine\Player; use function array_rand; class PaintingItem extends Item{ - public function __construct(){ - parent::__construct(self::PAINTING, 0, "Painting"); - } public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ if(Facing::axis($face) === Facing::AXIS_Y){ diff --git a/src/pocketmine/item/PoisonousPotato.php b/src/pocketmine/item/PoisonousPotato.php index f869884f7..962e87a2c 100644 --- a/src/pocketmine/item/PoisonousPotato.php +++ b/src/pocketmine/item/PoisonousPotato.php @@ -28,9 +28,6 @@ use pocketmine\entity\effect\EffectInstance; use function mt_rand; class PoisonousPotato extends Food{ - public function __construct(){ - parent::__construct(self::POISONOUS_POTATO, 0, "Poisonous Potato"); - } public function getFoodRestore() : int{ return 2; diff --git a/src/pocketmine/item/Potato.php b/src/pocketmine/item/Potato.php index b550a4f24..c9fbd32eb 100644 --- a/src/pocketmine/item/Potato.php +++ b/src/pocketmine/item/Potato.php @@ -28,9 +28,6 @@ use pocketmine\block\BlockFactory; use pocketmine\block\BlockLegacyIds; class Potato extends Food{ - public function __construct(){ - parent::__construct(self::POTATO, 0, "Potato"); - } public function getBlock() : Block{ return BlockFactory::get(BlockLegacyIds::POTATO_BLOCK); diff --git a/src/pocketmine/item/Potion.php b/src/pocketmine/item/Potion.php index 6e7acb06d..9cb0ecd0c 100644 --- a/src/pocketmine/item/Potion.php +++ b/src/pocketmine/item/Potion.php @@ -255,10 +255,6 @@ class Potion extends Item implements Consumable{ return []; } - public function __construct(int $variant){ - parent::__construct(self::POTION, $variant, "Potion"); - } - public function getMaxStackSize() : int{ return 1; } diff --git a/src/pocketmine/item/Pufferfish.php b/src/pocketmine/item/Pufferfish.php index 3d1451256..6e9826fb4 100644 --- a/src/pocketmine/item/Pufferfish.php +++ b/src/pocketmine/item/Pufferfish.php @@ -27,9 +27,6 @@ use pocketmine\entity\effect\Effect; use pocketmine\entity\effect\EffectInstance; class Pufferfish extends Food{ - public function __construct(){ - parent::__construct(self::PUFFERFISH, 0, "Pufferfish"); - } public function getFoodRestore() : int{ return 1; diff --git a/src/pocketmine/item/PumpkinPie.php b/src/pocketmine/item/PumpkinPie.php index 90628dd68..ba4567358 100644 --- a/src/pocketmine/item/PumpkinPie.php +++ b/src/pocketmine/item/PumpkinPie.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class PumpkinPie extends Food{ - public function __construct(){ - parent::__construct(self::PUMPKIN_PIE, 0, "Pumpkin Pie"); - } public function getFoodRestore() : int{ return 8; diff --git a/src/pocketmine/item/PumpkinSeeds.php b/src/pocketmine/item/PumpkinSeeds.php index 28ec69cbf..048538090 100644 --- a/src/pocketmine/item/PumpkinSeeds.php +++ b/src/pocketmine/item/PumpkinSeeds.php @@ -28,9 +28,6 @@ use pocketmine\block\BlockFactory; use pocketmine\block\BlockLegacyIds; class PumpkinSeeds extends Item{ - public function __construct(){ - parent::__construct(self::PUMPKIN_SEEDS, 0, "Pumpkin Seeds"); - } public function getBlock() : Block{ return BlockFactory::get(BlockLegacyIds::PUMPKIN_STEM); diff --git a/src/pocketmine/item/RabbitStew.php b/src/pocketmine/item/RabbitStew.php index 9161d888a..239973d8a 100644 --- a/src/pocketmine/item/RabbitStew.php +++ b/src/pocketmine/item/RabbitStew.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class RabbitStew extends Food{ - public function __construct(){ - parent::__construct(self::RABBIT_STEW, 0, "Rabbit Stew"); - } public function getMaxStackSize() : int{ return 1; diff --git a/src/pocketmine/item/RawBeef.php b/src/pocketmine/item/RawBeef.php index 59aa7e9c3..64f09701f 100644 --- a/src/pocketmine/item/RawBeef.php +++ b/src/pocketmine/item/RawBeef.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class RawBeef extends Food{ - public function __construct(){ - parent::__construct(self::RAW_BEEF, 0, "Raw Beef"); - } public function getFoodRestore() : int{ return 3; diff --git a/src/pocketmine/item/RawChicken.php b/src/pocketmine/item/RawChicken.php index ef9fd3949..0408a6552 100644 --- a/src/pocketmine/item/RawChicken.php +++ b/src/pocketmine/item/RawChicken.php @@ -28,9 +28,6 @@ use pocketmine\entity\effect\EffectInstance; use function mt_rand; class RawChicken extends Food{ - public function __construct(){ - parent::__construct(self::RAW_CHICKEN, 0, "Raw Chicken"); - } public function getFoodRestore() : int{ return 2; diff --git a/src/pocketmine/item/RawFish.php b/src/pocketmine/item/RawFish.php index 54da485c1..cbd0aef13 100644 --- a/src/pocketmine/item/RawFish.php +++ b/src/pocketmine/item/RawFish.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class RawFish extends Food{ - public function __construct(){ - parent::__construct(self::RAW_FISH, 0, "Raw Fish"); - } public function getFoodRestore() : int{ return 2; diff --git a/src/pocketmine/item/RawMutton.php b/src/pocketmine/item/RawMutton.php index 125f901a5..1fd389fbc 100644 --- a/src/pocketmine/item/RawMutton.php +++ b/src/pocketmine/item/RawMutton.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class RawMutton extends Food{ - public function __construct(){ - parent::__construct(self::RAW_MUTTON, 0, "Raw Mutton"); - } public function getFoodRestore() : int{ return 2; diff --git a/src/pocketmine/item/RawPorkchop.php b/src/pocketmine/item/RawPorkchop.php index fa28f5929..ce2e12623 100644 --- a/src/pocketmine/item/RawPorkchop.php +++ b/src/pocketmine/item/RawPorkchop.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class RawPorkchop extends Food{ - public function __construct(){ - parent::__construct(self::RAW_PORKCHOP, 0, "Raw Porkchop"); - } public function getFoodRestore() : int{ return 3; diff --git a/src/pocketmine/item/RawRabbit.php b/src/pocketmine/item/RawRabbit.php index 2234c60a2..bd1111fe8 100644 --- a/src/pocketmine/item/RawRabbit.php +++ b/src/pocketmine/item/RawRabbit.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class RawRabbit extends Food{ - public function __construct(){ - parent::__construct(self::RAW_RABBIT, 0, "Raw Rabbit"); - } public function getFoodRestore() : int{ return 3; diff --git a/src/pocketmine/item/RawSalmon.php b/src/pocketmine/item/RawSalmon.php index d8b2375f9..5e0de0e81 100644 --- a/src/pocketmine/item/RawSalmon.php +++ b/src/pocketmine/item/RawSalmon.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class RawSalmon extends Food{ - public function __construct(){ - parent::__construct(self::RAW_SALMON, 0, "Raw Salmon"); - } public function getFoodRestore() : int{ return 2; diff --git a/src/pocketmine/item/Redstone.php b/src/pocketmine/item/Redstone.php index 2a08dda69..6e4e054b5 100644 --- a/src/pocketmine/item/Redstone.php +++ b/src/pocketmine/item/Redstone.php @@ -28,9 +28,6 @@ use pocketmine\block\BlockFactory; use pocketmine\block\BlockLegacyIds; class Redstone extends Item{ - public function __construct(){ - parent::__construct(self::REDSTONE, 0, "Redstone"); - } public function getBlock() : Block{ return BlockFactory::get(BlockLegacyIds::REDSTONE_WIRE); diff --git a/src/pocketmine/item/RottenFlesh.php b/src/pocketmine/item/RottenFlesh.php index 3b4677478..90f4c9050 100644 --- a/src/pocketmine/item/RottenFlesh.php +++ b/src/pocketmine/item/RottenFlesh.php @@ -29,10 +29,6 @@ use function lcg_value; class RottenFlesh extends Food{ - public function __construct(){ - parent::__construct(self::ROTTEN_FLESH, 0, "Rotten Flesh"); - } - public function getFoodRestore() : int{ return 4; } diff --git a/src/pocketmine/item/Shears.php b/src/pocketmine/item/Shears.php index 811bb380f..bc99b02b6 100644 --- a/src/pocketmine/item/Shears.php +++ b/src/pocketmine/item/Shears.php @@ -27,9 +27,6 @@ use pocketmine\block\Block; use pocketmine\block\BlockToolType; class Shears extends Tool{ - public function __construct(){ - parent::__construct(self::SHEARS, 0, "Shears"); - } public function getMaxDurability() : int{ return 239; diff --git a/src/pocketmine/item/Snowball.php b/src/pocketmine/item/Snowball.php index 6f46dfcb4..8da341c06 100644 --- a/src/pocketmine/item/Snowball.php +++ b/src/pocketmine/item/Snowball.php @@ -26,9 +26,6 @@ namespace pocketmine\item; use pocketmine\entity\projectile\Snowball as SnowballEntity; class Snowball extends ProjectileItem{ - public function __construct(){ - parent::__construct(self::SNOWBALL, 0, "Snowball"); - } public function getMaxStackSize() : int{ return 16; diff --git a/src/pocketmine/item/SpawnEgg.php b/src/pocketmine/item/SpawnEgg.php index de42271d8..f1a52ef89 100644 --- a/src/pocketmine/item/SpawnEgg.php +++ b/src/pocketmine/item/SpawnEgg.php @@ -39,12 +39,13 @@ class SpawnEgg extends Item{ /** * @param int $id * @param int $variant - * @param string $entityClass instanceof Entity * @param string $name * + * @param string $entityClass instanceof Entity + * * @throws \InvalidArgumentException */ - public function __construct(int $id, int $variant, string $entityClass, string $name = "Unknown"){ + public function __construct(int $id, int $variant, string $name, string $entityClass){ parent::__construct($id, $variant, $name); Utils::testValidInstance($entityClass, Entity::class); $this->entityClass = $entityClass; diff --git a/src/pocketmine/item/SpiderEye.php b/src/pocketmine/item/SpiderEye.php index cc8c4c4aa..b443a4fad 100644 --- a/src/pocketmine/item/SpiderEye.php +++ b/src/pocketmine/item/SpiderEye.php @@ -27,9 +27,6 @@ use pocketmine\entity\effect\Effect; use pocketmine\entity\effect\EffectInstance; class SpiderEye extends Food{ - public function __construct(){ - parent::__construct(self::SPIDER_EYE, 0, "Spider Eye"); - } public function getFoodRestore() : int{ return 2; diff --git a/src/pocketmine/item/SplashPotion.php b/src/pocketmine/item/SplashPotion.php index 3f12c7b84..d29f5839b 100644 --- a/src/pocketmine/item/SplashPotion.php +++ b/src/pocketmine/item/SplashPotion.php @@ -28,10 +28,6 @@ use pocketmine\nbt\tag\CompoundTag; class SplashPotion extends ProjectileItem{ - public function __construct(int $variant){ - parent::__construct(self::SPLASH_POTION, $variant, "Splash Potion"); - } - public function getMaxStackSize() : int{ return 1; } diff --git a/src/pocketmine/item/Steak.php b/src/pocketmine/item/Steak.php index 1e5ed99f0..baeee5e15 100644 --- a/src/pocketmine/item/Steak.php +++ b/src/pocketmine/item/Steak.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class Steak extends Food{ - public function __construct(){ - parent::__construct(self::STEAK, 0, "Steak"); - } public function getFoodRestore() : int{ return 8; diff --git a/src/pocketmine/item/Stick.php b/src/pocketmine/item/Stick.php index 4bbb63bf2..d7b749e05 100644 --- a/src/pocketmine/item/Stick.php +++ b/src/pocketmine/item/Stick.php @@ -25,9 +25,6 @@ namespace pocketmine\item; class Stick extends Item{ - public function __construct(){ - parent::__construct(self::STICK, 0, "Stick"); - } public function getFuelTime() : int{ return 100; diff --git a/src/pocketmine/item/StringItem.php b/src/pocketmine/item/StringItem.php index 4253ba980..9497e34ab 100644 --- a/src/pocketmine/item/StringItem.php +++ b/src/pocketmine/item/StringItem.php @@ -28,9 +28,6 @@ use pocketmine\block\BlockFactory; use pocketmine\block\BlockLegacyIds; class StringItem extends Item{ - public function __construct(){ - parent::__construct(self::STRING, 0, "String"); - } public function getBlock() : Block{ return BlockFactory::get(BlockLegacyIds::TRIPWIRE); diff --git a/src/pocketmine/item/Totem.php b/src/pocketmine/item/Totem.php index e322de7f1..8928dd139 100644 --- a/src/pocketmine/item/Totem.php +++ b/src/pocketmine/item/Totem.php @@ -24,9 +24,6 @@ declare(strict_types=1); namespace pocketmine\item; class Totem extends Item{ - public function __construct(){ - parent::__construct(self::TOTEM, 0, "Totem of Undying"); - } public function getMaxStackSize() : int{ return 1; diff --git a/src/pocketmine/item/WheatSeeds.php b/src/pocketmine/item/WheatSeeds.php index 967942492..d844aeea7 100644 --- a/src/pocketmine/item/WheatSeeds.php +++ b/src/pocketmine/item/WheatSeeds.php @@ -28,9 +28,6 @@ use pocketmine\block\BlockFactory; use pocketmine\block\BlockLegacyIds; class WheatSeeds extends Item{ - public function __construct(){ - parent::__construct(self::WHEAT_SEEDS, 0, "Wheat Seeds"); - } public function getBlock() : Block{ return BlockFactory::get(BlockLegacyIds::WHEAT_BLOCK); diff --git a/src/pocketmine/item/WritableBook.php b/src/pocketmine/item/WritableBook.php index d4ae343c1..fca4e1222 100644 --- a/src/pocketmine/item/WritableBook.php +++ b/src/pocketmine/item/WritableBook.php @@ -25,7 +25,4 @@ namespace pocketmine\item; class WritableBook extends WritableBookBase{ - public function __construct(){ - parent::__construct(self::WRITABLE_BOOK, 0, "Book & Quill"); - } } diff --git a/src/pocketmine/item/WrittenBook.php b/src/pocketmine/item/WrittenBook.php index 7173816ba..dbccfa77d 100644 --- a/src/pocketmine/item/WrittenBook.php +++ b/src/pocketmine/item/WrittenBook.php @@ -34,10 +34,6 @@ class WrittenBook extends WritableBookBase{ public const TAG_AUTHOR = "author"; //TAG_String public const TAG_TITLE = "title"; //TAG_String - public function __construct(){ - parent::__construct(self::WRITTEN_BOOK, 0, "Written Book"); - } - public function getMaxStackSize() : int{ return 16; }