From 3330a40419ded7b6b8bc60802b2c5033a65c7a2e Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 25 Jun 2025 17:20:26 +0200 Subject: [PATCH] packets: Add support for 1.21.7 --- .../fancysitula/api/utils/ServerVersion.java | 1 + .../fancysitula/factories/PacketFactory.java | 32 +++++++++---------- .../factories/PacketListenerFactory.java | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/libraries/packets/packets-api/src/main/java/de/oliver/fancysitula/api/utils/ServerVersion.java b/libraries/packets/packets-api/src/main/java/de/oliver/fancysitula/api/utils/ServerVersion.java index 5aad9237..80790b18 100644 --- a/libraries/packets/packets-api/src/main/java/de/oliver/fancysitula/api/utils/ServerVersion.java +++ b/libraries/packets/packets-api/src/main/java/de/oliver/fancysitula/api/utils/ServerVersion.java @@ -7,6 +7,7 @@ import java.util.List; public enum ServerVersion { + v1_21_7("1.21.7", 772), v1_21_6("1.21.6", 771), v1_21_5("1.21.5", 770), v1_21_4("1.21.4", 769), diff --git a/libraries/packets/src/main/java/de/oliver/fancysitula/factories/PacketFactory.java b/libraries/packets/src/main/java/de/oliver/fancysitula/factories/PacketFactory.java index 0ae49ad0..a0cbc8e7 100644 --- a/libraries/packets/src/main/java/de/oliver/fancysitula/factories/PacketFactory.java +++ b/libraries/packets/src/main/java/de/oliver/fancysitula/factories/PacketFactory.java @@ -28,7 +28,7 @@ public class PacketFactory { List entries ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundPlayerInfoUpdatePacketImpl(actions, entries); } case v1_21_5 -> { @@ -70,7 +70,7 @@ public class PacketFactory { int velocityZ, int data) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundAddEntityPacketImpl(entityId, entityUUID, entityType, x, y, z, yaw, pitch, headYaw, velocityX, velocityY, velocityZ, data); } case v1_21_5 -> { @@ -99,7 +99,7 @@ public class PacketFactory { List uuids ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundPlayerInfoRemovePacketImpl(uuids); } case v1_21_5 -> { @@ -128,7 +128,7 @@ public class PacketFactory { List entityIds ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundRemoveEntitiesPacketImpl(entityIds); } case v1_21_5 -> { @@ -169,7 +169,7 @@ public class PacketFactory { boolean onGround ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundTeleportEntityPacketImpl(entityId, x, y, z, yaw, pitch, onGround); } case v1_21_5 -> { @@ -200,7 +200,7 @@ public class PacketFactory { float headYaw ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundRotateHeadPacketImpl(entityId, headYaw); } case v1_21_5 -> { @@ -231,7 +231,7 @@ public class PacketFactory { List entityData ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundSetEntityDataPacketImpl(entityId, entityData); } case v1_21_5 -> { @@ -262,7 +262,7 @@ public class PacketFactory { Map equipment ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundSetEquipmentPacketImpl(entityId, equipment); } case v1_21_5 -> { @@ -293,7 +293,7 @@ public class PacketFactory { List passengers ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundSetPassengersPacketImpl(entityId, passengers); } case v1_21_5 -> { @@ -327,7 +327,7 @@ public class PacketFactory { FS_ClientboundCreateOrUpdateTeamPacket.CreateTeam createTeam ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, createTeam); } case v1_21_5 -> { @@ -360,7 +360,7 @@ public class PacketFactory { FS_ClientboundCreateOrUpdateTeamPacket.RemoveTeam removeTeam ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, removeTeam); } case v1_21_5 -> { @@ -393,7 +393,7 @@ public class PacketFactory { FS_ClientboundCreateOrUpdateTeamPacket.UpdateTeam updateTeam ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, updateTeam); } case v1_21_5 -> { @@ -426,7 +426,7 @@ public class PacketFactory { FS_ClientboundCreateOrUpdateTeamPacket.AddEntity addEntity ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, addEntity); } case v1_21_5 -> { @@ -459,7 +459,7 @@ public class PacketFactory { FS_ClientboundCreateOrUpdateTeamPacket.RemoveEntity removeEntity ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, removeEntity); } case v1_21_5 -> { @@ -489,7 +489,7 @@ public class PacketFactory { FS_Dialog dialog ) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundShowDialogPacketImpl(dialog); } default -> @@ -504,7 +504,7 @@ public class PacketFactory { */ public FS_ClientboundClearDialogPacket createClearDialogPacket() { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.packets.ClientboundClearDialogPacketImpl(); } default -> diff --git a/libraries/packets/src/main/java/de/oliver/fancysitula/factories/PacketListenerFactory.java b/libraries/packets/src/main/java/de/oliver/fancysitula/factories/PacketListenerFactory.java index 1fff167f..d43f58b9 100644 --- a/libraries/packets/src/main/java/de/oliver/fancysitula/factories/PacketListenerFactory.java +++ b/libraries/packets/src/main/java/de/oliver/fancysitula/factories/PacketListenerFactory.java @@ -8,7 +8,7 @@ public class PacketListenerFactory { public FS_PacketListener createPacketListener(FS_ServerboundPacket.Type packet) { switch (ServerVersion.getCurrentVersion()) { - case v1_21_6 -> { + case v1_21_6, v1_21_7 -> { return new de.oliver.fancysitula.versions.v1_21_6.utils.PacketListenerImpl(packet); } default ->