From 06083d6dc4d7c364da113fce947610e567cab6e2 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 7 Aug 2017 16:26:27 +0100 Subject: [PATCH] s/Item/Block --- src/pocketmine/block/Block.php | 2 +- src/pocketmine/block/Dirt.php | 2 +- src/pocketmine/block/GlowingRedstoneOre.php | 2 +- src/pocketmine/block/Liquid.php | 4 ++-- src/pocketmine/block/RedstoneOre.php | 2 +- src/pocketmine/item/Bed.php | 2 +- src/pocketmine/item/BeetrootSeeds.php | 2 +- src/pocketmine/item/Cake.php | 2 +- src/pocketmine/item/Carrot.php | 2 +- src/pocketmine/item/FlowerPot.php | 2 +- src/pocketmine/item/IronDoor.php | 2 +- src/pocketmine/item/MelonSeeds.php | 2 +- src/pocketmine/item/Potato.php | 2 +- src/pocketmine/item/PumpkinSeeds.php | 2 +- src/pocketmine/item/Sign.php | 2 +- src/pocketmine/item/Skull.php | 2 +- src/pocketmine/item/Sugarcane.php | 2 +- src/pocketmine/item/WheatSeeds.php | 2 +- src/pocketmine/item/WoodenDoor.php | 2 +- src/pocketmine/tile/Furnace.php | 4 ++-- 20 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php index b6e3d164b..9c7cb6593 100644 --- a/src/pocketmine/block/Block.php +++ b/src/pocketmine/block/Block.php @@ -688,7 +688,7 @@ class Block extends Position implements BlockIds, Metadatable{ return $this->getLevel()->getBlock(Vector3::getSide($side, $step)); } - return Block::get(Item::AIR, 0, Position::fromObject(Vector3::getSide($side, $step))); + return Block::get(Block::AIR, 0, Position::fromObject(Vector3::getSide($side, $step))); } /** diff --git a/src/pocketmine/block/Dirt.php b/src/pocketmine/block/Dirt.php index a6c14ff57..3ee68eeab 100644 --- a/src/pocketmine/block/Dirt.php +++ b/src/pocketmine/block/Dirt.php @@ -50,7 +50,7 @@ class Dirt extends Solid{ public function onActivate(Item $item, Player $player = null){ if($item->isHoe()){ $item->useOn($this); - $this->getLevel()->setBlock($this, Block::get(Item::FARMLAND, 0), true); + $this->getLevel()->setBlock($this, Block::get(Block::FARMLAND, 0), true); return true; } diff --git a/src/pocketmine/block/GlowingRedstoneOre.php b/src/pocketmine/block/GlowingRedstoneOre.php index 431401f81..2dfeed96c 100644 --- a/src/pocketmine/block/GlowingRedstoneOre.php +++ b/src/pocketmine/block/GlowingRedstoneOre.php @@ -40,7 +40,7 @@ class GlowingRedstoneOre extends RedstoneOre{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_SCHEDULED or $type === Level::BLOCK_UPDATE_RANDOM){ - $this->getLevel()->setBlock($this, Block::get(Item::REDSTONE_ORE, $this->meta), false, false); + $this->getLevel()->setBlock($this, Block::get(Block::REDSTONE_ORE, $this->meta), false, false); return Level::BLOCK_UPDATE_WEAK; } diff --git a/src/pocketmine/block/Liquid.php b/src/pocketmine/block/Liquid.php index 343c874e9..a08c6b28b 100644 --- a/src/pocketmine/block/Liquid.php +++ b/src/pocketmine/block/Liquid.php @@ -434,9 +434,9 @@ abstract class Liquid extends Transparent{ if($colliding){ if($this->getDamage() === 0){ - $this->getLevel()->setBlock($this, Block::get(Item::OBSIDIAN), true, true); + $this->getLevel()->setBlock($this, Block::get(Block::OBSIDIAN), true, true); }elseif($this->getDamage() <= 4){ - $this->getLevel()->setBlock($this, Block::get(Item::COBBLESTONE), true, true); + $this->getLevel()->setBlock($this, Block::get(Block::COBBLESTONE), true, true); } } } diff --git a/src/pocketmine/block/RedstoneOre.php b/src/pocketmine/block/RedstoneOre.php index a965b9f9a..5a978bf65 100644 --- a/src/pocketmine/block/RedstoneOre.php +++ b/src/pocketmine/block/RedstoneOre.php @@ -50,7 +50,7 @@ class RedstoneOre extends Solid{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL or $type === Level::BLOCK_UPDATE_TOUCH){ - $this->getLevel()->setBlock($this, Block::get(Item::GLOWING_REDSTONE_ORE, $this->meta)); + $this->getLevel()->setBlock($this, Block::get(Block::GLOWING_REDSTONE_ORE, $this->meta)); return Level::BLOCK_UPDATE_WEAK; } diff --git a/src/pocketmine/item/Bed.php b/src/pocketmine/item/Bed.php index e477cc8fd..6dd9c776f 100644 --- a/src/pocketmine/item/Bed.php +++ b/src/pocketmine/item/Bed.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class Bed extends Item{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::BED_BLOCK); + $this->block = Block::get(Block::BED_BLOCK); parent::__construct(self::BED, $meta, $count, "Bed"); } diff --git a/src/pocketmine/item/BeetrootSeeds.php b/src/pocketmine/item/BeetrootSeeds.php index 57cdc7671..f32952bcb 100644 --- a/src/pocketmine/item/BeetrootSeeds.php +++ b/src/pocketmine/item/BeetrootSeeds.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class BeetrootSeeds extends Item{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::BEETROOT_BLOCK); + $this->block = Block::get(Block::BEETROOT_BLOCK); parent::__construct(self::BEETROOT_SEEDS, $meta, $count, "Beetroot Seeds"); } } \ No newline at end of file diff --git a/src/pocketmine/item/Cake.php b/src/pocketmine/item/Cake.php index f21cdb075..709cf5f59 100644 --- a/src/pocketmine/item/Cake.php +++ b/src/pocketmine/item/Cake.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class Cake extends Item{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::CAKE_BLOCK); + $this->block = Block::get(Block::CAKE_BLOCK); parent::__construct(self::CAKE, $meta, $count, "Cake"); } diff --git a/src/pocketmine/item/Carrot.php b/src/pocketmine/item/Carrot.php index 2a739d7e5..e22c41b7f 100644 --- a/src/pocketmine/item/Carrot.php +++ b/src/pocketmine/item/Carrot.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class Carrot extends Food{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::CARROT_BLOCK); + $this->block = Block::get(Block::CARROT_BLOCK); parent::__construct(self::CARROT, $meta, $count, "Carrot"); } diff --git a/src/pocketmine/item/FlowerPot.php b/src/pocketmine/item/FlowerPot.php index 5423e8c75..2c0136bc7 100644 --- a/src/pocketmine/item/FlowerPot.php +++ b/src/pocketmine/item/FlowerPot.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class FlowerPot extends Item{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::FLOWER_POT_BLOCK); + $this->block = Block::get(Block::FLOWER_POT_BLOCK); parent::__construct(self::FLOWER_POT, $meta, $count, "Flower Pot"); } } \ No newline at end of file diff --git a/src/pocketmine/item/IronDoor.php b/src/pocketmine/item/IronDoor.php index 5094cc894..a58cf3120 100644 --- a/src/pocketmine/item/IronDoor.php +++ b/src/pocketmine/item/IronDoor.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class IronDoor extends Item{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::IRON_DOOR_BLOCK); + $this->block = Block::get(Block::IRON_DOOR_BLOCK); parent::__construct(self::IRON_DOOR, $meta, $count, "Iron Door"); } diff --git a/src/pocketmine/item/MelonSeeds.php b/src/pocketmine/item/MelonSeeds.php index f5bc14935..050808a59 100644 --- a/src/pocketmine/item/MelonSeeds.php +++ b/src/pocketmine/item/MelonSeeds.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class MelonSeeds extends Item{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::MELON_STEM); + $this->block = Block::get(Block::MELON_STEM); parent::__construct(self::MELON_SEEDS, $meta, $count, "Melon Seeds"); } } \ No newline at end of file diff --git a/src/pocketmine/item/Potato.php b/src/pocketmine/item/Potato.php index ee8b2b799..f5018f5fe 100644 --- a/src/pocketmine/item/Potato.php +++ b/src/pocketmine/item/Potato.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class Potato extends Food{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::POTATO_BLOCK); + $this->block = Block::get(Block::POTATO_BLOCK); parent::__construct(self::POTATO, $meta, $count, "Potato"); } diff --git a/src/pocketmine/item/PumpkinSeeds.php b/src/pocketmine/item/PumpkinSeeds.php index 35dc7f25e..92d20a225 100644 --- a/src/pocketmine/item/PumpkinSeeds.php +++ b/src/pocketmine/item/PumpkinSeeds.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class PumpkinSeeds extends Item{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::PUMPKIN_STEM); + $this->block = Block::get(Block::PUMPKIN_STEM); parent::__construct(self::PUMPKIN_SEEDS, $meta, $count, "Pumpkin Seeds"); } } \ No newline at end of file diff --git a/src/pocketmine/item/Sign.php b/src/pocketmine/item/Sign.php index 1b1be25ab..90c6bfb41 100644 --- a/src/pocketmine/item/Sign.php +++ b/src/pocketmine/item/Sign.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class Sign extends Item{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::SIGN_POST); + $this->block = Block::get(Block::SIGN_POST); parent::__construct(self::SIGN, $meta, $count, "Sign"); } diff --git a/src/pocketmine/item/Skull.php b/src/pocketmine/item/Skull.php index 850ff4ed6..daa4dac60 100644 --- a/src/pocketmine/item/Skull.php +++ b/src/pocketmine/item/Skull.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class Skull extends Item{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::SKULL_BLOCK); + $this->block = Block::get(Block::SKULL_BLOCK); parent::__construct(self::SKULL, $meta, $count, "Mob Head"); } } \ No newline at end of file diff --git a/src/pocketmine/item/Sugarcane.php b/src/pocketmine/item/Sugarcane.php index a62b21c06..f18aa96e0 100644 --- a/src/pocketmine/item/Sugarcane.php +++ b/src/pocketmine/item/Sugarcane.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class Sugarcane extends Item{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::SUGARCANE_BLOCK); + $this->block = Block::get(Block::SUGARCANE_BLOCK); parent::__construct(self::SUGARCANE, $meta, $count, "Sugar Cane"); } } \ No newline at end of file diff --git a/src/pocketmine/item/WheatSeeds.php b/src/pocketmine/item/WheatSeeds.php index 4c6aee052..5fb302a9f 100644 --- a/src/pocketmine/item/WheatSeeds.php +++ b/src/pocketmine/item/WheatSeeds.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class WheatSeeds extends Item{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::WHEAT_BLOCK); + $this->block = Block::get(Block::WHEAT_BLOCK); parent::__construct(self::WHEAT_SEEDS, $meta, $count, "Wheat Seeds"); } } \ No newline at end of file diff --git a/src/pocketmine/item/WoodenDoor.php b/src/pocketmine/item/WoodenDoor.php index 99b014884..bad8b9834 100644 --- a/src/pocketmine/item/WoodenDoor.php +++ b/src/pocketmine/item/WoodenDoor.php @@ -27,7 +27,7 @@ use pocketmine\block\Block; class WoodenDoor extends Item{ public function __construct($meta = 0, $count = 1){ - $this->block = Block::get(Item::WOODEN_DOOR_BLOCK); + $this->block = Block::get(Block::WOODEN_DOOR_BLOCK); parent::__construct(self::WOODEN_DOOR, $meta, $count, "Wooden Door"); } diff --git a/src/pocketmine/tile/Furnace.php b/src/pocketmine/tile/Furnace.php index 912a47be6..966701a74 100644 --- a/src/pocketmine/tile/Furnace.php +++ b/src/pocketmine/tile/Furnace.php @@ -191,7 +191,7 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{ $this->namedtag->BurnTime->setValue($ev->getBurnTime()); $this->namedtag->BurnTicks = new ShortTag("BurnTicks", 0); if($this->getBlock()->getId() === Item::FURNACE){ - $this->getLevel()->setBlock($this, Block::get(Item::BURNING_FURNACE, $this->getBlock()->getDamage()), true); + $this->getLevel()->setBlock($this, Block::get(Block::BURNING_FURNACE, $this->getBlock()->getDamage()), true); } if($this->namedtag->BurnTime->getValue() > 0 and $ev->isBurning()){ @@ -254,7 +254,7 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{ $ret = true; }else{ if($this->getBlock()->getId() === Item::BURNING_FURNACE){ - $this->getLevel()->setBlock($this, Block::get(Item::FURNACE, $this->getBlock()->getDamage()), true); + $this->getLevel()->setBlock($this, Block::get(Block::FURNACE, $this->getBlock()->getDamage()), true); } $this->namedtag->BurnTime->setValue(0); $this->namedtag->CookTime->setValue(0);