mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-17 19:50:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'minor-next' into major-next

Browse Source
This commit is contained in:
Dylan K. Taylor
2023-07-24 12:07:55 +01:00
parent b944205f60 43770313ba
commit 3c0e7ae492
55 changed files with 247 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/crafting/CraftingManagerFromDataHelper.php
View File

@@ -209,9 +209,6 @@ final class CraftingManagerFromDataHelper{
public static function make(string $directoryPath) : CraftingManager{
$result = new CraftingManager();
$ingredientDeserializerFunc = \Closure::fromCallable([self::class, "deserializeIngredient"]);
$itemDeserializerFunc = \Closure::fromCallable([self::class, 'deserializeItemStack']);
foreach(self::loadJsonArrayOfObjectsFile(Path::join($directoryPath, 'shapeless_crafting.json'), ShapelessRecipeData::class) as $recipe){
$recipeType = match($recipe->block){
"crafting_table" => ShapelessRecipeType::CRAFTING(),
@@ -225,7 +222,7 @@ final class CraftingManagerFromDataHelper{
}
$inputs = [];
foreach($recipe->input as $inputData){
$input = $ingredientDeserializerFunc($inputData);
$input = self::deserializeIngredient($inputData);
if($input === null){ //unknown input item
continue 2;
}
@@ -233,7 +230,7 @@ final class CraftingManagerFromDataHelper{
}
$outputs = [];
foreach($recipe->output as $outputData){
$output = $itemDeserializerFunc($outputData);
$output = self::deserializeItemStack($outputData);
if($output === null){ //unknown output item
continue 2;
}
@@ -251,7 +248,7 @@ final class CraftingManagerFromDataHelper{
}
$inputs = [];
foreach(Utils::stringifyKeys($recipe->input) as $symbol => $inputData){
$input = $ingredientDeserializerFunc($inputData);
$input = self::deserializeIngredient($inputData);
if($input === null){ //unknown input item
continue 2;
}
@@ -259,7 +256,7 @@ final class CraftingManagerFromDataHelper{
}
$outputs = [];
foreach($recipe->output as $outputData){
$output = $itemDeserializerFunc($outputData);
$output = self::deserializeItemStack($outputData);
if($output === null){ //unknown output item
continue 2;
}