From 7e47136f28a007d1d9e8885d92ca167ff37bf898 Mon Sep 17 00:00:00 2001 From: mworzala Date: Sat, 16 Dec 2023 09:07:39 +0200 Subject: [PATCH] chore: use common function to generate invalid state errors --- .../network/packet/server/common/DisconnectPacket.java | 5 +++-- .../network/packet/server/common/KeepAlivePacket.java | 5 +++-- .../network/packet/server/common/PingPacket.java | 5 +++-- .../packet/server/common/PluginMessagePacket.java | 5 +++-- .../packet/server/common/ResourcePackSendPacket.java | 5 +++-- .../network/packet/server/common/TagsPacket.java | 5 +++-- .../configuration/FinishConfigurationPacket.java | 3 ++- .../server/configuration/RegistryDataPacket.java | 3 ++- .../configuration/UpdateEnabledFeaturesPacket.java | 3 ++- .../packet/server/login/EncryptionRequestPacket.java | 3 ++- .../packet/server/login/LoginDisconnectPacket.java | 3 ++- .../packet/server/login/LoginPluginRequestPacket.java | 3 ++- .../packet/server/login/LoginSuccessPacket.java | 3 ++- .../packet/server/login/SetCompressionPacket.java | 3 ++- .../server/play/AcknowledgeBlockChangePacket.java | 3 ++- .../network/packet/server/play/ActionBarPacket.java | 3 ++- .../network/packet/server/play/AdvancementsPacket.java | 3 ++- .../network/packet/server/play/AttachEntityPacket.java | 3 ++- .../network/packet/server/play/BlockActionPacket.java | 3 ++- .../packet/server/play/BlockBreakAnimationPacket.java | 3 ++- .../network/packet/server/play/BlockChangePacket.java | 3 ++- .../packet/server/play/BlockEntityDataPacket.java | 3 ++- .../network/packet/server/play/BossBarPacket.java | 3 ++- .../network/packet/server/play/CameraPacket.java | 3 ++- .../packet/server/play/ChangeGameStatePacket.java | 3 ++- .../packet/server/play/ChunkBatchFinishedPacket.java | 3 ++- .../packet/server/play/ChunkBatchStartPacket.java | 3 ++- .../network/packet/server/play/ChunkDataPacket.java | 3 ++- .../network/packet/server/play/ClearTitlesPacket.java | 3 ++- .../network/packet/server/play/CloseWindowPacket.java | 3 ++- .../network/packet/server/play/CollectItemPacket.java | 3 ++- .../packet/server/play/CraftRecipeResponse.java | 3 ++- .../packet/server/play/CustomChatCompletionPacket.java | 3 ++- .../network/packet/server/play/DamageEventPacket.java | 3 ++- .../packet/server/play/DeathCombatEventPacket.java | 3 ++- .../packet/server/play/DeclareCommandsPacket.java | 3 ++- .../packet/server/play/DeclareRecipesPacket.java | 3 ++- .../network/packet/server/play/DeleteChatPacket.java | 3 ++- .../packet/server/play/DestroyEntitiesPacket.java | 3 ++- .../packet/server/play/DisplayScoreboardPacket.java | 3 ++- .../network/packet/server/play/EffectPacket.java | 3 ++- .../packet/server/play/EndCombatEventPacket.java | 3 ++- .../packet/server/play/EnterCombatEventPacket.java | 3 ++- .../packet/server/play/EntityAnimationPacket.java | 3 ++- .../network/packet/server/play/EntityEffectPacket.java | 3 ++- .../packet/server/play/EntityEquipmentPacket.java | 3 ++- .../packet/server/play/EntityHeadLookPacket.java | 3 ++- .../packet/server/play/EntityMetaDataPacket.java | 3 ++- .../server/play/EntityPositionAndRotationPacket.java | 3 ++- .../packet/server/play/EntityPositionPacket.java | 3 ++- .../packet/server/play/EntityPropertiesPacket.java | 3 ++- .../packet/server/play/EntityRotationPacket.java | 3 ++- .../packet/server/play/EntitySoundEffectPacket.java | 3 ++- .../network/packet/server/play/EntityStatusPacket.java | 3 ++- .../packet/server/play/EntityTeleportPacket.java | 3 ++- .../packet/server/play/EntityVelocityPacket.java | 3 ++- .../network/packet/server/play/ExplosionPacket.java | 3 ++- .../network/packet/server/play/FacePlayerPacket.java | 3 ++- .../packet/server/play/HeldItemChangePacket.java | 3 ++- .../network/packet/server/play/HitAnimationPacket.java | 3 ++- .../server/play/InitializeWorldBorderPacket.java | 3 ++- .../network/packet/server/play/JoinGamePacket.java | 3 ++- .../network/packet/server/play/MapDataPacket.java | 3 ++- .../packet/server/play/MultiBlockChangePacket.java | 3 ++- .../packet/server/play/NbtQueryResponsePacket.java | 3 ++- .../network/packet/server/play/OpenBookPacket.java | 3 ++- .../packet/server/play/OpenHorseWindowPacket.java | 3 ++- .../packet/server/play/OpenSignEditorPacket.java | 3 ++- .../network/packet/server/play/OpenWindowPacket.java | 3 ++- .../network/packet/server/play/ParticlePacket.java | 3 ++- .../packet/server/play/PlayerAbilitiesPacket.java | 3 ++- .../packet/server/play/PlayerChatMessagePacket.java | 3 ++- .../packet/server/play/PlayerInfoRemovePacket.java | 3 ++- .../packet/server/play/PlayerInfoUpdatePacket.java | 3 ++- .../server/play/PlayerListHeaderAndFooterPacket.java | 3 ++- .../server/play/PlayerPositionAndLookPacket.java | 3 ++- .../packet/server/play/RemoveEntityEffectPacket.java | 3 ++- .../network/packet/server/play/RespawnPacket.java | 3 ++- .../packet/server/play/ScoreboardObjectivePacket.java | 3 ++- .../packet/server/play/SelectAdvancementTabPacket.java | 3 ++- .../network/packet/server/play/ServerDataPacket.java | 3 ++- .../packet/server/play/ServerDifficultyPacket.java | 3 ++- .../network/packet/server/play/SetCooldownPacket.java | 3 ++- .../packet/server/play/SetExperiencePacket.java | 3 ++- .../packet/server/play/SetPassengersPacket.java | 3 ++- .../network/packet/server/play/SetSlotPacket.java | 3 ++- .../packet/server/play/SetTitleSubTitlePacket.java | 3 ++- .../network/packet/server/play/SetTitleTextPacket.java | 3 ++- .../network/packet/server/play/SetTitleTimePacket.java | 3 ++- .../network/packet/server/play/SoundEffectPacket.java | 3 ++- .../network/packet/server/play/SpawnEntityPacket.java | 3 ++- .../packet/server/play/SpawnExperienceOrbPacket.java | 3 ++- .../packet/server/play/SpawnPositionPacket.java | 3 ++- .../packet/server/play/StartConfigurationPacket.java | 3 ++- .../network/packet/server/play/StatisticsPacket.java | 3 ++- .../network/packet/server/play/StopSoundPacket.java | 3 ++- .../network/packet/server/play/SystemChatPacket.java | 3 ++- .../network/packet/server/play/TabCompletePacket.java | 3 ++- .../server/network/packet/server/play/TeamsPacket.java | 3 ++- .../network/packet/server/play/TimeUpdatePacket.java | 3 ++- .../network/packet/server/play/TradeListPacket.java | 3 ++- .../network/packet/server/play/UnloadChunkPacket.java | 3 ++- .../packet/server/play/UnlockRecipesPacket.java | 3 ++- .../network/packet/server/play/UpdateHealthPacket.java | 3 ++- .../network/packet/server/play/UpdateLightPacket.java | 3 ++- .../network/packet/server/play/UpdateScorePacket.java | 3 ++- .../server/play/UpdateSimulationDistancePacket.java | 3 ++- .../packet/server/play/UpdateViewDistancePacket.java | 3 ++- .../packet/server/play/UpdateViewPositionPacket.java | 3 ++- .../network/packet/server/play/VehicleMovePacket.java | 3 ++- .../network/packet/server/play/WindowItemsPacket.java | 3 ++- .../packet/server/play/WindowPropertyPacket.java | 3 ++- .../packet/server/play/WorldBorderCenterPacket.java | 3 ++- .../packet/server/play/WorldBorderLerpSizePacket.java | 3 ++- .../packet/server/play/WorldBorderSizePacket.java | 3 ++- .../server/play/WorldBorderWarningDelayPacket.java | 3 ++- .../server/play/WorldBorderWarningReachPacket.java | 3 ++- .../network/packet/server/status/PongPacket.java | 3 ++- .../network/packet/server/status/ResponsePacket.java | 3 ++- .../java/net/minestom/server/utils/PacketUtils.java | 10 ++++++++++ 120 files changed, 254 insertions(+), 125 deletions(-) diff --git a/src/main/java/net/minestom/server/network/packet/server/common/DisconnectPacket.java b/src/main/java/net/minestom/server/network/packet/server/common/DisconnectPacket.java index 87b1bd29c..1d89997ab 100644 --- a/src/main/java/net/minestom/server/network/packet/server/common/DisconnectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/common/DisconnectPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -27,9 +28,9 @@ public record DisconnectPacket(@NotNull Component message) implements ComponentH @Override public int getId(@NotNull ConnectionState state) { return switch (state) { - case PLAY -> ServerPacketIdentifier.DISCONNECT; case CONFIGURATION -> ServerPacketIdentifier.CONFIGURATION_DISCONNECT; - default -> throw new IllegalArgumentException(); + case PLAY -> ServerPacketIdentifier.DISCONNECT; + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.CONFIGURATION, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/common/KeepAlivePacket.java b/src/main/java/net/minestom/server/network/packet/server/common/KeepAlivePacket.java index 069349229..655d277a4 100644 --- a/src/main/java/net/minestom/server/network/packet/server/common/KeepAlivePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/common/KeepAlivePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.LONG; @@ -21,9 +22,9 @@ public record KeepAlivePacket(long id) implements ServerPacket { @Override public int getId(@NotNull ConnectionState state) { return switch (state) { - case PLAY -> ServerPacketIdentifier.KEEP_ALIVE; case CONFIGURATION -> ServerPacketIdentifier.CONFIGURATION_KEEP_ALIVE; - default -> throw new IllegalArgumentException(); + case PLAY -> ServerPacketIdentifier.KEEP_ALIVE; + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.CONFIGURATION, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/common/PingPacket.java b/src/main/java/net/minestom/server/network/packet/server/common/PingPacket.java index 9e4efc51c..d25c8d43a 100644 --- a/src/main/java/net/minestom/server/network/packet/server/common/PingPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/common/PingPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.INT; @@ -21,9 +22,9 @@ public record PingPacket(int id) implements ServerPacket { @Override public int getId(@NotNull ConnectionState state) { return switch (state) { - case PLAY -> ServerPacketIdentifier.PING; case CONFIGURATION -> ServerPacketIdentifier.CONFIGURATION_PING; - default -> throw new IllegalArgumentException(); + case PLAY -> ServerPacketIdentifier.PING; + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.CONFIGURATION, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/common/PluginMessagePacket.java b/src/main/java/net/minestom/server/network/packet/server/common/PluginMessagePacket.java index e001183c4..3edcda88b 100644 --- a/src/main/java/net/minestom/server/network/packet/server/common/PluginMessagePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/common/PluginMessagePacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.RAW_BYTES; @@ -24,9 +25,9 @@ public record PluginMessagePacket(String channel, byte[] data) implements Server @Override public int getId(@NotNull ConnectionState state) { return switch (state) { - case PLAY -> ServerPacketIdentifier.PLUGIN_MESSAGE; case CONFIGURATION -> ServerPacketIdentifier.CONFIGURATION_PLUGIN_MESSAGE; - default -> throw new IllegalArgumentException(); + case PLAY -> ServerPacketIdentifier.PLUGIN_MESSAGE; + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.CONFIGURATION, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/common/ResourcePackSendPacket.java b/src/main/java/net/minestom/server/network/packet/server/common/ResourcePackSendPacket.java index 8ac3ed7f9..83ae4b77d 100644 --- a/src/main/java/net/minestom/server/network/packet/server/common/ResourcePackSendPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/common/ResourcePackSendPacket.java @@ -7,6 +7,7 @@ import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.resourcepack.ResourcePack; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -48,9 +49,9 @@ public record ResourcePackSendPacket( @Override public int getId(@NotNull ConnectionState state) { return switch (state) { - case PLAY -> ServerPacketIdentifier.RESOURCE_PACK_SEND; case CONFIGURATION -> ServerPacketIdentifier.CONFIGURATION_RESOURCE_PACK_SEND; - default -> throw new IllegalArgumentException(); + case PLAY -> ServerPacketIdentifier.RESOURCE_PACK_SEND; + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.CONFIGURATION, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/common/TagsPacket.java b/src/main/java/net/minestom/server/network/packet/server/common/TagsPacket.java index b5df8493d..5906ad48a 100644 --- a/src/main/java/net/minestom/server/network/packet/server/common/TagsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/common/TagsPacket.java @@ -7,6 +7,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.CachedPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -50,9 +51,9 @@ public record TagsPacket(@NotNull Map> tagsMap) impleme @Override public int getId(@NotNull ConnectionState state) { return switch (state) { - case PLAY -> ServerPacketIdentifier.TAGS; case CONFIGURATION -> ServerPacketIdentifier.CONFIGURATION_TAGS; - default -> throw new IllegalArgumentException(); + case PLAY -> ServerPacketIdentifier.TAGS; + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.CONFIGURATION, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/configuration/FinishConfigurationPacket.java b/src/main/java/net/minestom/server/network/packet/server/configuration/FinishConfigurationPacket.java index d771c517a..5fc7a9f05 100644 --- a/src/main/java/net/minestom/server/network/packet/server/configuration/FinishConfigurationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/configuration/FinishConfigurationPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -21,7 +22,7 @@ public record FinishConfigurationPacket() implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case CONFIGURATION -> ServerPacketIdentifier.CONFIGURATION_FINISH_CONFIGURATION; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.CONFIGURATION); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/configuration/RegistryDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/configuration/RegistryDataPacket.java index c7056ab3a..0fb4824a9 100644 --- a/src/main/java/net/minestom/server/network/packet/server/configuration/RegistryDataPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/configuration/RegistryDataPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jglrxavpok.hephaistos.nbt.NBTCompound; @@ -24,7 +25,7 @@ public record RegistryDataPacket(@NotNull NBTCompound data) implements ServerPac public int getId(@NotNull ConnectionState state) { return switch (state) { case CONFIGURATION -> ServerPacketIdentifier.CONFIGURATION_REGISTRY_DATA; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.CONFIGURATION); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/configuration/UpdateEnabledFeaturesPacket.java b/src/main/java/net/minestom/server/network/packet/server/configuration/UpdateEnabledFeaturesPacket.java index 88885b2ce..e186d618b 100644 --- a/src/main/java/net/minestom/server/network/packet/server/configuration/UpdateEnabledFeaturesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/configuration/UpdateEnabledFeaturesPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.NamespaceID; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Set; @@ -26,7 +27,7 @@ public record UpdateEnabledFeaturesPacket(@NotNull Set features) im public int getId(@NotNull ConnectionState state) { return switch (state) { case CONFIGURATION -> ServerPacketIdentifier.CONFIGURATION_UPDATE_ENABLED_FEATURES; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.CONFIGURATION); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/login/EncryptionRequestPacket.java b/src/main/java/net/minestom/server/network/packet/server/login/EncryptionRequestPacket.java index 0f4c163b8..b9996c341 100644 --- a/src/main/java/net/minestom/server/network/packet/server/login/EncryptionRequestPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/login/EncryptionRequestPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BYTE_ARRAY; @@ -29,7 +30,7 @@ public record EncryptionRequestPacket(@NotNull String serverId, public int getId(@NotNull ConnectionState state) { return switch (state) { case LOGIN -> ServerPacketIdentifier.LOGIN_ENCRYPTION_REQUEST; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.LOGIN); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/login/LoginDisconnectPacket.java b/src/main/java/net/minestom/server/network/packet/server/login/LoginDisconnectPacket.java index 85f0cbc66..7c5fe210b 100644 --- a/src/main/java/net/minestom/server/network/packet/server/login/LoginDisconnectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/login/LoginDisconnectPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -27,7 +28,7 @@ public record LoginDisconnectPacket(@NotNull Component kickMessage) implements C public int getId(@NotNull ConnectionState state) { return switch (state) { case LOGIN -> ServerPacketIdentifier.LOGIN_DISCONNECT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.LOGIN); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/login/LoginPluginRequestPacket.java b/src/main/java/net/minestom/server/network/packet/server/login/LoginPluginRequestPacket.java index a025c6acd..16e2291cd 100644 --- a/src/main/java/net/minestom/server/network/packet/server/login/LoginPluginRequestPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/login/LoginPluginRequestPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,7 +30,7 @@ public record LoginPluginRequestPacket(int messageId, @NotNull String channel, public int getId(@NotNull ConnectionState state) { return switch (state) { case LOGIN -> ServerPacketIdentifier.LOGIN_PLUGIN_REQUEST; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.LOGIN); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/login/LoginSuccessPacket.java b/src/main/java/net/minestom/server/network/packet/server/login/LoginSuccessPacket.java index 2df74f41e..e5d1df4c0 100644 --- a/src/main/java/net/minestom/server/network/packet/server/login/LoginSuccessPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/login/LoginSuccessPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -28,7 +29,7 @@ public record LoginSuccessPacket(@NotNull UUID uuid, @NotNull String username, i public int getId(@NotNull ConnectionState state) { return switch (state) { case LOGIN -> ServerPacketIdentifier.LOGIN_SUCCESS; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.LOGIN); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/login/SetCompressionPacket.java b/src/main/java/net/minestom/server/network/packet/server/login/SetCompressionPacket.java index 922e4ad32..f43b06ad9 100644 --- a/src/main/java/net/minestom/server/network/packet/server/login/SetCompressionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/login/SetCompressionPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -22,7 +23,7 @@ public record SetCompressionPacket(int threshold) implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case LOGIN -> ServerPacketIdentifier.LOGIN_SET_COMPRESSION; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.LOGIN); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/AcknowledgeBlockChangePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/AcknowledgeBlockChangePacket.java index 6427a5fef..d5e503581 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/AcknowledgeBlockChangePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/AcknowledgeBlockChangePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -22,7 +23,7 @@ public record AcknowledgeBlockChangePacket(int sequence) implements ServerPacket public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ACKNOWLEDGE_BLOCK_CHANGE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ActionBarPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ActionBarPacket.java index a28a84b18..a92442161 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ActionBarPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ActionBarPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -28,7 +29,7 @@ public record ActionBarPacket(@NotNull Component text) implements ComponentHoldi public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ACTION_BAR; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/AdvancementsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/AdvancementsPacket.java index 1da8cea74..65952997b 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/AdvancementsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/AdvancementsPacket.java @@ -9,6 +9,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -47,7 +48,7 @@ public record AdvancementsPacket(boolean reset, @NotNull List ServerPacketIdentifier.ADVANCEMENTS; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/AttachEntityPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/AttachEntityPacket.java index 1f5805a1b..4d39e6a83 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/AttachEntityPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/AttachEntityPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,7 +30,7 @@ public record AttachEntityPacket(int attachedEntityId, int holdingEntityId) impl public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ATTACH_ENTITY; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java index bb02246ad..61131c3c5 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -33,7 +34,7 @@ public record BlockActionPacket(@NotNull Point blockPosition, byte actionId, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.BLOCK_ACTION; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/BlockBreakAnimationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockBreakAnimationPacket.java index 81e2c6eeb..1d6ad250d 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/BlockBreakAnimationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockBreakAnimationPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -26,7 +27,7 @@ public record BlockBreakAnimationPacket(int entityId, @NotNull Point blockPositi public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.BLOCK_BREAK_ANIMATION; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } \ No newline at end of file diff --git a/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java index 1a62eb709..f99e66e40 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BLOCK_POSITION; @@ -30,7 +31,7 @@ public record BlockChangePacket(@NotNull Point blockPosition, int blockStateId) public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.BLOCK_CHANGE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/BlockEntityDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockEntityDataPacket.java index 579c159ec..51f7b8e05 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/BlockEntityDataPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockEntityDataPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jglrxavpok.hephaistos.nbt.NBTCompound; @@ -33,7 +34,7 @@ public record BlockEntityDataPacket(@NotNull Point blockPosition, int action, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.BLOCK_ENTITY_DATA; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/BossBarPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BossBarPacket.java index 35818d506..92f76d7c4 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/BossBarPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BossBarPacket.java @@ -9,6 +9,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -203,7 +204,7 @@ public record BossBarPacket(@NotNull UUID uuid, @NotNull Action action) implemen public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.BOSS_BAR; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/CameraPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/CameraPacket.java index 75347a7fa..3d323786b 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/CameraPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/CameraPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -27,7 +28,7 @@ public record CameraPacket(int cameraId) implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.CAMERA; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ChangeGameStatePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ChangeGameStatePacket.java index 20f0a1090..d8b0e9d49 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ChangeGameStatePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ChangeGameStatePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BYTE; @@ -24,7 +25,7 @@ public record ChangeGameStatePacket(@NotNull Reason reason, float value) impleme public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.CHANGE_GAME_STATE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ChunkBatchFinishedPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ChunkBatchFinishedPacket.java index 93a924663..f3cf6b545 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ChunkBatchFinishedPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ChunkBatchFinishedPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -23,7 +24,7 @@ public record ChunkBatchFinishedPacket(int batchSize) implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.CHUNK_BATCH_FINISHED; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ChunkBatchStartPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ChunkBatchStartPacket.java index ced6b557a..11f7fb4db 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ChunkBatchStartPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ChunkBatchStartPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; public record ChunkBatchStartPacket() implements ServerPacket { @@ -20,7 +21,7 @@ public record ChunkBatchStartPacket() implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.CHUNK_BATCH_START; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java index 37d148e38..abf7bbfa3 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.network.packet.server.play.data.ChunkData; import net.minestom.server.network.packet.server.play.data.LightData; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.INT; @@ -31,7 +32,7 @@ public record ChunkDataPacket(int chunkX, int chunkZ, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.CHUNK_DATA; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } \ No newline at end of file diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ClearTitlesPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ClearTitlesPacket.java index a9b5253ff..b73d5ab2b 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ClearTitlesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ClearTitlesPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BOOLEAN; @@ -22,7 +23,7 @@ public record ClearTitlesPacket(boolean reset) implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.CLEAR_TITLES; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/CloseWindowPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/CloseWindowPacket.java index c8497b032..2819e098f 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/CloseWindowPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/CloseWindowPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BYTE; @@ -22,7 +23,7 @@ public record CloseWindowPacket(byte windowId) implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.CLOSE_WINDOW; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/CollectItemPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/CollectItemPacket.java index 8ef6e8e0a..3880910c2 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/CollectItemPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/CollectItemPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -25,7 +26,7 @@ public record CollectItemPacket(int collectedEntityId, int collectorEntityId, in public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.COLLECT_ITEM; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/CraftRecipeResponse.java b/src/main/java/net/minestom/server/network/packet/server/play/CraftRecipeResponse.java index 71143fe9a..af14516a9 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/CraftRecipeResponse.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/CraftRecipeResponse.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BYTE; @@ -24,7 +25,7 @@ public record CraftRecipeResponse(byte windowId, String recipe) implements Serve public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.CRAFT_RECIPE_RESPONSE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/CustomChatCompletionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/CustomChatCompletionPacket.java index 869bcc3f0..de45af00c 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/CustomChatCompletionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/CustomChatCompletionPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -30,7 +31,7 @@ public record CustomChatCompletionPacket(@NotNull Action action, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.CUSTOM_CHAT_COMPLETIONS; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/DamageEventPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DamageEventPacket.java index e6ccddde1..034389873 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/DamageEventPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DamageEventPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,7 +30,7 @@ public record DamageEventPacket(int targetEntityId, int damageTypeId, int source public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.DAMAGE_EVENT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/DeathCombatEventPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DeathCombatEventPacket.java index 1d101734e..4d6556b58 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/DeathCombatEventPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DeathCombatEventPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -29,7 +30,7 @@ public record DeathCombatEventPacket(int playerId, @NotNull Component message) i public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.DEATH_COMBAT_EVENT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/DeclareCommandsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DeclareCommandsPacket.java index beca0c4d7..91478fb12 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/DeclareCommandsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DeclareCommandsPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.registry.ProtocolObject; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -37,7 +38,7 @@ public record DeclareCommandsPacket(@NotNull List nodes, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.DECLARE_COMMANDS; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/DeclareRecipesPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DeclareRecipesPacket.java index 1e4848391..14d46a793 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/DeclareRecipesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DeclareRecipesPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.recipe.RecipeCategory; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -50,7 +51,7 @@ public record DeclareRecipesPacket(@NotNull List recipes) implem public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.DECLARE_RECIPES; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/DeleteChatPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DeleteChatPacket.java index ba5e64351..bd9f040ae 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/DeleteChatPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DeleteChatPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; public record DeleteChatPacket(@NotNull MessageSignature signature) implements ServerPacket { @@ -21,7 +22,7 @@ public record DeleteChatPacket(@NotNull MessageSignature signature) implements S public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.DELETE_CHAT_MESSAGE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/DestroyEntitiesPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DestroyEntitiesPacket.java index b6c4d7d24..a77bc064d 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/DestroyEntitiesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DestroyEntitiesPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -32,7 +33,7 @@ public record DestroyEntitiesPacket(@NotNull List entityIds) implements public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.DESTROY_ENTITIES; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/DisplayScoreboardPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/DisplayScoreboardPacket.java index 4dbcefeab..6b746970c 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/DisplayScoreboardPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/DisplayScoreboardPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BYTE; @@ -24,7 +25,7 @@ public record DisplayScoreboardPacket(byte position, String scoreName) implement public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.DISPLAY_SCOREBOARD; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EffectPacket.java index 3137d2d45..18fb7ebc4 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EffectPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -27,7 +28,7 @@ public record EffectPacket(int effectId, Point position, int data, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.EFFECT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EndCombatEventPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EndCombatEventPacket.java index 248c85c0d..a3672c2fd 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EndCombatEventPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EndCombatEventPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -22,7 +23,7 @@ public record EndCombatEventPacket(int duration) implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.END_COMBAT_EVENT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EnterCombatEventPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EnterCombatEventPacket.java index 2efdcd182..28edc98cb 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EnterCombatEventPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EnterCombatEventPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; public record EnterCombatEventPacket() implements ServerPacket { @@ -20,7 +21,7 @@ public record EnterCombatEventPacket() implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTER_COMBAT_EVENT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityAnimationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityAnimationPacket.java index 26f79f494..c46201a03 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityAnimationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityAnimationPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BYTE; @@ -24,7 +25,7 @@ public record EntityAnimationPacket(int entityId, @NotNull Animation animation) public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_ANIMATION; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityEffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityEffectPacket.java index 2561f85ad..642c1e775 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityEffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityEffectPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.potion.Potion; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jglrxavpok.hephaistos.nbt.NBTCompound; @@ -29,7 +30,7 @@ public record EntityEffectPacket(int entityId, @NotNull Potion potion, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_EFFECT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityEquipmentPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityEquipmentPacket.java index e3fb97b71..958e53009 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityEquipmentPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityEquipmentPacket.java @@ -8,6 +8,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -48,7 +49,7 @@ public record EntityEquipmentPacket(int entityId, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_EQUIPMENT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityHeadLookPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityHeadLookPacket.java index 5ac65edfc..d340623b2 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityHeadLookPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityHeadLookPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BYTE; @@ -24,7 +25,7 @@ public record EntityHeadLookPacket(int entityId, float yaw) implements ServerPac public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_HEAD_LOOK; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityMetaDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityMetaDataPacket.java index c51879635..31c0347cb 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityMetaDataPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityMetaDataPacket.java @@ -7,6 +7,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -53,7 +54,7 @@ public record EntityMetaDataPacket(int entityId, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_METADATA; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionAndRotationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionAndRotationPacket.java index 2c235d2f8..264ee4ba5 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionAndRotationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionAndRotationPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -31,7 +32,7 @@ public record EntityPositionAndRotationPacket(int entityId, short deltaX, short public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_POSITION_AND_ROTATION; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionPacket.java index 67aeb6816..b08a410ce 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityPositionPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -29,7 +30,7 @@ public record EntityPositionPacket(int entityId, short deltaX, short deltaY, sho public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_POSITION; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityPropertiesPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityPropertiesPacket.java index e34cb1a5f..98fefc2ee 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityPropertiesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityPropertiesPacket.java @@ -8,6 +8,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -61,7 +62,7 @@ public record EntityPropertiesPacket(int entityId, List prope public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_PROPERTIES; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityRotationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityRotationPacket.java index 2b75a94e1..1bd84bfc9 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityRotationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityRotationPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -25,7 +26,7 @@ public record EntityRotationPacket(int entityId, float yaw, float pitch, boolean public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_ROTATION; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntitySoundEffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntitySoundEffectPacket.java index a698f437b..29ea71925 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntitySoundEffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntitySoundEffectPacket.java @@ -7,6 +7,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.sound.SoundEvent; +import net.minestom.server.utils.PacketUtils; import net.minestom.server.utils.validate.Check; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -93,7 +94,7 @@ public record EntitySoundEffectPacket( public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_SOUND_EFFECT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityStatusPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityStatusPacket.java index 928b6896b..19cdfaab6 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityStatusPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityStatusPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BYTE; @@ -24,7 +25,7 @@ public record EntityStatusPacket(int entityId, byte status) implements ServerPac public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_STATUS; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityTeleportPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityTeleportPacket.java index 3a480d2d5..bca9879a2 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityTeleportPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityTeleportPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -31,7 +32,7 @@ public record EntityTeleportPacket(int entityId, Pos position, boolean onGround) public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_TELEPORT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityVelocityPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityVelocityPacket.java index 974f00653..394fd738d 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityVelocityPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityVelocityPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.utils.MathUtils; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.SHORT; @@ -38,7 +39,7 @@ public record EntityVelocityPacket(int entityId, short velocityX, short velocity public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.ENTITY_VELOCITY; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ExplosionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ExplosionPacket.java index 9adf9b909..fa64f6fd2 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ExplosionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ExplosionPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -33,7 +34,7 @@ public record ExplosionPacket(double x, double y, double z, float radius, byte @ public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.EXPLOSION; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/FacePlayerPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/FacePlayerPacket.java index c03c5023d..1225194ba 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/FacePlayerPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/FacePlayerPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -37,7 +38,7 @@ public record FacePlayerPacket(FacePosition facePosition, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.FACE_PLAYER; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/HeldItemChangePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/HeldItemChangePacket.java index 5f89f7136..4740ee7da 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/HeldItemChangePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/HeldItemChangePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BYTE; @@ -22,7 +23,7 @@ public record HeldItemChangePacket(byte slot) implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.HELD_ITEM_CHANGE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/HitAnimationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/HitAnimationPacket.java index 5c7b9bccf..3e8b61488 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/HitAnimationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/HitAnimationPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.FLOAT; @@ -25,7 +26,7 @@ public record HitAnimationPacket(int entityId, float yaw) implements ServerPacke public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.HIT_ANIMATION; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/InitializeWorldBorderPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/InitializeWorldBorderPacket.java index 7cf4f8ae6..4c6e401bd 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/InitializeWorldBorderPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/InitializeWorldBorderPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -34,7 +35,7 @@ public record InitializeWorldBorderPacket(double x, double z, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.INITIALIZE_WORLD_BORDER; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/JoinGamePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/JoinGamePacket.java index 69c119122..b1a55f5aa 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/JoinGamePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/JoinGamePacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.network.packet.server.play.data.DeathLocation; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jglrxavpok.hephaistos.nbt.NBTCompound; @@ -80,7 +81,7 @@ public record JoinGamePacket( public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.JOIN_GAME; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/MapDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/MapDataPacket.java index e022729af..c41c4d19f 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/MapDataPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/MapDataPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -65,7 +66,7 @@ public record MapDataPacket(int mapId, byte scale, boolean locked, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.MAP_DATA; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/MultiBlockChangePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/MultiBlockChangePacket.java index 0004ac49f..6bca0c7b9 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/MultiBlockChangePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/MultiBlockChangePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -28,7 +29,7 @@ public record MultiBlockChangePacket(long chunkSectionPosition, long[] blocks) i public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.MULTI_BLOCK_CHANGE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/NbtQueryResponsePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/NbtQueryResponsePacket.java index 8f1fbd5c0..45bdd1465 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/NbtQueryResponsePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/NbtQueryResponsePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jglrxavpok.hephaistos.nbt.NBTCompound; @@ -29,7 +30,7 @@ public record NbtQueryResponsePacket(int transactionId, NBTCompound data) implem public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.NBT_QUERY_RESPONSE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/OpenBookPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/OpenBookPacket.java index eb7e8de35..64b698a9e 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/OpenBookPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/OpenBookPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; public record OpenBookPacket(@NotNull Player.Hand hand) implements ServerPacket { @@ -21,7 +22,7 @@ public record OpenBookPacket(@NotNull Player.Hand hand) implements ServerPacket public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.OPEN_BOOK; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/OpenHorseWindowPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/OpenHorseWindowPacket.java index 3a9100a63..b86bc3d9f 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/OpenHorseWindowPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/OpenHorseWindowPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -24,7 +25,7 @@ public record OpenHorseWindowPacket(byte windowId, int slotCount, int entityId) public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.OPEN_HORSE_WINDOW; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java index 92b69f0d3..316879acd 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/OpenSignEditorPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BLOCK_POSITION; @@ -25,7 +26,7 @@ public record OpenSignEditorPacket(@NotNull Point position, boolean isFrontText) public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.OPEN_SIGN_EDITOR; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/OpenWindowPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/OpenWindowPacket.java index 231525582..d49daceac 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/OpenWindowPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/OpenWindowPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -32,7 +33,7 @@ public record OpenWindowPacket(int windowId, int windowType, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.OPEN_WINDOW; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ParticlePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ParticlePacket.java index d2020665e..c810c4130 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ParticlePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ParticlePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -39,7 +40,7 @@ public record ParticlePacket(int particleId, boolean longDistance, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.PARTICLE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/PlayerAbilitiesPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PlayerAbilitiesPacket.java index 09251b39f..08de4b410 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/PlayerAbilitiesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PlayerAbilitiesPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BYTE; @@ -30,7 +31,7 @@ public record PlayerAbilitiesPacket(byte flags, float flyingSpeed, float walking public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.PLAYER_ABILITIES; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/PlayerChatMessagePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PlayerChatMessagePacket.java index 82c8a7d5b..c51b4f59e 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/PlayerChatMessagePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PlayerChatMessagePacket.java @@ -8,6 +8,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -52,7 +53,7 @@ public record PlayerChatMessagePacket(UUID sender, int index, byte @Nullable [] public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.PLAYER_CHAT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoRemovePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoRemovePacket.java index 67ad33606..49ce319c3 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoRemovePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoRemovePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -31,7 +32,7 @@ public record PlayerInfoRemovePacket(@NotNull List<@NotNull UUID> uuids) impleme public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.PLAYER_INFO_REMOVE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoUpdatePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoUpdatePacket.java index 313244ed7..d877c29b1 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoUpdatePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoUpdatePacket.java @@ -7,6 +7,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -74,7 +75,7 @@ public final class PlayerInfoUpdatePacket implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.PLAYER_INFO_UPDATE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/PlayerListHeaderAndFooterPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PlayerListHeaderAndFooterPacket.java index 9fddb3ce3..10208ab6b 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/PlayerListHeaderAndFooterPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PlayerListHeaderAndFooterPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -40,7 +41,7 @@ public record PlayerListHeaderAndFooterPacket(@NotNull Component header, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.PLAYER_LIST_HEADER_AND_FOOTER; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/PlayerPositionAndLookPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/PlayerPositionAndLookPacket.java index 52882dbdd..2d84871b9 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/PlayerPositionAndLookPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/PlayerPositionAndLookPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -32,7 +33,7 @@ public record PlayerPositionAndLookPacket(Pos position, byte flags, int teleport public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.PLAYER_POSITION_AND_LOOK; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } \ No newline at end of file diff --git a/src/main/java/net/minestom/server/network/packet/server/play/RemoveEntityEffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/RemoveEntityEffectPacket.java index d2c0c0c70..a9b4f1e62 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/RemoveEntityEffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/RemoveEntityEffectPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.potion.PotionEffect; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Objects; @@ -26,7 +27,7 @@ public record RemoveEntityEffectPacket(int entityId, @NotNull PotionEffect potio public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.REMOVE_ENTITY_EFFECT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/RespawnPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/RespawnPacket.java index e3f5c5cac..b549e65f3 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/RespawnPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/RespawnPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.network.packet.server.play.data.DeathLocation; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -48,7 +49,7 @@ public record RespawnPacket( public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.RESPAWN; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ScoreboardObjectivePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ScoreboardObjectivePacket.java index ee4c2e46f..7a80a6d63 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ScoreboardObjectivePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ScoreboardObjectivePacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -54,7 +55,7 @@ public record ScoreboardObjectivePacket(@NotNull String objectiveName, byte mode public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SCOREBOARD_OBJECTIVE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SelectAdvancementTabPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SelectAdvancementTabPacket.java index 40339a87d..a97b4598c 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SelectAdvancementTabPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SelectAdvancementTabPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -23,7 +24,7 @@ public record SelectAdvancementTabPacket(@Nullable String identifier) implements public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SELECT_ADVANCEMENT_TAB; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ServerDataPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ServerDataPacket.java index 1b6ac3000..299c47d40 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ServerDataPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ServerDataPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -28,7 +29,7 @@ public record ServerDataPacket(@Nullable Component motd, byte @Nullable [] iconB public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SERVER_DATA; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ServerDifficultyPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ServerDifficultyPacket.java index 78d9850ff..712dcf418 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ServerDifficultyPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ServerDifficultyPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import net.minestom.server.world.Difficulty; import org.jetbrains.annotations.NotNull; @@ -24,7 +25,7 @@ public record ServerDifficultyPacket(@NotNull Difficulty difficulty, boolean loc public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SERVER_DIFFICULTY; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SetCooldownPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SetCooldownPacket.java index 851b32192..70b3b9424 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SetCooldownPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SetCooldownPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -23,7 +24,7 @@ public record SetCooldownPacket(int itemId, int cooldownTicks) implements Server public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SET_COOLDOWN; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SetExperiencePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SetExperiencePacket.java index b23bb236e..e8ac670ea 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SetExperiencePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SetExperiencePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.FLOAT; @@ -25,7 +26,7 @@ public record SetExperiencePacket(float percentage, int level, int totalExperien public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SET_EXPERIENCE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SetPassengersPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SetPassengersPacket.java index 70362b7b1..cea54ff73 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SetPassengersPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SetPassengersPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -30,7 +31,7 @@ public record SetPassengersPacket(int vehicleEntityId, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SET_PASSENGERS; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SetSlotPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SetSlotPacket.java index 0481147b9..64aecebf4 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SetSlotPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SetSlotPacket.java @@ -7,6 +7,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -35,7 +36,7 @@ public record SetSlotPacket(byte windowId, int stateId, short slot, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SET_SLOT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SetTitleSubTitlePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SetTitleSubTitlePacket.java index 59a05f859..fbe13e32d 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SetTitleSubTitlePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SetTitleSubTitlePacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -28,7 +29,7 @@ public record SetTitleSubTitlePacket(@NotNull Component subtitle) implements Com public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SET_TITLE_SUBTITLE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SetTitleTextPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SetTitleTextPacket.java index 3a9c80efe..e4f8e62a8 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SetTitleTextPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SetTitleTextPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -28,7 +29,7 @@ public record SetTitleTextPacket(@NotNull Component title) implements ComponentH public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SET_TITLE_TEXT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SetTitleTimePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SetTitleTimePacket.java index 88c3ac9c2..030ed978f 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SetTitleTimePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SetTitleTimePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.INT; @@ -24,7 +25,7 @@ public record SetTitleTimePacket(int fadeIn, int stay, int fadeOut) implements S public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SET_TITLE_TIME; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SoundEffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SoundEffectPacket.java index ed4540403..a647d54bc 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SoundEffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SoundEffectPacket.java @@ -8,6 +8,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.sound.SoundEvent; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -94,7 +95,7 @@ public record SoundEffectPacket( public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SOUND_EFFECT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SpawnEntityPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnEntityPacket.java index f8829fbd5..270219a98 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SpawnEntityPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnEntityPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.UUID; @@ -46,7 +47,7 @@ public record SpawnEntityPacket(int entityId, @NotNull UUID uuid, int type, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SPAWN_ENTITY; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SpawnExperienceOrbPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnExperienceOrbPacket.java index 854e2ccf0..381b7cd46 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SpawnExperienceOrbPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnExperienceOrbPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -29,7 +30,7 @@ public record SpawnExperienceOrbPacket(int entityId, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SPAWN_EXPERIENCE_ORB; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SpawnPositionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPositionPacket.java index 5bd4e779f..e0612ca6f 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SpawnPositionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SpawnPositionPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BLOCK_POSITION; @@ -25,7 +26,7 @@ public record SpawnPositionPacket(@NotNull Point position, float angle) implemen public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SPAWN_POSITION; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/StartConfigurationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/StartConfigurationPacket.java index c6177bed3..bbe9d31fb 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/StartConfigurationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/StartConfigurationPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -17,7 +18,7 @@ public record StartConfigurationPacket() implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.START_CONFIGURATION_PACKET; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/StatisticsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/StatisticsPacket.java index 1c471a365..f03331454 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/StatisticsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/StatisticsPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.statistic.StatisticCategory; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -29,7 +30,7 @@ public record StatisticsPacket(@NotNull List statistics) implements S public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.STATISTICS; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/StopSoundPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/StopSoundPacket.java index 49c145fe1..e8fa7e7b9 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/StopSoundPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/StopSoundPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -45,7 +46,7 @@ public record StopSoundPacket(byte flags, @Nullable Sound.Source source, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.STOP_SOUND; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/SystemChatPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/SystemChatPacket.java index e528fa091..bb46260b8 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/SystemChatPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/SystemChatPacket.java @@ -6,6 +6,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -30,7 +31,7 @@ public record SystemChatPacket(@NotNull Component message, boolean overlay) impl public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SYSTEM_CHAT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/TabCompletePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/TabCompletePacket.java index 37dc7e02e..f120334e5 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/TabCompletePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/TabCompletePacket.java @@ -7,6 +7,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -39,7 +40,7 @@ public record TabCompletePacket(int transactionId, int start, int length, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.TAB_COMPLETE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/TeamsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/TeamsPacket.java index eefce1820..7d37a060f 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/TeamsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/TeamsPacket.java @@ -9,6 +9,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import net.minestom.server.utils.validate.Check; import org.jetbrains.annotations.NotNull; @@ -220,7 +221,7 @@ public record TeamsPacket(String teamName, Action action) implements ComponentHo public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.TEAMS; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/TimeUpdatePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/TimeUpdatePacket.java index 84a648d9b..e38763588 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/TimeUpdatePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/TimeUpdatePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.LONG; @@ -23,7 +24,7 @@ public record TimeUpdatePacket(long worldAge, long timeOfDay) implements ServerP public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.TIME_UPDATE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/TradeListPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/TradeListPacket.java index 98a03c64b..caa3d8f55 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/TradeListPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/TradeListPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -38,7 +39,7 @@ public record TradeListPacket(int windowId, @NotNull List trades, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.TRADE_LIST; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/UnloadChunkPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UnloadChunkPacket.java index 11a203cb0..0ad8435f7 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/UnloadChunkPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UnloadChunkPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.INT; @@ -28,7 +29,7 @@ public record UnloadChunkPacket(int chunkX, int chunkZ) implements ServerPacket public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.UNLOAD_CHUNK; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/UnlockRecipesPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UnlockRecipesPacket.java index ad9940983..cfdec25b6 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/UnlockRecipesPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UnlockRecipesPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.UnknownNullability; @@ -80,7 +81,7 @@ public record UnlockRecipesPacket(int mode, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.UNLOCK_RECIPES; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/UpdateHealthPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UpdateHealthPacket.java index 4dc7214a5..7c27bad17 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/UpdateHealthPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UpdateHealthPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.FLOAT; @@ -25,7 +26,7 @@ public record UpdateHealthPacket(float health, int food, float foodSaturation) i public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.UPDATE_HEALTH; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java index 5f1d1fce9..316c6dcce 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.network.packet.server.play.data.LightData; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -26,7 +27,7 @@ public record UpdateLightPacket(int chunkX, int chunkZ, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.UPDATE_LIGHT; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/UpdateScorePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UpdateScorePacket.java index b0eb3b398..7d2a01f4c 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/UpdateScorePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UpdateScorePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.*; @@ -38,7 +39,7 @@ public record UpdateScorePacket(@NotNull String entityName, byte action, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.UPDATE_SCORE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/UpdateSimulationDistancePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UpdateSimulationDistancePacket.java index b5125c1e9..890e751cc 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/UpdateSimulationDistancePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UpdateSimulationDistancePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -22,7 +23,7 @@ public record UpdateSimulationDistancePacket(int simulationDistance) implements public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.SET_SIMULATION_DISTANCE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/UpdateViewDistancePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UpdateViewDistancePacket.java index 235c237d5..8abd274f1 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/UpdateViewDistancePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UpdateViewDistancePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -22,7 +23,7 @@ public record UpdateViewDistancePacket(int viewDistance) implements ServerPacket public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.UPDATE_VIEW_DISTANCE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/UpdateViewPositionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UpdateViewPositionPacket.java index c53760823..664bbe674 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/UpdateViewPositionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UpdateViewPositionPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -23,7 +24,7 @@ public record UpdateViewPositionPacket(int chunkX, int chunkZ) implements Server public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.UPDATE_VIEW_POSITION; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/VehicleMovePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/VehicleMovePacket.java index 543347a8c..cbfb2f72f 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/VehicleMovePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/VehicleMovePacket.java @@ -5,6 +5,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.DOUBLE; @@ -29,7 +30,7 @@ public record VehicleMovePacket(@NotNull Pos position) implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.VEHICLE_MOVE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/WindowItemsPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/WindowItemsPacket.java index dfcae66a6..3825a34f5 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/WindowItemsPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/WindowItemsPacket.java @@ -7,6 +7,7 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ComponentHoldingServerPacket; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -39,7 +40,7 @@ public record WindowItemsPacket(byte windowId, int stateId, @NotNull List ServerPacketIdentifier.WINDOW_ITEMS; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/WindowPropertyPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/WindowPropertyPacket.java index f0fff728a..00b64e892 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/WindowPropertyPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/WindowPropertyPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.BYTE; @@ -25,7 +26,7 @@ public record WindowPropertyPacket(byte windowId, short property, short value) i public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.WINDOW_PROPERTY; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderCenterPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderCenterPacket.java index 6988fad6a..dce86cac5 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderCenterPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderCenterPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.DOUBLE; @@ -23,7 +24,7 @@ public record WorldBorderCenterPacket(double x, double z) implements ServerPacke public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.WORLD_BORDER_CENTER; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderLerpSizePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderLerpSizePacket.java index 89f853d9b..721358df0 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderLerpSizePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderLerpSizePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.DOUBLE; @@ -25,7 +26,7 @@ public record WorldBorderLerpSizePacket(double oldDiameter, double newDiameter, public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.WORLD_BORDER_LERP_SIZE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderSizePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderSizePacket.java index 7baacdafa..cf93c4b19 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderSizePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderSizePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.DOUBLE; @@ -22,7 +23,7 @@ public record WorldBorderSizePacket(double diameter) implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.WORLD_BORDER_SIZE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderWarningDelayPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderWarningDelayPacket.java index e516a0394..f76a1af59 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderWarningDelayPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderWarningDelayPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -22,7 +23,7 @@ public record WorldBorderWarningDelayPacket(int warningTime) implements ServerPa public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.WORLD_BORDER_WARNING_DELAY; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderWarningReachPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderWarningReachPacket.java index 909f69125..9851f3500 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderWarningReachPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/WorldBorderWarningReachPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.VAR_INT; @@ -22,7 +23,7 @@ public record WorldBorderWarningReachPacket(int warningBlocks) implements Server public int getId(@NotNull ConnectionState state) { return switch (state) { case PLAY -> ServerPacketIdentifier.WORLD_BORDER_WARNING_REACH; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.PLAY); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/status/PongPacket.java b/src/main/java/net/minestom/server/network/packet/server/status/PongPacket.java index 520c94e13..ff123ba6c 100644 --- a/src/main/java/net/minestom/server/network/packet/server/status/PongPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/status/PongPacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.LONG; @@ -22,7 +23,7 @@ public record PongPacket(long number) implements ServerPacket { public int getId(@NotNull ConnectionState state) { return switch (state) { case STATUS -> ServerPacketIdentifier.STATUS_PONG; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.STATUS); }; } } diff --git a/src/main/java/net/minestom/server/network/packet/server/status/ResponsePacket.java b/src/main/java/net/minestom/server/network/packet/server/status/ResponsePacket.java index 22cb41325..098e4c36b 100644 --- a/src/main/java/net/minestom/server/network/packet/server/status/ResponsePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/status/ResponsePacket.java @@ -4,6 +4,7 @@ import net.minestom.server.network.ConnectionState; import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.PacketUtils; import org.jetbrains.annotations.NotNull; import static net.minestom.server.network.NetworkBuffer.STRING; @@ -22,7 +23,7 @@ public record ResponsePacket(@NotNull String jsonResponse) implements ServerPack public int getId(@NotNull ConnectionState state) { return switch (state) { case STATUS -> ServerPacketIdentifier.STATUS_RESPONSE; - default -> throw new IllegalArgumentException(); + default -> PacketUtils.invalidPacketState(getClass(), state, ConnectionState.STATUS); }; } } diff --git a/src/main/java/net/minestom/server/utils/PacketUtils.java b/src/main/java/net/minestom/server/utils/PacketUtils.java index e21996d70..367956bad 100644 --- a/src/main/java/net/minestom/server/utils/PacketUtils.java +++ b/src/main/java/net/minestom/server/utils/PacketUtils.java @@ -386,4 +386,14 @@ public final class PacketUtils { // TODO for non-socket connection } } + + @ApiStatus.Internal + public static int invalidPacketState(@NotNull Class packetClass, @NotNull ConnectionState state, @NotNull ConnectionState... expected) { + StringBuilder expectedStr = new StringBuilder(); + for (ConnectionState connectionState : expected) { + expectedStr.append(connectionState).append(", "); + } + expectedStr.delete(expectedStr.length() - 2, expectedStr.length()); + throw new IllegalStateException(String.format("Packet %s is not valid in state %s (only %s)", packetClass.getSimpleName(), state, expectedStr)); + } }