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

Use Filesystem::fileGetContents() in more places

Browse Source
This commit is contained in:
Dylan K. Taylor
2022-12-25 18:26:53 +00:00
parent c89df7eb1c
commit 8fd4918429
9 changed files with 20 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/data/bedrock/ItemTagToIdMap.php
View File

@ -23,13 +23,12 @@ declare(strict_types=1);
namespace pocketmine\data\bedrock;
use pocketmine\errorhandler\ErrorToExceptionHandler;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\utils\Filesystem;
use pocketmine\utils\SingletonTrait;
use pocketmine\utils\Utils;
use Symfony\Component\Filesystem\Path;
use function array_keys;
use function file_get_contents;
use function gettype;
use function is_array;
use function is_string;
@ -46,7 +45,7 @@ final class ItemTagToIdMap{
use SingletonTrait;
private static function make() : self{
$map = json_decode(ErrorToExceptionHandler::trapAndRemoveFalse(fn() => file_get_contents(Path::join(BEDROCK_DATA_PATH, 'item_tags.json'))), true, flags: JSON_THROW_ON_ERROR);
$map = json_decode(Filesystem::fileGetContents(Path::join(BEDROCK_DATA_PATH, 'item_tags.json')), true, flags: JSON_THROW_ON_ERROR);
if(!is_array($map)){
throw new AssumptionFailedError("Invalid item tag map, expected array");
}

9
src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaUtils.php
View File

@ -27,16 +27,15 @@ use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModel;
use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModelBlockRemap;
use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModelTag;
use pocketmine\data\bedrock\block\upgrade\model\BlockStateUpgradeSchemaModelValueRemap;
use pocketmine\errorhandler\ErrorToExceptionHandler;
use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\IntTag;
use pocketmine\nbt\tag\StringTag;
use pocketmine\nbt\tag\Tag;
use pocketmine\utils\Filesystem;
use pocketmine\utils\Utils;
use Symfony\Component\Filesystem\Path;
use function array_map;
use function count;
use function file_get_contents;
use function get_debug_type;
use function gettype;
use function implode;
@ -275,11 +274,7 @@ final class BlockStateUpgradeSchemaUtils{
$fullPath = Path::join($path, $filename);
try{
$raw = ErrorToExceptionHandler::trapAndRemoveFalse(fn() => file_get_contents($fullPath));
}catch(\ErrorException $e){
throw new \RuntimeException("Loading schema file $fullPath: " . $e->getMessage(), 0, $e);
}
$raw = Filesystem::fileGetContents($fullPath);
try{
$schema = self::loadSchemaFromString($raw, $priority);

5
src/data/bedrock/item/BlockItemIdMap.php
View File

@ -24,11 +24,10 @@ declare(strict_types=1);
namespace pocketmine\data\bedrock\item;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\utils\Filesystem;
use pocketmine\utils\SingletonTrait;
use pocketmine\utils\Utils;
use Symfony\Component\Filesystem\Path;
use function array_flip;
use function file_get_contents;
use function is_array;
use function json_decode;
use const JSON_THROW_ON_ERROR;
@ -42,7 +41,7 @@ final class BlockItemIdMap{
private static function make() : self{
$map = json_decode(
Utils::assumeNotFalse(file_get_contents(Path::join(BEDROCK_DATA_PATH, 'block_id_to_item_id_map.json')), "Missing required resource file"),
Filesystem::fileGetContents(Path::join(BEDROCK_DATA_PATH, 'block_id_to_item_id_map.json')),
associative: true,
flags: JSON_THROW_ON_ERROR
);

9
src/data/bedrock/item/upgrade/ItemIdMetaUpgradeSchemaUtils.php
View File

@ -24,9 +24,8 @@ declare(strict_types=1);
namespace pocketmine\data\bedrock\item\upgrade;
use pocketmine\data\bedrock\item\upgrade\model\ItemIdMetaUpgradeSchemaModel;
use pocketmine\errorhandler\ErrorToExceptionHandler;
use pocketmine\utils\Filesystem;
use Symfony\Component\Filesystem\Path;
use function file_get_contents;
use function gettype;
use function is_object;
use function json_decode;
@ -60,11 +59,7 @@ final class ItemIdMetaUpgradeSchemaUtils{
$fullPath = Path::join($path, $filename);
try{
$raw = ErrorToExceptionHandler::trapAndRemoveFalse(fn() => file_get_contents($fullPath));
}catch(\ErrorException $e){
throw new \RuntimeException("Loading schema file $fullPath: " . $e->getMessage(), 0, $e);
}
$raw = Filesystem::fileGetContents($fullPath);
try{
$schema = self::loadSchemaFromString($raw, $priority);

4
src/data/bedrock/item/upgrade/R12ItemIdToBlockIdMap.php
View File

@ -24,10 +24,10 @@ declare(strict_types=1);
namespace pocketmine\data\bedrock\item\upgrade;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\utils\Filesystem;
use pocketmine\utils\SingletonTrait;
use pocketmine\utils\Utils;
use Symfony\Component\Filesystem\Path;
use function file_get_contents;
use function is_array;
use function is_string;
use function json_decode;
@ -47,7 +47,7 @@ final class R12ItemIdToBlockIdMap{
private static function make() : self{
$map = json_decode(
Utils::assumeNotFalse(file_get_contents(Path::join(BEDROCK_ITEM_UPGRADE_SCHEMA_PATH, '1.12.0_item_id_to_block_id_map.json')), "Missing required resource file"),
Filesystem::fileGetContents(Path::join(BEDROCK_ITEM_UPGRADE_SCHEMA_PATH, '1.12.0_item_id_to_block_id_map.json')),
associative: true,
flags: JSON_THROW_ON_ERROR
);