Actually ported creative content

Author: Buddelbubi

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,34 +1,43 @@
 package org.powernukkitx.anyversion.handler.handlers;
 
 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;
 import org.powernukkitx.anyversion.registries.Registries;
 
-import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.List;
 
 public class CreativeContentHandler extends PacketHandler<CreativeContentPacket> {
 
     @Override
     public void handle(ProtocolPlayer player, CreativeContentPacket packet) {
-        Iterator<CreativeItemEntryPayload> iterator = packet.getEntries().iterator();
-        while (iterator.hasNext()) {
-            CreativeItemEntryPayload data = iterator.next();
+        List<CreativeItemEntryPayload> c = new ArrayList<>(packet.getEntries());
+        packet.getEntries().clear();
+        for(CreativeItemEntryPayload data : c) {
             if (data.getItemInstance().getDefinition() == null) {
+                packet.getEntries().add(data);
                 continue;
             }
             ItemData itemData = Registries.ITEM.downgrade(player.getVersion(), data.getItemInstance());
-            if (itemData.getDefinition() == null || Registries.ITEM.getOutdated(itemData).getDefinition() == null) {
+            if(itemData.getDefinition() == null || Registries.ITEM.getOutdated(itemData).getDefinition() == null) {
+                packet.getEntries().add(data);
                 continue;
             }
-            if (itemData.getDefinition().getIdentifier().equals(Registries.ITEM.getOutdated(itemData).getDefinition().getIdentifier())) {
-                iterator.remove();
-                continue;
-            }
-            data.setItemInstance(itemData);
+            if(itemData.getDefinition().getIdentifier().equals(Registries.ITEM.getOutdated(itemData).getDefinition().getIdentifier())) continue;
+            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/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());
     }