Separate ItemTypeDictionary implementation from initialization

we're not going to want implementation details like how it's setup getting in the way when we separate protocol from the core.

src/network/mcpe/convert/GlobalItemTypeDictionary.php

@@ -0,0 +1,65 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe\convert;
+
+use pocketmine\network\mcpe\protocol\serializer\ItemTypeDictionary;
+use pocketmine\network\mcpe\protocol\types\ItemTypeEntry;
+use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\SingletonTrait;
+use function file_get_contents;
+use function is_array;
+use function is_bool;
+use function is_int;
+use function is_string;
+use function json_decode;
+
+final class GlobalItemTypeDictionary{
+	use SingletonTrait;
+
+	private static function make() : self{
+		$data = file_get_contents(\pocketmine\RESOURCE_PATH . '/vanilla/required_item_list.json');
+		if($data === false) throw new AssumptionFailedError("Missing required resource file");
+		$table = json_decode($data, true);
+		if(!is_array($table)){
+			throw new AssumptionFailedError("Invalid item list format");
+		}
+
+		$params = [];
+		foreach($table as $name => $entry){
+			if(!is_array($entry) || !is_string($name) || !isset($entry["component_based"], $entry["runtime_id"]) || !is_bool($entry["component_based"]) || !is_int($entry["runtime_id"])){
+				throw new AssumptionFailedError("Invalid item list format");
+			}
+			$params[] = new ItemTypeEntry($name, $entry["runtime_id"], $entry["component_based"]);
+		}
+		return new self(new ItemTypeDictionary($params));
+	}
+
+	private ItemTypeDictionary $dictionary;
+
+	public function __construct(ItemTypeDictionary $dictionary){
+		$this->dictionary = $dictionary;
+	}
+
+	public function getDictionary() : ItemTypeDictionary{ return $this->dictionary; }
+}

src/network/mcpe/convert/ItemTranslator.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe\convert;
 
+use pocketmine\network\mcpe\protocol\serializer\ItemTypeDictionary;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\SingletonTrait;
 use function array_key_exists;
@@ -108,7 +109,7 @@ final class ItemTranslator{
 			}
 		}
 
-		return new self(ItemTypeDictionary::getInstance(), $simpleMappings, $complexMappings);
+		return new self(GlobalItemTypeDictionary::getInstance()->getDictionary(), $simpleMappings, $complexMappings);
 	}
 
 	/**

src/network/mcpe/convert/TypeConverter.php

@@ -63,7 +63,7 @@ class TypeConverter{
 
 	public function __construct(){
 		//TODO: inject stuff via constructor
-		$this->shieldRuntimeId = ItemTypeDictionary::getInstance()->fromStringId("minecraft:shield");
+		$this->shieldRuntimeId = GlobalItemTypeDictionary::getInstance()->getDictionary()->fromStringId("minecraft:shield");
 	}
 
 	/**

src/network/mcpe/handler/PreSpawnPacketHandler.php

@@ -25,7 +25,7 @@ namespace pocketmine\network\mcpe\handler;
 
 use pocketmine\network\mcpe\cache\CraftingDataCache;
 use pocketmine\network\mcpe\cache\StaticPacketCache;
-use pocketmine\network\mcpe\convert\ItemTypeDictionary;
+use pocketmine\network\mcpe\convert\GlobalItemTypeDictionary;
 use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket;
@@ -87,7 +87,7 @@ class PreSpawnPacketHandler extends PacketHandler{
 		$pk->experiments = new Experiments([], false);
 		$pk->levelId = "";
 		$pk->worldName = $this->server->getMotd();
-		$pk->itemTable = ItemTypeDictionary::getInstance()->getEntries(); //TODO: check if this is actually needed
+		$pk->itemTable = GlobalItemTypeDictionary::getInstance()->getDictionary()->getEntries(); //TODO: check if this is actually needed
 		$pk->playerMovementSettings = new PlayerMovementSettings(PlayerMovementType::LEGACY, 0, false);
 		$this->session->sendDataPacket($pk);
 

src/network/mcpe/protocol/serializer/ItemTypeDictionary.php

@@ -21,55 +21,28 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\network\mcpe\convert;
+namespace pocketmine\network\mcpe\protocol\serializer;
 
 use pocketmine\network\mcpe\protocol\types\ItemTypeEntry;
-use pocketmine\utils\AssumptionFailedError;
-use pocketmine\utils\SingletonTrait;
 use function array_key_exists;
-use function file_get_contents;
-use function is_array;
-use function is_bool;
-use function is_int;
-use function is_string;
-use function json_decode;
 
 final class ItemTypeDictionary{
-	use SingletonTrait;
 
 	/**
 	 * @var ItemTypeEntry[]
 	 * @phpstan-var list<ItemTypeEntry>
 	 */
-	private $itemTypes;
+	private array $itemTypes;
 	/**
 	 * @var string[]
 	 * @phpstan-var array<int, string>
 	 */
-	private $intToStringIdMap = [];
+	private array $intToStringIdMap = [];
 	/**
 	 * @var int[]
 	 * @phpstan-var array<string, int>
 	 */
-	private $stringToIntMap = [];
-
-	private static function make() : self{
-		$data = file_get_contents(\pocketmine\RESOURCE_PATH . '/vanilla/required_item_list.json');
-		if($data === false) throw new AssumptionFailedError("Missing required resource file");
-		$table = json_decode($data, true);
-		if(!is_array($table)){
-			throw new AssumptionFailedError("Invalid item list format");
-		}
-
-		$params = [];
-		foreach($table as $name => $entry){
-			if(!is_array($entry) || !is_string($name) || !isset($entry["component_based"], $entry["runtime_id"]) || !is_bool($entry["component_based"]) || !is_int($entry["runtime_id"])){
-				throw new AssumptionFailedError("Invalid item list format");
-			}
-			$params[] = new ItemTypeEntry($name, $entry["runtime_id"], $entry["component_based"]);
-		}
-		return new self($params);
-	}
+	private array $stringToIntMap = [];
 
 	/**
 	 * @param ItemTypeEntry[] $itemTypes

src/network/mcpe/protocol/serializer/PacketSerializer.php

@@ -30,7 +30,7 @@ use pocketmine\nbt\LittleEndianNbtSerializer;
 use pocketmine\nbt\NbtDataException;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\TreeRoot;
-use pocketmine\network\mcpe\convert\ItemTypeDictionary;
+use pocketmine\network\mcpe\convert\GlobalItemTypeDictionary;
 use pocketmine\network\mcpe\protocol\PacketDecodeException;
 use pocketmine\network\mcpe\protocol\types\BoolGameRule;
 use pocketmine\network\mcpe\protocol\types\command\CommandOriginData;
@@ -73,7 +73,7 @@ class PacketSerializer extends BinaryStream{
 
 	public function __construct(string $buffer = "", int $offset = 0){
 		parent::__construct($buffer, $offset);
-		$this->shieldItemRuntimeId = ItemTypeDictionary::getInstance()->fromStringId("minecraft:shield");
+		$this->shieldItemRuntimeId = GlobalItemTypeDictionary::getInstance()->getDictionary()->fromStringId("minecraft:shield");
 	}
 
 	/**