From 7aa424b07974b8d949deebf441d81b48349ca653 Mon Sep 17 00:00:00 2001 From: Mattie Date: Wed, 12 Feb 2025 11:56:52 -0500 Subject: Finish 1.21.60 support --- .github/assets/supportedVersion | 2 +- .../com/pyratron/pugmatt/bedrockconnect/BCPlayer.java | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/assets/supportedVersion b/.github/assets/supportedVersion index 384e6a3..dcda300 100644 --- a/.github/assets/supportedVersion +++ b/.github/assets/supportedVersion @@ -1 +1 @@ -1.21.51.02 +1.21.60.10 diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java index 007c833..3fd54e4 100644 --- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java +++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java @@ -297,20 +297,10 @@ public class BCPlayer { session.sendPacket(startGamePacket); - // Previously was able to send empty ItemData array to fulfill this; Game client crashes now - // though if contents/groups are empty. Also tried setting it to lists that have single phony entries... - // Example: - // creativeItemData.add(new CreativeItemData(ItemData.AIR, 0, 0); - // creativeItemGroupData.add(new CreativeItemGroup(CreativeItemCategory.ALL, "", ItemData.AIR)); - // - // ... but no dice (Either crashes client or client shows a 'Server returned broken packet' error) - // , unless I'm missing something - // - // Unless I'm missing something, I'm assuming this version requires the actual parsed creative_items.json - // to be passed-in, will need to figure out parsing the file with the new format. + ItemComponentPacket componentPacket = new ItemComponentPacket(); + session.sendPacket(componentPacket); + CreativeContentPacket creativeContentPacket = new CreativeContentPacket(); - creativeContentPacket.getContents().addAll(BedrockConnect.paletteManager.CREATIVE_ITEM_DATA); - creativeContentPacket.getGroups().addAll(BedrockConnect.paletteManager.CREATIVE_ITEM_GROUPS); session.sendPacket(creativeContentPacket); spawn(); -- cgit v1.2.1