From dda9c598f15fa0435c08734a4d3c70151f8b4e18 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Tue, 7 Oct 2014 10:16:05 +0200 Subject: [PATCH] Added new Tool type selection constants --- src/pocketmine/item/DiamondAxe.php | 4 ++ src/pocketmine/item/DiamondHoe.php | 3 + src/pocketmine/item/DiamondPickaxe.php | 3 + src/pocketmine/item/DiamondShovel.php | 3 + src/pocketmine/item/DiamondSword.php | 3 + src/pocketmine/item/GoldAxe.php | 3 + src/pocketmine/item/GoldHoe.php | 3 + src/pocketmine/item/GoldPickaxe.php | 3 + src/pocketmine/item/GoldShovel.php | 3 + src/pocketmine/item/GoldSword.php | 3 + src/pocketmine/item/IronAxe.php | 3 + src/pocketmine/item/IronHoe.php | 3 + src/pocketmine/item/IronPickaxe.php | 3 + src/pocketmine/item/IronShovel.php | 3 + src/pocketmine/item/IronSword.php | 3 + src/pocketmine/item/StoneAxe.php | 4 ++ src/pocketmine/item/StoneHoe.php | 3 + src/pocketmine/item/StonePickaxe.php | 3 + src/pocketmine/item/StoneShovel.php | 3 + src/pocketmine/item/StoneSword.php | 3 + src/pocketmine/item/Tool.php | 84 ++++---------------------- src/pocketmine/item/WoodenAxe.php | 3 + src/pocketmine/item/WoodenHoe.php | 3 + src/pocketmine/item/WoodenPickaxe.php | 3 + src/pocketmine/item/WoodenShovel.php | 3 + src/pocketmine/item/WoodenSword.php | 3 + 26 files changed, 90 insertions(+), 71 deletions(-) diff --git a/src/pocketmine/item/DiamondAxe.php b/src/pocketmine/item/DiamondAxe.php index 300788e1a..2e0af7ae4 100644 --- a/src/pocketmine/item/DiamondAxe.php +++ b/src/pocketmine/item/DiamondAxe.php @@ -27,4 +27,8 @@ class DiamondAxe extends Tool{ parent::__construct(self::DIAMOND_AXE, $meta, $count, "Diamond Axe"); } + public function isAxe(){ + return Tool::TIER_DIAMOND; + } + } \ No newline at end of file diff --git a/src/pocketmine/item/DiamondHoe.php b/src/pocketmine/item/DiamondHoe.php index 1f9b69cfc..da514885f 100644 --- a/src/pocketmine/item/DiamondHoe.php +++ b/src/pocketmine/item/DiamondHoe.php @@ -27,4 +27,7 @@ class DiamondHoe extends Tool{ parent::__construct(self::DIAMOND_HOE, $meta, $count, "Diamond Hoe"); } + public function isHoe(){ + return Tool::TIER_DIAMOND; + } } \ No newline at end of file diff --git a/src/pocketmine/item/DiamondPickaxe.php b/src/pocketmine/item/DiamondPickaxe.php index e75a3429c..a5c4f6284 100644 --- a/src/pocketmine/item/DiamondPickaxe.php +++ b/src/pocketmine/item/DiamondPickaxe.php @@ -27,4 +27,7 @@ class DiamondPickaxe extends Tool{ parent::__construct(self::DIAMOND_PICKAXE, $meta, $count, "Diamond Pickaxe"); } + public function isPickaxe(){ + return Tool::TIER_DIAMOND; + } } diff --git a/src/pocketmine/item/DiamondShovel.php b/src/pocketmine/item/DiamondShovel.php index c0b41697b..ce96ed609 100644 --- a/src/pocketmine/item/DiamondShovel.php +++ b/src/pocketmine/item/DiamondShovel.php @@ -27,4 +27,7 @@ class DiamondShovel extends Tool{ parent::__construct(self::DIAMOND_SHOVEL, $meta, $count, "Diamond Shovel"); } + public function isShovel(){ + return Tool::TIER_DIAMOND; + } } diff --git a/src/pocketmine/item/DiamondSword.php b/src/pocketmine/item/DiamondSword.php index fb0a5345d..62454f72e 100644 --- a/src/pocketmine/item/DiamondSword.php +++ b/src/pocketmine/item/DiamondSword.php @@ -27,4 +27,7 @@ class DiamondSword extends Tool{ parent::__construct(self::DIAMOND_SWORD, $meta, $count, "Diamond Sword"); } + public function isSword(){ + return Tool::TIER_DIAMOND; + } } diff --git a/src/pocketmine/item/GoldAxe.php b/src/pocketmine/item/GoldAxe.php index b12fbd8e1..36725812b 100644 --- a/src/pocketmine/item/GoldAxe.php +++ b/src/pocketmine/item/GoldAxe.php @@ -27,4 +27,7 @@ class GoldAxe extends Tool{ parent::__construct(self::GOLD_AXE, $meta, $count, "Gold Axe"); } + public function isAxe(){ + return Tool::TIER_GOLD; + } } \ No newline at end of file diff --git a/src/pocketmine/item/GoldHoe.php b/src/pocketmine/item/GoldHoe.php index 3213d0145..4dcd3113a 100644 --- a/src/pocketmine/item/GoldHoe.php +++ b/src/pocketmine/item/GoldHoe.php @@ -27,4 +27,7 @@ class GoldHoe extends Tool{ parent::__construct(self::GOLD_HOE, $meta, $count, "Gold Hoe"); } + public function isHoe(){ + return Tool::TIER_GOLD; + } } \ No newline at end of file diff --git a/src/pocketmine/item/GoldPickaxe.php b/src/pocketmine/item/GoldPickaxe.php index b6cade921..869168f2d 100644 --- a/src/pocketmine/item/GoldPickaxe.php +++ b/src/pocketmine/item/GoldPickaxe.php @@ -27,4 +27,7 @@ class GoldPickaxe extends Tool{ parent::__construct(self::GOLD_PICKAXE, $meta, $count, "Gold Pickaxe"); } + public function isPickaxe(){ + return Tool::TIER_GOLD; + } } diff --git a/src/pocketmine/item/GoldShovel.php b/src/pocketmine/item/GoldShovel.php index c2e9b4fd9..b4107c532 100644 --- a/src/pocketmine/item/GoldShovel.php +++ b/src/pocketmine/item/GoldShovel.php @@ -27,4 +27,7 @@ class GoldShovel extends Tool{ parent::__construct(self::GOLD_SHOVEL, $meta, $count, "Gold Shovel"); } + public function isShovel(){ + return Tool::TIER_GOLD; + } } diff --git a/src/pocketmine/item/GoldSword.php b/src/pocketmine/item/GoldSword.php index 0004d1769..40d17e806 100644 --- a/src/pocketmine/item/GoldSword.php +++ b/src/pocketmine/item/GoldSword.php @@ -27,4 +27,7 @@ class GoldSword extends Tool{ parent::__construct(self::GOLD_SWORD, $meta, $count, "Gold Sword"); } + public function isSword(){ + return Tool::TIER_GOLD; + } } diff --git a/src/pocketmine/item/IronAxe.php b/src/pocketmine/item/IronAxe.php index b9d356c62..f853b4fc9 100644 --- a/src/pocketmine/item/IronAxe.php +++ b/src/pocketmine/item/IronAxe.php @@ -27,4 +27,7 @@ class IronAxe extends Tool{ parent::__construct(self::IRON_AXE, $meta, $count, "Iron Axe"); } + public function isAxe(){ + return Tool::TIER_IRON; + } } \ No newline at end of file diff --git a/src/pocketmine/item/IronHoe.php b/src/pocketmine/item/IronHoe.php index 982b5a1f2..e9064e64b 100644 --- a/src/pocketmine/item/IronHoe.php +++ b/src/pocketmine/item/IronHoe.php @@ -27,4 +27,7 @@ class IronHoe extends Tool{ parent::__construct(self::IRON_HOE, $meta, $count, "Iron Hoe"); } + public function isHoe(){ + return Tool::TIER_IRON; + } } \ No newline at end of file diff --git a/src/pocketmine/item/IronPickaxe.php b/src/pocketmine/item/IronPickaxe.php index 5aea9973b..d6000daa0 100644 --- a/src/pocketmine/item/IronPickaxe.php +++ b/src/pocketmine/item/IronPickaxe.php @@ -27,4 +27,7 @@ class IronPickaxe extends Tool{ parent::__construct(self::IRON_PICKAXE, $meta, $count, "Iron Pickaxe"); } + public function isPickaxe(){ + return Tool::TIER_IRON; + } } \ No newline at end of file diff --git a/src/pocketmine/item/IronShovel.php b/src/pocketmine/item/IronShovel.php index 4a22ba04f..9dfefac83 100644 --- a/src/pocketmine/item/IronShovel.php +++ b/src/pocketmine/item/IronShovel.php @@ -27,4 +27,7 @@ class IronShovel extends Tool{ parent::__construct(self::IRON_SHOVEL, $meta, $count, "Iron Shovel"); } + public function isShovel(){ + return Tool::TIER_IRON; + } } \ No newline at end of file diff --git a/src/pocketmine/item/IronSword.php b/src/pocketmine/item/IronSword.php index cac2bd730..13c3025c0 100644 --- a/src/pocketmine/item/IronSword.php +++ b/src/pocketmine/item/IronSword.php @@ -27,4 +27,7 @@ class IronSword extends Tool{ parent::__construct(self::IRON_SWORD, $meta, $count, "Iron Sword"); } + public function isSword(){ + return Tool::TIER_IRON; + } } \ No newline at end of file diff --git a/src/pocketmine/item/StoneAxe.php b/src/pocketmine/item/StoneAxe.php index 986287b07..9be7983f9 100644 --- a/src/pocketmine/item/StoneAxe.php +++ b/src/pocketmine/item/StoneAxe.php @@ -27,4 +27,8 @@ class StoneAxe extends Tool{ parent::__construct(self::STONE_AXE, $meta, $count, "Stone Axe"); } + + public function isAxe(){ + return Tool::TIER_STONE; + } } \ No newline at end of file diff --git a/src/pocketmine/item/StoneHoe.php b/src/pocketmine/item/StoneHoe.php index f8854d728..610bf1e9b 100644 --- a/src/pocketmine/item/StoneHoe.php +++ b/src/pocketmine/item/StoneHoe.php @@ -27,4 +27,7 @@ class StoneHoe extends Tool{ parent::__construct(self::STONE_HOE, $meta, $count, "Stone Hoe"); } + public function isHoe(){ + return Tool::TIER_STONE; + } } \ No newline at end of file diff --git a/src/pocketmine/item/StonePickaxe.php b/src/pocketmine/item/StonePickaxe.php index a87641c69..60f4ed462 100644 --- a/src/pocketmine/item/StonePickaxe.php +++ b/src/pocketmine/item/StonePickaxe.php @@ -27,4 +27,7 @@ class StonePickaxe extends Tool{ parent::__construct(self::STONE_PICKAXE, $meta, $count, "Stone Pickaxe"); } + public function isPickaxe(){ + return Tool::TIER_IRON; + } } diff --git a/src/pocketmine/item/StoneShovel.php b/src/pocketmine/item/StoneShovel.php index d836892c2..40f50e993 100644 --- a/src/pocketmine/item/StoneShovel.php +++ b/src/pocketmine/item/StoneShovel.php @@ -27,4 +27,7 @@ class StoneShovel extends Tool{ parent::__construct(self::STONE_SHOVEL, $meta, $count, "Stone Shovel"); } + public function isShovel(){ + return Tool::TIER_STONE; + } } diff --git a/src/pocketmine/item/StoneSword.php b/src/pocketmine/item/StoneSword.php index 583289163..4a499631d 100644 --- a/src/pocketmine/item/StoneSword.php +++ b/src/pocketmine/item/StoneSword.php @@ -27,4 +27,7 @@ class StoneSword extends Tool{ parent::__construct(self::STONE_SWORD, $meta, $count, "Stone Sword"); } + public function isSword(){ + return Tool::TIER_STONE; + } } diff --git a/src/pocketmine/item/Tool.php b/src/pocketmine/item/Tool.php index 30016b2b3..3c8f0e645 100644 --- a/src/pocketmine/item/Tool.php +++ b/src/pocketmine/item/Tool.php @@ -26,6 +26,11 @@ use pocketmine\block\Block; use pocketmine\entity\Entity; abstract class Tool extends Item{ + const TIER_WOODEN = 1; + const TIER_GOLD = 2; + const TIER_STONE = 3; + const TIER_IRON = 4; + const TIER_DIAMOND = 5; public function __construct($id, $meta = 0, $count = 1, $name = "Unknown"){ parent::__construct($id, $meta, $count, $name); @@ -87,84 +92,23 @@ abstract class Tool extends Item{ } public function isPickaxe(){ - switch($this->id){ - case self::WOODEN_PICKAXE: - return 1; - case self::STONE_PICKAXE: - return 3; - case self::IRON_PICKAXE: - return 4; - case self::DIAMOND_PICKAXE: - return 5; - case self::GOLD_PICKAXE: - return 2; - default: - return false; - } + return false; } - final public function isAxe(){ - switch($this->id){ - case self::IRON_AXE: - return 4; - case self::WOODEN_AXE: - return 1; - case self::STONE_AXE: - return 3; - case self::DIAMOND_AXE: - return 5; - case self::GOLD_AXE: - return 2; - default: - return false; - } + public function isAxe(){ + return false; } - final public function isSword(){ - switch($this->id){ - case self::IRON_SWORD: - return 4; - case self::WOODEN_SWORD: - return 1; - case self::STONE_SWORD: - return 3; - case self::DIAMOND_SWORD: - return 5; - case self::GOLD_SWORD: - return 2; - default: - return false; - } + public function isSword(){ + return false; } - final public function isShovel(){ - switch($this->id){ - case self::IRON_SHOVEL: - return 4; - case self::WOODEN_SHOVEL: - return 1; - case self::STONE_SHOVEL: - return 3; - case self::DIAMOND_SHOVEL: - return 5; - case self::GOLD_SHOVEL: - return 2; - default: - return false; - } + public function isShovel(){ + return false; } public function isHoe(){ - switch($this->id){ - case self::IRON_HOE: - case self::WOODEN_HOE: - case self::STONE_HOE: - case self::DIAMOND_HOE: - case self::GOLD_HOE: - return true; - default: - return false; - } + return false; } public function isShears(){ @@ -172,8 +116,6 @@ abstract class Tool extends Item{ } public function isTool(){ - return false; - return ($this->id === self::FLINT_STEEL or $this->id === self::SHEARS or $this->id === self::BOW or $this->isPickaxe() !== false or $this->isAxe() !== false or $this->isShovel() !== false or $this->isSword() !== false); } } \ No newline at end of file diff --git a/src/pocketmine/item/WoodenAxe.php b/src/pocketmine/item/WoodenAxe.php index b1ec05983..18f216087 100644 --- a/src/pocketmine/item/WoodenAxe.php +++ b/src/pocketmine/item/WoodenAxe.php @@ -27,4 +27,7 @@ class WoodenAxe extends Tool{ parent::__construct(self::WOODEN_AXE, $meta, $count, "Wooden Axe"); } + public function isAxe(){ + return Tool::TIER_WOODEN; + } } diff --git a/src/pocketmine/item/WoodenHoe.php b/src/pocketmine/item/WoodenHoe.php index 506f287b6..529056498 100644 --- a/src/pocketmine/item/WoodenHoe.php +++ b/src/pocketmine/item/WoodenHoe.php @@ -27,4 +27,7 @@ class WoodenHoe extends Tool{ parent::__construct(self::WOODEN_HOE, $meta, $count, "Wooden Hoe"); } + public function isHoe(){ + return Tool::TIER_WOODEN; + } } \ No newline at end of file diff --git a/src/pocketmine/item/WoodenPickaxe.php b/src/pocketmine/item/WoodenPickaxe.php index 2c288d18d..cca61bd09 100644 --- a/src/pocketmine/item/WoodenPickaxe.php +++ b/src/pocketmine/item/WoodenPickaxe.php @@ -27,4 +27,7 @@ class WoodenPickaxe extends Tool{ parent::__construct(self::WOODEN_PICKAXE, $meta, $count, "Wooden Pickaxe"); } + public function isPickaxe(){ + return Tool::TIER_WOODEN; + } } diff --git a/src/pocketmine/item/WoodenShovel.php b/src/pocketmine/item/WoodenShovel.php index 8e83ef1d6..d85a03487 100644 --- a/src/pocketmine/item/WoodenShovel.php +++ b/src/pocketmine/item/WoodenShovel.php @@ -27,4 +27,7 @@ class WoodenShovel extends Tool{ parent::__construct(self::WOODEN_SHOVEL, $meta, $count, "Wooden Shovel"); } + public function isShovel(){ + return Tool::TIER_WOODEN; + } } diff --git a/src/pocketmine/item/WoodenSword.php b/src/pocketmine/item/WoodenSword.php index 2fbe9cd6c..962f436af 100644 --- a/src/pocketmine/item/WoodenSword.php +++ b/src/pocketmine/item/WoodenSword.php @@ -27,4 +27,7 @@ class WoodenSword extends Tool{ parent::__construct(self::WOODEN_SWORD, $meta, $count, "Wooden Sword"); } + public function isSword(){ + return Tool::TIER_WOODEN; + } }