From 2ab3a4322a297655000fc060aff135abab898ad7 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Wed, 23 Apr 2025 15:20:29 +0700 Subject: [PATCH] refactor: use java 21 switch case ahh thing for packet checking --- build-number.txt | 2 +- .../java/me/chayapak1/chomens_bot/Bot.java | 19 +++++++++++-------- .../chomens_bot/plugins/ChatPlugin.java | 11 +++++++---- .../chomens_bot/plugins/PlayersPlugin.java | 15 +++++++++------ .../chomens_bot/plugins/PositionPlugin.java | 17 ++++++++++------- .../chomens_bot/plugins/SelfCarePlugin.java | 13 ++++++++----- .../chomens_bot/plugins/WorldPlugin.java | 19 +++++++++++-------- 7 files changed, 57 insertions(+), 39 deletions(-) diff --git a/build-number.txt b/build-number.txt index e681ffd9..9d57e9ad 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -2925 \ No newline at end of file +2927 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/Bot.java b/src/main/java/me/chayapak1/chomens_bot/Bot.java index 36f76bdb..f3385ebc 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Bot.java +++ b/src/main/java/me/chayapak1/chomens_bot/Bot.java @@ -223,14 +223,17 @@ public class Bot extends SessionAdapter { public void packetReceived (final Session session, final Packet packet) { this.listener.dispatch(listener -> listener.packetReceived(session, packet)); - if (packet instanceof final ClientboundLoginPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundLoginFinishedPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundCustomQueryPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundCookieRequestPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundTransferPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundStoreCookiePacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundLoginCompressionPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundCustomPayloadPacket t_packet) packetReceived(t_packet); + switch (packet) { + case final ClientboundLoginPacket t_packet -> packetReceived(t_packet); + case final ClientboundLoginFinishedPacket t_packet -> packetReceived(t_packet); + case final ClientboundCustomQueryPacket t_packet -> packetReceived(t_packet); + case final ClientboundCookieRequestPacket t_packet -> packetReceived(t_packet); + case final ClientboundTransferPacket t_packet -> packetReceived(t_packet); + case final ClientboundStoreCookiePacket t_packet -> packetReceived(t_packet); + case final ClientboundLoginCompressionPacket t_packet -> packetReceived(t_packet); + case final ClientboundCustomPayloadPacket t_packet -> packetReceived(t_packet); + default -> { } + } } private void packetReceived (final ClientboundLoginFinishedPacket packet) { diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java index 49271eaa..a8672468 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java @@ -70,10 +70,13 @@ public class ChatPlugin implements Listener { @Override public void packetReceived (final Session session, final Packet packet) { - if (packet instanceof final ClientboundSystemChatPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundPlayerChatPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundDisguisedChatPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundRegistryDataPacket t_packet) packetReceived(t_packet); + switch (packet) { + case final ClientboundSystemChatPacket t_packet -> packetReceived(t_packet); + case final ClientboundPlayerChatPacket t_packet -> packetReceived(t_packet); + case final ClientboundDisguisedChatPacket t_packet -> packetReceived(t_packet); + case final ClientboundRegistryDataPacket t_packet -> packetReceived(t_packet); + default -> { } + } } private void packetReceived (final ClientboundSystemChatPacket packet) { diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java index 924127a0..94610025 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java @@ -51,12 +51,15 @@ public class PlayersPlugin implements Listener { for (final PlayerListEntryAction action : actions) { for (final PlayerListEntry entry : packet.getEntries()) { - if (action == PlayerListEntryAction.ADD_PLAYER) addPlayer(entry); - else if (action == PlayerListEntryAction.INITIALIZE_CHAT) initializeChat(entry); - else if (action == PlayerListEntryAction.UPDATE_LISTED) updateListed(entry); - else if (action == PlayerListEntryAction.UPDATE_GAME_MODE) updateGameMode(entry); - else if (action == PlayerListEntryAction.UPDATE_LATENCY) updateLatency(entry); - else if (action == PlayerListEntryAction.UPDATE_DISPLAY_NAME) updateDisplayName(entry); + switch (action) { + case ADD_PLAYER -> addPlayer(entry); + case INITIALIZE_CHAT -> initializeChat(entry); + case UPDATE_LISTED -> updateListed(entry); + case UPDATE_GAME_MODE -> updateGameMode(entry); + case UPDATE_LATENCY -> updateLatency(entry); + case UPDATE_DISPLAY_NAME -> updateDisplayName(entry); + default -> { } + } } } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java index 00a90479..08401e40 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java @@ -58,13 +58,16 @@ public class PositionPlugin implements Listener { @Override public void packetReceived (final Session session, final Packet packet) { - if (packet instanceof final ClientboundPlayerPositionPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundAddEntityPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundRemoveEntitiesPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundMoveEntityRotPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundMoveEntityPosPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundMoveEntityPosRotPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundEntityPositionSyncPacket t_packet) packetReceived(t_packet); + switch (packet) { + case final ClientboundPlayerPositionPacket t_packet -> packetReceived(t_packet); + case final ClientboundAddEntityPacket t_packet -> packetReceived(t_packet); + case final ClientboundRemoveEntitiesPacket t_packet -> packetReceived(t_packet); + case final ClientboundMoveEntityRotPacket t_packet -> packetReceived(t_packet); + case final ClientboundMoveEntityPosPacket t_packet -> packetReceived(t_packet); + case final ClientboundMoveEntityPosRotPacket t_packet -> packetReceived(t_packet); + case final ClientboundEntityPositionSyncPacket t_packet -> packetReceived(t_packet); + default -> { } + } } private void packetReceived (final ClientboundPlayerPositionPacket packet) { diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java index b91701d9..a8e74089 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java @@ -136,11 +136,14 @@ public class SelfCarePlugin implements Listener { @Override public void packetReceived (final Session session, final Packet packet) { - if (packet instanceof final ClientboundLoginPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundGameEventPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundEntityEventPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundOpenScreenPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundSetPassengersPacket t_packet) packetReceived(t_packet); + switch (packet) { + case final ClientboundLoginPacket t_packet -> packetReceived(t_packet); + case final ClientboundGameEventPacket t_packet -> packetReceived(t_packet); + case final ClientboundEntityEventPacket t_packet -> packetReceived(t_packet); + case final ClientboundOpenScreenPacket t_packet -> packetReceived(t_packet); + case final ClientboundSetPassengersPacket t_packet -> packetReceived(t_packet); + default -> { } + } } private void packetReceived (final ClientboundLoginPacket packet) { diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java index a6cd187f..55bdff6b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java @@ -41,14 +41,17 @@ public class WorldPlugin implements Listener { @Override public void packetReceived (final Session session, final Packet packet) { - if (packet instanceof final ClientboundLevelChunkWithLightPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundForgetLevelChunkPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundBlockUpdatePacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundSectionBlocksUpdatePacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundLoginPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundRespawnPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundRegistryDataPacket t_packet) packetReceived(t_packet); - else if (packet instanceof final ClientboundSetSimulationDistancePacket t_packet) packetReceived(t_packet); + switch (packet) { + case final ClientboundLevelChunkWithLightPacket t_packet -> packetReceived(t_packet); + case final ClientboundForgetLevelChunkPacket t_packet -> packetReceived(t_packet); + case final ClientboundBlockUpdatePacket t_packet -> packetReceived(t_packet); + case final ClientboundSectionBlocksUpdatePacket t_packet -> packetReceived(t_packet); + case final ClientboundLoginPacket t_packet -> packetReceived(t_packet); + case final ClientboundRespawnPacket t_packet -> packetReceived(t_packet); + case final ClientboundRegistryDataPacket t_packet -> packetReceived(t_packet); + case final ClientboundSetSimulationDistancePacket t_packet -> packetReceived(t_packet); + default -> { } + } } @Override