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

Changed NBT representation in JSON to hex, fix encoding problems with UTF-8

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-06 14:50:18 +01:00
parent 71e354cf1d
commit e4a5cb6021
4 changed files with 4272 additions and 3991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,7 +259,7 @@ class Item implements ItemIds, \JsonSerializable{
$creativeItems = new Config(Server::getInstance()->getFilePath() . "src/pocketmine/resources/creativeitems.json", Config::JSON, []);
foreach($creativeItems->getAll() as $data){
$item = Item::get($data["id"], $data["damage"], $data["count"], $data["nbt"]);
$item = Item::jsonDeserialize($data);
if($item->getName() === "Unknown"){
continue;
}
@ -1053,13 +1053,28 @@ class Item implements ItemIds, \JsonSerializable{
*/
final public function jsonSerialize(){
return [
"id" => $this->id,
"damage" => $this->meta,
"count" => $this->count, //TODO: separate items and stacks
"nbt" => $this->tags
"id" => $this->getId(),
"damage" => $this->getDamage(),
"count" => $this->getCount(),
"nbt_hex" => bin2hex($this->getCompoundTag())
];
}
/**
* Returns an Item from properties created in an array by {@link Item#jsonSerialize}
*
* @param array $data
* @return Item
*/
final public static function jsonDeserialize(array $data) : Item{
return Item::get(
(int) $data["id"],
(int) $data["damage"],
(int) $data["count"],
(string) ($data["nbt"] ?? hex2bin($data["nbt_hex"])) //`nbt` key might contain old raw data
);
}
/**
* Serializes the item to an NBT CompoundTag
*