mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 10:22:56 +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

10
src/pocketmine/inventory/CraftingManager.php
View File

@ -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: