From 4a3d03073e5aa4527f746940fdd64462f852359f Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 19 May 2025 20:37:22 +0200 Subject: [PATCH] packets: Simplify packet creation methods to use always current server version --- .../fancysitula/factories/PacketFactory.java | 343 +++++------------- 1 file changed, 95 insertions(+), 248 deletions(-) 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 46a161a6..ac3a8a9c 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 @@ -23,9 +23,10 @@ public class PacketFactory { * @param entries List of {@link FS_ClientboundPlayerInfoUpdatePacket.Entry} to update */ public FS_ClientboundPlayerInfoUpdatePacket createPlayerInfoUpdatePacket( - ServerVersion serverVersion, EnumSet actions, - List entries) { - switch (serverVersion) { + EnumSet actions, + List entries + ) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundPlayerInfoUpdatePacketImpl(actions, entries); } @@ -38,22 +39,11 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundPlayerInfoUpdatePacketImpl(actions, entries); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates a new FS_ClientboundPlayerInfoUpdatePacket instance based on the current server version - * - * @param actions EnumSet of {@link FS_ClientboundPlayerInfoUpdatePacket.Action} to perform - * @param entries List of {@link FS_ClientboundPlayerInfoUpdatePacket.Entry} to update - */ - public FS_ClientboundPlayerInfoUpdatePacket createPlayerInfoUpdatePacket( - EnumSet actions, - List entries) { - return createPlayerInfoUpdatePacket(ServerVersion.getCurrentVersion(), actions, entries); - } - /** * Creates a new FS_ClientboundAddEntityPacket instance based on the server version * @@ -62,7 +52,6 @@ public class PacketFactory { * @param headYaw in degrees (0 - 360) */ public FS_ClientboundAddEntityPacket createAddEntityPacket( - ServerVersion serverVersion, int entityId, UUID entityUUID, EntityType entityType, @@ -76,7 +65,7 @@ public class PacketFactory { int velocityY, int velocityZ, int data) { - switch (serverVersion) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundAddEntityPacketImpl(entityId, entityUUID, entityType, x, y, z, yaw, pitch, headYaw, velocityX, velocityY, velocityZ, data); } @@ -89,41 +78,20 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundAddEntityPacketImpl(entityId, entityUUID, entityType, x, y, z, yaw, pitch, headYaw, velocityX, velocityY, velocityZ, data); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates a new FS_ClientboundAddEntityPacket instance based on the current server version - * - * @param yaw in degrees (0 - 360) - * @param pitch in degrees (0 - 360) - * @param headYaw in degrees (0 - 360) - */ - public FS_ClientboundAddEntityPacket createAddEntityPacket( - int entityId, - UUID entityUUID, - EntityType entityType, - double x, - double y, - double z, - float yaw, - float pitch, - float headYaw, - int velocityX, - int velocityY, - int velocityZ, - int data) { - return createAddEntityPacket(ServerVersion.getCurrentVersion(), entityId, entityUUID, entityType, x, y, z, yaw, pitch, headYaw, velocityX, velocityY, velocityZ, data); - } - /** * Creates a new FS_ClientboundPlayerInfoRemovePacket instance based on the server version * * @param uuids UUIDs of the players to remove */ - public FS_ClientboundPlayerInfoRemovePacket createPlayerInfoRemovePacket(ServerVersion serverVersion, List uuids) { - switch (serverVersion) { + public FS_ClientboundPlayerInfoRemovePacket createPlayerInfoRemovePacket( + List uuids + ) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundPlayerInfoRemovePacketImpl(uuids); } @@ -136,44 +104,20 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundPlayerInfoRemovePacketImpl(uuids); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates a new FS_ClientboundPlayerInfoRemovePacket instance based on the current server version - * - * @param uuids UUIDs of the players to remove - */ - public FS_ClientboundPlayerInfoRemovePacket createPlayerInfoRemovePacket(List uuids) { - return createPlayerInfoRemovePacket(ServerVersion.getCurrentVersion(), uuids); - } - - /** - * Creates a new FS_ClientboundPlayerInfoRemovePacket instance based on the server version - * - * @param uuid UUID of the player to remove - */ - public FS_ClientboundPlayerInfoRemovePacket createPlayerInfoRemovePacket(ServerVersion serverVersion, UUID uuid) { - return createPlayerInfoRemovePacket(serverVersion, List.of(uuid)); - } - - /** - * Creates a new FS_ClientboundPlayerInfoRemovePacket instance based on the current server version - * - * @param uuid UUID of the player to remove - */ - public FS_ClientboundPlayerInfoRemovePacket createPlayerInfoRemovePacket(UUID uuid) { - return createPlayerInfoRemovePacket(ServerVersion.getCurrentVersion(), uuid); - } - /** * Creates a new FS_ClientboundRemoveEntitiesPacket instance based on the server version * * @param entityIds IDs of the entities to remove */ - public FS_ClientboundRemoveEntitiesPacket createRemoveEntitiesPacket(ServerVersion serverVersion, List entityIds) { - switch (serverVersion) { + public FS_ClientboundRemoveEntitiesPacket createRemoveEntitiesPacket( + List entityIds + ) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundRemoveEntitiesPacketImpl(entityIds); } @@ -186,19 +130,11 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundRemoveEntitiesPacketImpl(entityIds); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates a new FS_ClientboundRemoveEntitiesPacket instance based on the current server version - * - * @param entityIds IDs of the entities to remove - */ - public FS_ClientboundRemoveEntitiesPacket createRemoveEntitiesPacket(List entityIds) { - return createRemoveEntitiesPacket(ServerVersion.getCurrentVersion(), entityIds); - } - /** * Creates a new FS_ClientboundTeleportEntityPacket instance based on the server version * @@ -211,7 +147,6 @@ public class PacketFactory { * @param onGround Whether the entity is on the ground */ public FS_ClientboundTeleportEntityPacket createTeleportEntityPacket( - ServerVersion serverVersion, int entityId, double x, double y, @@ -220,7 +155,7 @@ public class PacketFactory { float pitch, boolean onGround ) { - switch (serverVersion) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundTeleportEntityPacketImpl(entityId, x, y, z, yaw, pitch, onGround); } @@ -233,41 +168,22 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundTeleportEntityPacketImpl(entityId, x, y, z, yaw, pitch, onGround); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates a new FS_ClientboundTeleportEntityPacket instance based on the current server version - * - * @param entityId ID of the entity to teleport - * @param x X coordinate - * @param y Y coordinate - * @param z Z coordinate - * @param yaw Yaw in degrees (0 - 360) - * @param pitch Pitch in degrees (0 - 360) - * @param onGround Whether the entity is on the ground - */ - public FS_ClientboundTeleportEntityPacket createTeleportEntityPacket( - int entityId, - double x, - double y, - double z, - float yaw, - float pitch, - boolean onGround - ) { - return createTeleportEntityPacket(ServerVersion.getCurrentVersion(), entityId, x, y, z, yaw, pitch, onGround); - } - /** * Creates a new FS_ClientboundRotateHeadPacket instance based on the server version * * @param entityId ID of the entity to rotate the head of * @param headYaw Yaw of the head in degrees (0 - 360) */ - public FS_ClientboundRotateHeadPacket createRotateHeadPacket(ServerVersion serverVersion, int entityId, float headYaw) { - switch (serverVersion) { + public FS_ClientboundRotateHeadPacket createRotateHeadPacket( + int entityId, + float headYaw + ) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundRotateHeadPacketImpl(entityId, headYaw); } @@ -280,20 +196,11 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundRotateHeadPacketImpl(entityId, headYaw); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates a new FS_ClientboundRotateHeadPacket instance based on the current server version - * - * @param entityId ID of the entity to rotate the head of - * @param headYaw Yaw of the head in degrees (0 - 360) - */ - public FS_ClientboundRotateHeadPacket createRotateHeadPacket(int entityId, float headYaw) { - return createRotateHeadPacket(ServerVersion.getCurrentVersion(), entityId, headYaw); - } - /** * Creates a new FS_ClientboundSetEntityDataPacket instance based on the server version * @@ -301,8 +208,10 @@ public class PacketFactory { * @param entityData List of {@link FS_ClientboundSetEntityDataPacket.EntityData} to set */ public FS_ClientboundSetEntityDataPacket createSetEntityDataPacket( - ServerVersion serverVersion, int entityId, List entityData) { - switch (serverVersion) { + int entityId, + List entityData + ) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundSetEntityDataPacketImpl(entityId, entityData); } @@ -315,28 +224,22 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundSetEntityDataPacketImpl(entityId, entityData); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates a new FS_ClientboundSetEntityDataPacket instance based on the current server version - * - * @param entityId ID of the entity to set the data of - * @param entityData List of {@link FS_ClientboundSetEntityDataPacket.EntityData} to set - */ - public FS_ClientboundSetEntityDataPacket createSetEntityDataPacket(int entityId, List entityData) { - return createSetEntityDataPacket(ServerVersion.getCurrentVersion(), entityId, entityData); - } - /** * Creates a new FS_ClientboundSetEquipmentPacket instance based on the server version * * @param entityId ID of the entity to set the equipment of * @param equipment Map of {@link org.bukkit.inventory.EquipmentSlot} and {@link org.bukkit.inventory.ItemStack} to set */ - public FS_ClientboundSetEquipmentPacket createSetEquipmentPacket(ServerVersion serverVersion, int entityId, Map equipment) { - switch (serverVersion) { + public FS_ClientboundSetEquipmentPacket createSetEquipmentPacket( + int entityId, + Map equipment + ) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundSetEquipmentPacketImpl(entityId, equipment); } @@ -349,20 +252,11 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundSetEquipmentPacketImpl(entityId, equipment); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates a new FS_ClientboundSetEquipmentPacket instance based on the current server version - * - * @param entityId ID of the entity to set the equipment of - * @param equipment Map of {@link org.bukkit.inventory.EquipmentSlot} and {@link org.bukkit.inventory.ItemStack} to set - */ - public FS_ClientboundSetEquipmentPacket createSetEquipmentPacket(int entityId, Map equipment) { - return createSetEquipmentPacket(ServerVersion.getCurrentVersion(), entityId, equipment); - } - /** * Creates a new FS_ClientboundSetPassengersPacket instance based on the server version * @@ -370,8 +264,10 @@ public class PacketFactory { * @param passengers List of entity IDs to set as passengers */ public FS_ClientboundSetPassengersPacket createSetPassengersPacket( - ServerVersion serverVersion, int entityId, List passengers) { - switch (serverVersion) { + int entityId, + List passengers + ) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundSetPassengersPacketImpl(entityId, passengers); } @@ -384,32 +280,25 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundSetPassengersPacketImpl(entityId, passengers); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates a new FS_ClientboundSetPassengersPacket instance based on the current server version - * - * @param entityId ID of the vehicle entity - * @param passengers List of entity IDs to set as passengers - */ - public FS_ClientboundSetPassengersPacket createSetPassengersPacket(int entityId, List passengers) { - return createSetPassengersPacket(ServerVersion.getCurrentVersion(), entityId, passengers); - } - /** * Creates and returns a FS_ClientboundCreateOrUpdateTeamPacket based on the given server version and team information. * - * @param serverVersion the version of the server for which the packet is to be created - * @param teamName the name of the team to be created or updated - * @param createTeam an instance of FS_ClientboundCreateOrUpdateTeamPacket.CreateTeam containing the team creation or update details + * @param teamName the name of the team to be created or updated + * @param createTeam an instance of FS_ClientboundCreateOrUpdateTeamPacket.CreateTeam containing the team creation or update details * @return a FS_ClientboundCreateOrUpdateTeamPacket instance corresponding to the specified server version and team details * @throws IllegalArgumentException if the provided server version is not supported */ - public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(ServerVersion serverVersion, String teamName, FS_ClientboundCreateOrUpdateTeamPacket.CreateTeam createTeam) { - switch (serverVersion) { + public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket( + String teamName, + FS_ClientboundCreateOrUpdateTeamPacket.CreateTeam createTeam + ) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, createTeam); } @@ -422,32 +311,24 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, createTeam); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates an FS_ClientboundCreateOrUpdateTeamPacket for the given team name and creation details. - * - * @param teamName The name of the team to create or update. - * @param createTeam The details of the team creation or update. - * @return An instance of FS_ClientboundCreateOrUpdateTeamPacket containing the creation or update details. - */ - public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(String teamName, FS_ClientboundCreateOrUpdateTeamPacket.CreateTeam createTeam) { - return createCreateOrUpdateTeamPacket(ServerVersion.getCurrentVersion(), teamName, createTeam); - } - /** * Creates a packet for creating or updating a team based on the specified server version. * - * @param serverVersion The version of the server. - * @param teamName The name of the team. - * @param removeTeam Information about whether to remove the team. + * @param teamName The name of the team. + * @param removeTeam Information about whether to remove the team. * @return The packet for creating or updating the team. * @throws IllegalArgumentException if the server version is unsupported. */ - public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(ServerVersion serverVersion, String teamName, FS_ClientboundCreateOrUpdateTeamPacket.RemoveTeam removeTeam) { - switch (serverVersion) { + public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket( + String teamName, + FS_ClientboundCreateOrUpdateTeamPacket.RemoveTeam removeTeam + ) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, removeTeam); } @@ -460,32 +341,24 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, removeTeam); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates a packet to create or update a team with the specified name and removal flag. - * - * @param teamName the name of the team to create or update - * @param removeTeam the flag indicating whether to remove the team - * @return a packet for creating or updating the team - */ - public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(String teamName, FS_ClientboundCreateOrUpdateTeamPacket.RemoveTeam removeTeam) { - return createCreateOrUpdateTeamPacket(ServerVersion.getCurrentVersion(), teamName, removeTeam); - } - /** * Creates an instance of FS_ClientboundCreateOrUpdateTeamPacket based on the provided server version. * - * @param serverVersion The server version for which the packet should be created. - * @param teamName The name of the team that is being created or updated. - * @param updateTeam The update team details which contain information about the team. + * @param teamName The name of the team that is being created or updated. + * @param updateTeam The update team details which contain information about the team. * @return A new instance of FS_ClientboundCreateOrUpdateTeamPacket tailored for the specified server version. * @throws IllegalArgumentException If the provided server version is not supported. */ - public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(ServerVersion serverVersion, String teamName, FS_ClientboundCreateOrUpdateTeamPacket.UpdateTeam updateTeam) { - switch (serverVersion) { + public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket( + String teamName, + FS_ClientboundCreateOrUpdateTeamPacket.UpdateTeam updateTeam + ) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, updateTeam); } @@ -498,32 +371,24 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, updateTeam); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates a new FS_ClientboundCreateOrUpdateTeamPacket for creating or updating a team. - * - * @param teamName the name of the team to be created or updated - * @param updateTeam the update information for the team - * @return a new instance of FS_ClientboundCreateOrUpdateTeamPacket - */ - public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(String teamName, FS_ClientboundCreateOrUpdateTeamPacket.UpdateTeam updateTeam) { - return createCreateOrUpdateTeamPacket(ServerVersion.getCurrentVersion(), teamName, updateTeam); - } - /** * Creates a new instance of FS_ClientboundCreateOrUpdateTeamPacket based on the given server version, team name, and addEntity parameters. * - * @param serverVersion the version of the server for which the packet will be created - * @param teamName the name of the team to be created or updated - * @param addEntity the add entity information needed for packet creation + * @param teamName the name of the team to be created or updated + * @param addEntity the add entity information needed for packet creation * @return an instance of FS_ClientboundCreateOrUpdateTeamPacket appropriate for the specified server version * @throws IllegalArgumentException if the server version is not supported */ - public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(ServerVersion serverVersion, String teamName, FS_ClientboundCreateOrUpdateTeamPacket.AddEntity addEntity) { - switch (serverVersion) { + public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket( + String teamName, + FS_ClientboundCreateOrUpdateTeamPacket.AddEntity addEntity + ) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, addEntity); } @@ -536,32 +401,24 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, addEntity); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - /** - * Creates a packet for creating or updating a team with the specified name and entity. - * - * @param teamName the name of the team to create or update - * @param addEntity the entity representing the addition details for the team - * @return the packet representing the create or update operation on the team - */ - public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(String teamName, FS_ClientboundCreateOrUpdateTeamPacket.AddEntity addEntity) { - return createCreateOrUpdateTeamPacket(ServerVersion.getCurrentVersion(), teamName, addEntity); - } - /** * Creates an instance of FS_ClientboundCreateOrUpdateTeamPacket based on the server version. * - * @param serverVersion The version of the server. - * @param teamName The name of the team to create or update. - * @param removeEntity The entity removal configuration for the packet. + * @param teamName The name of the team to create or update. + * @param removeEntity The entity removal configuration for the packet. * @return A new instance of FS_ClientboundCreateOrUpdateTeamPacket for the specified server version. * @throws IllegalArgumentException If the server version is unsupported. */ - public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(ServerVersion serverVersion, String teamName, FS_ClientboundCreateOrUpdateTeamPacket.RemoveEntity removeEntity) { - switch (serverVersion) { + public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket( + String teamName, + FS_ClientboundCreateOrUpdateTeamPacket.RemoveEntity removeEntity + ) { + switch (ServerVersion.getCurrentVersion()) { case v1_21_5 -> { return new de.oliver.fancysitula.versions.v1_21_5.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, removeEntity); } @@ -574,18 +431,8 @@ public class PacketFactory { case v1_20_5, v1_20_6, v1_21, v1_21_1 -> { return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, removeEntity); } - default -> throw new IllegalArgumentException("Unsupported server version: " + serverVersion.getVersion()); + default -> + throw new IllegalArgumentException("Unsupported server version: " + ServerVersion.getCurrentVersion()); } } - - /** - * Creates a packet for creating or updating a team with the specified name and entity removal configuration. - * - * @param teamName the name of the team to create or update - * @param removeEntity the entity removal configuration for the team - * @return the packet for creating or updating the team - */ - public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(String teamName, FS_ClientboundCreateOrUpdateTeamPacket.RemoveEntity removeEntity) { - return createCreateOrUpdateTeamPacket(ServerVersion.getCurrentVersion(), teamName, removeEntity); - } }