Bump protocol & add more illegal/ignored packets

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

core/src/main/java/org/geysermc/geyser/network/GameProtocol.java

@@ -34,32 +34,59 @@ import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockPacketSerializer;
 import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.MobArmorEquipmentSerializer_v291;
 import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.MobEquipmentSerializer_v291;
+import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.PlayerHotbarSerializer_v291;
+import org.cloudburstmc.protocol.bedrock.codec.v291.serializer.SetEntityLinkSerializer_v291;
+import org.cloudburstmc.protocol.bedrock.codec.v390.serializer.PlayerSkinSerializer_v390;
 import org.cloudburstmc.protocol.bedrock.codec.v407.serializer.InventoryContentSerializer_v407;
 import org.cloudburstmc.protocol.bedrock.codec.v407.serializer.InventorySlotSerializer_v407;
 import org.cloudburstmc.protocol.bedrock.codec.v486.serializer.BossEventSerializer_v486;
+import org.cloudburstmc.protocol.bedrock.codec.v557.serializer.SetEntityDataSerializer_v557;
 import org.cloudburstmc.protocol.bedrock.codec.v622.Bedrock_v622;
 import org.cloudburstmc.protocol.bedrock.codec.v630.Bedrock_v630;
 import org.cloudburstmc.protocol.bedrock.codec.v649.Bedrock_v649;
 import org.cloudburstmc.protocol.bedrock.codec.v662.Bedrock_v662;
+import org.cloudburstmc.protocol.bedrock.codec.v662.serializer.SetEntityMotionSerializer_v662;
 import org.cloudburstmc.protocol.bedrock.codec.v671.Bedrock_v671;
 import org.cloudburstmc.protocol.bedrock.netty.codec.packet.BedrockPacketCodec;
+import org.cloudburstmc.protocol.bedrock.packet.AnvilDamagePacket;
 import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
 import org.cloudburstmc.protocol.bedrock.packet.BossEventPacket;
 import org.cloudburstmc.protocol.bedrock.packet.ClientCacheBlobStatusPacket;
+import org.cloudburstmc.protocol.bedrock.packet.ClientCacheStatusPacket;
 import org.cloudburstmc.protocol.bedrock.packet.ClientCheatAbilityPacket;
+import org.cloudburstmc.protocol.bedrock.packet.ClientToServerHandshakePacket;
 import org.cloudburstmc.protocol.bedrock.packet.CraftingEventPacket;
 import org.cloudburstmc.protocol.bedrock.packet.CreatePhotoPacket;
+import org.cloudburstmc.protocol.bedrock.packet.DebugInfoPacket;
+import org.cloudburstmc.protocol.bedrock.packet.DisconnectPacket;
 import org.cloudburstmc.protocol.bedrock.packet.EditorNetworkPacket;
+import org.cloudburstmc.protocol.bedrock.packet.EntityFallPacket;
+import org.cloudburstmc.protocol.bedrock.packet.GameTestRequestPacket;
 import org.cloudburstmc.protocol.bedrock.packet.InventoryContentPacket;
 import org.cloudburstmc.protocol.bedrock.packet.InventorySlotPacket;
 import org.cloudburstmc.protocol.bedrock.packet.LabTablePacket;
+import org.cloudburstmc.protocol.bedrock.packet.MapCreateLockedCopyPacket;
+import org.cloudburstmc.protocol.bedrock.packet.MapInfoRequestPacket;
 import org.cloudburstmc.protocol.bedrock.packet.MobArmorEquipmentPacket;
 import org.cloudburstmc.protocol.bedrock.packet.MobEquipmentPacket;
+import org.cloudburstmc.protocol.bedrock.packet.MultiplayerSettingsPacket;
+import org.cloudburstmc.protocol.bedrock.packet.NpcRequestPacket;
 import org.cloudburstmc.protocol.bedrock.packet.PhotoInfoRequestPacket;
 import org.cloudburstmc.protocol.bedrock.packet.PhotoTransferPacket;
 import org.cloudburstmc.protocol.bedrock.packet.PlayerAuthInputPacket;
+import org.cloudburstmc.protocol.bedrock.packet.PlayerHotbarPacket;
+import org.cloudburstmc.protocol.bedrock.packet.PlayerSkinPacket;
 import org.cloudburstmc.protocol.bedrock.packet.PurchaseReceiptPacket;
+import org.cloudburstmc.protocol.bedrock.packet.ScriptCustomEventPacket;
+import org.cloudburstmc.protocol.bedrock.packet.ScriptMessagePacket;
+import org.cloudburstmc.protocol.bedrock.packet.SetEntityDataPacket;
+import org.cloudburstmc.protocol.bedrock.packet.SetEntityLinkPacket;
+import org.cloudburstmc.protocol.bedrock.packet.SetEntityMotionPacket;
+import org.cloudburstmc.protocol.bedrock.packet.SettingsCommandPacket;
+import org.cloudburstmc.protocol.bedrock.packet.SimpleEventPacket;
+import org.cloudburstmc.protocol.bedrock.packet.SubChunkRequestPacket;
 import org.cloudburstmc.protocol.bedrock.packet.SubClientLoginPacket;
+import org.cloudburstmc.protocol.bedrock.packet.TickSyncPacket;
 import org.cloudburstmc.protocol.common.util.VarInts;
 import org.geysermc.geyser.session.GeyserSession;
 
@@ -196,59 +223,88 @@ public final class GameProtocol {
 
     private static BedrockCodec processCodec(BedrockCodec codec) {
         return codec.toBuilder()
-                // Illegal unused serverbound EDU packets
+            // Illegal unused serverbound EDU packets
-                .updateSerializer(PhotoTransferPacket.class, setIllegalSerializer())
+            .updateSerializer(PhotoTransferPacket.class, setIllegalSerializer())
-                .updateSerializer(LabTablePacket.class, setIllegalSerializer())
+            .updateSerializer(LabTablePacket.class, setIllegalSerializer())
-                .updateSerializer(CreatePhotoPacket.class, setIllegalSerializer())
+            .updateSerializer(CreatePhotoPacket.class, setIllegalSerializer())
-                .updateSerializer(PhotoInfoRequestPacket.class, setIllegalSerializer())
+            .updateSerializer(NpcRequestPacket.class, setIllegalSerializer())
-                // Illegal unused serverbound packets for featured servers
+            .updateSerializer(PhotoInfoRequestPacket.class, setIllegalSerializer())
-                .updateSerializer(PurchaseReceiptPacket.class, setIllegalSerializer())
+            // Illegal unused serverbound packets for featured servers
-                // Illegal unused serverbound packets for editor
+            .updateSerializer(PurchaseReceiptPacket.class, setIllegalSerializer())
-                .updateSerializer(EditorNetworkPacket.class, setIllegalSerializer())
+            // Illegal unused serverbound packets that are deprecated
-                // Illegal unused serverbound packets that are deprecated
+            .updateSerializer(ClientCheatAbilityPacket.class, setIllegalSerializer())
-                .updateSerializer(ClientCheatAbilityPacket.class, setIllegalSerializer())
+            // Illegal unusued serverbound packets that relate to unused features
-                // Illegal unusued serverbound packets that relate to unused features
+            .updateSerializer(PlayerAuthInputPacket.class, setIllegalSerializer())
-                .updateSerializer(PlayerAuthInputPacket.class, setIllegalSerializer())
+            .updateSerializer(ClientCacheBlobStatusPacket.class, setIllegalSerializer())
-                .updateSerializer(ClientCacheBlobStatusPacket.class, setIllegalSerializer())
+            .updateSerializer(ClientCacheStatusPacket.class, setIllegalSerializer())
-                .updateSerializer(SubClientLoginPacket.class, setIllegalSerializer())
+            .updateSerializer(SubClientLoginPacket.class, setIllegalSerializer())
-                // Illegal serverbound packets due to Geyser specific setup
+            .updateSerializer(SubChunkRequestPacket.class, setIllegalSerializer())
-                .updateSerializer(InventoryContentPacket.class, new InventoryContentSerializer_v407() {
+            .updateSerializer(GameTestRequestPacket.class, setIllegalSerializer())
-                    @Override
+            // Ignored serverbound packets
-                    public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, InventoryContentPacket packet) {
+            .updateSerializer(CraftingEventPacket.class, setIgnoredSerializer()) // Make illegal when 1.20.40 is removed
-                        throw new IllegalArgumentException("Client cannot send InventoryContentPacket in server-auth inventory environment!");
+            .updateSerializer(ClientToServerHandshakePacket.class, setIgnoredSerializer())
-                    }
+            .updateSerializer(EntityFallPacket.class, setIgnoredSerializer())
-                })
+            .updateSerializer(MapCreateLockedCopyPacket.class, setIgnoredSerializer())
-                .updateSerializer(InventorySlotPacket.class, new InventorySlotSerializer_v407() {
+            .updateSerializer(MapInfoRequestPacket.class, setIgnoredSerializer())
-                    @Override
+            .updateSerializer(SettingsCommandPacket.class, setIgnoredSerializer())
-                    public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, InventorySlotPacket packet) {
+            .updateSerializer(AnvilDamagePacket.class, setIgnoredSerializer())
-                        throw new IllegalArgumentException("Client cannot send InventorySlotPacket in server-auth inventory environment!");
+            // Illegal when serverbound due to Geyser specific setup
-                    }
+            .updateSerializer(InventoryContentPacket.class, new InventoryContentSerializer_v407() {
-                })
+                @Override
-                // Ignored serverbound packets
+                public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, InventoryContentPacket packet) {
-                .updateSerializer(CraftingEventPacket.class, setIgnoredSerializer()) // Make illegal when 1.20.40 is removed
+                    throw new IllegalArgumentException("Client cannot send InventoryContentPacket in server-auth inventory environment!");
-                // Ignored only when serverbound
+                }
-                .updateSerializer(BossEventPacket.class, new BossEventSerializer_v486() {
+            })
-                    @Override
+            .updateSerializer(InventorySlotPacket.class, new InventorySlotSerializer_v407() {
-                    public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, BossEventPacket packet) {
+                @Override
-                    }
+                public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, InventorySlotPacket packet) {
-                })
+                    throw new IllegalArgumentException("Client cannot send InventorySlotPacket in server-auth inventory environment!");
-                .updateSerializer(MobArmorEquipmentPacket.class, new MobArmorEquipmentSerializer_v291() {
+                }
-                    @Override
+            })
-                    public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, MobArmorEquipmentPacket packet) {
+            // Ignored only when serverbound
-                    }
+            .updateSerializer(BossEventPacket.class, new BossEventSerializer_v486() {
-                })
+                @Override public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, BossEventPacket packet) {}
-                // Valid serverbound packets where reading of some fields can be skipped
+            })
-                .updateSerializer(MobEquipmentPacket.class, new MobEquipmentSerializer_v291() {
+            .updateSerializer(MobArmorEquipmentPacket.class, new MobArmorEquipmentSerializer_v291() {
-                    @Override
+                @Override public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, MobArmorEquipmentPacket packet) {}
-                    public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, MobEquipmentPacket packet) {
+            })
-                        packet.setRuntimeEntityId(VarInts.readUnsignedLong(buffer));
+            .updateSerializer(PlayerHotbarPacket.class, new PlayerHotbarSerializer_v291() {
-                        fakeItemRead(buffer);
+                @Override public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, PlayerHotbarPacket packet) {}
-                        packet.setInventorySlot(buffer.readUnsignedByte());
+            })
-                        packet.setHotbarSlot(buffer.readUnsignedByte());
+            .updateSerializer(PlayerSkinPacket.class, new PlayerSkinSerializer_v390() {
-                        packet.setContainerId(buffer.readByte());
+                @Override public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, PlayerSkinPacket packet) {}
-                    }
+            })
-                })
+            .updateSerializer(SetEntityDataPacket.class, new SetEntityDataSerializer_v557() {
-                .build();
+                @Override public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, SetEntityDataPacket packet) {}
+            })
+            .updateSerializer(SetEntityMotionPacket.class, new SetEntityMotionSerializer_v662() {
+                @Override public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, SetEntityMotionPacket packet) {}
+            })
+            .updateSerializer(SetEntityLinkPacket.class, new SetEntityLinkSerializer_v291() {
+                @Override public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, SetEntityLinkPacket packet) {}
+            })
+            // Valid serverbound packets where reading of some fields can be skipped
+            .updateSerializer(MobEquipmentPacket.class, new MobEquipmentSerializer_v291() {
+                @Override
+                public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, MobEquipmentPacket packet) {
+                    packet.setRuntimeEntityId(VarInts.readUnsignedLong(buffer));
+                    fakeItemRead(buffer);
+                    packet.setInventorySlot(buffer.readUnsignedByte());
+                    packet.setHotbarSlot(buffer.readUnsignedByte());
+                    packet.setContainerId(buffer.readByte());
+                }
+            })
+            // Illegal bidirectional packets
+            .updateSerializer(DebugInfoPacket.class, setIllegalSerializer())
+            .updateSerializer(EditorNetworkPacket.class, setIllegalSerializer())
+            .updateSerializer(ScriptCustomEventPacket.class, setIllegalSerializer())
+            .updateSerializer(ScriptMessagePacket.class, setIllegalSerializer())
+            // Ignored bidirectional packets
+            .updateSerializer(DisconnectPacket.class, setIgnoredSerializer())
+            .updateSerializer(SimpleEventPacket.class, setIgnoredSerializer())
+            .updateSerializer(TickSyncPacket.class, setIgnoredSerializer())
+            .updateSerializer(MultiplayerSettingsPacket.class, setIgnoredSerializer())
+            .build();
     }
 
     /**

gradle/libs.versions.toml

@@ -118,9 +118,9 @@ websocket = { group = "org.java-websocket", name = "Java-WebSocket", version.ref
 #protocol-common = { group = "org.cloudburstmc.protocol", name = "common", version.ref = "protocol-connection" }
 #protocol-codec = { group = "org.cloudburstmc.protocol", name = "bedrock-codec", version.ref = "protocol" }
 #protocol-connection = { group = "org.cloudburstmc.protocol", name = "bedrock-connection", version.ref = "protocol-connection" }
-protocol-common = { group = "com.github.Kas-tle.Protocol", name = "common", version = "4902471" } # Remove before merge
+protocol-common = { group = "com.github.Kas-tle.Protocol", name = "common", version = "8dac7d9" } # Remove before merge
-protocol-codec = { group = "com.github.Kas-tle.Protocol", name = "bedrock-codec", version = "4902471" } # Remove before merge
+protocol-codec = { group = "com.github.Kas-tle.Protocol", name = "bedrock-codec", version = "8dac7d9" } # Remove before merge
-protocol-connection = { group = "com.github.Kas-tle.Protocol", name = "bedrock-connection", version = "4902471" } # Remove before merge
+protocol-connection = { group = "com.github.Kas-tle.Protocol", name = "bedrock-connection", version = "8dac7d9" } # Remove before merge
 
 math = { group = "org.cloudburstmc.math", name = "immutable", version = "2.0" }