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

LegacyStringToItemParser: use string IDs directly

Browse Source 
this allows plugins to add their own mappings (though they should really be using StringToItemParser) without needing any legacy numeric ID bullshit in the mix.
This commit is contained in:
Dylan K. Taylor 2022-06-29 15:25:50 +01:00
parent ce6b09291a
commit ea3d5ac563
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 1578 additions and 1584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3144
resources/item_from_string_bc_map.json
View File

File diff suppressed because it is too large Load Diff

18
src/item/LegacyStringToItemParser.php
View File

@ -67,7 +67,7 @@ final class LegacyStringToItemParser{
if(!is_array($mappings)) throw new AssumptionFailedError("Invalid mappings format, expected array");
foreach($mappings as $name => $id){
if(!is_int($id)) throw new AssumptionFailedError("Invalid mappings format, expected int values");
if(!is_string($id)) throw new AssumptionFailedError("Invalid mappings format, expected string values");
$result->addMapping((string) $name, $id);
}
@ -75,8 +75,8 @@ final class LegacyStringToItemParser{
}
/**
* @var int[]
* @phpstan-var array<string, int>
* @var string[]
* @phpstan-var array<string, string>
*/
private array $map = [];
@ -85,13 +85,13 @@ final class LegacyStringToItemParser{
private ItemDeserializer $itemDeserializer
){}
public function addMapping(string $alias, int $id) : void{
public function addMapping(string $alias, string $id) : void{
$this->map[$alias] = $id;
}
/**
* @return int[]
* @phpstan-return array<string, int>
* @return string[]
* @phpstan-return array<string, string>
*/
public function getMappings() : array{
return $this->map;
@ -123,11 +123,7 @@ final class LegacyStringToItemParser{
if($legacyId === null){
throw new LegacyStringToItemParserException("Unable to resolve \"" . $input . "\" to a valid item");
}
try{
$itemData = $this->itemDataUpgrader->upgradeItemTypeDataInt($legacyId, $meta, 1, null);
}catch(SavedDataLoadingException){
throw new LegacyStringToItemParserException("Unable to resolve \"" . $input . "\" to a valid item");
}
$itemData = $this->itemDataUpgrader->upgradeItemTypeDataString($legacyId, $meta, 1, null);
try{
return $this->itemDeserializer->deserializeStack($itemData);