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

ItemFactory: Use a simple hashmap for item types

Browse Source 
this is slower but yields less complicated code. Since this isn't in a hot path it's acceptable for this to slow down a little for the sake of sanity.
This commit is contained in:
Dylan K. Taylor 2018-10-26 18:38:24 +01:00
parent 93131b4d92
commit 0ef81e701a
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/pocketmine/item/ItemFactory.php
View File

@ -36,10 +36,10 @@ use pocketmine\tile\Skull;
class ItemFactory{ class ItemFactory{
/** @var \SplFixedArray */ /** @var \SplFixedArray */
private static $list = null; private static $list = [];
public static function init(){ public static function init(){
self::$list = new \SplFixedArray(65536); self::$list = []; //in case of re-initializing
self::registerItem(new Shovel(Item::IRON_SHOVEL, "Iron Shovel", TieredTool::TIER_IRON)); self::registerItem(new Shovel(Item::IRON_SHOVEL, "Iron Shovel", TieredTool::TIER_IRON));
self::registerItem(new Pickaxe(Item::IRON_PICKAXE, "Iron Pickaxe", TieredTool::TIER_IRON)); self::registerItem(new Pickaxe(Item::IRON_PICKAXE, "Iron Pickaxe", TieredTool::TIER_IRON));
@ -318,13 +318,7 @@ class ItemFactory{
throw new \RuntimeException("Trying to overwrite an already registered item"); throw new \RuntimeException("Trying to overwrite an already registered item");
} }
$offset = self::getListOffset($id); self::$list[self::getListOffset($id, $variant)] = clone $item;
$sublist = self::$list[$offset] ?? new \SplFixedArray();
if($sublist->getSize() < $variant + 1){
$sublist->setSize($variant + 1);
}
$sublist[$variant] = clone $item;
self::$list[$offset] = $sublist;
} }
/** /**
@ -346,17 +340,12 @@ class ItemFactory{
/** @var Item $item */ /** @var Item $item */
$item = null; $item = null;
if($meta !== -1){ if($meta !== -1){
$sublist = self::$list[self::getListOffset($id)]; if(isset(self::$list[$offset = self::getListOffset($id, $meta)])){
$item = clone self::$list[$offset];
/** @var Item|null $listed */ }elseif(isset(self::$list[$zero = self::getListOffset($id, 0)]) and self::$list[$zero] instanceof Durable){
if($sublist !== null){ /** @var Durable $item */
if(isset($sublist[$meta])){ $item = clone self::$list[$zero];
$item = clone $sublist[$meta]; $item->setDamage($meta);
}elseif(isset($sublist[0]) and $sublist[0] instanceof Durable){
/** @var Durable $item */
$item = clone $sublist[0];
$item->setDamage($meta);
}
}elseif($id < 256){ //intentionally includes negatives, for extended block IDs }elseif($id < 256){ //intentionally includes negatives, for extended block IDs
$item = new ItemBlock($id, $meta); $item = new ItemBlock($id, $meta);
} }
@ -433,14 +422,13 @@ class ItemFactory{
return BlockFactory::isRegistered($id); return BlockFactory::isRegistered($id);
} }
$sublist = self::$list[self::getListOffset($id)]; return isset(self::$list[self::getListOffset($id, $variant)]);
return $sublist !== null and isset($sublist[$variant]);
} }
private static function getListOffset(int $id) : int{ private static function getListOffset(int $id, int $variant) : int{
if($id < -0x8000 or $id > 0x7fff){ if($id < -0x8000 or $id > 0x7fff){
throw new \InvalidArgumentException("ID must be in range " . -0x8000 . " - " . 0x7fff); throw new \InvalidArgumentException("ID must be in range " . -0x8000 . " - " . 0x7fff);
} }
return $id & 0xffff; return (($id & 0xffff) << 16) | ($variant & 0xffff);
} }
} }