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

ItemTranslator: Use LegacyItemIdToStringMap instead of reading files directly

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-10-11 22:17:40 +01:00
parent 62f11360ee
commit 9b94a4661b
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\network\mcpe\convert; namespace pocketmine\network\mcpe\convert;
use pocketmine\data\bedrock\LegacyItemIdToStringIdMap;
use pocketmine\network\mcpe\protocol\serializer\ItemTypeDictionary; use pocketmine\network\mcpe\protocol\serializer\ItemTypeDictionary;
use pocketmine\utils\AssumptionFailedError; use pocketmine\utils\AssumptionFailedError;
use pocketmine\utils\SingletonTrait; use pocketmine\utils\SingletonTrait;
@ -76,10 +77,7 @@ final class ItemTranslator{
if($legacyStringToIntMapRaw === false){ if($legacyStringToIntMapRaw === false){
throw new AssumptionFailedError("Missing required resource file"); throw new AssumptionFailedError("Missing required resource file");
} }
$legacyStringToIntMap = json_decode($legacyStringToIntMapRaw, true); $legacyStringToIntMap = LegacyItemIdToStringIdMap::getInstance();
if(!is_array($legacyStringToIntMap)){
throw new AssumptionFailedError("Invalid mapping table format");
}
/** @phpstan-var array<string, int> $simpleMappings */ /** @phpstan-var array<string, int> $simpleMappings */
$simpleMappings = []; $simpleMappings = [];
@ -87,13 +85,14 @@ final class ItemTranslator{
if(!is_string($oldId) || !is_string($newId)){ if(!is_string($oldId) || !is_string($newId)){
throw new AssumptionFailedError("Invalid item table format"); throw new AssumptionFailedError("Invalid item table format");
} }
if(!isset($legacyStringToIntMap[$oldId])){ $intId = $legacyStringToIntMap->stringToLegacy($oldId);
if($intId === null){
//new item without a fixed legacy ID - we can't handle this right now //new item without a fixed legacy ID - we can't handle this right now
continue; continue;
} }
$simpleMappings[$newId] = $legacyStringToIntMap[$oldId]; $simpleMappings[$newId] = $intId;
} }
foreach($legacyStringToIntMap as $stringId => $intId){ foreach($legacyStringToIntMap->getStringToLegacyMap() as $stringId => $intId){
if(isset($simpleMappings[$stringId])){ if(isset($simpleMappings[$stringId])){
throw new \UnexpectedValueException("Old ID $stringId collides with new ID"); throw new \UnexpectedValueException("Old ID $stringId collides with new ID");
} }
@ -110,7 +109,12 @@ final class ItemTranslator{
if(!is_numeric($meta) || !is_string($newId)){ if(!is_numeric($meta) || !is_string($newId)){
throw new AssumptionFailedError("Invalid item table format"); throw new AssumptionFailedError("Invalid item table format");
} }
$complexMappings[$newId] = [$legacyStringToIntMap[$oldId], (int) $meta]; $intId = $legacyStringToIntMap->stringToLegacy($oldId);
if($intId === null){
//new item without a fixed legacy ID - we can't handle this right now
continue;
}
$complexMappings[$newId] = [$intId, (int) $meta];
} }
} }