From bb0900eeb6abbda542d729a7158bb4ed36e2e42d Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Mon, 31 Mar 2025 16:55:52 +0700 Subject: [PATCH] refactor: make `packetReceived` listeners private Intelligent IDEA Replacing Feature. --- build-number.txt | 2 +- .../java/me/chayapak1/chomens_bot/Bot.java | 18 +++++++++--------- .../plugins/BossbarManagerPlugin.java | 4 ++-- .../chomens_bot/plugins/ChatPlugin.java | 6 +++--- .../plugins/ExtrasMessengerPlugin.java | 2 +- .../chomens_bot/plugins/PlayersPlugin.java | 4 ++-- .../chomens_bot/plugins/PositionPlugin.java | 14 +++++++------- .../chomens_bot/plugins/SelfCarePlugin.java | 10 +++++----- .../plugins/ServerFeaturesPlugin.java | 2 +- .../chomens_bot/plugins/TPSPlugin.java | 4 ++-- .../chomens_bot/plugins/TabCompletePlugin.java | 2 +- .../chomens_bot/plugins/TeamPlugin.java | 2 +- .../chomens_bot/plugins/VoiceChatPlugin.java | 4 ++-- 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/build-number.txt b/build-number.txt index 47140065..0b39e14d 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -2307 \ No newline at end of file +2309 \ 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 e2eeb45b..8403f5b5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Bot.java +++ b/src/main/java/me/chayapak1/chomens_bot/Bot.java @@ -229,13 +229,13 @@ public class Bot extends SessionAdapter { else if (packet instanceof ClientboundCustomPayloadPacket t_packet) packetReceived(t_packet); } - public void packetReceived (ClientboundLoginFinishedPacket packet) { + private void packetReceived (ClientboundLoginFinishedPacket packet) { profile = packet.getProfile(); session.setFlag(BuiltinFlags.CLIENT_TRANSFERRING, false); } - public void packetReceived (ClientboundLoginPacket ignoredPacket) { + private void packetReceived (ClientboundLoginPacket ignoredPacket) { loggedIn = true; loginTime = System.currentTimeMillis(); @@ -248,11 +248,11 @@ public class Bot extends SessionAdapter { if (options.creayun) chat.send("/server creative"); } - public void packetReceived (ClientboundCustomQueryPacket packet) { + private void packetReceived (ClientboundCustomQueryPacket packet) { session.send(new ServerboundCustomQueryAnswerPacket(packet.getMessageId(), null)); } - public void packetReceived (ClientboundCustomPayloadPacket packet) { + private void packetReceived (ClientboundCustomPayloadPacket packet) { if (!packet.getChannel().asString().equals("minecraft:register")) return; session.send( @@ -263,7 +263,7 @@ public class Bot extends SessionAdapter { ); } - public void packetReceived (ClientboundCookieRequestPacket packet) { + private void packetReceived (ClientboundCookieRequestPacket packet) { session.send( new ServerboundCookieResponsePacket( packet.getKey(), @@ -272,11 +272,11 @@ public class Bot extends SessionAdapter { ); } - public void packetReceived (ClientboundStoreCookiePacket packet) { + private void packetReceived (ClientboundStoreCookiePacket packet) { cookies.put(packet.getKey(), packet.getPayload()); } - public void packetReceived (ClientboundTransferPacket ignoredPacket) { + private void packetReceived (ClientboundTransferPacket ignoredPacket) { this.isTransferring = true; session.disconnect(Component.translatable("disconnect.transfer")); @@ -284,7 +284,7 @@ public class Bot extends SessionAdapter { // we're not meant to send client information at finish configuration, // but if it works it works™ - public void packetReceived (ClientboundFinishConfigurationPacket ignoredPacket) { + private void packetReceived (ClientboundFinishConfigurationPacket ignoredPacket) { // for voicechat session.send(new ServerboundCustomPayloadPacket( Key.key("minecraft:brand"), @@ -319,7 +319,7 @@ public class Bot extends SessionAdapter { // they actually implemented this, but at this commit: // https://github.com/GeyserMC/MCProtocolLib/commit/f8460356db2b92fbf7cb506757fe8f87a011a1f7#diff-a9066adbcb6d5503f5edefe3ec95465cf755f1585e02b732a6fa907afe7c7177R67-L103 // they removed it, for some reason - public void packetReceived (ClientboundLoginCompressionPacket packet) { + private void packetReceived (ClientboundLoginCompressionPacket packet) { if (packet.getThreshold() < 0) { session.setCompression(null); } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java index d0b8f460..093cb833 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java @@ -40,11 +40,11 @@ public class BossbarManagerPlugin extends Bot.Listener implements PlayersPlugin. } @Override - public void packetReceived(Session session, Packet packet) { + public void packetReceived (Session session, Packet packet) { if (packet instanceof ClientboundBossEventPacket t_packet) packetReceived(t_packet); } - public void packetReceived(ClientboundBossEventPacket packet) { + private void packetReceived (ClientboundBossEventPacket packet) { if (!enabled || actionBar || !bot.options.useCore) return; try { 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 3b4e6e4b..a31b63da 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java @@ -84,7 +84,7 @@ public class ChatPlugin extends Bot.Listener { else if (packet instanceof ClientboundRegistryDataPacket t_packet) packetReceived(t_packet); } - public void packetReceived (ClientboundSystemChatPacket packet) { + private void packetReceived (ClientboundSystemChatPacket packet) { final Component component = packet.getContent(); if ( @@ -169,7 +169,7 @@ public class ChatPlugin extends Bot.Listener { ); } - public void packetReceived (ClientboundPlayerChatPacket packet) { + private void packetReceived (ClientboundPlayerChatPacket packet) { final UUID senderUUID = packet.getSender(); final PlayerEntry entry = bot.players.getEntry(senderUUID); @@ -208,7 +208,7 @@ public class ChatPlugin extends Bot.Listener { } } - public void packetReceived (ClientboundDisguisedChatPacket packet) { + private void packetReceived (ClientboundDisguisedChatPacket packet) { final Component component = packet.getMessage(); PlayerMessage parsedFromMessage = null; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ExtrasMessengerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ExtrasMessengerPlugin.java index 605f467f..52b10af9 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ExtrasMessengerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ExtrasMessengerPlugin.java @@ -48,7 +48,7 @@ public class ExtrasMessengerPlugin extends Bot.Listener { if (packet instanceof ClientboundCustomPayloadPacket t_packet) packetReceived(t_packet); } - public void packetReceived (ClientboundCustomPayloadPacket packet) { + private void packetReceived (ClientboundCustomPayloadPacket packet) { final Key packetChannel = packet.getChannel(); if (packetChannel.equals(MINECRAFT_REGISTER_KEY)) { 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 b0f00100..2ceb5473 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java @@ -49,7 +49,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { else if (packet instanceof ClientboundPlayerInfoRemovePacket t_packet) packetReceived(t_packet); } - public void packetReceived (ClientboundPlayerInfoUpdatePacket packet) { + private void packetReceived (ClientboundPlayerInfoUpdatePacket packet) { final EnumSet actions = packet.getActions(); for (PlayerListEntryAction action : actions) { @@ -64,7 +64,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { } } - public void packetReceived (ClientboundPlayerInfoRemovePacket packet) { + private void packetReceived (ClientboundPlayerInfoRemovePacket packet) { final List uuids = packet.getProfileIds(); for (UUID uuid : uuids) removePlayer(uuid); 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 c00b3c87..7ffdda36 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java @@ -70,7 +70,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener else if (packet instanceof ClientboundEntityPositionSyncPacket t_packet) packetReceived(t_packet); } - public void packetReceived (ClientboundPlayerPositionPacket packet) { + private void packetReceived (ClientboundPlayerPositionPacket packet) { if (bot.session != null) bot.session.send(new ServerboundAcceptTeleportationPacket(packet.getId())); position = packet.getPosition(); @@ -78,7 +78,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener for (Listener listener : listeners) { listener.positionChange(position); } } - public void packetReceived (ClientboundAddEntityPacket packet) { + private void packetReceived (ClientboundAddEntityPacket packet) { if (packet.getType() != EntityType.PLAYER) return; final PlayerEntry entry = bot.players.getEntry(packet.getUuid()); @@ -94,7 +94,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener rotationMap.put(packet.getEntityId(), new Rotation(packet.getYaw(), packet.getPitch())); } - public void packetReceived (ClientboundRemoveEntitiesPacket packet) { + private void packetReceived (ClientboundRemoveEntitiesPacket packet) { final int[] ids = packet.getEntityIds(); for (int id : ids) { @@ -104,7 +104,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener } } - public void packetReceived (ClientboundEntityPositionSyncPacket packet) { + private void packetReceived (ClientboundEntityPositionSyncPacket packet) { final PlayerEntry player = entityIdMap.get(packet.getId()); if (player == null) return; @@ -121,7 +121,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener for (Listener listener : listeners) listener.playerMoved(player, position, rotation); } - public void packetReceived (ClientboundMoveEntityRotPacket packet) { + private void packetReceived (ClientboundMoveEntityRotPacket packet) { final PlayerEntry player = entityIdMap.get(packet.getEntityId()); if (player == null) return; @@ -133,7 +133,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener for (Listener listener : listeners) listener.playerMoved(player, getPlayerPosition(player.profile.getName()), rotation); } - public void packetReceived (ClientboundMoveEntityPosPacket packet) { + private void packetReceived (ClientboundMoveEntityPosPacket packet) { final PlayerEntry player = entityIdMap.get(packet.getEntityId()); if (player == null) return; @@ -158,7 +158,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener for (Listener listener : listeners) listener.playerMoved(player, position, getPlayerRotation(player.profile.getName())); } - public void packetReceived (ClientboundMoveEntityPosRotPacket packet) { + private void packetReceived (ClientboundMoveEntityPosRotPacket packet) { final PlayerEntry player = entityIdMap.get(packet.getEntityId()); if (player == null) return; 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 9a085ec9..4ee151dd 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java @@ -163,7 +163,7 @@ public class SelfCarePlugin else if (packet instanceof ClientboundSetPassengersPacket t_packet) packetReceived(t_packet); } - public void packetReceived (ClientboundLoginPacket packet) { + private void packetReceived (ClientboundLoginPacket packet) { this.entityId = packet.getEntityId(); this.gamemode = packet.getCommonPlayerSpawnInfo().getGameMode(); @@ -183,7 +183,7 @@ public class SelfCarePlugin checkTask = bot.executor.scheduleAtFixedRate(task, 0, bot.config.selfCare.delay, TimeUnit.MILLISECONDS); } - public void packetReceived (ClientboundGameEventPacket packet) { + private void packetReceived (ClientboundGameEventPacket packet) { final GameEvent notification = packet.getNotification(); final GameEventValue value = packet.getValue(); @@ -195,7 +195,7 @@ public class SelfCarePlugin if (notification == GameEvent.CHANGE_GAMEMODE) gamemode = (GameMode) value; } - public void packetReceived (ClientboundEntityEventPacket packet) { + private void packetReceived (ClientboundEntityEventPacket packet) { final EntityEvent event = packet.getEvent(); final int id = packet.getEntityId(); @@ -208,7 +208,7 @@ public class SelfCarePlugin else if (event == EntityEvent.PLAYER_OP_PERMISSION_LEVEL_4) permissionLevel = 4; } - public void packetReceived (ClientboundOpenScreenPacket packet) { + private void packetReceived (ClientboundOpenScreenPacket packet) { // instantly closes the window when received the packet // also should this be in self care? bot.session.send( @@ -218,7 +218,7 @@ public class SelfCarePlugin ); } - public void packetReceived (ClientboundSetPassengersPacket packet) { + private void packetReceived (ClientboundSetPassengersPacket packet) { if ( Arrays.stream(packet.getPassengerIds()) .noneMatch(id -> id == entityId) diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ServerFeaturesPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ServerFeaturesPlugin.java index a88d0dd9..61c9b53a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ServerFeaturesPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ServerFeaturesPlugin.java @@ -27,7 +27,7 @@ public class ServerFeaturesPlugin extends Bot.Listener { if (packet instanceof ClientboundCommandsPacket t_packet) packetReceived(t_packet); } - public void packetReceived (ClientboundCommandsPacket packet) { + private void packetReceived (ClientboundCommandsPacket packet) { for (CommandNode node : packet.getNodes()) { if (!node.isExecutable() || node.getType() != CommandType.LITERAL) continue; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java index 569365d6..b984653b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java @@ -115,7 +115,7 @@ public class TPSPlugin extends Bot.Listener implements TickPlugin.Listener { else if (packet instanceof ClientboundLoginPacket t_packet) packetReceived(t_packet); } - public void packetReceived (ClientboundSetTimePacket ignoredPacket) { + private void packetReceived (ClientboundSetTimePacket ignoredPacket) { long now = System.currentTimeMillis(); float timeElapsed = (float) (now - timeLastTimeUpdate) / 1000.0F; tickRates[nextIndex] = MathUtilities.clamp(20.0f / timeElapsed, 0.0f, 20.0f); @@ -123,7 +123,7 @@ public class TPSPlugin extends Bot.Listener implements TickPlugin.Listener { timeLastTimeUpdate = now; } - public void packetReceived (ClientboundLoginPacket ignoredPacket) { + private void packetReceived (ClientboundLoginPacket ignoredPacket) { Arrays.fill(tickRates, 0); nextIndex = 0; timeGameJoined = timeLastTimeUpdate = System.currentTimeMillis(); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java index 3a298326..5a0c0970 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java @@ -38,7 +38,7 @@ public class TabCompletePlugin extends Bot.Listener { if (packet instanceof ClientboundCommandSuggestionsPacket t_packet) packetReceived(t_packet); } - public void packetReceived (ClientboundCommandSuggestionsPacket packet) { + private void packetReceived (ClientboundCommandSuggestionsPacket packet) { final int id = packet.getTransactionId(); if (!transactions.containsKey(id)) return; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java index f759a085..0eddcad8 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java @@ -42,7 +42,7 @@ public class TeamPlugin extends Bot.Listener { if (packet instanceof ClientboundSetPlayerTeamPacket t_packet) packetReceived(t_packet); } - public void packetReceived(ClientboundSetPlayerTeamPacket packet) { + private void packetReceived (ClientboundSetPlayerTeamPacket packet) { switch (packet.getAction()) { case CREATE -> { final Team team = new Team( diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/VoiceChatPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/VoiceChatPlugin.java index 7924d680..9c95de93 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/VoiceChatPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/VoiceChatPlugin.java @@ -48,7 +48,7 @@ public class VoiceChatPlugin extends Bot.Listener { else if (packet instanceof ClientboundCustomPayloadPacket t_packet) packetReceived(t_packet); } - public void packetReceived(ClientboundLoginPacket ignored) { + private void packetReceived (ClientboundLoginPacket ignored) { // totally didn't use a real minecraft client with voicechat mod to get this bot.session.send(new ServerboundCustomPayloadPacket( @@ -64,7 +64,7 @@ public class VoiceChatPlugin extends Bot.Listener { running = true; } - public void packetReceived(ClientboundCustomPayloadPacket _packet) { + private void packetReceived (ClientboundCustomPayloadPacket _packet) { if (_packet.getChannel().equals(Key.key("voicechat:secret"))) { // fard final byte[] bytes = _packet.getData(); final FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.wrappedBuffer(bytes));