mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-09 23:39:43 +00:00
Code Issues Projects Releases Wiki Activity

Item: remove misleading methods & premature optimization

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-03-03 12:36:46 +00:00
parent abbdd7efdd
commit fc9a61859a
1 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/pocketmine/item/Item.php
View File

@ -61,32 +61,6 @@ class Item implements ItemIds, \JsonSerializable{
public const TAG_DISPLAY_NAME = "Name"; public const TAG_DISPLAY_NAME = "Name";
public const TAG_DISPLAY_LORE = "Lore"; public const TAG_DISPLAY_LORE = "Lore";
/** @var LittleEndianNbtSerializer */
private static $cachedParser = null;
/**
* @param string $tag
*
* @return CompoundTag
* @throws NbtDataException
*/
private static function parseCompoundTag(string $tag) : CompoundTag{
if(self::$cachedParser === null){
self::$cachedParser = new LittleEndianNbtSerializer();
}
return self::$cachedParser->read($tag);
}
private static function writeCompoundTag(CompoundTag $tag) : string{
if(self::$cachedParser === null){
self::$cachedParser = new LittleEndianNbtSerializer();
}
return self::$cachedParser->write($tag);
}
/** /**
* Returns a new Item instance with the specified ID, damage, count and NBT. * Returns a new Item instance with the specified ID, damage, count and NBT.
* *
@ -841,7 +815,7 @@ class Item implements ItemIds, \JsonSerializable{
* @return string * @return string
*/ */
final public function __toString() : string{ final public function __toString() : string{
return "Item " . $this->name . " (" . $this->id . ":" . ($this->hasAnyDamageValue() ? "?" : $this->getMeta()) . ")x" . $this->count . ($this->hasNamedTag() ? " tags:" . base64_encode(self::writeCompoundTag($this->nbt)) : ""); return "Item " . $this->name . " (" . $this->id . ":" . ($this->hasAnyDamageValue() ? "?" : $this->getMeta()) . ")x" . $this->count . ($this->hasNamedTag() ? " tags:" . base64_encode((new LittleEndianNbtSerializer())->write($this->nbt)) : "");
} }
/** /**
@ -863,7 +837,7 @@ class Item implements ItemIds, \JsonSerializable{
} }
if($this->hasNamedTag()){ if($this->hasNamedTag()){
$data["nbt_b64"] = base64_encode(self::writeCompoundTag($this->getNamedTag())); $data["nbt_b64"] = base64_encode((new LittleEndianNbtSerializer())->write($this->getNamedTag()));
} }
return $data; return $data;
@ -875,6 +849,8 @@ class Item implements ItemIds, \JsonSerializable{
* @param array $data * @param array $data
* *
* @return Item * @return Item
* @throws NbtDataException
* @throws \InvalidArgumentException
*/ */
final public static function jsonDeserialize(array $data) : Item{ final public static function jsonDeserialize(array $data) : Item{
$nbt = ""; $nbt = "";
@ -888,7 +864,7 @@ class Item implements ItemIds, \JsonSerializable{
$nbt = base64_decode($data["nbt_b64"], true); $nbt = base64_decode($data["nbt_b64"], true);
} }
return ItemFactory::get( return ItemFactory::get(
(int) $data["id"], (int) ($data["damage"] ?? 0), (int) ($data["count"] ?? 1), $nbt !== "" ? self::parseCompoundTag($nbt) : null (int) $data["id"], (int) ($data["damage"] ?? 0), (int) ($data["count"] ?? 1), $nbt !== "" ? (new LittleEndianNbtSerializer())->read($nbt) : null
); );
} }