mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-06-13 06:55:29 +00:00
remove dead code
This commit is contained in:
parent
b4cb09fe5e
commit
11135c2fd8
@ -28,10 +28,8 @@ use pocketmine\item\Item;
|
|||||||
/**
|
/**
|
||||||
* This class is here to hold the result of an anvil crafting process.
|
* This class is here to hold the result of an anvil crafting process.
|
||||||
*/
|
*/
|
||||||
class AnvilCraftResult{
|
final class AnvilCraftResult{
|
||||||
/**
|
/**
|
||||||
* @param int $xpCost
|
|
||||||
* @param Item $output
|
|
||||||
* @param Item|null $sacrificeResult If the given item is considered as null (count <= 0), the value will be set to null.
|
* @param Item|null $sacrificeResult If the given item is considered as null (count <= 0), the value will be set to null.
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
|
@ -34,7 +34,6 @@ use function count;
|
|||||||
use function implode;
|
use function implode;
|
||||||
use function ksort;
|
use function ksort;
|
||||||
use function spl_object_id;
|
use function spl_object_id;
|
||||||
use function var_dump;
|
|
||||||
use const SORT_STRING;
|
use const SORT_STRING;
|
||||||
|
|
||||||
class CraftingManager{
|
class CraftingManager{
|
||||||
|
@ -25,12 +25,10 @@ namespace pocketmine\crafting;
|
|||||||
|
|
||||||
use pocketmine\item\Durable;
|
use pocketmine\item\Durable;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
use function ceil;
|
use function ceil;
|
||||||
use function floor;
|
use function floor;
|
||||||
use function max;
|
use function max;
|
||||||
use function min;
|
use function min;
|
||||||
use function var_dump;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represent a recipe that repair an item with a material in an anvil.
|
* Represent a recipe that repair an item with a material in an anvil.
|
||||||
@ -39,7 +37,8 @@ class MaterialRepairRecipe implements AnvilRecipe{
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
private RecipeIngredient $input,
|
private RecipeIngredient $input,
|
||||||
private RecipeIngredient $material
|
private RecipeIngredient $material
|
||||||
){ }
|
){
|
||||||
|
}
|
||||||
|
|
||||||
public function getInput() : RecipeIngredient{
|
public function getInput() : RecipeIngredient{
|
||||||
return $this->input;
|
return $this->input;
|
||||||
@ -55,10 +54,8 @@ class MaterialRepairRecipe implements AnvilRecipe{
|
|||||||
if($damage !== 0){
|
if($damage !== 0){
|
||||||
$quarter = min($damage, (int) floor($input->getMaxDurability() / 4));
|
$quarter = min($damage, (int) floor($input->getMaxDurability() / 4));
|
||||||
$numberRepair = min($material->getCount(), (int) ceil($damage / $quarter));
|
$numberRepair = min($material->getCount(), (int) ceil($damage / $quarter));
|
||||||
if($numberRepair > 0){
|
$damage -= $quarter * $numberRepair;
|
||||||
// TODO: remove the material
|
|
||||||
$damage -= $quarter * $numberRepair;
|
|
||||||
}
|
|
||||||
return new AnvilCraftResult(
|
return new AnvilCraftResult(
|
||||||
$numberRepair,
|
$numberRepair,
|
||||||
(clone $input)->setDamage(max(0, $damage)),
|
(clone $input)->setDamage(max(0, $damage)),
|
||||||
|
@ -34,7 +34,6 @@ use pocketmine\nbt\tag\IntTag;
|
|||||||
use pocketmine\player\Player;
|
use pocketmine\player\Player;
|
||||||
use pocketmine\utils\Binary;
|
use pocketmine\utils\Binary;
|
||||||
use pocketmine\utils\Utils;
|
use pocketmine\utils\Utils;
|
||||||
use function in_array;
|
|
||||||
use function mt_rand;
|
use function mt_rand;
|
||||||
|
|
||||||
class Armor extends Durable{
|
class Armor extends Durable{
|
||||||
@ -173,8 +172,4 @@ class Armor extends Durable{
|
|||||||
$tag->setInt(self::TAG_CUSTOM_COLOR, Binary::signInt($this->customColor->toARGB())) :
|
$tag->setInt(self::TAG_CUSTOM_COLOR, Binary::signInt($this->customColor->toARGB())) :
|
||||||
$tag->removeTag(self::TAG_CUSTOM_COLOR);
|
$tag->removeTag(self::TAG_CUSTOM_COLOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function isValidRepairMaterial(Item $material) : bool{
|
|
||||||
return in_array($material->getTypeId(), $this->armorInfo->getMaterial()->getRepairMaterials(), true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -27,13 +27,9 @@ use pocketmine\world\sound\Sound;
|
|||||||
|
|
||||||
class ArmorMaterial{
|
class ArmorMaterial{
|
||||||
|
|
||||||
/**
|
|
||||||
* @param int[] $repairMaterials
|
|
||||||
*/
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly int $enchantability,
|
private readonly int $enchantability,
|
||||||
private readonly ?Sound $equipSound = null,
|
private readonly ?Sound $equipSound = null
|
||||||
private readonly array $repairMaterials = []
|
|
||||||
){
|
){
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,13 +49,4 @@ class ArmorMaterial{
|
|||||||
public function getEquipSound() : ?Sound{
|
public function getEquipSound() : ?Sound{
|
||||||
return $this->equipSound;
|
return $this->equipSound;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the items that can be used to repair the armor
|
|
||||||
*
|
|
||||||
* @return int[]
|
|
||||||
*/
|
|
||||||
public function getRepairMaterials() : array{
|
|
||||||
return $this->repairMaterials;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -69,12 +69,12 @@ final class VanillaArmorMaterials{
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected static function setup() : void{
|
protected static function setup() : void{
|
||||||
self::register("leather", new ArmorMaterial(15, new ArmorEquipLeatherSound(), [ItemTypeIds::LEATHER]));
|
self::register("leather", new ArmorMaterial(15, new ArmorEquipLeatherSound()));
|
||||||
self::register("chainmail", new ArmorMaterial(12, new ArmorEquipChainSound()));
|
self::register("chainmail", new ArmorMaterial(12, new ArmorEquipChainSound()));
|
||||||
self::register("iron", new ArmorMaterial(9, new ArmorEquipIronSound(), [ItemTypeIds::IRON_INGOT]));
|
self::register("iron", new ArmorMaterial(9, new ArmorEquipIronSound()));
|
||||||
self::register("turtle", new ArmorMaterial(9, new ArmorEquipGenericSound(), [ItemTypeIds::SCUTE]));
|
self::register("turtle", new ArmorMaterial(9, new ArmorEquipGenericSound()));
|
||||||
self::register("gold", new ArmorMaterial(25, new ArmorEquipGoldSound(), [ItemTypeIds::GOLD_INGOT]));
|
self::register("gold", new ArmorMaterial(25, new ArmorEquipGoldSound()));
|
||||||
self::register("diamond", new ArmorMaterial(10, new ArmorEquipDiamondSound(), [ItemTypeIds::DIAMOND]));
|
self::register("diamond", new ArmorMaterial(10, new ArmorEquipDiamondSound()));
|
||||||
self::register("netherite", new ArmorMaterial(15, new ArmorEquipNetheriteSound(), [ItemTypeIds::NETHERITE_INGOT]));
|
self::register("netherite", new ArmorMaterial(15, new ArmorEquipNetheriteSound()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user