diff --git a/src/world/format/io/GlobalBlockStateHandlers.php b/src/world/format/io/GlobalBlockStateHandlers.php index 2aee9876c..ed162c8ca 100644 --- a/src/world/format/io/GlobalBlockStateHandlers.php +++ b/src/world/format/io/GlobalBlockStateHandlers.php @@ -34,6 +34,7 @@ use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaUtils; use pocketmine\data\bedrock\block\upgrade\LegacyBlockIdToStringIdMap; use pocketmine\utils\Filesystem; use Symfony\Component\Filesystem\Path; +use const PHP_INT_MAX; use const pocketmine\BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH; /** @@ -43,8 +44,6 @@ use const pocketmine\BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH; * benefits for now. */ final class GlobalBlockStateHandlers{ - public const MAX_BLOCKSTATE_UPGRADE_SCHEMA_ID = 171; //0171_1.19.60_to_1.9.70.26_beta.json - private static ?BlockObjectToStateSerializer $blockStateSerializer = null; private static ?BlockStateToObjectDeserializer $blockStateDeserializer = null; @@ -65,7 +64,7 @@ final class GlobalBlockStateHandlers{ if(self::$blockDataUpgrader === null){ $blockStateUpgrader = new BlockStateUpgrader(BlockStateUpgradeSchemaUtils::loadSchemas( Path::join(BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH, 'nbt_upgrade_schema'), - self::MAX_BLOCKSTATE_UPGRADE_SCHEMA_ID + PHP_INT_MAX )); self::$blockDataUpgrader = new BlockDataUpgrader( BlockIdMetaUpgrader::loadFromString( diff --git a/src/world/format/io/GlobalItemDataHandlers.php b/src/world/format/io/GlobalItemDataHandlers.php index e3bef6466..ea5568c7c 100644 --- a/src/world/format/io/GlobalItemDataHandlers.php +++ b/src/world/format/io/GlobalItemDataHandlers.php @@ -31,11 +31,10 @@ use pocketmine\data\bedrock\item\upgrade\ItemIdMetaUpgradeSchemaUtils; use pocketmine\data\bedrock\item\upgrade\LegacyItemIdToStringIdMap; use pocketmine\data\bedrock\item\upgrade\R12ItemIdToBlockIdMap; use Symfony\Component\Filesystem\Path; +use const PHP_INT_MAX; use const pocketmine\BEDROCK_ITEM_UPGRADE_SCHEMA_PATH; final class GlobalItemDataHandlers{ - public const MAX_ITEM_ID_UPGRADE_SCHEMA_ID = 91; //0091_1.19.60_to_1.19.70.26_beta.json - private static ?ItemSerializer $itemSerializer = null; private static ?ItemDeserializer $itemDeserializer = null; @@ -52,7 +51,7 @@ final class GlobalItemDataHandlers{ public static function getUpgrader() : ItemDataUpgrader{ return self::$itemDataUpgrader ??= new ItemDataUpgrader( - new ItemIdMetaUpgrader(ItemIdMetaUpgradeSchemaUtils::loadSchemas(Path::join(BEDROCK_ITEM_UPGRADE_SCHEMA_PATH, 'id_meta_upgrade_schema'), self::MAX_ITEM_ID_UPGRADE_SCHEMA_ID)), + new ItemIdMetaUpgrader(ItemIdMetaUpgradeSchemaUtils::loadSchemas(Path::join(BEDROCK_ITEM_UPGRADE_SCHEMA_PATH, 'id_meta_upgrade_schema'), PHP_INT_MAX)), LegacyItemIdToStringIdMap::getInstance(), R12ItemIdToBlockIdMap::getInstance(), GlobalBlockStateHandlers::getUpgrader() diff --git a/src/world/format/io/data/BedrockWorldData.php b/src/world/format/io/data/BedrockWorldData.php index fbe8b36b8..82279e734 100644 --- a/src/world/format/io/data/BedrockWorldData.php +++ b/src/world/format/io/data/BedrockWorldData.php @@ -49,11 +49,11 @@ use function time; class BedrockWorldData extends BaseNbtWorldData{ public const CURRENT_STORAGE_VERSION = 10; - public const CURRENT_STORAGE_NETWORK_VERSION = 560; + public const CURRENT_STORAGE_NETWORK_VERSION = 575; public const CURRENT_CLIENT_VERSION_TARGET = [ 1, //major 19, //minor - 50, //patch + 70, //patch 0, //revision 0 //is beta ];