From decd15a92601a72cef394fb527bb1b3a79fd45a3 Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Wed, 16 Apr 2025 15:34:20 +0700
Subject: [PATCH] refactor: have global Listener interface instead of creating
 one in each plugin not sure how much this improves the code, readability
 and/or the performance but i hope they are better

---
 build-number.txt                              |  2 +-
 codestyle.xml                                 |  1 +
 .../java/me/chayapak1/chomens_bot/Bot.java    | 61 +++---------
 .../chomens_bot/data/listener/Listener.java   | 69 ++++++++++++++
 .../GetLatestChatMessageFunction.java         |  8 +-
 .../chomens_bot/plugins/AuthPlugin.java       | 20 ++--
 .../plugins/BossbarManagerPlugin.java         | 16 +---
 .../plugins/BotSelectorBroadcasterPlugin.java | 10 +-
 .../chomens_bot/plugins/BruhifyPlugin.java    |  5 +-
 .../plugins/ChatCommandHandlerPlugin.java     | 10 +-
 .../chomens_bot/plugins/ChatPlugin.java       | 57 +++++-------
 .../plugins/ChomeNSModIntegrationPlugin.java  | 20 ++--
 .../plugins/ClearChatNameAnnouncerPlugin.java |  7 +-
 .../plugins/CommandHandlerPlugin.java         |  5 +-
 .../chomens_bot/plugins/CommandSpyPlugin.java | 18 +---
 .../plugins/CommandSuggestionPlugin.java      | 22 +++--
 .../chomens_bot/plugins/CorePlugin.java       | 33 ++-----
 .../chomens_bot/plugins/DiscordPlugin.java    | 34 +++----
 .../plugins/ExtrasMessengerPlugin.java        | 15 +--
 .../plugins/FilterManagerPlugin.java          | 19 ++--
 .../chomens_bot/plugins/IPFilterPlugin.java   | 10 +-
 .../chomens_bot/plugins/IRCPlugin.java        | 14 +--
 .../plugins/ListenerManagerPlugin.java        | 67 ++++++++++++++
 .../chomens_bot/plugins/LoggerPlugin.java     | 92 +++++++++----------
 .../chomens_bot/plugins/MailPlugin.java       |  7 +-
 .../plugins/MusicPlayerPlugin.java            | 12 +--
 .../plugins/PacketSnifferPlugin.java          |  9 +-
 .../plugins/PlayerFilterPlugin.java           |  7 +-
 .../plugins/PlayersDatabasePlugin.java        | 11 ++-
 .../chomens_bot/plugins/PlayersPlugin.java    | 55 ++++-------
 .../chomens_bot/plugins/PositionPlugin.java   | 45 ++++-----
 .../chomens_bot/plugins/QueryPlugin.java      |  9 +-
 .../chomens_bot/plugins/SelfCarePlugin.java   |  8 +-
 .../plugins/ServerFeaturesPlugin.java         |  5 +-
 .../chomens_bot/plugins/TPSPlugin.java        |  6 +-
 .../plugins/TabCompletePlugin.java            |  6 +-
 .../chomens_bot/plugins/TeamPlugin.java       |  5 +-
 .../chomens_bot/plugins/TickPlugin.java       | 28 ++----
 .../chomens_bot/plugins/TrustedPlugin.java    | 10 +-
 .../chomens_bot/plugins/VoiceChatPlugin.java  |  5 +-
 .../chomens_bot/plugins/WhitelistPlugin.java  |  7 +-
 .../chomens_bot/plugins/WorldPlugin.java      | 20 ++--
 42 files changed, 429 insertions(+), 441 deletions(-)
 create mode 100644 src/main/java/me/chayapak1/chomens_bot/data/listener/Listener.java
 create mode 100644 src/main/java/me/chayapak1/chomens_bot/plugins/ListenerManagerPlugin.java

diff --git a/build-number.txt b/build-number.txt
index 5710984f..737a0ba1 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-2747
\ No newline at end of file
+2757
\ No newline at end of file
diff --git a/codestyle.xml b/codestyle.xml
index 05007b58..5e5d1274 100644
--- a/codestyle.xml
+++ b/codestyle.xml
@@ -12,6 +12,7 @@
   <codeStyleSettings language="JAVA">
     <option name="RIGHT_MARGIN" value="120" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
     <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
     <option name="SPACE_WITHIN_BRACES" value="true" />
     <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
diff --git a/src/main/java/me/chayapak1/chomens_bot/Bot.java b/src/main/java/me/chayapak1/chomens_bot/Bot.java
index ad0ef54b..cae1727a 100644
--- a/src/main/java/me/chayapak1/chomens_bot/Bot.java
+++ b/src/main/java/me/chayapak1/chomens_bot/Bot.java
@@ -1,6 +1,7 @@
 package me.chayapak1.chomens_bot;
 
 import me.chayapak1.chomens_bot.data.color.ColorPalette;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.plugins.*;
 import me.chayapak1.chomens_bot.util.ComponentUtilities;
 import me.chayapak1.chomens_bot.util.RandomStringUtilities;
@@ -41,8 +42,6 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 public class Bot extends SessionAdapter {
-    private final List<Listener> listeners = new ArrayList<>();
-
     public final String host;
     public final int port;
 
@@ -73,6 +72,7 @@ public class Bot extends SessionAdapter {
     public final ExecutorService executorService = Main.EXECUTOR_SERVICE;
     public final ScheduledExecutorService executor = Main.EXECUTOR;
 
+    public final ListenerManagerPlugin listener;
     public final LoggerPlugin logger;
     public final TickPlugin tick;
     public final ChatPlugin chat;
@@ -129,14 +129,15 @@ public class Bot extends SessionAdapter {
         this.config = config;
         this.colorPalette = new ColorPalette(config.colorPalette);
 
-        this.logger = new LoggerPlugin(this);
+        this.listener = new ListenerManagerPlugin(this);
         this.tick = new TickPlugin(this);
         this.chat = new ChatPlugin(this);
         this.commandSpy = new CommandSpyPlugin(this);
+        this.query = new QueryPlugin(this);
+        this.logger = new LoggerPlugin(this);
         this.position = new PositionPlugin(this);
         this.serverFeatures = new ServerFeaturesPlugin(this);
         this.selfCare = new SelfCarePlugin(this);
-        this.query = new QueryPlugin(this);
         this.extrasMessenger = new ExtrasMessengerPlugin(this);
         this.world = new WorldPlugin(this);
         this.core = new CorePlugin(this);
@@ -172,8 +173,6 @@ public class Bot extends SessionAdapter {
     }
 
     protected void connect () {
-        for (final Listener listener : listeners) listener.loadedPlugins(this);
-
         reconnect();
     }
 
@@ -182,9 +181,7 @@ public class Bot extends SessionAdapter {
 
         connectAttempts++;
 
-        for (final Listener listener : listeners) {
-            listener.connecting();
-        }
+        this.listener.dispatch(Listener::onConnecting);
 
         if (!isTransferring) {
             username = options.username == null ?
@@ -215,13 +212,7 @@ public class Bot extends SessionAdapter {
 
     @Override
     public void packetReceived (final Session session, final Packet packet) {
-        for (final SessionListener listener : listeners) {
-            try {
-                listener.packetReceived(session, packet);
-            } catch (final Exception e) {
-                logger.error(e);
-            }
-        }
+        this.listener.dispatch(listener -> listener.packetReceived(session, packet));
 
         if (packet instanceof final ClientboundLoginPacket t_packet) packetReceived(t_packet);
         else if (packet instanceof final ClientboundFinishConfigurationPacket t_packet) packetReceived(t_packet);
@@ -245,9 +236,7 @@ public class Bot extends SessionAdapter {
         loginTime = System.currentTimeMillis();
         connectAttempts = 0;
 
-        for (final SessionListener listener : listeners) {
-            listener.connected(new ConnectedEvent(session));
-        }
+        this.listener.dispatch(listener -> listener.connected(new ConnectedEvent(session)));
 
         session.send(ServerboundPlayerLoadedPacket.INSTANCE);
     }
@@ -331,31 +320,23 @@ public class Bot extends SessionAdapter {
 
     @Override
     public void packetSending (final PacketSendingEvent packetSendingEvent) {
-        for (final SessionListener listener : listeners) {
-            listener.packetSending(packetSendingEvent);
-        }
+        this.listener.dispatch(listener -> listener.packetSending(packetSendingEvent));
     }
 
     @Override
     public void packetSent (final Session session, final Packet packet) {
-        for (final SessionListener listener : listeners) {
-            listener.packetSent(session, packet);
-        }
+        this.listener.dispatch(listener -> listener.packetSent(session, packet));
     }
 
     @Override
     public void packetError (final PacketErrorEvent packetErrorEvent) {
-        for (final SessionListener listener : listeners) {
-            listener.packetError(packetErrorEvent);
-        }
+        this.listener.dispatch(listener -> listener.packetError(packetErrorEvent));
         packetErrorEvent.setSuppress(true); // fixes the ohio sus exploit
     }
 
     @Override
     public void disconnecting (final DisconnectingEvent disconnectingEvent) {
-        for (final SessionListener listener : listeners) {
-            listener.disconnecting(disconnectingEvent);
-        }
+        this.listener.dispatch(listener -> listener.disconnecting(disconnectingEvent));
     }
 
     @Override
@@ -389,13 +370,7 @@ public class Bot extends SessionAdapter {
             executor.schedule(this::reconnect, reconnectDelay, TimeUnit.MILLISECONDS);
         }
 
-        for (final SessionListener listener : listeners) {
-            try {
-                listener.disconnected(disconnectedEvent);
-            } catch (final Exception e) {
-                logger.error(e);
-            }
-        }
+        this.listener.dispatch(listener -> listener.disconnected(disconnectedEvent));
     }
 
     public String getServerString () { return getServerString(false); }
@@ -411,10 +386,6 @@ public class Bot extends SessionAdapter {
         Main.bots.remove(this);
     }
 
-    public void addListener (final Listener listener) {
-        listeners.add(listener);
-    }
-
     @Override
     public String toString () {
         return "Bot{" +
@@ -424,10 +395,4 @@ public class Bot extends SessionAdapter {
                 ", loggedIn=" + loggedIn +
                 '}';
     }
-
-    public static class Listener extends SessionAdapter {
-        public void connecting () { }
-
-        public void loadedPlugins (final Bot bot) { }
-    }
 }
diff --git a/src/main/java/me/chayapak1/chomens_bot/data/listener/Listener.java b/src/main/java/me/chayapak1/chomens_bot/data/listener/Listener.java
new file mode 100644
index 00000000..c5df42ef
--- /dev/null
+++ b/src/main/java/me/chayapak1/chomens_bot/data/listener/Listener.java
@@ -0,0 +1,69 @@
+package me.chayapak1.chomens_bot.data.listener;
+
+import me.chayapak1.chomens_bot.data.chat.ChatPacketType;
+import me.chayapak1.chomens_bot.data.chat.PlayerMessage;
+import me.chayapak1.chomens_bot.data.entity.Rotation;
+import me.chayapak1.chomens_bot.data.player.PlayerEntry;
+import net.kyori.adventure.text.Component;
+import org.cloudburstmc.math.vector.Vector3d;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.event.session.*;
+import org.geysermc.mcprotocollib.network.packet.Packet;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
+
+import java.util.UUID;
+
+@SuppressWarnings("unused")
+public interface Listener {
+    // from mcprotocollib SessionListener
+    default void packetReceived (final Session session, final Packet packet) { }
+    default void packetSending (final PacketSendingEvent event) { }
+    default void packetSent (final Session session, final Packet packet) { }
+    default void packetError (final PacketErrorEvent event) { }
+    default void connected (final ConnectedEvent event) { }
+    default void disconnecting (final DisconnectingEvent event) { }
+    default void disconnected (final DisconnectedEvent event) { }
+
+    // bot
+    default void onConnecting () { }
+
+    // ticker
+    default void onTick () { }
+    default void onAlwaysTick () { }
+    default void onSecondTick () { }
+
+    // core
+    default void onCoreReady () { }
+    default void onCoreRefilled () { }
+
+    // position
+    default void onPositionChange (final Vector3d position) { }
+    default void onPlayerMoved (final PlayerEntry player, final Vector3d position, final Rotation rotation) { }
+
+    // world
+    default void onWorldChanged (final String dimension) { }
+
+    // players
+    default void onPlayerJoined (final PlayerEntry target) { }
+    default void onPlayerUnVanished (final PlayerEntry target) { }
+    default void onPlayerGameModeUpdated (final PlayerEntry target, final GameMode gameMode) { }
+    default void onPlayerLatencyUpdated (final PlayerEntry target, final int ping) { }
+    default void onPlayerDisplayNameUpdated (final PlayerEntry target, final Component displayName) { }
+    default void onPlayerLeft (final PlayerEntry target) { }
+    default void onPlayerVanished (final PlayerEntry target) { }
+    default void onPlayerChangedUsername (final PlayerEntry target, final String from, final String to) { }
+    default void onQueriedPlayerIP (final PlayerEntry target, final String ip) { }
+
+    // ChomeNS Mod
+    default void onChomeNSModPacketReceived (final PlayerEntry player, final me.chayapak1.chomens_bot.chomeNSMod.Packet packet) { }
+
+    // chat
+    default boolean onPlayerMessageReceived (final PlayerMessage message, final ChatPacketType packetType) { return true; }
+    default boolean onSystemMessageReceived (final Component component, final String string, final String ansi) { return true; }
+
+    // commandspy
+    default void onCommandSpyMessageReceived (final PlayerEntry sender, final String command) { }
+
+    // extras messenger
+    default void onExtrasMessageReceived (final UUID sender, final byte[] message) { }
+}
diff --git a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetLatestChatMessageFunction.java b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetLatestChatMessageFunction.java
index 8e30b168..01751536 100644
--- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetLatestChatMessageFunction.java
+++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetLatestChatMessageFunction.java
@@ -2,21 +2,21 @@ package me.chayapak1.chomens_bot.evalFunctions;
 
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.data.eval.EvalFunction;
-import me.chayapak1.chomens_bot.plugins.ChatPlugin;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 
-public class GetLatestChatMessageFunction extends EvalFunction implements ChatPlugin.Listener {
+public class GetLatestChatMessageFunction extends EvalFunction implements Listener {
     private String latestMessage = "";
 
     public GetLatestChatMessageFunction (final Bot bot) {
         super("getLatestChatMessage", bot);
 
-        bot.chat.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
-    public boolean systemMessageReceived (final Component component, final String string, final String ansi) {
+    public boolean onSystemMessageReceived (final Component component, final String string, final String ansi) {
         latestMessage = GsonComponentSerializer.gson().serialize(component);
 
         return true;
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java
index 20580e63..e186b3dd 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java
@@ -1,6 +1,7 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.logging.LogType;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import net.kyori.adventure.text.Component;
@@ -9,7 +10,7 @@ import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
 
 import java.util.concurrent.TimeUnit;
 
-public class AuthPlugin implements PlayersPlugin.Listener, ChatPlugin.Listener {
+public class AuthPlugin implements Listener {
     private final Bot bot;
 
     public boolean isAuthenticating = false;
@@ -28,15 +29,7 @@ public class AuthPlugin implements PlayersPlugin.Listener, ChatPlugin.Listener {
             timeoutCheck();
         }, 500, 500, TimeUnit.MILLISECONDS);
 
-        bot.addListener(new Bot.Listener() {
-            @Override
-            public void disconnected (final DisconnectedEvent event) {
-                AuthPlugin.this.disconnected();
-            }
-        });
-
-        bot.chat.addListener(this);
-        bot.players.addListener(this);
+        bot.listener.addListener(this);
     }
 
     private void checkAuthenticated () {
@@ -74,7 +67,7 @@ public class AuthPlugin implements PlayersPlugin.Listener, ChatPlugin.Listener {
     }
 
     @Override
-    public void playerJoined (final PlayerEntry target) {
+    public void onPlayerJoined (final PlayerEntry target) {
         if (!target.profile.getName().equals(bot.config.ownerName) || !bot.options.useCore) return;
 
         startTime = System.currentTimeMillis();
@@ -82,13 +75,14 @@ public class AuthPlugin implements PlayersPlugin.Listener, ChatPlugin.Listener {
     }
 
     @Override
-    public void playerLeft (final PlayerEntry target) {
+    public void onPlayerLeft (final PlayerEntry target) {
         if (!target.profile.getName().equals(bot.config.ownerName)) return;
 
         isAuthenticating = false;
     }
 
-    private void disconnected () {
+    @Override
+    public void disconnected (final DisconnectedEvent event) {
         isAuthenticating = false;
     }
 }
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 c1b6b8c2..a37b7733 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java
@@ -3,6 +3,7 @@ package me.chayapak1.chomens_bot.plugins;
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.data.bossbar.BossBar;
 import me.chayapak1.chomens_bot.data.bossbar.BotBossBar;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.geysermc.mcprotocollib.network.Session;
@@ -16,10 +17,7 @@ import java.util.Map;
 import java.util.UUID;
 
 // yes this has been rewritten to be not spammy
-public class BossbarManagerPlugin
-        extends Bot.Listener
-        implements PlayersPlugin.Listener, TickPlugin.Listener, CorePlugin.Listener
-{
+public class BossbarManagerPlugin implements Listener {
     private final Bot bot;
 
     public final Map<UUID, BossBar> serverBossBars = new HashMap<>();
@@ -34,11 +32,7 @@ public class BossbarManagerPlugin
         this.bot = bot;
         this.bossBarPrefix = bot.config.namespace + ":";
 
-        bot.addListener(this);
-
-        bot.players.addListener(this);
-        bot.tick.addListener(this);
-        bot.core.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
@@ -154,7 +148,7 @@ public class BossbarManagerPlugin
     }
 
     @Override
-    public void coreReady () {
+    public void onCoreReady () {
         for (final Map.Entry<UUID, BotBossBar> _bossBar : bossBars.entrySet()) {
             final BotBossBar bossBar = _bossBar.getValue();
 
@@ -168,7 +162,7 @@ public class BossbarManagerPlugin
     }
 
     @Override
-    public void playerJoined (final PlayerEntry target) {
+    public void onPlayerJoined (final PlayerEntry target) {
         if (!enabled || actionBar || !bot.options.useCore) return;
 
         for (final Map.Entry<UUID, BotBossBar> _bossBar : bossBars.entrySet()) {
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/BotSelectorBroadcasterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/BotSelectorBroadcasterPlugin.java
index b76a7f94..73c4c888 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/BotSelectorBroadcasterPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/BotSelectorBroadcasterPlugin.java
@@ -1,6 +1,7 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.UUIDUtilities;
 import net.kyori.adventure.text.Component;
@@ -9,7 +10,7 @@ import net.kyori.adventure.text.Component;
 // since that can actually be used to harm the bot,
 // but it's used for the command suggestions
 // (not sure what are some other ways to do it)
-public class BotSelectorBroadcasterPlugin implements PlayersPlugin.Listener, CorePlugin.Listener {
+public class BotSelectorBroadcasterPlugin implements Listener {
     private final Bot bot;
 
     private final String id;
@@ -18,17 +19,16 @@ public class BotSelectorBroadcasterPlugin implements PlayersPlugin.Listener, Cor
         this.bot = bot;
         this.id = bot.config.namespace + "_selector"; // chomens_bot_selector, for example
 
-        bot.players.addListener(this);
-        bot.core.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
-    public void playerJoined (final PlayerEntry target) {
+    public void onPlayerJoined (final PlayerEntry target) {
         sendSelector(UUIDUtilities.selector(target.profile.getId()));
     }
 
     @Override
-    public void coreReady () {
+    public void onCoreReady () {
         sendSelector("@a");
     }
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/BruhifyPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/BruhifyPlugin.java
index 34efebb5..14fd447b 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/BruhifyPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/BruhifyPlugin.java
@@ -1,11 +1,12 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.util.HSVLike;
 
-public class BruhifyPlugin implements TickPlugin.Listener {
+public class BruhifyPlugin implements Listener {
     private final Bot bot;
 
     public String bruhifyText = "";
@@ -15,7 +16,7 @@ public class BruhifyPlugin implements TickPlugin.Listener {
     public BruhifyPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.tick.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java
index fddde916..76aeed44 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java
@@ -4,6 +4,7 @@ import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.command.contexts.PlayerCommandContext;
 import me.chayapak1.chomens_bot.data.chat.ChatPacketType;
 import me.chayapak1.chomens_bot.data.chat.PlayerMessage;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.ComponentUtilities;
 import me.chayapak1.chomens_bot.util.UUIDUtilities;
@@ -11,7 +12,7 @@ import net.kyori.adventure.text.Component;
 
 import java.util.List;
 
-public class ChatCommandHandlerPlugin implements ChatPlugin.Listener, CommandSpyPlugin.Listener {
+public class ChatCommandHandlerPlugin implements Listener {
     public final Bot bot;
 
     public final List<String> prefixes;
@@ -23,12 +24,11 @@ public class ChatCommandHandlerPlugin implements ChatPlugin.Listener, CommandSpy
         this.prefixes = bot.config.prefixes;
         this.commandSpyPrefixes = bot.config.commandSpyPrefixes;
 
-        bot.chat.addListener(this);
-        bot.commandSpy.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
-    public boolean playerMessageReceived (final PlayerMessage message, final ChatPacketType packetType) {
+    public boolean onPlayerMessageReceived (final PlayerMessage message, final ChatPacketType packetType) {
         if (
                 message.sender() != null &&
                         bot.profile != null &&
@@ -45,7 +45,7 @@ public class ChatCommandHandlerPlugin implements ChatPlugin.Listener, CommandSpy
     }
 
     @Override
-    public void commandReceived (final PlayerEntry sender, final String command) {
+    public void onCommandSpyMessageReceived (final PlayerEntry sender, final String command) {
         if (
                 sender.profile != null &&
                         bot.profile != null &&
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 ee28e0c0..163c8d32 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java
@@ -7,6 +7,7 @@ import me.chayapak1.chomens_bot.chatParsers.U203aChatParser;
 import me.chayapak1.chomens_bot.data.chat.ChatPacketType;
 import me.chayapak1.chomens_bot.data.chat.ChatParser;
 import me.chayapak1.chomens_bot.data.chat.PlayerMessage;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.ComponentUtilities;
 import me.chayapak1.chomens_bot.util.IllegalCharactersUtilities;
@@ -38,7 +39,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class ChatPlugin extends Bot.Listener {
+public class ChatPlugin implements Listener {
     public static final Pattern COLOR_CODE_PATTERN = Pattern.compile("(&[a-f0-9rlonmk])", Pattern.MULTILINE);
     public static final Pattern COLOR_CODE_END_PATTERN = Pattern.compile("^.*&[a-f0-9rlonmk]$", Pattern.MULTILINE);
 
@@ -49,7 +50,7 @@ public class ChatPlugin extends Bot.Listener {
 
     public final Pattern CHAT_SPLIT_PATTERN = Pattern.compile("\\G\\s*([^\\r\\n]{1,254}(?=\\s|$)|[^\\r\\n]{254})");
 
-    private final List<ChatParser> chatParsers;
+    private final List<ChatParser> chatParsers = Collections.synchronizedList(new ArrayList<>());
 
     public final List<Component> chatTypes = new ArrayList<>();
 
@@ -57,16 +58,13 @@ public class ChatPlugin extends Bot.Listener {
 
     public final int queueDelay;
 
-    private final List<Listener> listeners = new ArrayList<>();
-
     public ChatPlugin (final Bot bot) {
         this.bot = bot;
 
         queueDelay = bot.options.chatQueueDelay;
 
-        bot.addListener(this);
+        bot.listener.addListener(this);
 
-        chatParsers = Collections.synchronizedList(new ArrayList<>());
         chatParsers.add(new MinecraftChatParser(bot));
         chatParsers.add(new KaboomChatParser(bot));
         chatParsers.add(new U203aChatParser(bot));
@@ -117,11 +115,13 @@ public class ChatPlugin extends Bot.Listener {
         final String string = ComponentUtilities.stringify(component);
         final String ansi = ComponentUtilities.stringifyAnsi(component);
 
-        for (final Listener listener : listeners) {
-            if (!listener.systemMessageReceived(component, string, ansi)) break;
+        final PlayerMessage finalPlayerMessage = playerMessage; // ???
+        bot.listener.dispatchWithCheck(listener -> {
+            if (!listener.onSystemMessageReceived(component, string, ansi)) return false;
 
-            if (playerMessage != null && !listener.playerMessageReceived(playerMessage, ChatPacketType.SYSTEM)) break;
-        }
+            return finalPlayerMessage == null
+                    || listener.onPlayerMessageReceived(finalPlayerMessage, ChatPacketType.SYSTEM);
+        });
     }
 
     private void packetReceived (final ClientboundRegistryDataPacket packet) {
@@ -182,8 +182,8 @@ public class ChatPlugin extends Bot.Listener {
 
         final Component unsignedContent = packet.getUnsignedContent();
 
-        for (final Listener listener : listeners) {
-            if (!listener.playerMessageReceived(playerMessage, ChatPacketType.PLAYER)) break;
+        bot.listener.dispatchWithCheck(listener -> {
+            if (!listener.onPlayerMessageReceived(playerMessage, ChatPacketType.PLAYER)) return false;
 
             final Component chatTypeComponent = getComponentByChatType(
                     packet.getChatType().id(),
@@ -196,14 +196,14 @@ public class ChatPlugin extends Bot.Listener {
                 final String string = ComponentUtilities.stringify(chatTypeComponent);
                 final String ansi = ComponentUtilities.stringifyAnsi(chatTypeComponent);
 
-                if (!listener.systemMessageReceived(chatTypeComponent, string, ansi)) break;
+                return listener.onSystemMessageReceived(chatTypeComponent, string, ansi);
             } else {
                 final String string = ComponentUtilities.stringify(unsignedContent);
                 final String ansi = ComponentUtilities.stringifyAnsi(unsignedContent);
 
-                if (!listener.systemMessageReceived(unsignedContent, string, ansi)) break;
+                return listener.onSystemMessageReceived(unsignedContent, string, ansi);
             }
-        }
+        });
     }
 
     private void packetReceived (final ClientboundDisguisedChatPacket packet) {
@@ -227,9 +227,8 @@ public class ChatPlugin extends Bot.Listener {
             final String string = ComponentUtilities.stringify(chatTypeComponent);
             final String ansi = ComponentUtilities.stringifyAnsi(chatTypeComponent);
 
-            for (final Listener listener : listeners) {
-                if (!listener.systemMessageReceived(chatTypeComponent, string, ansi)) break;
-            }
+            bot.listener.dispatchWithCheck(listener ->
+                                                   listener.onSystemMessageReceived(chatTypeComponent, string, ansi));
 
             for (final ChatParser parser : chatParsers) {
                 final PlayerMessage parsed = parser.parse(chatTypeComponent);
@@ -242,9 +241,9 @@ public class ChatPlugin extends Bot.Listener {
                         parsed.contents()
                 );
 
-                for (final Listener listener : listeners) {
-                    if (!listener.playerMessageReceived(playerMessage, ChatPacketType.DISGUISED)) break;
-                }
+                bot.listener.dispatchWithCheck(listener -> listener.onPlayerMessageReceived(
+                        playerMessage, ChatPacketType.DISGUISED
+                ));
             }
         } else {
             if (parsedFromMessage == null) return;
@@ -258,10 +257,10 @@ public class ChatPlugin extends Bot.Listener {
             final String string = ComponentUtilities.stringify(component);
             final String ansi = ComponentUtilities.stringifyAnsi(component);
 
-            for (final Listener listener : listeners) {
-                if (!listener.playerMessageReceived(playerMessage, ChatPacketType.DISGUISED)) break;
-                if (!listener.systemMessageReceived(component, string, ansi)) break;
-            }
+            bot.listener.dispatchWithCheck(listener -> {
+                if (!listener.onPlayerMessageReceived(playerMessage, ChatPacketType.DISGUISED)) return false;
+                return listener.onSystemMessageReceived(component, string, ansi);
+            });
         }
     }
 
@@ -377,14 +376,6 @@ public class ChatPlugin extends Bot.Listener {
 
     public void actionBar (final Component component) { actionBar(component, "@a"); }
 
-    public void addListener (final Listener listener) { listeners.add(listener); }
-
-    public interface Listener {
-        default boolean playerMessageReceived (final PlayerMessage message, final ChatPacketType packetType) { return true; }
-
-        default boolean systemMessageReceived (final Component component, final String string, final String ansi) { return true; }
-    }
-
     private record ChatTypeContext(Component target, Component sender, Component content) { }
 
     private static class ChatTypeComponentRenderer extends TranslatableComponentRenderer<ChatTypeContext> {
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ChomeNSModIntegrationPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ChomeNSModIntegrationPlugin.java
index 68f8b4ae..2d160e18 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChomeNSModIntegrationPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChomeNSModIntegrationPlugin.java
@@ -14,6 +14,7 @@ import me.chayapak1.chomens_bot.chomeNSMod.serverboundPackets.ServerboundRunCore
 import me.chayapak1.chomens_bot.chomeNSMod.serverboundPackets.ServerboundSuccessfulHandshakePacket;
 import me.chayapak1.chomens_bot.data.chomeNSMod.PayloadMetadata;
 import me.chayapak1.chomens_bot.data.chomeNSMod.PayloadState;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.logging.LogType;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.UUIDUtilities;
@@ -28,7 +29,7 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 // This is inspired from the ChomeNS Bot Proxy which is in the JavaScript version of ChomeNS Bot.
-public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, PlayersPlugin.Listener, TickPlugin.Listener {
+public class ChomeNSModIntegrationPlugin implements Listener {
     private static final String ID = "chomens_mod";
     private static final int ENCODED_PAYLOAD_LENGTH = 31_000; // just 32767 trimmed "a bit"
 
@@ -48,8 +49,6 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players
 
     private final PacketHandler handler;
 
-    private final List<Listener> listeners = new ArrayList<>();
-
     public final List<PlayerEntry> connectedPlayers = Collections.synchronizedList(new ArrayList<>());
 
     private final Map<PlayerEntry, Map<Integer, StringBuilder>> receivedParts = new ConcurrentHashMap<>();
@@ -60,9 +59,7 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players
         this.bot = bot;
         this.handler = new PacketHandler(bot);
 
-        bot.chat.addListener(this);
-        bot.players.addListener(this);
-        bot.tick.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
@@ -171,7 +168,7 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players
     }
 
     @Override
-    public boolean systemMessageReceived (final Component component, final String string, final String ansi) {
+    public boolean onSystemMessageReceived (final Component component, final String string, final String ansi) {
         if (
                 !(component instanceof final TranslatableComponent translatableComponent) ||
                         !translatableComponent.key().isEmpty()
@@ -262,17 +259,12 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players
 
         handler.handlePacket(player, packet);
 
-        for (final Listener listener : listeners) listener.packetReceived(player, packet);
+        bot.listener.dispatch(listener -> listener.onChomeNSModPacketReceived(player, packet));
     }
 
     @Override
-    public void playerLeft (final PlayerEntry target) {
+    public void onPlayerLeft (final PlayerEntry target) {
         connectedPlayers.removeIf(player -> player.equals(target));
         receivedParts.remove(target);
     }
-
-    @SuppressWarnings("unused")
-    public interface Listener {
-        default void packetReceived (final PlayerEntry player, final Packet packet) { }
-    }
 }
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java
index c57548c1..a506ed98 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java
@@ -1,11 +1,12 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 
-public class ClearChatNameAnnouncerPlugin implements CommandSpyPlugin.Listener {
+public class ClearChatNameAnnouncerPlugin implements Listener {
     private final Bot bot;
 
     public ClearChatNameAnnouncerPlugin (final Bot bot) {
@@ -13,11 +14,11 @@ public class ClearChatNameAnnouncerPlugin implements CommandSpyPlugin.Listener {
 
         if (!bot.config.announceClearChatUsername) return;
 
-        bot.commandSpy.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
-    public void commandReceived (final PlayerEntry sender, final String command) {
+    public void onCommandSpyMessageReceived (final PlayerEntry sender, final String command) {
         if (
                 command.equals("/clearchat") ||
                         command.equals("/cc") ||
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java
index 3846fe7a..1427e6c0 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java
@@ -7,6 +7,7 @@ import me.chayapak1.chomens_bot.command.CommandException;
 import me.chayapak1.chomens_bot.command.TrustLevel;
 import me.chayapak1.chomens_bot.command.contexts.*;
 import me.chayapak1.chomens_bot.commands.*;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.util.ExceptionUtilities;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
@@ -19,7 +20,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class CommandHandlerPlugin implements TickPlugin.Listener {
+public class CommandHandlerPlugin implements Listener {
     public static final List<Command> COMMANDS = new ArrayList<>();
 
     static {
@@ -93,7 +94,7 @@ public class CommandHandlerPlugin implements TickPlugin.Listener {
     public CommandHandlerPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.tick.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java
index e1d415f2..863f99b5 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java
@@ -1,28 +1,26 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.ComponentUtilities;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.format.NamedTextColor;
 
-import java.util.ArrayList;
 import java.util.List;
 
-public class CommandSpyPlugin implements ChatPlugin.Listener {
+public class CommandSpyPlugin implements Listener {
     private final Bot bot;
 
-    private final List<Listener> listeners = new ArrayList<>();
-
     public CommandSpyPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.chat.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
-    public boolean systemMessageReceived (final Component component, final String string, final String ansi) {
+    public boolean onSystemMessageReceived (final Component component, final String string, final String ansi) {
         final List<Component> children = component.children();
 
         if (
@@ -44,14 +42,8 @@ public class CommandSpyPlugin implements ChatPlugin.Listener {
 
         if (sender == null) return true;
 
-        for (final Listener listener : listeners) listener.commandReceived(sender, command);
+        bot.listener.dispatch(listener -> listener.onCommandSpyMessageReceived(sender, command));
 
         return true;
     }
-
-    public void addListener (final Listener listener) { listeners.add(listener); }
-
-    public interface Listener {
-        default void commandReceived (final PlayerEntry sender, final String command) { }
-    }
 }
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSuggestionPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSuggestionPlugin.java
index e55a8ad9..d0f54fee 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSuggestionPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSuggestionPlugin.java
@@ -2,6 +2,7 @@ package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.command.Command;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.JoinConfiguration;
 import net.kyori.adventure.text.TextComponent;
@@ -9,32 +10,33 @@ import net.kyori.adventure.text.TextComponent;
 import java.util.ArrayList;
 import java.util.List;
 
-public class CommandSuggestionPlugin implements ChatPlugin.Listener {
-    public static final String ID = "chomens_bot_request_command_suggestion";
-
+public class CommandSuggestionPlugin implements Listener {
     private final Bot bot;
 
+    private final String id;
+
     public CommandSuggestionPlugin (final Bot bot) {
         this.bot = bot;
+        this.id = bot.config.namespace + "_request_command_suggestions"; // chomens_bot_request_command_suggestion
 
-        bot.chat.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
-    public boolean systemMessageReceived (final Component component, final String string, final String ansi) {
+    public boolean onSystemMessageReceived (final Component component, final String string, final String ansi) {
         final List<Component> children = component.children();
 
         if (
-                !(component instanceof final TextComponent idComponent) ||
-                        !idComponent.content().equals(ID) ||
-                        children.size() != 1 ||
-                        !(children.getFirst() instanceof final TextComponent playerComponent)
+                !(component instanceof final TextComponent idComponent)
+                        || !idComponent.content().equals(id)
+                        || children.size() != 1
+                        || !(children.getFirst() instanceof final TextComponent playerComponent)
         ) return true;
 
         final String player = playerComponent.content();
 
         final List<Component> output = new ArrayList<>();
-        output.add(Component.text(ID));
+        output.add(Component.text(id));
 
         for (final Command command : CommandHandlerPlugin.COMMANDS) {
             if (command.consoleOnly) continue;
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java
index f8f4b666..384ecd1c 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java
@@ -2,6 +2,7 @@ package me.chayapak1.chomens_bot.plugins;
 
 import com.google.gson.JsonSyntaxException;
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.util.MathUtilities;
 import me.chayapak1.chomens_bot.util.StringUtilities;
 import net.kyori.adventure.text.Component;
@@ -27,22 +28,19 @@ import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.S
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundPlayerActionPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundUseItemOnPacket;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Queue;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class CorePlugin
-        extends Bot.Listener
-        implements PositionPlugin.Listener, WorldPlugin.Listener, TickPlugin.Listener
-{
+public class CorePlugin implements Listener {
     public static final int COMMAND_BLOCK_ID = 418;
 
     private final Bot bot;
 
-    private final List<Listener> listeners = new ArrayList<>();
-
     public volatile boolean ready = false;
 
     public final Vector3i fromSize;
@@ -89,10 +87,7 @@ public class CorePlugin
             );
         }
 
-        bot.addListener(this);
-        bot.world.addListener(this);
-        bot.tick.addListener(this);
-        bot.position.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
@@ -444,7 +439,7 @@ public class CorePlugin
     }
 
     @Override
-    public void positionChange (final Vector3d position) {
+    public void onPositionChange (final Vector3d position) {
         if (bot.position.isGoingDownFromHeightLimit) return;
 
         positionChangesPerSecond.incrementAndGet();
@@ -471,12 +466,12 @@ public class CorePlugin
             reset();
             refill();
 
-            for (final Listener listener : listeners) listener.coreReady();
+            bot.listener.dispatch(Listener::onCoreReady);
         }
     }
 
     @Override
-    public void worldChanged (final String dimension) {
+    public void onWorldChanged (final String dimension) {
         reset();
         refill();
     }
@@ -562,15 +557,7 @@ public class CorePlugin
         }
 
         if (refilledMap.containsValue(true)) {
-            for (final Listener listener : listeners) listener.coreRefilled();
+            bot.listener.dispatch(Listener::onCoreRefilled);
         }
     }
-
-    public interface Listener {
-        default void coreReady () { }
-
-        default void coreRefilled () { }
-    }
-
-    public void addListener (final Listener listener) { listeners.add(listener); }
 }
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java
index 7b044b5e..165556de 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java
@@ -3,6 +3,7 @@ package me.chayapak1.chomens_bot.plugins;
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.Configuration;
 import me.chayapak1.chomens_bot.Main;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.discord.DirectMessageEventHandler;
 import me.chayapak1.chomens_bot.discord.GuildMessageEventHandler;
 import me.chayapak1.chomens_bot.discord.MessageLogger;
@@ -86,30 +87,25 @@ public class DiscordPlugin {
 
             logData.put(channelId, new LogData());
 
-            bot.addListener(new Bot.Listener() {
+            bot.listener.addListener(new Listener() {
                 @Override
-                public void loadedPlugins (final Bot bot) {
-                    bot.chat.addListener(new ChatPlugin.Listener() {
-                        @Override
-                        public boolean systemMessageReceived (final Component component, final String string, final String _ansi) {
-                            if (string.length() > 2000 - 12) {
-                                sendMessage(CodeBlockUtilities.escape(string), channelId);
-                            } else {
-                                final String ansi = ComponentUtilities.stringifyDiscordAnsi(component);
+                public boolean onSystemMessageReceived (final Component component, final String string, final String _ansi) {
+                    if (string.length() > 2000 - 12) {
+                        sendMessage(CodeBlockUtilities.escape(string), channelId);
+                    } else {
+                        final String ansi = ComponentUtilities.stringifyDiscordAnsi(component);
 
-                                sendMessage(
-                                        CodeBlockUtilities.escape(ansi),
-                                        channelId
-                                );
-                            }
+                        sendMessage(
+                                CodeBlockUtilities.escape(ansi),
+                                channelId
+                        );
+                    }
 
-                            return true;
-                        }
-                    });
+                    return true;
                 }
 
                 @Override
-                public void connecting () {
+                public void onConnecting () {
                     if (bot.connectAttempts > 6) return;
                     else if (bot.connectAttempts == 6) {
                         sendMessageInstantly("Suppressing connection status messages from now on", channelId);
@@ -223,7 +219,7 @@ public class DiscordPlugin {
 
             data.nextLogTime.set(currentTime + logDelay);
 
-            String message;
+            final String message;
 
             final StringBuilder logMessages = data.logMessages;
 
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 b84652e0..ecb999f2 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/ExtrasMessengerPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ExtrasMessengerPlugin.java
@@ -3,6 +3,7 @@ package me.chayapak1.chomens_bot.plugins;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import net.kyori.adventure.key.Key;
 import org.geysermc.mcprotocollib.network.Session;
 import org.geysermc.mcprotocollib.network.packet.Packet;
@@ -15,7 +16,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
-public class ExtrasMessengerPlugin extends Bot.Listener {
+public class ExtrasMessengerPlugin implements Listener {
     private static final Key MINECRAFT_REGISTER_KEY = Key.key("minecraft", "register");
 
     private static final Key EXTRAS_REGISTER_KEY = Key.key("extras", "register");
@@ -26,8 +27,6 @@ public class ExtrasMessengerPlugin extends Bot.Listener {
 
     private static final byte END_CHAR_MASK = (byte) 0x80;
 
-    private final List<Listener> listeners = new ArrayList<>();
-
     private final Bot bot;
 
     private final String chomens_namespace;
@@ -40,7 +39,7 @@ public class ExtrasMessengerPlugin extends Bot.Listener {
         this.bot = bot;
         this.chomens_namespace = bot.config.namespace + ":"; // Ex. chomens_bot: (then it will be appended by channel)
 
-        bot.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
@@ -102,7 +101,7 @@ public class ExtrasMessengerPlugin extends Bot.Listener {
 
             final byte[] data = readByteArrayToEnd(buf);
 
-            for (final Listener listener : listeners) listener.onMessage(uuid, data);
+            bot.listener.dispatch(listener -> listener.onExtrasMessageReceived(uuid, data));
         }
     }
 
@@ -194,10 +193,4 @@ public class ExtrasMessengerPlugin extends Bot.Listener {
 
         return bytes;
     }
-
-    public void addListener (final Listener listener) { listeners.add(listener); }
-
-    public interface Listener {
-        default void onMessage (final UUID sender, final byte[] message) { }
-    }
 }
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java
index 62b7fec5..00e89ec5 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java
@@ -3,6 +3,7 @@ package me.chayapak1.chomens_bot.plugins;
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.data.chat.ChatPacketType;
 import me.chayapak1.chomens_bot.data.chat.PlayerMessage;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.ComponentUtilities;
 import me.chayapak1.chomens_bot.util.UUIDUtilities;
@@ -16,9 +17,7 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-public class FilterManagerPlugin
-        extends Bot.Listener
-        implements PlayersPlugin.Listener, ChatPlugin.Listener, CommandSpyPlugin.Listener, TickPlugin.Listener {
+public class FilterManagerPlugin implements Listener {
     private final Bot bot;
 
     public final Map<PlayerEntry, String> list = Collections.synchronizedMap(new HashMap<>());
@@ -26,13 +25,9 @@ public class FilterManagerPlugin
     public FilterManagerPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.executor.scheduleAtFixedRate(this::kick, 0, 10, TimeUnit.SECONDS);
+        bot.listener.addListener(this);
 
-        bot.addListener(this);
-        bot.players.addListener(this);
-        bot.tick.addListener(this);
-        bot.chat.addListener(this);
-        bot.commandSpy.addListener(this);
+        bot.executor.scheduleAtFixedRate(this::kick, 0, 10, TimeUnit.SECONDS);
     }
 
     @Override
@@ -46,7 +41,7 @@ public class FilterManagerPlugin
     }
 
     @Override
-    public void playerDisplayNameUpdated (final PlayerEntry target, final Component displayName) {
+    public void onPlayerDisplayNameUpdated (final PlayerEntry target, final Component displayName) {
         final Pair<PlayerEntry, String> player = getFilteredFromName(target.profile.getName());
 
         if (player == null) return;
@@ -59,7 +54,7 @@ public class FilterManagerPlugin
     }
 
     @Override
-    public void commandReceived (final PlayerEntry sender, final String command) {
+    public void onCommandSpyMessageReceived (final PlayerEntry sender, final String command) {
         final Pair<PlayerEntry, String> player = getFilteredFromName(sender.profile.getName());
 
         if (player == null) return;
@@ -81,7 +76,7 @@ public class FilterManagerPlugin
     }
 
     @Override
-    public boolean playerMessageReceived (final PlayerMessage message, final ChatPacketType packetType) {
+    public boolean onPlayerMessageReceived (final PlayerMessage message, final ChatPacketType packetType) {
         if (message.sender().profile.getName() == null) return true;
 
         final Pair<PlayerEntry, String> player = getFilteredFromName(message.sender().profile.getName());
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java
index 35703d24..b772892f 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java
@@ -2,6 +2,7 @@ package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.Main;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.LoggerUtilities;
 
@@ -12,7 +13,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listener {
+public class IPFilterPlugin implements Listener {
     private static final String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS ipFilters (ip VARCHAR(255) PRIMARY KEY, reason VARCHAR(255));";
     private static final String LIST_FILTERS = "SELECT * FROM ipFilters;";
     private static final String INSERT_FILTER = "INSERT INTO ipFilters (ip, reason) VALUES (?, ?);";
@@ -42,19 +43,18 @@ public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listen
 
         if (Main.database == null) return;
 
-        bot.players.addListener(this);
-        bot.core.addListener(this);
+        bot.listener.addListener(this);
 
         bot.executor.scheduleAtFixedRate(this::checkAllPlayers, 5, 5, TimeUnit.SECONDS);
     }
 
     @Override
-    public void coreReady () {
+    public void onCoreReady () {
         checkAllPlayers();
     }
 
     @Override
-    public void queriedPlayerIP (final PlayerEntry target, final String ip) {
+    public void onQueriedPlayerIP (final PlayerEntry target, final String ip) {
         if (localList.isEmpty()) return;
 
         check(target);
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java
index 6b59b9af..b21cea2e 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java
@@ -4,6 +4,7 @@ import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.Configuration;
 import me.chayapak1.chomens_bot.Main;
 import me.chayapak1.chomens_bot.command.contexts.IRCCommandContext;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.util.ColorUtilities;
 import me.chayapak1.chomens_bot.util.LoggerUtilities;
 import net.kyori.adventure.text.Component;
@@ -65,22 +66,17 @@ public class IRCPlugin extends ListenerAdapter {
         }).start();
 
         for (final Bot bot : Main.bots) {
-            bot.addListener(new Bot.Listener() {
+            bot.listener.addListener(new Listener() {
                 @Override
                 public void connected (final ConnectedEvent event) {
                     IRCPlugin.this.connected(bot);
                 }
 
                 @Override
-                public void loadedPlugins (final Bot bot) {
-                    bot.chat.addListener(new ChatPlugin.Listener() {
-                        @Override
-                        public boolean systemMessageReceived (final Component component, final String string, final String ansi) {
-                            IRCPlugin.this.systemMessageReceived(bot, ansi);
+                public boolean onSystemMessageReceived (final Component component, final String string, final String ansi) {
+                    IRCPlugin.this.systemMessageReceived(bot, ansi);
 
-                            return true;
-                        }
-                    });
+                    return true;
                 }
             });
         }
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ListenerManagerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ListenerManagerPlugin.java
new file mode 100644
index 00000000..166e85d1
--- /dev/null
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ListenerManagerPlugin.java
@@ -0,0 +1,67 @@
+package me.chayapak1.chomens_bot.plugins;
+
+import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
+import net.kyori.adventure.text.Component;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public class ListenerManagerPlugin {
+    private final Bot bot;
+
+    private final List<Listener> listeners = Collections.synchronizedList(new LinkedList<>());
+
+    public ListenerManagerPlugin (final Bot bot) {
+        this.bot = bot;
+    }
+
+    public void dispatch (final Consumer<Listener> consumer) {
+        for (final Listener listener : listeners) {
+            try {
+                consumer.accept(listener);
+            } catch (final Exception e) {
+                bot.logger.error(
+                        Component.translatable(
+                                "Caught exception while trying to dispatch an event to %s!",
+                                Component.text(listener.getClass().getSimpleName())
+                        )
+                );
+                bot.logger.error(e);
+            }
+        }
+    }
+
+    public void dispatchWithCheck (final Function<Listener, Boolean> function) {
+        for (final Listener listener : listeners) {
+            try {
+                final Boolean result = function.apply(listener);
+
+                if (result != null && !result) break;
+            } catch (final Exception e) {
+                bot.logger.error(
+                        Component.translatable(
+                                "Caught exception while trying to dispatch an event with a returning boolean to %s!",
+                                Component.text(listener.getClass().getSimpleName())
+                        )
+                );
+                bot.logger.error(e);
+            }
+        }
+    }
+
+    public void addListener (final Listener listener) {
+        if (listeners.contains(listener)) throw new IllegalStateException(
+                "This listener is already in the listeners list. " +
+                        "Please call `removeListener(listener)` first."
+        );
+        listeners.add(listener);
+    }
+
+    public void removeListener (final Listener listener) {
+        listeners.remove(listener);
+    }
+}
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java
index 4fa5fa62..198b6e0d 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java
@@ -1,6 +1,7 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.logging.LogType;
 import me.chayapak1.chomens_bot.util.ExceptionUtilities;
 import me.chayapak1.chomens_bot.util.LoggerUtilities;
@@ -8,7 +9,7 @@ import net.kyori.adventure.text.Component;
 import org.geysermc.mcprotocollib.network.event.session.ConnectedEvent;
 import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
 
-public class LoggerPlugin implements ChatPlugin.Listener {
+public class LoggerPlugin implements Listener {
     private final Bot bot;
 
     public boolean logToConsole = true;
@@ -16,52 +17,7 @@ public class LoggerPlugin implements ChatPlugin.Listener {
     public LoggerPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.addListener(new Bot.Listener() {
-            @Override
-            public void connecting () {
-                if (bot.connectAttempts > 10) return;
-                else if (bot.connectAttempts == 10) {
-                    log("Suppressing connection status messages from now on");
-
-                    return;
-                }
-
-                log(
-                        String.format(
-                                "Connecting to: %s",
-                                bot.getServerString(true)
-                        )
-                );
-            }
-
-            @Override
-            public void connected (final ConnectedEvent event) {
-                log(
-                        String.format(
-                                "Successfully connected to: %s",
-                                bot.getServerString(true)
-                        )
-                );
-            }
-
-            @Override
-            public void disconnected (final DisconnectedEvent event) {
-                if (bot.connectAttempts >= 10) return;
-
-                final Component message = Component.translatable(
-                        "Disconnected from %s, reason: %s",
-                        Component.text(bot.getServerString(true)),
-                        event.getReason()
-                );
-
-                log(message);
-            }
-
-            @Override
-            public void loadedPlugins (final Bot bot) {
-                bot.chat.addListener(LoggerPlugin.this);
-            }
-        });
+        bot.listener.addListener(this);
     }
 
     public void log (final LogType type, final Component message) {
@@ -85,7 +41,47 @@ public class LoggerPlugin implements ChatPlugin.Listener {
     public void error (final Throwable throwable) { log(LogType.ERROR, ExceptionUtilities.getStacktrace(throwable)); }
 
     @Override
-    public boolean systemMessageReceived (final Component component, final String string, final String ansi) {
+    public void onConnecting () {
+        if (bot.connectAttempts > 10) return;
+        else if (bot.connectAttempts == 10) {
+            log("Suppressing connection status messages from now on");
+
+            return;
+        }
+
+        log(
+                String.format(
+                        "Connecting to: %s",
+                        bot.getServerString(true)
+                )
+        );
+    }
+
+    @Override
+    public void connected (final ConnectedEvent event) {
+        log(
+                String.format(
+                        "Successfully connected to: %s",
+                        bot.getServerString(true)
+                )
+        );
+    }
+
+    @Override
+    public void disconnected (final DisconnectedEvent event) {
+        if (bot.connectAttempts >= 10) return;
+
+        final Component message = Component.translatable(
+                "Disconnected from %s, reason: %s",
+                Component.text(bot.getServerString(true)),
+                event.getReason()
+        );
+
+        log(message);
+    }
+
+    @Override
+    public boolean onSystemMessageReceived (final Component component, final String string, final String ansi) {
         log(LogType.CHAT, component);
 
         return true;
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java
index 3e3a186e..d0a5e9aa 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java
@@ -2,6 +2,7 @@ package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.Main;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.mail.Mail;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.LoggerUtilities;
@@ -14,7 +15,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MailPlugin implements PlayersPlugin.Listener {
+public class MailPlugin implements Listener {
     private static final String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS mails (sentBy VARCHAR(255), sentTo VARCHAR(255), timeSent BIGINT, server VARCHAR(255), contents TEXT);";
     private static final String INSERT_MAIL = "INSERT INTO mails (sentBy, sentTo, timeSent, server, contents) VALUES (?, ?, ?, ?, ?);";
     private static final String LIST_MAILS = "SELECT * FROM mails;";
@@ -39,11 +40,11 @@ public class MailPlugin implements PlayersPlugin.Listener {
 
         if (Main.database == null) return;
 
-        bot.players.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
-    public void playerJoined (final PlayerEntry target) {
+    public void onPlayerJoined (final PlayerEntry target) {
         DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
             final String name = target.profile.getName();
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java
index 16e36a4f..55e22045 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java
@@ -2,6 +2,7 @@ package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.data.bossbar.BotBossBar;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.song.Loop;
 import me.chayapak1.chomens_bot.song.Note;
@@ -29,7 +30,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 // Author: _ChipMC_ & hhhzzzsss
-public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listener {
+public class MusicPlayerPlugin implements Listener {
     public static final String SELECTOR = "@a[tag=!nomusic,tag=!chomens_bot_nomusic,tag=!custompitch]";
     public static final String CUSTOM_PITCH_SELECTOR = "@a[tag=!nomusic,tag=!chomens_bot_nomusic,tag=custompitch]";
     public static final String BOTH_SELECTOR = "@a[tag=!nomusic,tag=!chomens_bot_nomusic]";
@@ -76,9 +77,7 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen
     public MusicPlayerPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.addListener(this);
-
-        bot.core.addListener(this);
+        bot.listener.addListener(this);
 
         bot.executor.scheduleAtFixedRate(this::onTick, 0, 50, TimeUnit.MILLISECONDS);
         bot.executor.scheduleAtFixedRate(() -> urlLimit = 0, 0, bot.config.music.urlRatelimit.seconds, TimeUnit.SECONDS);
@@ -131,13 +130,14 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen
     }
 
     @Override
-    public void coreReady () {
+    public void onCoreReady () {
         if (currentSong != null) currentSong.play();
     }
 
     // this needs a separate ticker because we need
     // the song to be playing without lag
-    private void onTick () {
+    @Override
+    public void onTick () {
         try {
             if (!bot.loggedIn) return;
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PacketSnifferPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PacketSnifferPlugin.java
index 5981bb71..2012f004 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PacketSnifferPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PacketSnifferPlugin.java
@@ -1,6 +1,7 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import org.geysermc.mcprotocollib.network.Session;
 import org.geysermc.mcprotocollib.network.event.session.PacketSendingEvent;
 import org.geysermc.mcprotocollib.network.packet.Packet;
@@ -11,21 +12,21 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 
-// normally unused in the main instance of the bot
-public class PacketSnifferPlugin extends Bot.Listener {
+// pretty useful for debugging in production
+public class PacketSnifferPlugin implements Listener {
     private final Bot bot;
 
     public boolean enabled = false;
 
     private BufferedWriter writer;
 
-    @SuppressWarnings("ConstantValue") // this can be set through servereval
+    @SuppressWarnings("ConstantValue") // you can set `enabled` above before compiling
     public PacketSnifferPlugin (final Bot bot) {
         this.bot = bot;
 
         if (enabled) enable();
 
-        bot.addListener(this);
+        bot.listener.addListener(this);
     }
 
     public void enable () {
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java
index dedc0b7c..61d2253f 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java
@@ -3,6 +3,7 @@ package me.chayapak1.chomens_bot.plugins;
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.Main;
 import me.chayapak1.chomens_bot.data.filter.FilteredPlayer;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.LoggerUtilities;
 
@@ -14,7 +15,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
-public class PlayerFilterPlugin implements PlayersPlugin.Listener {
+public class PlayerFilterPlugin implements Listener {
     private static final String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS filters (name VARCHAR(255) PRIMARY KEY, reason VARCHAR(255), regex BOOLEAN, ignoreCase BOOLEAN);";
     private static final String LIST_FILTERS = "SELECT * FROM filters;";
     private static final String INSERT_FILTER = "INSERT INTO filters (name, reason, regex, ignoreCase) VALUES (?, ?, ?, ?);";
@@ -44,7 +45,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener {
 
         if (Main.database == null) return;
 
-        bot.players.addListener(this);
+        bot.listener.addListener(this);
     }
 
     public static List<FilteredPlayer> list () {
@@ -124,7 +125,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener {
     }
 
     @Override
-    public void playerJoined (final PlayerEntry target) {
+    public void onPlayerJoined (final PlayerEntry target) {
         bot.executorService.submit(() -> {
             final FilteredPlayer player = getPlayer(target.profile.getName());
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
index 0bb26750..7bcfc92e 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.Main;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.LoggerUtilities;
 
@@ -17,7 +18,7 @@ import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
 
-public class PlayersDatabasePlugin implements PlayersPlugin.Listener {
+public class PlayersDatabasePlugin implements Listener {
     private static final String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS players (username VARCHAR(255) PRIMARY KEY, data LONGTEXT);";
     private static final String INSERT_PLAYER = "INSERT IGNORE INTO players (username, data) VALUES (?, ?);";
     private static final String UPDATE_PLAYER = "UPDATE players SET data = JSON_SET(data, ?, JSON_MERGE_PATCH(JSON_EXTRACT(data, ?), ?)) WHERE username = ?;";
@@ -47,7 +48,7 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener {
 
         if (Main.database == null) return;
 
-        bot.players.addListener(this);
+        bot.listener.addListener(this);
     }
 
     public JsonNode getPlayerData (final String username) {
@@ -133,7 +134,7 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener {
     }
 
     @Override
-    public void playerJoined (final PlayerEntry target) {
+    public void onPlayerJoined (final PlayerEntry target) {
         DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
             try {
                 final PreparedStatement insertPlayerStatement = Main.database.connection.prepareStatement(INSERT_PLAYER);
@@ -158,7 +159,7 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener {
     }
 
     @Override
-    public void queriedPlayerIP (final PlayerEntry target, final String ip) {
+    public void onQueriedPlayerIP (final PlayerEntry target, final String ip) {
         DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
             try {
                 final PreparedStatement updatePlayerStatement = Main.database.connection.prepareStatement(UPDATE_PLAYER);
@@ -181,7 +182,7 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener {
     }
 
     @Override
-    public void playerLeft (final PlayerEntry target) {
+    public void onPlayerLeft (final PlayerEntry target) {
         DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
             try {
                 final PreparedStatement updatePlayerStatement = Main.database.connection.prepareStatement(UPDATE_PLAYER);
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 e4fc1f2d..f5b5bf59 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
@@ -1,6 +1,7 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.ComponentUtilities;
 import net.kyori.adventure.text.Component;
@@ -19,22 +20,19 @@ import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
-public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener {
+public class PlayersPlugin implements Listener {
     private final Bot bot;
 
     public final List<PlayerEntry> list = Collections.synchronizedList(new ArrayList<>());
 
-    private final List<Listener> listeners = new ArrayList<>();
-
     private final List<PlayerEntry> pendingLeftPlayers = Collections.synchronizedList(new ArrayList<>());
 
     public PlayersPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.executor.scheduleAtFixedRate(this::onLastKnownNameTick, 0, 5, TimeUnit.SECONDS);
+        bot.listener.addListener(this);
 
-        bot.addListener(this);
-        bot.tick.addListener(this);
+        bot.executor.scheduleAtFixedRate(this::onLastKnownNameTick, 0, 5, TimeUnit.SECONDS);
     }
 
     @Override
@@ -79,7 +77,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener {
         future.thenApply(ip -> {
             target.ip = ip;
 
-            for (final Listener listener : listeners) listener.queriedPlayerIP(target, ip);
+            bot.listener.dispatch(listener -> listener.onQueriedPlayerIP(target, ip));
 
             return null;
         });
@@ -207,13 +205,13 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener {
 
             list.add(target);
 
-            for (final Listener listener : listeners) listener.playerUnVanished(target);
+            bot.listener.dispatch(listener -> listener.onPlayerUnVanished(target));
         } else {
             list.add(target);
 
             queryPlayersIP(target);
 
-            for (final Listener listener : listeners) listener.playerJoined(target);
+            bot.listener.dispatch(listener -> listener.onPlayerJoined(target));
         }
     }
 
@@ -225,7 +223,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener {
 
         target.gamemode = gameMode;
 
-        for (final Listener listener : listeners) { listener.playerGameModeUpdated(target, gameMode); }
+        bot.listener.dispatch(listener -> listener.onPlayerGameModeUpdated(target, gameMode));
     }
 
     private void updateLatency (final PlayerListEntry newEntry) {
@@ -236,7 +234,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener {
 
         target.latency = ping;
 
-        for (final Listener listener : listeners) { listener.playerLatencyUpdated(target, ping); }
+        bot.listener.dispatch(listener -> listener.onPlayerLatencyUpdated(target, ping));
     }
 
     private void updateDisplayName (final PlayerListEntry newEntry) {
@@ -247,7 +245,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener {
 
         target.displayName = displayName;
 
-        for (final Listener listener : listeners) { listener.playerDisplayNameUpdated(target, displayName); }
+        bot.listener.dispatch(listener -> listener.onPlayerDisplayNameUpdated(target, displayName));
     }
 
     private CompletableFuture<String> getLastKnownName (final String uuid) {
@@ -275,7 +273,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener {
                 // checking if removed prevents the event from being called twice
                 // this was a bug for quite a few weeks lol
                 if (removed) {
-                    for (final Listener listener : listeners) listener.playerLeft(target);
+                    bot.listener.dispatch(listener -> listener.onPlayerLeft(target));
                 }
             } else if (!lastKnownName.equals(target.profile.getName())) {
                 final PlayerEntry newTarget = new PlayerEntry(
@@ -301,14 +299,16 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener {
 
                 list.add(newTarget);
 
-                for (final Listener listener : listeners) listener.playerChangedUsername(newTarget);
+                bot.listener.dispatch(listener -> listener.onPlayerChangedUsername(
+                        newTarget, target.profile.getName(), newTarget.profile.getName()
+                ));
             } else if (pending != null) {
                 // we already passed all the left and username check,
                 // so the only one left is vanish
 
                 target.listed = false;
 
-                for (final Listener listener : listeners) listener.playerVanished(target);
+                bot.listener.dispatch(listener -> listener.onPlayerVanished(target));
             }
 
             return null;
@@ -334,7 +334,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener {
             final boolean removed = list.remove(target);
 
             if (removed) {
-                for (final Listener listener : listeners) listener.playerLeft(target);
+                bot.listener.dispatch(listener -> listener.onPlayerLeft(target));
             }
         } else {
             pendingLeftPlayers.add(target);
@@ -347,27 +347,4 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener {
     public void disconnected (final DisconnectedEvent event) {
         list.clear();
     }
-
-    public void addListener (final Listener listener) { listeners.add(listener); }
-
-    @SuppressWarnings("unused")
-    public interface Listener {
-        default void playerJoined (final PlayerEntry target) { }
-
-        default void playerUnVanished (final PlayerEntry target) { }
-
-        default void playerGameModeUpdated (final PlayerEntry target, final GameMode gameMode) { }
-
-        default void playerLatencyUpdated (final PlayerEntry target, final int ping) { }
-
-        default void playerDisplayNameUpdated (final PlayerEntry target, final Component displayName) { }
-
-        default void playerLeft (final PlayerEntry target) { }
-
-        default void playerVanished (final PlayerEntry target) { }
-
-        default void playerChangedUsername (final PlayerEntry target) { }
-
-        default void queriedPlayerIP (final PlayerEntry target, final String ip) { }
-    }
 }
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 791bcd39..a4bbd428 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java
@@ -2,6 +2,7 @@ package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.data.entity.Rotation;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.MathUtilities;
 import org.cloudburstmc.math.vector.Vector3d;
@@ -14,17 +15,13 @@ import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.spaw
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundAcceptTeleportationPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosPacket;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 // some part of the code used to be in a test plugin but i thought it would be useful in the future so i moved it here
-public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener {
+public class PositionPlugin implements Listener {
     private final Bot bot;
 
-    private final List<Listener> listeners = new ArrayList<>();
-
     public Vector3d position = Vector3d.from(0, 0, 0);
 
     public boolean isGoingDownFromHeightLimit = false; // cool variable name
@@ -38,8 +35,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener
     public PositionPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.addListener(this);
-        bot.tick.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
@@ -77,7 +73,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener
 
         position = packet.getPosition();
 
-        for (final Listener listener : listeners) { listener.positionChange(position); }
+        bot.listener.dispatch(listener -> listener.onPositionChange(position));
     }
 
     private void packetReceived (final ClientboundAddEntityPacket packet) {
@@ -120,7 +116,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener
         positionMap.put(packet.getId(), position);
         rotationMap.put(packet.getId(), rotation);
 
-        for (final Listener listener : listeners) listener.playerMoved(player, position, rotation);
+        bot.listener.dispatch(listener -> listener.onPlayerMoved(player, position, rotation));
     }
 
     private void packetReceived (final ClientboundMoveEntityRotPacket packet) {
@@ -132,8 +128,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener
 
         rotationMap.put(packet.getEntityId(), rotation);
 
-        for (final Listener listener : listeners)
-            listener.playerMoved(player, getPlayerPosition(player.profile.getName()), rotation);
+        bot.listener.dispatch(listener -> listener.onPlayerMoved(player, getPlayerPosition(player.profile.getName()), rotation));
     }
 
     private void packetReceived (final ClientboundMoveEntityPosPacket packet) {
@@ -146,20 +141,21 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener
         positionMap.remove(packet.getEntityId());
 
         // code ported straight from minecraft
-        Vector3d position = lastPosition;
+        final Vector3d position;
 
         if (packet.getMoveX() != 0 || packet.getMoveY() != 0 || packet.getMoveZ() != 0) {
-            position = position.add(
+            position = lastPosition.add(
                     packet.getMoveX() == 0 ? 0 : packet.getMoveX(),
                     packet.getMoveY() == 0 ? 0 : packet.getMoveY(),
                     packet.getMoveZ() == 0 ? 0 : packet.getMoveZ()
             );
+        } else {
+            position = lastPosition;
         }
 
         positionMap.put(packet.getEntityId(), position);
 
-        for (final Listener listener : listeners)
-            listener.playerMoved(player, position, getPlayerRotation(player.profile.getName()));
+        bot.listener.dispatch(listener -> listener.onPlayerMoved(player, position, getPlayerRotation(player.profile.getName())));
     }
 
     private void packetReceived (final ClientboundMoveEntityPosRotPacket packet) {
@@ -172,14 +168,16 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener
         positionMap.remove(packet.getEntityId());
         rotationMap.remove(packet.getEntityId());
 
-        Vector3d position = lastPosition;
+        final Vector3d position;
 
         if (packet.getMoveX() != 0 || packet.getMoveY() != 0 || packet.getMoveZ() != 0) {
-            position = position.add(
+            position = lastPosition.add(
                     packet.getMoveX() == 0 ? 0 : packet.getMoveX(),
                     packet.getMoveY() == 0 ? 0 : packet.getMoveY(),
                     packet.getMoveZ() == 0 ? 0 : packet.getMoveZ()
             );
+        } else {
+            position = lastPosition;
         }
 
         final Rotation rotation = new Rotation(packet.getYaw(), packet.getPitch());
@@ -187,7 +185,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener
         positionMap.put(packet.getEntityId(), position);
         rotationMap.put(packet.getEntityId(), rotation);
 
-        for (final Listener listener : listeners) listener.playerMoved(player, position, rotation);
+        bot.listener.dispatch(listener -> listener.onPlayerMoved(player, position, rotation));
     }
 
     // for now this is used in CorePlugin when placing the command block
@@ -200,7 +198,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener
             if (isGoingDownFromHeightLimit) {
                 isGoingDownFromHeightLimit = false;
 
-                for (final Listener listener : listeners) { listener.positionChange(position); }
+                bot.listener.dispatch(listener -> listener.onPositionChange(position));
             }
 
             return;
@@ -269,13 +267,4 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener
 
         return null;
     }
-
-    public void addListener (final Listener listener) { listeners.add(listener); }
-
-    @SuppressWarnings("unused")
-    public interface Listener {
-        default void positionChange (final Vector3d position) { }
-
-        default void playerMoved (final PlayerEntry player, final Vector3d position, final Rotation rotation) { }
-    }
 }
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/QueryPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/QueryPlugin.java
index a664658e..524c3ea9 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/QueryPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/QueryPlugin.java
@@ -1,6 +1,7 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.util.UUIDUtilities;
 import net.kyori.adventure.text.*;
 import org.apache.commons.lang3.tuple.Triple;
@@ -14,7 +15,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
-public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, TickPlugin.Listener {
+public class QueryPlugin implements Listener {
     private static final String ID = "chomens_bot_query";
 
     private final Bot bot;
@@ -28,9 +29,7 @@ public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, Ti
     public QueryPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.addListener(this);
-        bot.chat.addListener(this);
-        bot.tick.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
@@ -52,7 +51,7 @@ public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, Ti
     }
 
     @Override
-    public boolean systemMessageReceived (final Component component, final String string, final String ansi) {
+    public boolean onSystemMessageReceived (final Component component, final String string, final String ansi) {
         if (
                 !(component instanceof final TranslatableComponent rootTranslatable) ||
                         !rootTranslatable.key().equals(ID)
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 6c3d295b..fd2ba6e6 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java
@@ -2,6 +2,7 @@ package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.Configuration;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import net.kyori.adventure.text.Component;
 import org.geysermc.mcprotocollib.network.Session;
 import org.geysermc.mcprotocollib.network.packet.Packet;
@@ -23,7 +24,7 @@ import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.Serv
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener {
+public class SelfCarePlugin implements Listener {
     private final Bot bot;
 
     public boolean visible = false;
@@ -47,12 +48,11 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener
 
         bot.executor.scheduleAtFixedRate(this::check, 0, bot.config.selfCare.delay, TimeUnit.MILLISECONDS);
 
-        bot.addListener(this);
-        bot.chat.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
-    public boolean systemMessageReceived (final Component component, final String string, final String ansi) {
+    public boolean onSystemMessageReceived (final Component component, final String string, final String ansi) {
         final Configuration.BotOption.EssentialsMessages essentialsMessages = bot.options.essentialsMessages;
 
         if (string.equals("Successfully enabled CommandSpy")) cspy = true;
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 d421ba4f..f886602e 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/ServerFeaturesPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ServerFeaturesPlugin.java
@@ -1,6 +1,7 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import org.geysermc.mcprotocollib.network.Session;
 import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
 import org.geysermc.mcprotocollib.network.packet.Packet;
@@ -8,7 +9,7 @@ import org.geysermc.mcprotocollib.protocol.data.game.command.CommandNode;
 import org.geysermc.mcprotocollib.protocol.data.game.command.CommandType;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundCommandsPacket;
 
-public class ServerFeaturesPlugin extends Bot.Listener {
+public class ServerFeaturesPlugin implements Listener {
     private final Bot bot;
 
     public boolean hasNamespaces = false;
@@ -19,7 +20,7 @@ public class ServerFeaturesPlugin extends Bot.Listener {
     public ServerFeaturesPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
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 b8fce3dd..572b88ce 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java
@@ -2,6 +2,7 @@ package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.data.bossbar.BotBossBar;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.util.MathUtilities;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -16,7 +17,7 @@ import java.text.DecimalFormat;
 import java.util.Arrays;
 
 // totallynotskidded™ from meteor client (https://github.com/MeteorDevelopment/meteor-client/blob/master/src/main/java/meteordevelopment/meteorclient/utils/world/TickRate.java)
-public class TPSPlugin extends Bot.Listener implements TickPlugin.Listener {
+public class TPSPlugin implements Listener {
     private final Bot bot;
 
     private boolean enabled = false;
@@ -31,8 +32,7 @@ public class TPSPlugin extends Bot.Listener implements TickPlugin.Listener {
     public TPSPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.addListener(this);
-        bot.tick.addListener(this);
+        bot.listener.addListener(this);
     }
 
     private void createBossBar () {
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 a34af760..d269d0e3 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java
@@ -1,6 +1,7 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import org.geysermc.mcprotocollib.network.Session;
 import org.geysermc.mcprotocollib.network.packet.Packet;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundCommandSuggestionsPacket;
@@ -10,14 +11,15 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-public class TabCompletePlugin extends Bot.Listener {
+public class TabCompletePlugin implements Listener {
     private final Bot bot;
     private int nextTransactionId = 0;
     private final Map<Integer, CompletableFuture<ClientboundCommandSuggestionsPacket>> transactions = new HashMap<>();
 
     public TabCompletePlugin (final Bot bot) {
         this.bot = bot;
-        bot.addListener(this);
+
+        bot.listener.addListener(this);
     }
 
     public CompletableFuture<ClientboundCommandSuggestionsPacket> tabComplete (final String command) {
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 220345fc..b9bee36b 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java
@@ -1,6 +1,7 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.team.Team;
 import org.geysermc.mcprotocollib.network.Session;
 import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
@@ -12,11 +13,11 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-public class TeamPlugin extends Bot.Listener {
+public class TeamPlugin implements Listener {
     public final List<Team> teams = Collections.synchronizedList(new ArrayList<>());
 
     public TeamPlugin (final Bot bot) {
-        bot.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TickPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TickPlugin.java
index 2c541bf9..a107fb1b 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/TickPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TickPlugin.java
@@ -2,15 +2,11 @@ package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public class TickPlugin {
     private final Bot bot;
 
-    private final List<Listener> listeners = new ArrayList<>();
-
     public TickPlugin (final Bot bot) {
         this.bot = bot;
 
@@ -19,49 +15,37 @@ public class TickPlugin {
     }
 
     private void tick () {
-        for (final Listener listener : listeners) {
+        bot.listener.dispatch(listener -> {
             try {
                 listener.onAlwaysTick();
             } catch (final Exception e) {
                 bot.logger.error("Caught exception in an always tick listener!");
                 bot.logger.error(e);
             }
-        }
+        });
 
         if (!bot.loggedIn) return;
 
-        for (final Listener listener : listeners) {
+        bot.listener.dispatch(listener -> {
             try {
                 listener.onTick();
             } catch (final Exception e) {
                 bot.logger.error("Caught exception in a tick listener!");
                 bot.logger.error(e);
             }
-        }
+        });
     }
 
     private void tickSecond () {
         if (!bot.loggedIn) return;
 
-        for (final Listener listener : listeners) {
+        bot.listener.dispatch(listener -> {
             try {
                 listener.onSecondTick();
             } catch (final Exception e) {
                 bot.logger.error("Caught exception in a second tick listener!");
                 bot.logger.error(e);
             }
-        }
-    }
-
-    public void addListener (final Listener listener) {
-        listeners.add(listener);
-    }
-
-    public interface Listener {
-        default void onTick () { }
-
-        default void onAlwaysTick () { }
-
-        default void onSecondTick () { }
+        });
     }
 }
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TrustedPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TrustedPlugin.java
index 5381a25a..9e523821 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/TrustedPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TrustedPlugin.java
@@ -1,6 +1,7 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.logging.LogType;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 import me.chayapak1.chomens_bot.util.LoggerUtilities;
@@ -12,17 +13,16 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.UUID;
 
-public class TrustedPlugin implements PlayersPlugin.Listener {
+public class TrustedPlugin implements Listener {
     private final Bot bot;
 
     public final List<String> list;
 
     public TrustedPlugin (final Bot bot) {
         this.bot = bot;
-
         this.list = bot.config.trusted;
 
-        bot.players.addListener(this);
+        bot.listener.addListener(this);
     }
 
     public void broadcast (final Component message, final UUID exceptTarget) {
@@ -53,7 +53,7 @@ public class TrustedPlugin implements PlayersPlugin.Listener {
     public void broadcast (final Component message) { broadcast(message, null); }
 
     @Override
-    public void playerJoined (final PlayerEntry target) {
+    public void onPlayerJoined (final PlayerEntry target) {
         if (!list.contains(target.profile.getName())) return;
 
         // based (VERY)
@@ -95,7 +95,7 @@ public class TrustedPlugin implements PlayersPlugin.Listener {
     }
 
     @Override
-    public void playerLeft (final PlayerEntry target) {
+    public void onPlayerLeft (final PlayerEntry target) {
         if (!list.contains(target.profile.getName())) return;
 
         broadcast(
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 9f7093f9..9d3d61b0 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/VoiceChatPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/VoiceChatPlugin.java
@@ -2,6 +2,7 @@ package me.chayapak1.chomens_bot.plugins;
 
 import io.netty.buffer.Unpooled;
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.logging.LogType;
 import me.chayapak1.chomens_bot.data.voiceChat.ClientGroup;
 import me.chayapak1.chomens_bot.data.voiceChat.RawUdpPacket;
@@ -27,7 +28,7 @@ import java.util.UUID;
 
 // ALMOST ALL of these codes are from the simple voice chat mod itself including the other voicechat classes
 // mic packet exists but is never sent because i am too lazy to implement the player + evilbot already has a voicechat music player
-public class VoiceChatPlugin extends Bot.Listener implements Runnable {
+public class VoiceChatPlugin implements Listener, Runnable {
     private static final Key SECRET_KEY = Key.key("voicechat:secret");
     private static final Key ADD_GROUP_KEY = Key.key("voicechat:add_group");
     private static final Key REMOVE_GROUP_KEY = Key.key("voicechat:remove_group");
@@ -45,7 +46,7 @@ public class VoiceChatPlugin extends Bot.Listener implements Runnable {
     public VoiceChatPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/WhitelistPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/WhitelistPlugin.java
index 48b54737..40db8fa6 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/WhitelistPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/WhitelistPlugin.java
@@ -1,12 +1,13 @@
 package me.chayapak1.chomens_bot.plugins;
 
 import me.chayapak1.chomens_bot.Bot;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import me.chayapak1.chomens_bot.data.player.PlayerEntry;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class WhitelistPlugin implements PlayersPlugin.Listener {
+public class WhitelistPlugin implements Listener {
     private final Bot bot;
 
     public final List<String> list = new ArrayList<>();
@@ -16,7 +17,7 @@ public class WhitelistPlugin implements PlayersPlugin.Listener {
     public WhitelistPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.players.addListener(this);
+        bot.listener.addListener(this);
     }
 
     public void enable () {
@@ -74,7 +75,7 @@ public class WhitelistPlugin implements PlayersPlugin.Listener {
     }
 
     @Override
-    public void playerJoined (final PlayerEntry target) {
+    public void onPlayerJoined (final PlayerEntry target) {
         if (!enabled) return;
 
         if (isBlacklisted(target.profile.getName())) bot.filterManager.add(target, "");
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 88cf03d1..c856a3ff 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java
@@ -3,6 +3,7 @@ package me.chayapak1.chomens_bot.plugins;
 import me.chayapak1.chomens_bot.Bot;
 import me.chayapak1.chomens_bot.chunk.ChunkColumn;
 import me.chayapak1.chomens_bot.data.chunk.ChunkPos;
+import me.chayapak1.chomens_bot.data.listener.Listener;
 import org.cloudburstmc.math.vector.Vector3i;
 import org.cloudburstmc.nbt.NbtMap;
 import org.geysermc.mcprotocollib.network.Session;
@@ -15,9 +16,12 @@ import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.Clientbound
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundRespawnPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.*;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-public class WorldPlugin extends Bot.Listener {
+public class WorldPlugin implements Listener {
     private final Bot bot;
 
     public int minY = 0;
@@ -29,12 +33,10 @@ public class WorldPlugin extends Bot.Listener {
 
     public List<RegistryEntry> registry = null;
 
-    private final List<Listener> listeners = new ArrayList<>();
-
     public WorldPlugin (final Bot bot) {
         this.bot = bot;
 
-        bot.addListener(this);
+        bot.listener.addListener(this);
     }
 
     @Override
@@ -69,7 +71,7 @@ public class WorldPlugin extends Bot.Listener {
         minY = data.getInt("min_y");
         maxY = data.getInt("height") + minY;
 
-        for (final Listener listener : listeners) listener.worldChanged(dimension);
+        bot.listener.dispatch(listener -> listener.onWorldChanged(dimension));
     }
 
     private void packetReceived (final ClientboundRegistryDataPacket packet) {
@@ -136,10 +138,4 @@ public class WorldPlugin extends Bot.Listener {
         if (!chunks.containsKey(chunkPos)) return;
         chunks.get(chunkPos).setBlock(x & 15, y, z & 15, id);
     }
-
-    public void addListener (final Listener listener) { listeners.add(listener); }
-
-    public interface Listener {
-        default void worldChanged (final String dimension) { }
-    }
 }