Merge branch 'next-minor' into next-major

src/data/bedrock/ItemTagToIdMap.php

@@ -34,6 +34,7 @@ use function gettype;
 use function is_array;
 use function is_string;
 use function json_decode;
+use const JSON_THROW_ON_ERROR;
 use const pocketmine\BEDROCK_DATA_PATH;
 
 /**

src/data/bedrock/item/BlockItemIdMap.php

@@ -31,6 +31,7 @@ use function array_flip;
 use function file_get_contents;
 use function is_array;
 use function json_decode;
+use const JSON_THROW_ON_ERROR;
 use const pocketmine\BEDROCK_DATA_PATH;
 
 /**

src/data/bedrock/item/upgrade/ItemDataUpgrader.php

@@ -37,6 +37,7 @@ use pocketmine\nbt\tag\StringTag;
 use pocketmine\utils\Binary;
 use function assert;
 use function ksort;
+use const SORT_NUMERIC;
 
 final class ItemDataUpgrader{
 	private const TAG_LEGACY_ID = "id"; //TAG_Short (or TAG_String for Java itemstacks)

src/data/bedrock/item/upgrade/ItemIdMetaUpgradeSchema.php

@@ -28,7 +28,7 @@ use function mb_strtolower;
 final class ItemIdMetaUpgradeSchema{
 
 	/**
-	 * @param string[] $renamedIds
+	 * @param string[]   $renamedIds
 	 * @param string[][] $remappedMetas
 	 * @phpstan-param array<string, string> $renamedIds
 	 * @phpstan-param array<string, array<int, string>> $remappedMetas

src/data/bedrock/item/upgrade/ItemIdMetaUpgradeSchemaUtils.php

@@ -31,6 +31,8 @@ use function gettype;
 use function is_object;
 use function json_decode;
 use function ksort;
+use const JSON_THROW_ON_ERROR;
+use const SORT_NUMERIC;
 
 final class ItemIdMetaUpgradeSchemaUtils{
 

src/data/bedrock/item/upgrade/R12ItemIdToBlockIdMap.php

@@ -32,6 +32,7 @@ use function is_array;
 use function is_string;
 use function json_decode;
 use function mb_strtolower;
+use const JSON_THROW_ON_ERROR;
 use const pocketmine\BEDROCK_ITEM_UPGRADE_SCHEMA_PATH;
 
 /**