Fixes

dries-c · dries-c · commit e82cc1897bf2 · 2026-06-17T14:12:53.000+02:00
diff --git a/composer.lock b/composer.lock
diff --git a/generated/data/bedrock/BedrockDataFiles.php b/generated/data/bedrock/BedrockDataFiles.php
@@ -52,6 +52,7 @@ private function __construct(){
 	public const BLOCK_ID_TO_ITEM_ID_MAP_1_21_93_JSON = BEDROCK_DATA_PATH . '/block_id_to_item_id_map-1.21.93.json';
 	public const BLOCK_ID_TO_ITEM_ID_MAP_1_26_0_JSON = BEDROCK_DATA_PATH . '/block_id_to_item_id_map-1.26.0.json';
 	public const BLOCK_ID_TO_ITEM_ID_MAP_1_26_10_JSON = BEDROCK_DATA_PATH . '/block_id_to_item_id_map-1.26.10.json';
+	public const BLOCK_ID_TO_ITEM_ID_MAP_1_26_20_JSON = BEDROCK_DATA_PATH . '/block_id_to_item_id_map-1.26.20.json';
 	public const BLOCK_ID_TO_ITEM_ID_MAP_JSON = BEDROCK_DATA_PATH . '/block_id_to_item_id_map.json';
 	public const BLOCK_PROPERTIES_TABLE_JSON = BEDROCK_DATA_PATH . '/block_properties_table.json';
 	public const BLOCK_STATE_META_MAP_1_20_0_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map-1.20.0.json';
@@ -73,6 +74,7 @@ private function __construct(){
 	public const BLOCK_STATE_META_MAP_1_21_93_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map-1.21.93.json';
 	public const BLOCK_STATE_META_MAP_1_26_0_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map-1.26.0.json';
 	public const BLOCK_STATE_META_MAP_1_26_10_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map-1.26.10.json';
+	public const BLOCK_STATE_META_MAP_1_26_20_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map-1.26.20.json';
 	public const BLOCK_STATE_META_MAP_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map.json';
 	public const CANONICAL_BLOCK_STATES_1_20_0_NBT = BEDROCK_DATA_PATH . '/canonical_block_states-1.20.0.nbt';
 	public const CANONICAL_BLOCK_STATES_1_20_10_NBT = BEDROCK_DATA_PATH . '/canonical_block_states-1.20.10.nbt';
@@ -93,6 +95,7 @@ private function __construct(){
 	public const CANONICAL_BLOCK_STATES_1_21_93_NBT = BEDROCK_DATA_PATH . '/canonical_block_states-1.21.93.nbt';
 	public const CANONICAL_BLOCK_STATES_1_26_0_NBT = BEDROCK_DATA_PATH . '/canonical_block_states-1.26.0.nbt';
 	public const CANONICAL_BLOCK_STATES_1_26_10_NBT = BEDROCK_DATA_PATH . '/canonical_block_states-1.26.10.nbt';
+	public const CANONICAL_BLOCK_STATES_1_26_20_NBT = BEDROCK_DATA_PATH . '/canonical_block_states-1.26.20.nbt';
 	public const CANONICAL_BLOCK_STATES_NBT = BEDROCK_DATA_PATH . '/canonical_block_states.nbt';
 	public const COMMAND_ARG_TYPES_JSON = BEDROCK_DATA_PATH . '/command_arg_types.json';
 	public const CREATIVE = BEDROCK_DATA_PATH . '/creative';
@@ -143,5 +146,6 @@ private function __construct(){
 	public const REQUIRED_ITEM_LIST_1_21_93_JSON = BEDROCK_DATA_PATH . '/required_item_list-1.21.93.json';
 	public const REQUIRED_ITEM_LIST_1_26_0_JSON = BEDROCK_DATA_PATH . '/required_item_list-1.26.0.json';
 	public const REQUIRED_ITEM_LIST_1_26_10_JSON = BEDROCK_DATA_PATH . '/required_item_list-1.26.10.json';
+	public const REQUIRED_ITEM_LIST_1_26_20_JSON = BEDROCK_DATA_PATH . '/required_item_list-1.26.20.json';
 	public const REQUIRED_ITEM_LIST_JSON = BEDROCK_DATA_PATH . '/required_item_list.json';
 }
diff --git a/generated/data/bedrock/BiomeIds.php b/generated/data/bedrock/BiomeIds.php
@@ -123,4 +123,5 @@ private function __construct(){
 	public const MANGROVE_SWAMP = 191;
 	public const CHERRY_GROVE = 192;
 	public const PALE_GARDEN = 193;
+	public const SULFUR_CAVES = 194;
 }
diff --git a/generated/data/bedrock/block/BlockStateNames.php b/generated/data/bedrock/block/BlockStateNames.php
@@ -108,6 +108,7 @@ private function __construct(){
 	public const PERSISTENT_BIT = "persistent_bit";
 	public const PILLAR_AXIS = "pillar_axis";
 	public const PORTAL_AXIS = "portal_axis";
+	public const POTENT_SULFUR_STATE = "potent_sulfur_state";
 	public const POWERED_BIT = "powered_bit";
 	public const POWERED_SHELF_TYPE = "powered_shelf_type";
 	public const PROPAGULE_STAGE = "propagule_stage";
diff --git a/generated/data/bedrock/block/BlockStateStringValues.php b/generated/data/bedrock/block/BlockStateStringValues.php
@@ -134,6 +134,12 @@ private function __construct(){
 	public const PORTAL_AXIS_X = "x";
 	public const PORTAL_AXIS_Z = "z";
 
+	public const POTENT_SULFUR_STATE_CONTINUOUS = "continuous";
+	public const POTENT_SULFUR_STATE_DORMANT = "dormant";
+	public const POTENT_SULFUR_STATE_DRY = "dry";
+	public const POTENT_SULFUR_STATE_ERUPTING = "erupting";
+	public const POTENT_SULFUR_STATE_WET = "wet";
+
 	public const SEA_GRASS_TYPE_DEFAULT = "default";
 	public const SEA_GRASS_TYPE_DOUBLE_BOT = "double_bot";
 	public const SEA_GRASS_TYPE_DOUBLE_TOP = "double_top";
diff --git a/generated/data/bedrock/block/BlockTypeNames.php b/generated/data/bedrock/block/BlockTypeNames.php
@@ -1203,6 +1203,7 @@ private function __construct(){
 	public const SULFUR_BRICKS = "minecraft:sulfur_bricks";
 	public const SULFUR_DOUBLE_SLAB = "minecraft:sulfur_double_slab";
 	public const SULFUR_SLAB = "minecraft:sulfur_slab";
+	public const SULFUR_SPIKE = "minecraft:sulfur_spike";
 	public const SULFUR_STAIRS = "minecraft:sulfur_stairs";
 	public const SULFUR_WALL = "minecraft:sulfur_wall";
 	public const SUNFLOWER = "minecraft:sunflower";
diff --git a/generated/data/bedrock/item/ItemTypeNames.php b/generated/data/bedrock/item/ItemTypeNames.php
@@ -387,6 +387,7 @@ final class ItemTypeNames{
 	public const MUSIC_DISC_13 = "minecraft:music_disc_13";
 	public const MUSIC_DISC_5 = "minecraft:music_disc_5";
 	public const MUSIC_DISC_BLOCKS = "minecraft:music_disc_blocks";
+	public const MUSIC_DISC_BOUNCE = "minecraft:music_disc_bounce";
 	public const MUSIC_DISC_CAT = "minecraft:music_disc_cat";
 	public const MUSIC_DISC_CHIRP = "minecraft:music_disc_chirp";
 	public const MUSIC_DISC_CREATOR = "minecraft:music_disc_creator";
diff --git a/src/block/utils/RecordType.php b/src/block/utils/RecordType.php
@@ -110,7 +110,7 @@ public function getSoundName() : string{
 		return $this->getMetadata()[0];
 	}
 
-	public function getSoundId() : int{
+	public function getSoundId() : string{
 		return $this->getMetadata()[1];
 	}
 
diff --git a/src/data/bedrock/ItemTagToIdMap.php b/src/data/bedrock/ItemTagToIdMap.php
@@ -46,6 +46,7 @@ final class ItemTagToIdMap{
 
 	private const PATHS = [
 		ProtocolInfo::CURRENT_PROTOCOL => "",
+		ProtocolInfo::PROTOCOL_1_26_20 => "",
 		ProtocolInfo::PROTOCOL_1_26_10 => "",
 		ProtocolInfo::PROTOCOL_1_26_0 => "",
 		ProtocolInfo::PROTOCOL_1_21_130 => "",
diff --git a/src/network/mcpe/InventoryManager.php b/src/network/mcpe/InventoryManager.php
@@ -554,7 +554,7 @@ private function sendInventoryContentPackets(int $windowId, array $itemStackWrap
 		$this->session->sendDataPacket(InventoryContentPacket::create(
 			$windowId,
 			array_fill_keys(array_keys($itemStackWrappers), new ItemStackWrapper(0, ItemStack::null())),
-			$this->session->getProtocolId() >= ProtocolInfo::PROTOCOL_1_26_20 ? null : new FullContainerName($this->lastInventoryNetworkId),
+			new FullContainerName($this->session->getProtocolId() >= ProtocolInfo::PROTOCOL_1_26_20 ? 0 : $this->lastInventoryNetworkId, null),
 			0,
 			new ItemStackWrapper(0, ItemStack::null())
 		));
diff --git a/src/network/mcpe/convert/BlockTranslator.php b/src/network/mcpe/convert/BlockTranslator.php
@@ -46,6 +46,10 @@ final class BlockTranslator{
 			self::CANONICAL_BLOCK_STATES_PATH => '',
 			self::BLOCK_STATE_META_MAP_PATH => '',
 		],
+		ProtocolInfo::PROTOCOL_1_26_20 => [
+			self::CANONICAL_BLOCK_STATES_PATH => '-1.26.20',
+			self::BLOCK_STATE_META_MAP_PATH => '-1.26.20',
+		],
 		ProtocolInfo::PROTOCOL_1_26_10 => [
 			self::CANONICAL_BLOCK_STATES_PATH => '-1.26.10',
 			self::BLOCK_STATE_META_MAP_PATH => '-1.26.10',
diff --git a/src/network/mcpe/convert/ItemTranslator.php b/src/network/mcpe/convert/ItemTranslator.php
@@ -137,6 +137,7 @@ public function fromNetworkId(int $networkId, int $networkMeta, int $networkBloc
 
 	public static function getItemSchemaId(int $protocolId) : int{
 		return match($protocolId){
+			ProtocolInfo::PROTOCOL_1_26_30,
 			ProtocolInfo::PROTOCOL_1_26_20 => 261,
 
 			ProtocolInfo::PROTOCOL_1_26_10,
diff --git a/src/network/mcpe/convert/ItemTypeDictionaryFromDataHelper.php b/src/network/mcpe/convert/ItemTypeDictionaryFromDataHelper.php
@@ -46,6 +46,7 @@ final class ItemTypeDictionaryFromDataHelper{
 
 	private const PATHS = [
 		ProtocolInfo::CURRENT_PROTOCOL => "",
+		ProtocolInfo::PROTOCOL_1_26_20 => "-1.26.20",
 		ProtocolInfo::PROTOCOL_1_26_10 => "-1.26.10",
 		ProtocolInfo::PROTOCOL_1_26_0 => "-1.26.0",
 		ProtocolInfo::PROTOCOL_1_21_130 => "-1.21.130",
diff --git a/src/network/mcpe/handler/InGamePacketHandler.php b/src/network/mcpe/handler/InGamePacketHandler.php
@@ -311,15 +311,15 @@ public function handlePlayerAuthInput(PlayerAuthInputPacket $packet) : bool{
 	public function handleInventoryTransaction(InventoryTransactionPacket $packet) : bool{
 		$result = true;
 
-		if(count($packet->trData->getActions()) > 50){
+		if(count($packet->trData?->getActions() ?? []) > 50){
 			throw new PacketHandlingException("Too many actions in inventory transaction");
 		}
 		if(count($packet->requestChangedSlots) > 10){
 			throw new PacketHandlingException("Too many slot sync requests in inventory transaction");
 		}
 
 		$this->inventoryManager->setCurrentItemStackRequestId($packet->requestId);
-		$this->inventoryManager->addRawPredictedSlotChanges($packet->trData->getActions());
+		$this->inventoryManager->addRawPredictedSlotChanges($packet->trData?->getActions() ?? []);
 
 		if($packet->trData instanceof NormalTransactionData){
 			$result = $this->handleNormalTransaction($packet->trData, $packet->requestId);
diff --git a/src/network/mcpe/handler/PreSpawnPacketHandler.php b/src/network/mcpe/handler/PreSpawnPacketHandler.php
@@ -117,6 +117,7 @@ public function setUp() : void{
 				false,
 				false,
 				new NetworkPermissions(disableClientSounds: true),
+				false,
 				null,
 				new ServerTelemetryData("", "", "", ""),
 				[],
diff --git a/src/world/sound/RecordStopSound.php b/src/world/sound/RecordStopSound.php
@@ -30,6 +30,6 @@
 class RecordStopSound implements Sound{
 
 	public function encode(Vector3 $pos) : array{
-		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::STOP_RECORD, $pos, false)];
+		return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::RECORD_NULL, $pos, false)];
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -123,4 +123,5 @@ private function __construct(){`
`123`	`123`	`public const MANGROVE_SWAMP = 191;`
`124`	`124`	`public const CHERRY_GROVE = 192;`
`125`	`125`	`public const PALE_GARDEN = 193;`
	`126`	`+ public const SULFUR_CAVES = 194;`
`126`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function getSoundName() : string{`
`110`	`110`	`return $this->getMetadata()[0];`
`111`	`111`	`}`
`112`	`112`
`113`		`- public function getSoundId() : int{`
	`113`	`+ public function getSoundId() : string{`
`114`	`114`	`return $this->getMetadata()[1];`
`115`	`115`	`}`
`116`	`116`