From 831738b29cfebe57d0251de1e9f7004b92834d84 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Wed, 8 Jun 2022 14:53:58 +0100
Subject: [PATCH] Added BedrockItemUpgradeSchema dependency

---
 composer.json                                 |  1 +
 composer.lock                                 | 32 +++++++++++++++++--
 src/CoreConstants.php                         |  1 +
 .../bedrock/LegacyItemIdToStringIdMap.php     |  2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index e19f5f1cd..bbe11059a 100644
--- a/composer.json
+++ b/composer.json
@@ -36,6 +36,7 @@
       "netresearch/jsonmapper": "^4.0",
       "pocketmine/bedrock-block-upgrade-schema": "dev-master@dev",
       "pocketmine/bedrock-data": "dev-modern-world-support@dev",
+      "pocketmine/bedrock-item-upgrade-schema": "dev-master",
       "pocketmine/bedrock-protocol": "~10.0.0+bedrock-1.19.0",
       "pocketmine/binaryutils": "^0.2.1",
       "pocketmine/callback-validator": "^1.0.2",
diff --git a/composer.lock b/composer.lock
index 16160f851..88dde6bd0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1d35edfe78183512ce45be7a8a4940e7",
+    "content-hash": "4e3266e01983490663a0cdac7609bde0",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -300,6 +300,33 @@
             },
             "time": "2022-06-07T16:24:29+00:00"
         },
+        {
+            "name": "pocketmine/bedrock-item-upgrade-schema",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/BedrockItemUpgradeSchema.git",
+                "reference": "d984d2ee7283bc52e8733e7c7da1d0f6b6dc501f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/d984d2ee7283bc52e8733e7c7da1d0f6b6dc501f",
+                "reference": "d984d2ee7283bc52e8733e7c7da1d0f6b6dc501f",
+                "shasum": ""
+            },
+            "default-branch": true,
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "CC0-1.0"
+            ],
+            "description": "JSON schemas for upgrading items found in older Minecraft: Bedrock world saves",
+            "support": {
+                "issues": "https://github.com/pmmp/BedrockItemUpgradeSchema/issues",
+                "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/master"
+            },
+            "time": "2022-06-08T13:47:48+00:00"
+        },
         {
             "name": "pocketmine/bedrock-protocol",
             "version": "10.0.0+bedrock-1.19.0",
@@ -3361,7 +3388,8 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "pocketmine/bedrock-block-upgrade-schema": 20,
-        "pocketmine/bedrock-data": 20
+        "pocketmine/bedrock-data": 20,
+        "pocketmine/bedrock-item-upgrade-schema": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/src/CoreConstants.php b/src/CoreConstants.php
index 384f5d0a7..c18486237 100644
--- a/src/CoreConstants.php
+++ b/src/CoreConstants.php
@@ -38,4 +38,5 @@ define('pocketmine\RESOURCE_PATH', dirname(__DIR__) . '/resources/');
 define('pocketmine\BEDROCK_DATA_PATH', dirname(__DIR__) . '/vendor/pocketmine/bedrock-data/');
 define('pocketmine\LOCALE_DATA_PATH', dirname(__DIR__) . '/vendor/pocketmine/locale-data/');
 define('pocketmine\BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH', dirname(__DIR__) . '/vendor/pocketmine/bedrock-block-upgrade-schema/');
+define('pocketmine\BEDROCK_ITEM_UPGRADE_SCHEMA_PATH', dirname(__DIR__) . '/vendor/pocketmine/bedrock-item-upgrade-schema/');
 define('pocketmine\COMPOSER_AUTOLOADER_PATH', dirname(__DIR__) . '/vendor/autoload.php');
diff --git a/src/data/bedrock/LegacyItemIdToStringIdMap.php b/src/data/bedrock/LegacyItemIdToStringIdMap.php
index 85b6ff1bf..587a09fe0 100644
--- a/src/data/bedrock/LegacyItemIdToStringIdMap.php
+++ b/src/data/bedrock/LegacyItemIdToStringIdMap.php
@@ -30,6 +30,6 @@ final class LegacyItemIdToStringIdMap extends LegacyToStringBidirectionalIdMap{
 	use SingletonTrait;
 
 	public function __construct(){
-		parent::__construct(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'item_id_map.json'));
+		parent::__construct(Path::join(\pocketmine\BEDROCK_ITEM_UPGRADE_SCHEMA_PATH, 'item_legacy_id_map.json'));
 	}
 }