Merge remote-tracking branch 'upstream/stable' into stable

changelogs/5.19.md

@@ -1,5 +1,5 @@
 # 5.19.0
-Released 21tst September 2024.
+Released 21st September 2024.
 
 **For Minecraft: Bedrock Edition 1.21.30**
 

changelogs/5.20.md

@@ -0,0 +1,19 @@
+# 5.20.0
+Released 26th October 2024.
+
+**For Minecraft: Bedrock Edition 1.21.40**
+
+This is a support release for Minecraft: Bedrock Edition 1.21.40.
+
+**Plugin compatibility:** Plugins for previous 5.x versions will run unchanged on this release, unless they use internal APIs, reflection, or packages like the `pocketmine\network\mcpe`  or `pocketmine\data` namespace.
+Do not update plugin minimum API versions unless you need new features added in this release.
+
+**WARNING: If your plugin uses the `pocketmine\network\mcpe` namespace, you're not shielded by API change constraints.**
+Consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you're using packets directly.
+
+## General
+- Added support for Minecraft: Bedrock Edition 1.21.40.
+- Removed support for earlier versions.
+
+## Fixes
+- Fixed a bug in `tools/generate-blockstate-upgrade-schema.php` that caused it to fail on 1.21.40 with the new mushroom block changes.

src/VersionInfo.php

@@ -31,7 +31,7 @@
 
 final class VersionInfo{
 	public const NAME = "PocketMine-MP";
-	public const BASE_VERSION = "5.19.1";
+	public const BASE_VERSION = "5.20.1";
 	public const IS_DEVELOPMENT_BUILD = true;
 	public const BUILD_CHANNEL = "stable";
 

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

@@ -25,6 +25,7 @@
 
 use pocketmine\data\bedrock\block\BlockStateDeserializeException;
 use pocketmine\data\bedrock\block\upgrade\BlockDataUpgrader;
+use pocketmine\data\bedrock\item\BlockItemIdMap;
 use pocketmine\data\bedrock\item\SavedItemData;
 use pocketmine\data\bedrock\item\SavedItemStackData;
 use pocketmine\data\SavedDataLoadingException;
@@ -35,6 +36,7 @@
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\ShortTag;
 use pocketmine\nbt\tag\StringTag;
+use pocketmine\network\mcpe\convert\BlockStateDictionary;
 use pocketmine\utils\Binary;
 use function assert;
 
@@ -46,6 +48,8 @@ public function __construct(
 		private LegacyItemIdToStringIdMap $legacyIntToStringIdMap,
 		private R12ItemIdToBlockIdMap $r12ItemIdToBlockIdMap,
 		private BlockDataUpgrader $blockDataUpgrader,
+		private BlockItemIdMap $blockItemIdMap,
+		private BlockStateDictionary $blockStateDictionary
 	){}
 
 	/**
@@ -148,6 +152,17 @@ private function upgradeItemTypeNbt(CompoundTag $tag) : ?SavedItemData{
 
 		[$newNameId, $newMeta] = $this->idMetaUpgrader->upgrade($rawNameId, $meta);
 
+		//TODO: Dirty hack to load old skulls from disk: Put this into item upgrade schema's before Mojang makes something with a non 0 default state
+		if($blockStateData === null && ($blockId = $this->blockItemIdMap->lookupBlockId($newNameId)) !== null){
+			$networkRuntimeId = $this->blockStateDictionary->lookupStateIdFromIdMeta($blockId, 0);
+
+			if($networkRuntimeId === null){
+				throw new SavedDataLoadingException("Failed to find blockstate for blockitem $newNameId");
+			}
+
+			$blockStateData = $this->blockStateDictionary->generateDataFromStateId($networkRuntimeId);
+		}
+
 		//TODO: this won't account for spawn eggs from before 1.16.100 - perhaps we're lucky and they just left the meta in there anyway?
 		//TODO: read version from VersionInfo::TAG_WORLD_DATA_VERSION - we may need it to fix up old items
 

src/world/format/io/GlobalItemDataHandlers.php

@@ -23,13 +23,15 @@
 
 namespace pocketmine\world\format\io;
 
+use pocketmine\data\bedrock\item\BlockItemIdMap;
 use pocketmine\data\bedrock\item\ItemDeserializer;
 use pocketmine\data\bedrock\item\ItemSerializer;
 use pocketmine\data\bedrock\item\upgrade\ItemDataUpgrader;
 use pocketmine\data\bedrock\item\upgrade\ItemIdMetaUpgrader;
 use pocketmine\data\bedrock\item\upgrade\ItemIdMetaUpgradeSchemaUtils;
 use pocketmine\data\bedrock\item\upgrade\LegacyItemIdToStringIdMap;
 use pocketmine\data\bedrock\item\upgrade\R12ItemIdToBlockIdMap;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use Symfony\Component\Filesystem\Path;
 use const PHP_INT_MAX;
 use const pocketmine\BEDROCK_ITEM_UPGRADE_SCHEMA_PATH;
@@ -54,7 +56,9 @@ public static function getUpgrader() : ItemDataUpgrader{
 			new ItemIdMetaUpgrader(ItemIdMetaUpgradeSchemaUtils::loadSchemas(Path::join(BEDROCK_ITEM_UPGRADE_SCHEMA_PATH, 'id_meta_upgrade_schema'), PHP_INT_MAX)),
 			LegacyItemIdToStringIdMap::getInstance(),
 			R12ItemIdToBlockIdMap::getInstance(),
-			GlobalBlockStateHandlers::getUpgrader()
+			GlobalBlockStateHandlers::getUpgrader(),
+			BlockItemIdMap::getInstance(),
+			TypeConverter::getInstance()->getBlockTranslator()->getBlockStateDictionary()
 		);
 	}
 }

src/world/format/io/data/BedrockWorldData.php

@@ -51,12 +51,12 @@
 class BedrockWorldData extends BaseNbtWorldData{
 
 	public const CURRENT_STORAGE_VERSION = 10;
-	public const CURRENT_STORAGE_NETWORK_VERSION = 729;
+	public const CURRENT_STORAGE_NETWORK_VERSION = 748;
 	public const CURRENT_CLIENT_VERSION_TARGET = [
 		1, //major
 		21, //minor
-		30, //patch
-		3, //revision
+		40, //patch
+		1, //revision
 		0 //is beta
 	];
 

src/world/format/io/leveldb/ChunkVersion.php

@@ -71,4 +71,5 @@ private function __construct(){
 	public const v1_18_0_24_unused = 38;
 	public const v1_18_0_25_beta = 39;
 	public const v1_18_30 = 40;
+	public const v1_21_40 = 41;
 }

src/world/format/io/leveldb/LevelDB.php

@@ -78,7 +78,7 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
 
 	protected const ENTRY_FLAT_WORLD_LAYERS = "game_flatworldlayers";
 
-	protected const CURRENT_LEVEL_CHUNK_VERSION = ChunkVersion::v1_18_30;
+	protected const CURRENT_LEVEL_CHUNK_VERSION = ChunkVersion::v1_21_40;
 	protected const CURRENT_LEVEL_SUBCHUNK_VERSION = SubChunkVersion::PALETTED_MULTI;
 
 	private const CAVES_CLIFFS_EXPERIMENTAL_SUBCHUNK_KEY_OFFSET = 4;
@@ -654,6 +654,8 @@ public function loadChunk(int $chunkX, int $chunkZ) : ?LoadedChunkData{
 		$hasBeenUpgraded = $chunkVersion < self::CURRENT_LEVEL_CHUNK_VERSION;
 
 		switch($chunkVersion){
+			case ChunkVersion::v1_21_40:
+				//TODO: BiomeStates became shorts instead of bytes
 			case ChunkVersion::v1_18_30:
 			case ChunkVersion::v1_18_0_25_beta:
 			case ChunkVersion::v1_18_0_24_unused: