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

Revert "Item: skip a step when decoding PC itemstacks"

Browse Source 
This reverts commit 9b52af62b6f469771f2355a964b35ecffa5117d9.

We shouldn't assume that a string maps directly to a legacy ID,
because we might want string aliases (e.g. dark_oak_boat) which refer to
items that have a specific meta value in the MCPE system.

Overall, I want to get rid of the reliance on IDs here and register all
this stuff using closure callbacks on VanillaItems, so getting rid of
this assumption also serves that goal.
This commit is contained in:
Dylan K. Taylor 2021-06-30 13:13:53 +01:00
parent 2312511be6
commit 76a74b3931
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/item/Item.php
View File

@ -678,12 +678,13 @@ class Item implements \JsonSerializable{
if($idTag instanceof ShortTag){
$item = ItemFactory::getInstance()->get($idTag->getValue(), $meta, $count);
}elseif($idTag instanceof StringTag){ //PC item save format
//TODO: this isn't a very good mapping source, we need a dedicated mapping for PC
$id = LegacyStringToItemParser::getInstance()->parseId($idTag->getValue());
if($id === null){
try{
$item = LegacyStringToItemParser::getInstance()->parse($idTag->getValue() . ":$meta");
}catch(\InvalidArgumentException $e){
//TODO: improve error handling
return ItemFactory::air();
}
$item = ItemFactory::getInstance()->get($id, $meta, $count);
$item->setCount($count);
}else{
throw new \InvalidArgumentException("Item CompoundTag ID must be an instance of StringTag or ShortTag, " . get_class($idTag) . " given");
}

5
src/item/LegacyStringToItemParser.php
View File

@ -33,7 +33,6 @@ use function is_int;
use function is_numeric;
use function is_string;
use function json_decode;
use function mb_strtolower;
use function str_replace;
use function strtolower;
use function trim;
@ -80,10 +79,6 @@ final class LegacyStringToItemParser{
$this->map[$alias] = $id;
}
public function parseId(string $input) : ?int{
return $this->map[mb_strtolower($this->reprocess($input))] ?? null;
}
/**
* Tries to parse the specified string into Item types.
*