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

ItemTranslator: Accept dynamic BlockStateDictionary instead of using singleton

Browse Source 
this will be needed for handling protocol updates in the future
This commit is contained in:
Dylan K. Taylor 2022-06-06 21:50:43 +01:00
parent c89f7f8e5e
commit 860fa719b2
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/mcpe/convert/ItemTranslator.php
View File

@ -41,11 +41,17 @@ final class ItemTranslator{
use SingletonTrait; use SingletonTrait;
private static function make() : self{ private static function make() : self{
return new self(GlobalItemTypeDictionary::getInstance()->getDictionary(), new ItemSerializer(), new ItemDeserializer()); return new self(
GlobalItemTypeDictionary::getInstance()->getDictionary(),
RuntimeBlockMapping::getInstance()->getBlockStateDictionary(),
new ItemSerializer(),
new ItemDeserializer()
);
} }
public function __construct( public function __construct(
private ItemTypeDictionary $dictionary, private ItemTypeDictionary $itemTypeDictionary,
private BlockStateDictionary $blockStateDictionary,
private ItemSerializer $itemSerializer, private ItemSerializer $itemSerializer,
private ItemDeserializer $itemDeserializer private ItemDeserializer $itemDeserializer
){} ){}
@ -73,11 +79,11 @@ final class ItemTranslator{
$itemData = $this->itemSerializer->serialize($item); $itemData = $this->itemSerializer->serialize($item);
$numericId = $this->dictionary->fromStringId($itemData->getName()); $numericId = $this->itemTypeDictionary->fromStringId($itemData->getName());
$blockStateData = $itemData->getBlock(); $blockStateData = $itemData->getBlock();
if($blockStateData !== null){ if($blockStateData !== null){
$blockRuntimeId = RuntimeBlockMapping::getInstance()->getBlockStateDictionary()->lookupStateIdFromData($blockStateData); $blockRuntimeId = $this->blockStateDictionary->lookupStateIdFromData($blockStateData);
if($blockRuntimeId === null){ if($blockRuntimeId === null){
throw new AssumptionFailedError("Unmapped blockstate returned by blockstate serializer: " . $blockStateData->toNbt()); throw new AssumptionFailedError("Unmapped blockstate returned by blockstate serializer: " . $blockStateData->toNbt());
} }
@ -92,10 +98,10 @@ final class ItemTranslator{
* @throws TypeConversionException * @throws TypeConversionException
*/ */
public function fromNetworkId(int $networkId, int $networkMeta, int $networkBlockRuntimeId) : Item{ public function fromNetworkId(int $networkId, int $networkMeta, int $networkBlockRuntimeId) : Item{
$stringId = $this->dictionary->fromIntId($networkId); $stringId = $this->itemTypeDictionary->fromIntId($networkId);
$blockStateData = $networkBlockRuntimeId !== self::NO_BLOCK_RUNTIME_ID ? $blockStateData = $networkBlockRuntimeId !== self::NO_BLOCK_RUNTIME_ID ?
RuntimeBlockMapping::getInstance()->getBlockStateDictionary()->getDataFromStateId($networkBlockRuntimeId) : $this->blockStateDictionary->getDataFromStateId($networkBlockRuntimeId) :
null; null;
return $this->itemDeserializer->deserialize(new SavedItemData($stringId, $networkMeta, $blockStateData)); return $this->itemDeserializer->deserialize(new SavedItemData($stringId, $networkMeta, $blockStateData));