Support for latest PNX version

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "org.powernukkitx.anyversion"
-version = "2.8.3"
+version = "2.8.4"
 
 java {
     toolchain {

src/main/java/org/powernukkitx/anyversion/handler/handlers/CameraAimAssistPresetsHandler.java

@@ -0,0 +1,19 @@
+package org.powernukkitx.anyversion.handler.handlers;
+
+import org.cloudburstmc.protocol.bedrock.data.camera.CameraAimAssistPresetDefinition;
+import org.cloudburstmc.protocol.bedrock.packet.CameraAimAssistPresetsPacket;
+import org.powernukkitx.anyversion.handler.PacketHandler;
+import org.powernukkitx.anyversion.manager.ProtocolPlayer;
+import org.powernukkitx.anyversion.utils.ProtocolVersion;
+
+public class CameraAimAssistPresetsHandler extends PacketHandler<CameraAimAssistPresetsPacket> {
+
+    @Override
+    public void handle(ProtocolPlayer player, CameraAimAssistPresetsPacket packet) {
+        for (CameraAimAssistPresetDefinition preset : packet.getPresets()) {
+            if (preset.getCategories() == null) {
+                preset.setCategories("");
+            }
+        }
+    }
+}

src/main/java/org/powernukkitx/anyversion/handler/handlers/CreativeContentHandler.java

@@ -1,7 +1,8 @@
 package org.powernukkitx.anyversion.handler.handlers;
 
-import org.cloudburstmc.protocol.bedrock.data.inventory.CreativeItemData;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
+import org.cloudburstmc.protocol.bedrock.data.payload.creative.CreativeGroupInfoPayload;
+import org.cloudburstmc.protocol.bedrock.data.payload.creative.CreativeItemEntryPayload;
 import org.cloudburstmc.protocol.bedrock.packet.CreativeContentPacket;
 import org.powernukkitx.anyversion.handler.PacketHandler;
 import org.powernukkitx.anyversion.manager.ProtocolPlayer;
@@ -14,26 +15,29 @@ public class CreativeContentHandler extends PacketHandler<CreativeContentPacket>
 
     @Override
     public void handle(ProtocolPlayer player, CreativeContentPacket packet) {
-        List<CreativeItemData> c = new ArrayList<>(packet.getContents());
-        packet.getContents().clear();
-        for(CreativeItemData data : c) {
+        List<CreativeItemEntryPayload> c = new ArrayList<>(packet.getEntries());
+        packet.getEntries().clear();
+        for(CreativeItemEntryPayload data : c) {
             if (data.getItemInstance().getDefinition() == null) {
-                packet.getContents().add(data);
+                packet.getEntries().add(data);
                 continue;
             }
             ItemData itemData = Registries.ITEM.downgrade(player.getVersion(), data.getItemInstance());
             if(itemData.getDefinition() == null || Registries.ITEM.getOutdated(itemData).getDefinition() == null) {
-                packet.getContents().add(data);
+                packet.getEntries().add(data);
                 continue;
             }
             if(itemData.getDefinition().getIdentifier().equals(Registries.ITEM.getOutdated(itemData).getDefinition().getIdentifier())) continue;
-            CreativeItemData newData = CreativeItemData.builder()
-                    .itemInstance(itemData)
-                    .creativeNetId(data.getCreativeNetId())
-                    .groupIndex(data.getGroupIndex())
-                    .build();
-            packet.getContents().add(newData);
+            CreativeItemEntryPayload newData = new CreativeItemEntryPayload();
+            newData.setItemInstance(itemData);
+            newData.setCreativeNetId(data.getCreativeNetId());
+            newData.setGroupIndex(data.getGroupIndex());
+            packet.getEntries().add(newData);
         }
-    }
 
-}
+        for(CreativeGroupInfoPayload data : packet.getGroups()) {
+            ItemData itemData = Registries.ITEM.downgrade(player.getVersion(), data.getGroupIconItem());
+            data.setGroupIconItem(itemData);
+        }
+    }
+}

src/main/java/org/powernukkitx/anyversion/handler/handlers/StartGameHandler.java

@@ -10,7 +10,7 @@
 import org.powernukkitx.registry.ItemRuntimeIdRegistry;
 import org.powernukkitx.registry.Registries;
 import org.cloudburstmc.nbt.NbtMap;
-import org.cloudburstmc.protocol.bedrock.data.BlockPropertyData;
+import org.cloudburstmc.protocol.bedrock.data.ServerBlockProperty;
 import org.cloudburstmc.protocol.bedrock.data.definitions.ItemDefinition;
 import org.cloudburstmc.protocol.bedrock.data.definitions.SimpleItemDefinition;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
@@ -36,10 +36,6 @@ public void handle(ProtocolPlayer player, StartGamePacket packet) {
             packet.getSettings().setWorldId("");
             packet.getSettings().setScenarioId("");
             packet.getSettings().setOwnerId("");
-            packet.setServerID("");
-            packet.setWorldID("");
-            packet.setScenarioID("");
-            packet.setOwnerID("");
         }
 
         if(player.protocol() < ProtocolVersion.MINECRAFT_PE_1_21_130.protocol()) {
@@ -75,7 +71,7 @@ public void handle(ProtocolPlayer player, StartGamePacket packet) {
                         }
                     }
                 }
-                packet.getBlockProperties().add(new BlockPropertyData(definition.identifier(), InventoryTransactionHandler.deepcopy(nbt)));
+                packet.getBlockProperties().add(new ServerBlockProperty(definition.identifier(), InventoryTransactionHandler.deepcopy(nbt)));
             }
         }
 

src/main/java/org/powernukkitx/anyversion/manager/ProtocolManager.java

@@ -22,7 +22,7 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import lombok.extern.slf4j.Slf4j;
 import org.cloudburstmc.protocol.bedrock.data.auth.PlayerAuthenticationType;
-import org.cloudburstmc.protocol.bedrock.data.skin.SerializedSkin;
+import org.cloudburstmc.protocol.bedrock.data.skin.Skin;
 import org.cloudburstmc.protocol.bedrock.netty.codec.packet.BedrockPacketCodec;
 import org.cloudburstmc.protocol.bedrock.data.DisconnectFailReason;
 import org.cloudburstmc.protocol.bedrock.data.PacketCompressionAlgorithm;
@@ -235,7 +235,7 @@ private void handleLenient(LoginPacket packet, PlayerSessionHolder holder, Serve
 
             try {
                 final ChainValidationResult result = validateChainOrToken(packet, type);
-                if (xboxAuthRequired && (!result.signed() && !server.getSettings().baseSettings().waterdogpe())) {
+                if (xboxAuthRequired && !result.signed()) {
                     holder.disconnect(notAuthenticated);
                     return;
                 }
@@ -330,7 +330,7 @@ private LenientClientJwt validateClientJwtLenient(LoginPacket packet, PublicKey
                     return null;
                 }
 
-                final SerializedSkin skin;
+                final Skin skin;
                 try {
                     skin = ClientSkinData.readSkin(claims);
                 } catch (RuntimeException e) {
@@ -370,7 +370,7 @@ private void enableEncryption(ChainValidationResult.IdentityClaims claims, Playe
         }
     }
 
-    private record LenientClientJwt(ClientChainData chain, SerializedSkin skin) { }
+    private record LenientClientJwt(ClientChainData chain, Skin skin) { }
 
     private static void padChainClaims(JwtClaims claims) {
         putIfAbsent(claims, "CompatibleWithClientSideChunkGen", Boolean.FALSE);

src/main/java/org/powernukkitx/anyversion/registries/registries/PacketHandlerRegistry.java

@@ -39,6 +39,7 @@ public void init() {
         HANDLERS.add(new LoginHandler());
         HANDLERS.add(new SetEntityDataHandler());
         HANDLERS.add(new UpdateSubChunkBlocksHandler());
+        HANDLERS.add(new CameraAimAssistPresetsHandler());
         HANDLERS.add(new TextHandler());
     }