mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-11 04:17:48 +00:00
Code Issues Projects Releases Wiki Activity

Use more consistent exceptions

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-07-04 21:38:18 +01:00
parent 9f0b32e748
commit 56cf59355f
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/crafting/CraftingManagerFromDataHelper.php
View File

@ -60,7 +60,7 @@ final class CraftingManagerFromDataHelper{
$blockStateDictionary = RuntimeBlockMapping::getInstance()->getBlockStateDictionary(); $blockStateDictionary = RuntimeBlockMapping::getInstance()->getBlockStateDictionary();
$blockRuntimeId = $blockStateDictionary->lookupStateIdFromIdMeta($name, $meta === RecipeIngredientData::WILDCARD_META_VALUE ? 0 : $meta); $blockRuntimeId = $blockStateDictionary->lookupStateIdFromIdMeta($name, $meta === RecipeIngredientData::WILDCARD_META_VALUE ? 0 : $meta);
if($blockRuntimeId === null){ if($blockRuntimeId === null){
throw new \InvalidArgumentException("$blockName with meta $meta doesn't map to any known blockstate"); throw new SavedDataLoadingException("$blockName with meta $meta doesn't map to any known blockstate");
} }
$blockStateData = $blockStateDictionary->getDataFromStateId($blockRuntimeId); $blockStateData = $blockStateDictionary->getDataFromStateId($blockRuntimeId);
if($blockStateData === null){ if($blockStateData === null){
@ -118,7 +118,7 @@ final class CraftingManagerFromDataHelper{
$blockName = BlockItemIdMap::getInstance()->lookupBlockId($name); $blockName = BlockItemIdMap::getInstance()->lookupBlockId($name);
if($blockName !== null){ if($blockName !== null){
if($meta !== 0){ if($meta !== 0){
throw new \InvalidArgumentException("Meta should not be specified for blockitems"); throw new SavedDataLoadingException("Meta should not be specified for blockitems");
} }
$blockStatesTag = $blockStatesRaw === null ? $blockStatesTag = $blockStatesRaw === null ?
CompoundTag::create() : CompoundTag::create() :
@ -166,7 +166,7 @@ final class CraftingManagerFromDataHelper{
public static function loadJsonArrayOfObjectsFile(string $filePath, string $modelCLass) : array{ public static function loadJsonArrayOfObjectsFile(string $filePath, string $modelCLass) : array{
$recipes = json_decode(Utils::assumeNotFalse(file_get_contents($filePath), "Missing required resource file")); $recipes = json_decode(Utils::assumeNotFalse(file_get_contents($filePath), "Missing required resource file"));
if(!is_array($recipes)){ if(!is_array($recipes)){
throw new AssumptionFailedError("$filePath root should be an array, got " . get_debug_type($recipes)); throw new SavedDataLoadingException("$filePath root should be an array, got " . get_debug_type($recipes));
} }
$mapper = new \JsonMapper(); $mapper = new \JsonMapper();