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-09-07 20:10:31 +01:00
parent ed61a68013 7dcd2592d4
commit cd6b780d31
181 changed files with 2372 additions and 3251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/crafting/CraftingManagerFromDataHelper.php
View File

@@ -211,10 +211,10 @@ final class CraftingManagerFromDataHelper{
foreach(self::loadJsonArrayOfObjectsFile(Path::join($directoryPath, 'shapeless_crafting.json'), ShapelessRecipeData::class) as $recipe){
$recipeType = match($recipe->block){
"crafting_table" => ShapelessRecipeType::CRAFTING(),
"stonecutter" => ShapelessRecipeType::STONECUTTER(),
"smithing_table" => ShapelessRecipeType::SMITHING(),
"cartography_table" => ShapelessRecipeType::CARTOGRAPHY(),
"crafting_table" => ShapelessRecipeType::CRAFTING,
"stonecutter" => ShapelessRecipeType::STONECUTTER,
"smithing_table" => ShapelessRecipeType::SMITHING,
"cartography_table" => ShapelessRecipeType::CARTOGRAPHY,
default => null
};
if($recipeType === null){
@@ -270,9 +270,9 @@ final class CraftingManagerFromDataHelper{
}
foreach(self::loadJsonArrayOfObjectsFile(Path::join($directoryPath, 'smelting.json'), FurnaceRecipeData::class) as $recipe){
$furnaceType = match ($recipe->block){
"furnace" => FurnaceType::FURNACE(),
"blast_furnace" => FurnaceType::BLAST_FURNACE(),
"smoker" => FurnaceType::SMOKER(),
"furnace" => FurnaceType::FURNACE,
"blast_furnace" => FurnaceType::BLAST_FURNACE,
"smoker" => FurnaceType::SMOKER,
//TODO: campfire
default => null
};