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

Updated creative and crafting data to 1.19

Browse Source
This commit is contained in:
Dylan K. Taylor
2022-07-04 20:28:07 +01:00
parent 59c5770cf2
commit 9f0b32e748
17 changed files with 592 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/inventory/CreativeInventory.php
View File

@ -23,13 +23,11 @@ declare(strict_types=1);
namespace pocketmine\inventory;
use pocketmine\data\SavedDataLoadingException;
use pocketmine\crafting\CraftingManagerFromDataHelper;
use pocketmine\crafting\json\ItemStackData;
use pocketmine\item\Item;
use pocketmine\utils\SingletonTrait;
use Webmozart\PathUtil\Path;
use function file_get_contents;
use function is_array;
use function json_decode;
final class CreativeInventory{
use SingletonTrait;
@ -38,18 +36,13 @@ final class CreativeInventory{
private array $creative = [];
private function __construct(){
$creativeItems = json_decode(file_get_contents(Path::join(\pocketmine\BEDROCK_DATA_PATH, "creativeitems.json")), true);
if(!is_array($creativeItems)){
throw new SavedDataLoadingException("Invalid creative items file, expected array as root type");
}
$creativeItems = CraftingManagerFromDataHelper::loadJsonArrayOfObjectsFile(
Path::join(\pocketmine\BEDROCK_DATA_PATH, "creativeitems.json"),
ItemStackData::class
);
foreach($creativeItems as $data){
if(!is_array($data)){
throw new SavedDataLoadingException("Invalid creative items file, expected array as item type");
}
try{
$item = Item::legacyJsonDeserialize($data);
}catch(SavedDataLoadingException){
$item = CraftingManagerFromDataHelper::deserializeItemStack($data);
if($item === null){
//unknown item
continue;
}