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

Throw proper exceptions for serialize/deserialize failures

Browse Source 
this allows them to be caught and properly reported in tests.
This commit is contained in:
Dylan K. Taylor
2022-05-24 14:46:18 +01:00
parent 901a51a9dd
commit 5ce5e1d2b0
5 changed files with 89 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/data/bedrock/item/ItemSerializer.php
View File

@ -27,6 +27,7 @@ use pocketmine\block\Block;
use pocketmine\block\utils\DyeColor;
use pocketmine\block\utils\SkullType;
use pocketmine\data\bedrock\BlockItemIdMap;
use pocketmine\data\bedrock\blockstate\BlockStateSerializeException;
use pocketmine\data\bedrock\CompoundTypeIds;
use pocketmine\data\bedrock\DyeColorIdMap;
use pocketmine\data\bedrock\item\ItemTypeIds as Ids;
@ -78,6 +79,8 @@ final class ItemSerializer{
/**
* @phpstan-template TItemType of Item
* @phpstan-param TItemType $item
*
* @throws ItemTypeSerializeException
*/
public function serialize(Item $item) : Data{
if($item->isNull()){
@ -102,8 +105,7 @@ final class ItemSerializer{
}
if($locatedSerializer === null){
//TODO: proper exceptions
throw new \LogicException("No serializer registered for " . get_class($item) . " " . $item->getName());
throw new ItemTypeSerializeException("No serializer registered for " . get_class($item) . " " . $item->getName());
}
/**
@ -119,15 +121,22 @@ final class ItemSerializer{
return $data;
}
/**
* @throws ItemTypeSerializeException
*/
private static function standardBlock(Block $block) : Data{
$blockStateData = GlobalBlockStateHandlers::getSerializer()->serialize($block->getFullId());
try{
$blockStateData = GlobalBlockStateHandlers::getSerializer()->serialize($block->getFullId());
}catch(BlockStateSerializeException $e){
throw new ItemTypeSerializeException($e->getMessage(), 0, $e);
}
$itemNameId = BlockItemIdMap::getInstance()->lookupItemId($blockStateData->getName());
if($itemNameId === null){
//TODO: this might end up being a hassle for custom blocks, since it'll force providing an item
//serializer for every custom block
//it would probably be better if we allow adding custom item <-> block ID mappings for this
throw new \LogicException("No blockitem serializer or blockitem ID mapping registered for block " . $blockStateData->getName());
throw new ItemTypeSerializeException("No blockitem serializer or blockitem ID mapping registered for block " . $blockStateData->getName());
}
return new Data($itemNameId, 0, $blockStateData);