fix: fixed item components

Benedikt05 · Feb 18, 2025 · 1ca404e · 1ca404e
1 parent 59df7d4
commit 1ca404e
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 6 deletions.
diff --git a/src/pocketmine/network/mcpe/convert/ItemTypeDictionary.php b/src/pocketmine/network/mcpe/convert/ItemTypeDictionary.php
@@ -24,6 +24,7 @@
 namespace pocketmine\network\mcpe\convert;
 
 use InvalidArgumentException;
+use pocketmine\nbt\LittleEndianNBTStream;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\network\mcpe\protocol\types\ItemTypeEntry;
 use pocketmine\utils\AssumptionFailedError;
@@ -57,19 +58,30 @@ final class ItemTypeDictionary{
 	private $stringToIntMap = [];
 
 	private static function make() : self{
-		$data = file_get_contents(RESOURCE_PATH . '/vanilla/runtime_item_states.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");
+		$table = json_decode(file_get_contents(RESOURCE_PATH . '/vanilla/runtime_item_states.json'), true);
+		$componentData = json_decode(file_get_contents(RESOURCE_PATH . '/vanilla/item_components.json'), true);
+
+		if(!is_array($table) || !is_array($componentData)){
+			throw new AssumptionFailedError("Invalid resource file format");
 		}
 
 		$params = [];
 		foreach($table as $entry){
 			if(!is_array($entry) || !is_string($entry["name"]) || !isset($entry["componentBased"], $entry["id"], $entry["version"]) || !is_bool($entry["componentBased"]) || !is_int($entry["id"]) || !is_int($entry["version"])){
 				throw new AssumptionFailedError("Invalid item list format");
 			}
-			$params[] = new ItemTypeEntry($entry["name"], $entry["id"], $entry["componentBased"], $entry["version"], new CompoundTag());
+
+			$nbt = (isset($componentData[$entry["name"]]) && is_string($componentData[$entry["name"]]))
+				? (new LittleEndianNBTStream())->read(base64_decode($componentData[$entry["name"]], true))
+				: new CompoundTag();
+
+			$params[] = new ItemTypeEntry(
+				$entry["name"],
+				$entry["id"],
+				$entry["componentBased"],
+				$entry["version"],
+				$nbt
+			);
 		}
 		return new self($params);
 	}