Removed damage-table mess and added API methods Item->getAttackPoints() and Item->getDefensePoints()

src/pocketmine/Player.php

@@ -2232,35 +2232,10 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 						break;
 					}
 
-					$item = $this->inventory->getItemInHand();
+					$heldItem = $this->inventory->getItemInHand();
-					$damageTable = [
-						Item::WOODEN_SWORD => 4,
-						Item::GOLDEN_SWORD => 4,
-						Item::STONE_SWORD => 5,
-						Item::IRON_SWORD => 6,
-						Item::DIAMOND_SWORD => 7,
-
-						Item::WOODEN_AXE => 3,
-						Item::GOLDEN_AXE => 3,
-						Item::STONE_AXE => 3,
-						Item::IRON_AXE => 5,
-						Item::DIAMOND_AXE => 6,
-
-						Item::WOODEN_PICKAXE => 2,
-						Item::GOLDEN_PICKAXE => 2,
-						Item::STONE_PICKAXE => 3,
-						Item::IRON_PICKAXE => 4,
-						Item::DIAMOND_PICKAXE => 5,
-
-						Item::WOODEN_SHOVEL => 1,
-						Item::GOLDEN_SHOVEL => 1,
-						Item::STONE_SHOVEL => 2,
-						Item::IRON_SHOVEL => 3,
-						Item::DIAMOND_SHOVEL => 4,
-					];
 
 					$damage = [
-						EntityDamageEvent::MODIFIER_BASE => $damageTable[$item->getId()] ?? 1,
+						EntityDamageEvent::MODIFIER_BASE => $heldItem->getAttackPoints(),
 					];
 
 					if(!$this->canInteract($target, 8)){
@@ -2272,33 +2247,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 							$cancelled = true;
 						}
 
-						$armorValues = [
-							Item::LEATHER_CAP => 1,
-							Item::LEATHER_TUNIC => 3,
-							Item::LEATHER_PANTS => 2,
-							Item::LEATHER_BOOTS => 1,
-							Item::CHAINMAIL_HELMET => 1,
-							Item::CHAINMAIL_CHESTPLATE => 5,
-							Item::CHAINMAIL_LEGGINGS => 4,
-							Item::CHAINMAIL_BOOTS => 1,
-							Item::GOLDEN_HELMET => 1,
-							Item::GOLDEN_CHESTPLATE => 5,
-							Item::GOLDEN_LEGGINGS => 3,
-							Item::GOLDEN_BOOTS => 1,
-							Item::IRON_HELMET => 2,
-							Item::IRON_CHESTPLATE => 6,
-							Item::IRON_LEGGINGS => 5,
-							Item::IRON_BOOTS => 2,
-							Item::DIAMOND_HELMET => 3,
-							Item::DIAMOND_CHESTPLATE => 8,
-							Item::DIAMOND_LEGGINGS => 6,
-							Item::DIAMOND_BOOTS => 3,
-						];
 						$points = 0;
-						foreach($target->getInventory()->getArmorContents() as $index => $i){
+						foreach($target->getInventory()->getArmorContents() as $armorItem){
-							if(isset($armorValues[$i->getId()])){
+							$points += $armorItem->getDefensePoints();
-								$points += $armorValues[$i->getId()];
-							}
 						}
 
 						$damage[EntityDamageEvent::MODIFIER_ARMOR] = -floor($damage[EntityDamageEvent::MODIFIER_BASE] * $points * 0.04);
@@ -2312,18 +2263,18 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 					$target->attack($ev);
 
 					if($ev->isCancelled()){
-						if($item->isTool() and $this->isSurvival()){
+						if($heldItem->isTool() and $this->isSurvival()){
 							$this->inventory->sendContents($this);
 						}
 						break;
 					}
 
 					if($this->isSurvival()){
-						if($item->isTool()){
+						if($heldItem->isTool()){
-							if($item->useOn($target) and $item->getDamage() >= $item->getMaxDurability()){
+							if($heldItem->useOn($target) and $heldItem->getDamage() >= $heldItem->getMaxDurability()){
 								$this->inventory->setItemInHand(ItemFactory::get(Item::AIR, 0, 1));
 							}else{
-								$this->inventory->setItemInHand($item);
+								$this->inventory->setItemInHand($heldItem);
 							}
 						}
 

src/pocketmine/item/ChainBoots.php

@@ -28,4 +28,8 @@ class ChainBoots extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::CHAIN_BOOTS, $meta, "Chainmail Boots");
 	}
+
+	public function getDefensePoints() : int{
+		return 1;
+	}
 }

src/pocketmine/item/ChainChestplate.php

@@ -28,4 +28,8 @@ class ChainChestplate extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::CHAIN_CHESTPLATE, $meta, "Chain Chestplate");
 	}
+
+	public function getDefensePoints() : int{
+		return 5;
+	}
 }

src/pocketmine/item/ChainHelmet.php

@@ -28,4 +28,8 @@ class ChainHelmet extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::CHAIN_HELMET, $meta, "Chainmail Helmet");
 	}
+
+	public function getDefensePoints() : int{
+		return 2;
+	}
 }

src/pocketmine/item/ChainLeggings.php

@@ -28,4 +28,8 @@ class ChainLeggings extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::CHAIN_LEGGINGS, $meta, "Chain Leggings");
 	}
+
+	public function getDefensePoints() : int{
+		return 4;
+	}
 }

src/pocketmine/item/DiamondAxe.php

@@ -33,4 +33,7 @@ class DiamondAxe extends Tool{
 		return Tool::TIER_DIAMOND;
 	}
 
+	public function getAttackPoints() : int{
+		return 7;
+	}
 }

src/pocketmine/item/DiamondBoots.php

@@ -28,4 +28,8 @@ class DiamondBoots extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::DIAMOND_BOOTS, $meta, "Diamond Boots");
 	}
+
+	public function getDefensePoints() : int{
+		return 3;
+	}
 }

src/pocketmine/item/DiamondChestplate.php

@@ -28,4 +28,8 @@ class DiamondChestplate extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::DIAMOND_CHESTPLATE, $meta, "Diamond Chestplate");
 	}
+
+	public function getDefensePoints() : int{
+		return 8;
+	}
 }

src/pocketmine/item/DiamondHelmet.php

@@ -28,4 +28,8 @@ class DiamondHelmet extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::DIAMOND_HELMET, $meta, "Diamond Helmet");
 	}
+
+	public function getDefensePoints() : int{
+		return 3;
+	}
 }

src/pocketmine/item/DiamondLeggings.php

@@ -28,4 +28,8 @@ class DiamondLeggings extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::DIAMOND_LEGGINGS, $meta, "Diamond Leggings");
 	}
+
+	public function getDefensePoints() : int{
+		return 6;
+	}
 }

src/pocketmine/item/DiamondPickaxe.php

@@ -32,4 +32,8 @@ class DiamondPickaxe extends Tool{
 	public function isPickaxe(){
 		return Tool::TIER_DIAMOND;
 	}
+
+	public function getAttackPoints() : int{
+		return 6;
+	}
 }

src/pocketmine/item/DiamondShovel.php

@@ -32,4 +32,8 @@ class DiamondShovel extends Tool{
 	public function isShovel(){
 		return Tool::TIER_DIAMOND;
 	}
+
+	public function getAttackPoints() : int{
+		return 5;
+	}
 }

src/pocketmine/item/DiamondSword.php

@@ -32,4 +32,8 @@ class DiamondSword extends Tool{
 	public function isSword(){
 		return Tool::TIER_DIAMOND;
 	}
+
+	public function getAttackPoints() : int{
+		return 8;
+	}
 }

src/pocketmine/item/GoldAxe.php

@@ -32,4 +32,8 @@ class GoldAxe extends Tool{
 	public function isAxe(){
 		return Tool::TIER_GOLD;
 	}
+
+	public function getAttackPoints() : int{
+		return 4;
+	}
 }

src/pocketmine/item/GoldBoots.php

@@ -28,4 +28,8 @@ class GoldBoots extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::GOLD_BOOTS, $meta, "Gold Boots");
 	}
+
+	public function getDefensePoints() : int{
+		return 1;
+	}
 }

src/pocketmine/item/GoldChestplate.php

@@ -28,4 +28,8 @@ class GoldChestplate extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::GOLD_CHESTPLATE, $meta, "Gold Chestplate");
 	}
+
+	public function getDefensePoints() : int{
+		return 5;
+	}
 }

src/pocketmine/item/GoldHelmet.php

@@ -28,4 +28,8 @@ class GoldHelmet extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::GOLD_HELMET, $meta, "Gold Helmet");
 	}
+
+	public function getDefensePoints() : int{
+		return 2;
+	}
 }

src/pocketmine/item/GoldLeggings.php

@@ -28,4 +28,8 @@ class GoldLeggings extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::GOLD_LEGGINGS, $meta, "Gold Leggings");
 	}
+
+	public function getDefensePoints() : int{
+		return 3;
+	}
 }

src/pocketmine/item/GoldPickaxe.php

@@ -32,4 +32,8 @@ class GoldPickaxe extends Tool{
 	public function isPickaxe(){
 		return Tool::TIER_GOLD;
 	}
+
+	public function getAttackPoints() : int{
+		return 3;
+	}
 }

src/pocketmine/item/GoldShovel.php

@@ -32,4 +32,8 @@ class GoldShovel extends Tool{
 	public function isShovel(){
 		return Tool::TIER_GOLD;
 	}
+
+	public function getAttackPoints() : int{
+		return 2;
+	}
 }

src/pocketmine/item/GoldSword.php

@@ -32,4 +32,8 @@ class GoldSword extends Tool{
 	public function isSword(){
 		return Tool::TIER_GOLD;
 	}
+
+	public function getAttackPoints() : int{
+		return 5;
+	}
 }

src/pocketmine/item/IronAxe.php

@@ -32,4 +32,8 @@ class IronAxe extends Tool{
 	public function isAxe(){
 		return Tool::TIER_IRON;
 	}
+
+	public function getAttackPoints() : int{
+		return 6;
+	}
 }

src/pocketmine/item/IronBoots.php

@@ -28,4 +28,8 @@ class IronBoots extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::IRON_BOOTS, $meta, "Iron Boots");
 	}
+
+	public function getDefensePoints() : int{
+		return 2;
+	}
 }

src/pocketmine/item/IronChestplate.php

@@ -28,4 +28,8 @@ class IronChestplate extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::IRON_CHESTPLATE, $meta, "Iron Chestplate");
 	}
+
+	public function getDefensePoints() : int{
+		return 6;
+	}
 }

src/pocketmine/item/IronHelmet.php

@@ -28,4 +28,8 @@ class IronHelmet extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::IRON_HELMET, $meta, "Iron Helmet");
 	}
+
+	public function getDefensePoints() : int{
+		return 2;
+	}
 }

src/pocketmine/item/IronLeggings.php

@@ -28,4 +28,8 @@ class IronLeggings extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::IRON_LEGGINGS, $meta, "Iron Leggings");
 	}
+
+	public function getDefensePoints() : int{
+		return 5;
+	}
 }

src/pocketmine/item/IronPickaxe.php

@@ -32,4 +32,8 @@ class IronPickaxe extends Tool{
 	public function isPickaxe(){
 		return Tool::TIER_IRON;
 	}
+
+	public function getAttackPoints() : int{
+		return 5;
+	}
 }

src/pocketmine/item/IronShovel.php

@@ -32,4 +32,8 @@ class IronShovel extends Tool{
 	public function isShovel(){
 		return Tool::TIER_IRON;
 	}
+
+	public function getAttackPoints() : int{
+		return 4;
+	}
 }

src/pocketmine/item/IronSword.php

@@ -32,4 +32,8 @@ class IronSword extends Tool{
 	public function isSword(){
 		return Tool::TIER_IRON;
 	}
+
+	public function getAttackPoints() : int{
+		return 7;
+	}
 }

src/pocketmine/item/Item.php

@@ -746,6 +746,22 @@ class Item implements ItemIds, \JsonSerializable{
 		return 0;
 	}
 
+	/**
+	 * Returns how many points of damage this item will deal to an entity when used as a weapon.
+	 * @return int
+	 */
+	public function getAttackPoints() : int{
+		return 1;
+	}
+
+	/**
+	 * Returns how many armor points can be gained by wearing this item.
+	 * @return int
+	 */
+	public function getDefensePoints() : int{
+		return 0;
+	}
+
 	/**
 	 * @param Entity|Block $object
 	 *

src/pocketmine/item/LeatherBoots.php

@@ -28,4 +28,8 @@ class LeatherBoots extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::LEATHER_BOOTS, $meta, "Leather Boots");
 	}
+
+	public function getDefensePoints() : int{
+		return 1;
+	}
 }

src/pocketmine/item/LeatherCap.php

@@ -28,4 +28,8 @@ class LeatherCap extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::LEATHER_CAP, $meta, "Leather Cap");
 	}
+
+	public function getDefensePoints() : int{
+		return 1;
+	}
 }

src/pocketmine/item/LeatherPants.php

@@ -28,4 +28,8 @@ class LeatherPants extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::LEATHER_PANTS, $meta, "Leather Pants");
 	}
+
+	public function getDefensePoints() : int{
+		return 2;
+	}
 }

src/pocketmine/item/LeatherTunic.php

@@ -28,4 +28,8 @@ class LeatherTunic extends Armor{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::LEATHER_TUNIC, $meta, "Leather Tunic");
 	}
+
+	public function getDefensePoints() : int{
+		return 3;
+	}
 }

src/pocketmine/item/StoneAxe.php

@@ -33,4 +33,8 @@ class StoneAxe extends Tool{
 	public function isAxe(){
 		return Tool::TIER_STONE;
 	}
+
+	public function getAttackPoints() : int{
+		return 5;
+	}
 }

src/pocketmine/item/StonePickaxe.php

@@ -32,4 +32,8 @@ class StonePickaxe extends Tool{
 	public function isPickaxe(){
 		return Tool::TIER_STONE;
 	}
+
+	public function getAttackPoints() : int{
+		return 4;
+	}
 }

src/pocketmine/item/StoneShovel.php

@@ -32,4 +32,8 @@ class StoneShovel extends Tool{
 	public function isShovel(){
 		return Tool::TIER_STONE;
 	}
+
+	public function getAttackPoints() : int{
+		return 3;
+	}
 }

src/pocketmine/item/StoneSword.php

@@ -32,4 +32,8 @@ class StoneSword extends Tool{
 	public function isSword(){
 		return Tool::TIER_STONE;
 	}
+
+	public function getAttackPoints() : int{
+		return 6;
+	}
 }

src/pocketmine/item/WoodenAxe.php

@@ -36,4 +36,8 @@ class WoodenAxe extends Tool{
 	public function getFuelTime() : int{
 		return 200;
 	}
+
+	public function getAttackPoints() : int{
+		return 4;
+	}
 }

src/pocketmine/item/WoodenPickaxe.php

@@ -36,4 +36,8 @@ class WoodenPickaxe extends Tool{
 	public function getFuelTime() : int{
 		return 200;
 	}
+
+	public function getAttackPoints() : int{
+		return 3;
+	}
 }

src/pocketmine/item/WoodenShovel.php

@@ -36,4 +36,8 @@ class WoodenShovel extends Tool{
 	public function getFuelTime() : int{
 		return 200;
 	}
+
+	public function getAttackPoints() : int{
+		return 2;
+	}
 }

src/pocketmine/item/WoodenSword.php

@@ -36,4 +36,8 @@ class WoodenSword extends Tool{
 	public function getFuelTime() : int{
 		return 200;
 	}
+
+	public function getAttackPoints() : int{
+		return 5;
+	}
 }