Refactored tool hierarchy

This commit is contained in:
Dylan K. Taylor
2017-11-24 10:36:31 +00:00
parent 3beccc47cd
commit 2088a43c56
71 changed files with 218 additions and 742 deletions

View File

@ -26,6 +26,7 @@ namespace pocketmine\block;
use pocketmine\inventory\AnvilInventory;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Vector3;
@ -107,7 +108,7 @@ class Anvil extends Fallable{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return [
ItemFactory::get($this->getItemId(), $this->getDamage() & 0x0c, 1)
];

View File

@ -29,6 +29,7 @@ namespace pocketmine\block;
use pocketmine\entity\Entity;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
use pocketmine\level\Level;
use pocketmine\level\MovingObjectPosition;
@ -230,19 +231,19 @@ class Block extends Position implements BlockIds, Metadatable{
($this->getToolType() === Tool::TYPE_SHOVEL and ($tier = $item->isShovel()) !== false)
){
switch($tier){
case Tool::TIER_WOODEN:
case TieredTool::TIER_WOODEN:
$base /= 2;
break;
case Tool::TIER_STONE:
case TieredTool::TIER_STONE:
$base /= 4;
break;
case Tool::TIER_IRON:
case TieredTool::TIER_IRON:
$base /= 6;
break;
case Tool::TIER_DIAMOND:
case TieredTool::TIER_DIAMOND:
$base /= 8;
break;
case Tool::TIER_GOLD:
case TieredTool::TIER_GOLD:
$base /= 12;
break;
}

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\block\utils\PillarRotationHelper;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
use pocketmine\math\Vector3;
use pocketmine\Player;
@ -59,7 +60,7 @@ class BoneBlock extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Bricks extends Solid{
@ -51,7 +52,7 @@ class Bricks extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
use pocketmine\math\Vector3;
use pocketmine\nbt\tag\StringTag;
@ -92,7 +93,7 @@ class BurningFurnace extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Coal extends Solid{
@ -47,7 +48,7 @@ class Coal extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class CoalOre extends Solid{
@ -48,7 +49,7 @@ class CoalOre extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return [
ItemFactory::get(Item::COAL, 0, 1)
];

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Cobblestone extends Solid{
@ -47,7 +48,7 @@ class Cobblestone extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\block\utils\ColorBlockMetaHelper;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Concrete extends Solid{
@ -48,7 +49,7 @@ class Concrete extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Diamond extends Solid{
@ -47,7 +48,7 @@ class Diamond extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_IRON){
if($item->isPickaxe() >= TieredTool::TIER_IRON){
return parent::getDrops($item);
}

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class DiamondOre extends Solid{
@ -48,7 +49,7 @@ class DiamondOre extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_IRON){
if($item->isPickaxe() >= TieredTool::TIER_IRON){
return [
ItemFactory::get(Item::DIAMOND, 0, 1)
];

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class DoubleStoneSlab extends DoubleSlab{
@ -43,7 +44,7 @@ class DoubleStoneSlab extends DoubleSlab{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Emerald extends Solid{
@ -47,7 +48,7 @@ class Emerald extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_IRON){
if($item->isPickaxe() >= TieredTool::TIER_IRON){
return parent::getDrops($item);
}

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class EmeraldOre extends Solid{
@ -48,7 +49,7 @@ class EmeraldOre extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_IRON){
if($item->isPickaxe() >= TieredTool::TIER_IRON){
return [
ItemFactory::get(Item::EMERALD, 0, 1)
];

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\inventory\EnchantInventory;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
use pocketmine\math\Vector3;
use pocketmine\Player;
@ -74,7 +75,7 @@ class EnchantingTable extends Transparent{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class EndStoneBricks extends Solid{
@ -47,7 +48,7 @@ class EndStoneBricks extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
use pocketmine\math\Vector3;
use pocketmine\Player;
@ -98,7 +99,7 @@ class EnderChest extends Chest{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return [ItemFactory::get(Item::OBSIDIAN, 0, 8)];
}

View File

@ -25,6 +25,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
use pocketmine\math\Vector3;
use pocketmine\Player;
@ -58,7 +59,7 @@ class GlazedTerracotta extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Gold extends Solid{
@ -47,7 +48,7 @@ class Gold extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_IRON){
if($item->isPickaxe() >= TieredTool::TIER_IRON){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class GoldOre extends Solid{
@ -47,7 +48,7 @@ class GoldOre extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_IRON){
if($item->isPickaxe() >= TieredTool::TIER_IRON){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Iron extends Solid{
@ -47,7 +48,7 @@ class Iron extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_STONE){
if($item->isPickaxe() >= TieredTool::TIER_STONE){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class IronBars extends Thin{
@ -51,7 +52,7 @@ class IronBars extends Thin{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class IronDoor extends Door{
@ -49,7 +50,7 @@ class IronDoor extends Door{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class IronOre extends Solid{
@ -47,7 +48,7 @@ class IronOre extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_STONE){
if($item->isPickaxe() >= TieredTool::TIER_STONE){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Lapis extends Solid{
@ -47,7 +48,7 @@ class Lapis extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_STONE){
if($item->isPickaxe() >= TieredTool::TIER_STONE){
return parent::getDrops($item);
}

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class LapisOre extends Solid{
@ -48,7 +49,7 @@ class LapisOre extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_STONE){
if($item->isPickaxe() >= TieredTool::TIER_STONE){
return [
ItemFactory::get(Item::DYE, 4, mt_rand(4, 8))
];

View File

@ -27,6 +27,7 @@ use pocketmine\entity\Entity;
use pocketmine\event\entity\EntityDamageByBlockEvent;
use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Magma extends Solid{
@ -65,7 +66,7 @@ class Magma extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class NetherBrick extends Solid{
@ -37,7 +38,7 @@ class NetherBrick extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class NetherBrickFence extends Fence{
@ -43,7 +44,7 @@ class NetherBrickFence extends Fence{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class NetherQuartzOre extends Solid{
@ -48,7 +49,7 @@ class NetherQuartzOre extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return [
ItemFactory::get(Item::QUARTZ, 0, 1)
];

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class NetherReactor extends Solid{
@ -52,7 +53,7 @@ class NetherReactor extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return [
ItemFactory::get(Item::IRON_INGOT, 0, 6),
ItemFactory::get(Item::DIAMOND, 0, 3)

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Netherrack extends Solid{
@ -47,7 +48,7 @@ class Netherrack extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Obsidian extends Solid{
@ -51,7 +52,7 @@ class Obsidian extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_DIAMOND){
if($item->isPickaxe() >= TieredTool::TIER_DIAMOND){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Prismarine extends Solid{
@ -60,7 +61,7 @@ class Prismarine extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\block\utils\PillarRotationHelper;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
use pocketmine\math\Vector3;
use pocketmine\Player;
@ -70,7 +71,7 @@ class Quartz extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Redstone extends Solid{
@ -47,7 +48,7 @@ class Redstone extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
use pocketmine\level\Level;
use pocketmine\math\Vector3;
@ -65,7 +66,7 @@ class RedstoneOre extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_IRON){
if($item->isPickaxe() >= TieredTool::TIER_IRON){
return [
ItemFactory::get(Item::REDSTONE_DUST, 0, mt_rand(4, 5))
];

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Sandstone extends Solid{
@ -60,7 +61,7 @@ class Sandstone extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Vector3;
@ -104,7 +105,7 @@ abstract class Stair extends Transparent{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Stone extends Solid{
@ -64,7 +65,7 @@ class Stone extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
if($this->getDamage() === self::NORMAL){
return [
ItemFactory::get(Item::COBBLESTONE, $this->getDamage(), 1)

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class StoneBricks extends Solid{
@ -57,7 +58,7 @@ class StoneBricks extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class StoneSlab extends Slab{
@ -65,7 +66,7 @@ class StoneSlab extends Slab{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
class Stonecutter extends Solid{
@ -43,7 +44,7 @@ class Stonecutter extends Solid{
}
public function getDrops(Item $item) : array{
if($item->isPickaxe() >= Tool::TIER_WOODEN){
if($item->isPickaxe() >= TieredTool::TIER_WOODEN){
return parent::getDrops($item);
}