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

src/pocketmine/inventory/CraftingManager.php

@@ -57,22 +57,22 @@ class CraftingManager{
 				case 0:
 					// TODO: handle multiple result items
 					$first = $recipe["output"][0];
-					$result = new ShapelessRecipe(Item::get($first["id"], $first["damage"], $first["count"], $first["nbt"]));
+					$result = new ShapelessRecipe(Item::jsonDeserialize($first));
 
 					foreach($recipe["input"] as $ingredient){
-						$result->addIngredient(Item::get($ingredient["id"], $ingredient["damage"], $ingredient["count"], $first["nbt"]));
+						$result->addIngredient(Item::jsonDeserialize($ingredient));
 					}
 					$this->registerRecipe($result);
 					break;
 				case 1:
 					// TODO: handle multiple result items
 					$first = $recipe["output"][0];
-					$result = new ShapedRecipe(Item::get($first["id"], $first["damage"], $first["count"], $first["nbt"]), $recipe["height"], $recipe["width"]);
+					$result = new ShapedRecipe(Item::jsonDeserialize($first), $recipe["height"], $recipe["width"]);
 
 					$shape = array_chunk($recipe["input"], $recipe["width"]);
 					foreach($shape as $y => $row){
 						foreach($row as $x => $ingredient){
-							$result->addIngredient($x, $y, Item::get($ingredient["id"], ($ingredient["damage"] < 0 ? -1 : $ingredient["damage"]), $ingredient["count"], $ingredient["nbt"]));
+							$result->addIngredient($x, $y, Item::jsonDeserialize($ingredient));
 						}
 					}
 					$this->registerRecipe($result);
@@ -80,7 +80,7 @@ class CraftingManager{
 				case 2:
 				case 3:
 					$result = $recipe["output"];
-					$resultItem = Item::get($result["id"], $result["damage"], $result["count"], $result["nbt"]);
+					$resultItem = Item::jsonDeserialize($result);
 					$this->registerRecipe(new FurnaceRecipe($resultItem, Item::get($recipe["inputId"], $recipe["inputDamage"] ?? -1, 1)));
 					break;
 				default:

src/pocketmine/item/Item.php

@@ -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,
+			"id" => $this->getId(),
-			"damage" => $this->meta,
+			"damage" => $this->getDamage(),
-			"count" => $this->count, //TODO: separate items and stacks
+			"count" => $this->getCount(),
-			"nbt" => $this->tags
+			"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
 	 *