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

Allow Item (de)serializer to accept dynamic BlockState(De)Serializer

Browse Source
This commit is contained in:
Dylan K. Taylor
2022-06-08 16:22:35 +01:00
parent c8e318df8c
commit 301b0aba82
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/data/bedrock/item/ItemDeserializer.php
View File

@ -29,6 +29,7 @@ use pocketmine\block\utils\SkullType;
use pocketmine\block\utils\TreeType;
use pocketmine\block\VanillaBlocks as Blocks;
use pocketmine\data\bedrock\block\BlockStateDeserializeException;
use pocketmine\data\bedrock\block\BlockStateDeserializer;
use pocketmine\data\bedrock\CompoundTypeIds;
use pocketmine\data\bedrock\DyeColorIdMap;
use pocketmine\data\bedrock\EntityLegacyIds;
@ -43,16 +44,15 @@ use pocketmine\utils\SingletonTrait;
use pocketmine\world\format\io\GlobalBlockStateHandlers;
final class ItemDeserializer{
use SingletonTrait;
/**
* @var \Closure[]
* @phpstan-var array<string, \Closure(Data) : Item>
*/
private array $deserializers = [];
public function __construct(){
public function __construct(
private BlockStateDeserializer $blockStateDeserializer
){
$this->registerDeserializers();
}
@ -70,7 +70,7 @@ final class ItemDeserializer{
if(($blockData = $data->getBlock()) !== null){
//TODO: this is rough duct tape; we need a better way to deal with this
try{
$block = GlobalBlockStateHandlers::getDeserializer()->deserialize($blockData);
$block = $this->blockStateDeserializer->deserialize($blockData);
}catch(BlockStateDeserializeException $e){
throw new ItemTypeDeserializeException("Failed to deserialize item data: " . $e->getMessage(), 0, $e);
}