From a68b78e5a4f1d5b7202ba190ae897483dbf28fd4 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Sun, 15 Sep 2024 09:40:23 +0800
Subject: [PATCH] Make contract for core specific listeners and commands

---
 .../mvplugins/multiverse/core/MultiverseCore.java   |  9 ++++-----
 .../multiverse/core/commands/CheckCommand.java      |  2 +-
 .../multiverse/core/commands/CloneCommand.java      |  2 +-
 .../multiverse/core/commands/ConfigCommand.java     |  2 +-
 .../multiverse/core/commands/ConfirmCommand.java    |  2 +-
 .../core/commands/CoordinatesCommand.java           |  2 +-
 .../multiverse/core/commands/CoreCommand.java       | 13 +++++++++++++
 .../multiverse/core/commands/CreateCommand.java     |  2 +-
 .../multiverse/core/commands/DebugCommand.java      |  2 +-
 .../multiverse/core/commands/DeleteCommand.java     |  2 +-
 .../multiverse/core/commands/DumpsCommand.java      |  2 +-
 .../multiverse/core/commands/GameruleCommand.java   |  2 +-
 .../multiverse/core/commands/GeneratorsCommand.java |  2 +-
 .../multiverse/core/commands/ImportCommand.java     |  2 +-
 .../multiverse/core/commands/InfoCommand.java       |  2 +-
 .../multiverse/core/commands/ListCommand.java       |  2 +-
 .../multiverse/core/commands/LoadCommand.java       |  2 +-
 .../multiverse/core/commands/ModifyCommand.java     |  2 +-
 .../multiverse/core/commands/RegenCommand.java      |  2 +-
 .../multiverse/core/commands/ReloadCommand.java     |  2 +-
 .../multiverse/core/commands/RemoveCommand.java     |  2 +-
 .../multiverse/core/commands/RootCommand.java       |  2 +-
 .../multiverse/core/commands/SetSpawnCommand.java   |  2 +-
 .../multiverse/core/commands/SpawnCommand.java      |  2 +-
 .../multiverse/core/commands/TeleportCommand.java   |  2 +-
 .../multiverse/core/commands/UnloadCommand.java     |  2 +-
 .../multiverse/core/commands/UsageCommand.java      |  2 +-
 .../multiverse/core/commands/VersionCommand.java    |  2 +-
 .../multiverse/core/commands/WhoCommand.java        |  2 +-
 .../multiverse/core/inject/InjectableListener.java  |  7 -------
 .../multiverse/core/listeners/CoreListener.java     |  7 +++++++
 .../multiverse/core/listeners/MVChatListener.java   |  3 +--
 .../multiverse/core/listeners/MVEntityListener.java |  3 +--
 .../multiverse/core/listeners/MVPlayerListener.java |  3 +--
 .../multiverse/core/listeners/MVPortalListener.java |  3 +--
 .../core/listeners/MVWeatherListener.java           |  3 +--
 .../multiverse/core/listeners/MVWorldListener.java  |  3 +--
 37 files changed, 57 insertions(+), 51 deletions(-)
 create mode 100644 src/main/java/org/mvplugins/multiverse/core/commands/CoreCommand.java
 delete mode 100644 src/main/java/org/mvplugins/multiverse/core/inject/InjectableListener.java
 create mode 100644 src/main/java/org/mvplugins/multiverse/core/listeners/CoreListener.java

diff --git a/src/main/java/org/mvplugins/multiverse/core/MultiverseCore.java b/src/main/java/org/mvplugins/multiverse/core/MultiverseCore.java
index 43b1b23ec..d7be91605 100644
--- a/src/main/java/org/mvplugins/multiverse/core/MultiverseCore.java
+++ b/src/main/java/org/mvplugins/multiverse/core/MultiverseCore.java
@@ -18,7 +18,6 @@
 import me.main__.util.SerializationConfig.SerializationConfig;
 import org.bukkit.configuration.serialization.ConfigurationSerialization;
 import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.jetbrains.annotations.NotNull;
@@ -27,13 +26,13 @@
 import org.mvplugins.multiverse.core.anchor.AnchorManager;
 import org.mvplugins.multiverse.core.api.Destination;
 import org.mvplugins.multiverse.core.api.MVCore;
+import org.mvplugins.multiverse.core.commands.CoreCommand;
 import org.mvplugins.multiverse.core.commandtools.MVCommandManager;
-import org.mvplugins.multiverse.core.commandtools.MultiverseCommand;
 import org.mvplugins.multiverse.core.commandtools.PluginLocales;
 import org.mvplugins.multiverse.core.config.MVCoreConfig;
 import org.mvplugins.multiverse.core.destination.DestinationsProvider;
 import org.mvplugins.multiverse.core.economy.MVEconomist;
-import org.mvplugins.multiverse.core.inject.InjectableListener;
+import org.mvplugins.multiverse.core.listeners.CoreListener;
 import org.mvplugins.multiverse.core.inject.PluginServiceLocator;
 import org.mvplugins.multiverse.core.inject.PluginServiceLocatorFactory;
 import org.mvplugins.multiverse.core.placeholders.MultiverseCorePlaceholders;
@@ -197,7 +196,7 @@ private void loadAnchors() {
     private void registerEvents() {
         var pluginManager = getServer().getPluginManager();
 
-        Try.run(() -> serviceLocator.getAllServices(InjectableListener.class).forEach(
+        Try.run(() -> serviceLocator.getAllServices(CoreListener.class).forEach(
                 listener -> pluginManager.registerEvents(listener, this)))
                 .onFailure(e -> {
                     throw new RuntimeException("Failed to register listeners. Terminating...", e);
@@ -209,7 +208,7 @@ private void registerEvents() {
      */
     private void registerCommands() {
         Try.of(() -> commandManagerProvider.get())
-                .andThenTry(commandManager -> serviceLocator.getAllServices(MultiverseCommand.class)
+                .andThenTry(commandManager -> serviceLocator.getAllServices(CoreCommand.class)
                         .forEach(commandManager::registerCommand))
                 .onFailure(e -> {
                     Logging.severe("Failed to register commands");
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CheckCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CheckCommand.java
index a1283ff02..5310c5b79 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/CheckCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/CheckCommand.java
@@ -20,7 +20,7 @@
 
 @Service
 @CommandAlias("mv")
-class CheckCommand extends MultiverseCommand {
+class CheckCommand extends CoreCommand {
 
     private final DestinationsProvider destinationsProvider;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java
index 5875e110c..9f70cb3b0 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/CloneCommand.java
@@ -24,7 +24,7 @@
 
 @Service
 @CommandAlias("mv")
-class CloneCommand extends MultiverseCommand {
+class CloneCommand extends CoreCommand {
 
     private final WorldManager worldManager;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/ConfigCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ConfigCommand.java
index ec0d17e1c..b2f9684a1 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/ConfigCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/ConfigCommand.java
@@ -20,7 +20,7 @@
 
 @Service
 @CommandAlias("mv")
-class ConfigCommand extends MultiverseCommand {
+class ConfigCommand extends CoreCommand {
 
     private final MVCoreConfig config;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/ConfirmCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ConfirmCommand.java
index f37b8ef04..62914a225 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/ConfirmCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/ConfirmCommand.java
@@ -14,7 +14,7 @@
 
 @Service
 @CommandAlias("mv")
-class ConfirmCommand extends MultiverseCommand {
+class ConfirmCommand extends CoreCommand {
 
     @Inject
     ConfirmCommand(@NotNull MVCommandManager commandManager) {
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CoordinatesCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CoordinatesCommand.java
index 71055ba8c..993716fef 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/CoordinatesCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/CoordinatesCommand.java
@@ -19,7 +19,7 @@
 
 @Service
 @CommandAlias("mv")
-class CoordinatesCommand extends MultiverseCommand {
+class CoordinatesCommand extends CoreCommand {
 
     private final LocationManipulation locationManipulation;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CoreCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CoreCommand.java
new file mode 100644
index 000000000..8f225d0fe
--- /dev/null
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/CoreCommand.java
@@ -0,0 +1,13 @@
+package org.mvplugins.multiverse.core.commands;
+
+import org.jetbrains.annotations.NotNull;
+import org.jvnet.hk2.annotations.Contract;
+import org.mvplugins.multiverse.core.commandtools.MVCommandManager;
+import org.mvplugins.multiverse.core.commandtools.MultiverseCommand;
+
+@Contract
+public abstract class CoreCommand extends MultiverseCommand {
+    protected CoreCommand(@NotNull MVCommandManager commandManager) {
+        super(commandManager);
+    }
+}
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java
index 824bc5543..9f05089c1 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java
@@ -30,7 +30,7 @@
 
 @Service
 @CommandAlias("mv")
-class CreateCommand extends MultiverseCommand {
+class CreateCommand extends CoreCommand {
 
     private final WorldManager worldManager;
     private GeneratorProvider generatorProvider;
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/DebugCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/DebugCommand.java
index 119074eb3..9d8d720c7 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/DebugCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/DebugCommand.java
@@ -19,7 +19,7 @@
 
 @Service
 @CommandAlias("mv")
-class DebugCommand extends MultiverseCommand {
+class DebugCommand extends CoreCommand {
 
     private final MVCoreConfig config;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java
index 3d5a50d90..7795edda3 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java
@@ -31,7 +31,7 @@
 
 @Service
 @CommandAlias("mv")
-class DeleteCommand extends MultiverseCommand {
+class DeleteCommand extends CoreCommand {
 
     private final WorldManager worldManager;
     private final PlayerWorldTeleporter playerWorldTeleporter;
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/DumpsCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/DumpsCommand.java
index 0c70b671e..f01e543f7 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/DumpsCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/DumpsCommand.java
@@ -42,7 +42,7 @@
 
 @Service
 @CommandAlias("mv")
-class DumpsCommand extends MultiverseCommand {
+class DumpsCommand extends CoreCommand {
 
     private final MultiverseCore plugin;
     private final WorldManager worldManager;
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java
index b3f68a1d5..ab0408e0a 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/GameruleCommand.java
@@ -41,7 +41,7 @@
 @Service
 @CommandAlias("mv")
 @Subcommand("gamerule|rule|gamerules|rules")
-class GameruleCommand extends MultiverseCommand {
+class GameruleCommand extends CoreCommand {
 
     private final CommandValueFlag<Integer> PAGE_FLAG = flag(CommandValueFlag
             .builder("--page", Integer.class)
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/GeneratorsCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/GeneratorsCommand.java
index 28899382b..6b80c3950 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/GeneratorsCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/GeneratorsCommand.java
@@ -35,7 +35,7 @@
  */
 @Service
 @CommandAlias("mv")
-class GeneratorsCommand extends MultiverseCommand {
+class GeneratorsCommand extends CoreCommand {
 
     private final GeneratorProvider generatorProvider;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java
index bc351967a..3b9120e00 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/ImportCommand.java
@@ -27,7 +27,7 @@
 
 @Service
 @CommandAlias("mv")
-class ImportCommand extends MultiverseCommand {
+class ImportCommand extends CoreCommand {
 
     private final WorldManager worldManager;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/InfoCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/InfoCommand.java
index 2f5d0fa78..d2907f093 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/InfoCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/InfoCommand.java
@@ -35,7 +35,7 @@
 
 @Service
 @CommandAlias("mv")
-class InfoCommand extends MultiverseCommand {
+class InfoCommand extends CoreCommand {
 
     private final CommandValueFlag<Integer> PAGE_FLAG = flag(CommandValueFlag
             .builder("--page", Integer.class)
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/ListCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ListCommand.java
index 804e57bb7..ebaa77430 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/ListCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/ListCommand.java
@@ -36,7 +36,7 @@
 
 @Service
 @CommandAlias("mv")
-class ListCommand extends MultiverseCommand {
+class ListCommand extends CoreCommand {
 
     private final WorldManager worldManager;
     private final WorldEntryCheckerProvider worldEntryCheckerProvider;
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/LoadCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/LoadCommand.java
index a5e75f74a..f128da478 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/LoadCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/LoadCommand.java
@@ -21,7 +21,7 @@
 
 @Service
 @CommandAlias("mv")
-class LoadCommand extends MultiverseCommand {
+class LoadCommand extends CoreCommand {
 
     private final WorldManager worldManager;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/ModifyCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ModifyCommand.java
index d881626ac..499a1fb3a 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/ModifyCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/ModifyCommand.java
@@ -24,7 +24,7 @@
 
 @Service
 @CommandAlias("mv")
-class ModifyCommand extends MultiverseCommand {
+class ModifyCommand extends CoreCommand {
 
     private final WorldManager worldManager;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java
index 21773f4a7..22d6353f5 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java
@@ -34,7 +34,7 @@
 
 @Service
 @CommandAlias("mv")
-class RegenCommand extends MultiverseCommand {
+class RegenCommand extends CoreCommand {
 
     private final WorldManager worldManager;
     private final PlayerWorldTeleporter playerWorldTeleporter;
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/ReloadCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/ReloadCommand.java
index d39641f2c..b6c73a7fa 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/ReloadCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/ReloadCommand.java
@@ -23,7 +23,7 @@
 
 @Service
 @CommandAlias("mv")
-class ReloadCommand extends MultiverseCommand {
+class ReloadCommand extends CoreCommand {
 
     private final MVCoreConfig config;
     private final AnchorManager anchorManager;
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java
index d2ecb9429..cb600d1af 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java
@@ -29,7 +29,7 @@
 
 @Service
 @CommandAlias("mv")
-class RemoveCommand extends MultiverseCommand {
+class RemoveCommand extends CoreCommand {
 
     private final WorldManager worldManager;
     private final PlayerWorldTeleporter playerWorldTeleporter;
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/RootCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/RootCommand.java
index 4d0bb326c..fb5b7c90f 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/RootCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/RootCommand.java
@@ -14,7 +14,7 @@
 import org.mvplugins.multiverse.core.utils.MVCorei18n;
 
 @Service
-class RootCommand extends MultiverseCommand {
+class RootCommand extends CoreCommand {
 
     private final Plugin plugin;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/SetSpawnCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/SetSpawnCommand.java
index d150d5a57..fa301053d 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/SetSpawnCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/SetSpawnCommand.java
@@ -18,7 +18,7 @@
 
 @Service
 @CommandAlias("mv")
-public class SetSpawnCommand extends MultiverseCommand {
+public class SetSpawnCommand extends CoreCommand {
 
     private final WorldManager worldManager;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/SpawnCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/SpawnCommand.java
index 97ff11e6c..d5c3b3322 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/SpawnCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/SpawnCommand.java
@@ -19,7 +19,7 @@
 
 @Service
 @CommandAlias("mv")
-class SpawnCommand extends MultiverseCommand {
+class SpawnCommand extends CoreCommand {
     private final WorldManager worldManager;
     private final AsyncSafetyTeleporter safetyTeleporter;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java
index 70426d15c..398c6d348 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java
@@ -25,7 +25,7 @@
 
 @Service
 @CommandAlias("mv")
-class TeleportCommand extends MultiverseCommand {
+class TeleportCommand extends CoreCommand {
 
     private final CorePermissionsChecker permissionsChecker;
     private final AsyncSafetyTeleporter safetyTeleporter;
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java
index 48204f4de..fada8dd6e 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java
@@ -28,7 +28,7 @@
 
 @Service
 @CommandAlias("mv")
-class UnloadCommand extends MultiverseCommand {
+class UnloadCommand extends CoreCommand {
 
     private final WorldManager worldManager;
     private final PlayerWorldTeleporter playerWorldTeleporter;
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/UsageCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/UsageCommand.java
index a27e3a5e9..eb0bfb0d2 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/UsageCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/UsageCommand.java
@@ -17,7 +17,7 @@
 
 @Service
 @CommandAlias("mv")
-class UsageCommand extends MultiverseCommand {
+class UsageCommand extends CoreCommand {
 
     @Inject
     UsageCommand(@NotNull MVCommandManager commandManager) {
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/VersionCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/VersionCommand.java
index 4b417ad59..762adf451 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/VersionCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/VersionCommand.java
@@ -16,7 +16,7 @@
 
 @Service
 @CommandAlias("mv")
-class VersionCommand extends MultiverseCommand {
+class VersionCommand extends CoreCommand {
 
     private final MultiverseCore plugin;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/WhoCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/WhoCommand.java
index 13e80c724..480f73f8e 100644
--- a/src/main/java/org/mvplugins/multiverse/core/commands/WhoCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/commands/WhoCommand.java
@@ -37,7 +37,7 @@
 
 @Service
 @CommandAlias("mv")
-public class WhoCommand extends MultiverseCommand {
+public class WhoCommand extends CoreCommand {
 
     private final WorldManager worldManager;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/inject/InjectableListener.java b/src/main/java/org/mvplugins/multiverse/core/inject/InjectableListener.java
deleted file mode 100644
index 6de94105b..000000000
--- a/src/main/java/org/mvplugins/multiverse/core/inject/InjectableListener.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.mvplugins.multiverse.core.inject;
-
-import org.bukkit.event.Listener;
-import org.jvnet.hk2.annotations.Contract;
-
-@Contract
-public interface InjectableListener extends Listener { }
diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/CoreListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/CoreListener.java
new file mode 100644
index 000000000..def51f2d2
--- /dev/null
+++ b/src/main/java/org/mvplugins/multiverse/core/listeners/CoreListener.java
@@ -0,0 +1,7 @@
+package org.mvplugins.multiverse.core.listeners;
+
+import org.bukkit.event.Listener;
+import org.jvnet.hk2.annotations.Contract;
+
+@Contract
+public interface CoreListener extends Listener { }
diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MVChatListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVChatListener.java
index dc9273f6c..94eed0b8d 100644
--- a/src/main/java/org/mvplugins/multiverse/core/listeners/MVChatListener.java
+++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVChatListener.java
@@ -7,14 +7,13 @@
 import org.jvnet.hk2.annotations.Service;
 
 import org.mvplugins.multiverse.core.config.MVCoreConfig;
-import org.mvplugins.multiverse.core.inject.InjectableListener;
 import org.mvplugins.multiverse.core.world.WorldManager;
 
 /**
  * Multiverse's Listener for players.
  */
 @Service
-public class MVChatListener implements InjectableListener {
+public class MVChatListener implements CoreListener {
     private final MVCoreConfig config;
     private final WorldManager worldManager;
     private final MVPlayerListener playerListener;
diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MVEntityListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVEntityListener.java
index ffc1d59fa..4583e1d3d 100644
--- a/src/main/java/org/mvplugins/multiverse/core/listeners/MVEntityListener.java
+++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVEntityListener.java
@@ -20,7 +20,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jvnet.hk2.annotations.Service;
 
-import org.mvplugins.multiverse.core.inject.InjectableListener;
 import org.mvplugins.multiverse.core.world.WorldManager;
 import org.mvplugins.multiverse.core.world.WorldPurger;
 
@@ -28,7 +27,7 @@
  * Multiverse's Entity {@link Listener}.
  */
 @Service
-public class MVEntityListener implements InjectableListener {
+public class MVEntityListener implements CoreListener {
     private final WorldManager worldManager;
     private final WorldPurger worldPurger;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java
index ecb28c016..dca3ef500 100644
--- a/src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java
+++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java
@@ -40,7 +40,6 @@
 import org.mvplugins.multiverse.core.destination.ParsedDestination;
 import org.mvplugins.multiverse.core.economy.MVEconomist;
 import org.mvplugins.multiverse.core.event.MVRespawnEvent;
-import org.mvplugins.multiverse.core.inject.InjectableListener;
 import org.mvplugins.multiverse.core.teleportation.AsyncSafetyTeleporter;
 import org.mvplugins.multiverse.core.teleportation.TeleportQueue;
 import org.mvplugins.multiverse.core.utils.result.ResultChain;
@@ -54,7 +53,7 @@
  * Multiverse's Listener for players.
  */
 @Service
-public class MVPlayerListener implements InjectableListener {
+public class MVPlayerListener implements CoreListener {
     private final Plugin plugin;
     private final MVCoreConfig config;
     private final Provider<WorldManager> worldManagerProvider;
diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MVPortalListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVPortalListener.java
index de2626973..20e5943dd 100644
--- a/src/main/java/org/mvplugins/multiverse/core/listeners/MVPortalListener.java
+++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVPortalListener.java
@@ -21,7 +21,6 @@
 import org.jvnet.hk2.annotations.Service;
 
 import org.mvplugins.multiverse.core.config.MVCoreConfig;
-import org.mvplugins.multiverse.core.inject.InjectableListener;
 import org.mvplugins.multiverse.core.world.WorldManager;
 
 import static org.bukkit.PortalType.CUSTOM;
@@ -30,7 +29,7 @@
  * A custom listener for portal related events.
  */
 @Service
-public class MVPortalListener implements InjectableListener {
+public class MVPortalListener implements CoreListener {
 
     private final MVCoreConfig config;
     private final WorldManager worldManager;
diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MVWeatherListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVWeatherListener.java
index 8032d0f4b..7c373e0ff 100644
--- a/src/main/java/org/mvplugins/multiverse/core/listeners/MVWeatherListener.java
+++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVWeatherListener.java
@@ -14,14 +14,13 @@
 import org.bukkit.event.weather.WeatherChangeEvent;
 import org.jvnet.hk2.annotations.Service;
 
-import org.mvplugins.multiverse.core.inject.InjectableListener;
 import org.mvplugins.multiverse.core.world.WorldManager;
 
 /**
  * Multiverse's Weather Listener.
  */
 @Service
-public class MVWeatherListener implements InjectableListener {
+public class MVWeatherListener implements CoreListener {
 
     private final WorldManager worldManager;
 
diff --git a/src/main/java/org/mvplugins/multiverse/core/listeners/MVWorldListener.java b/src/main/java/org/mvplugins/multiverse/core/listeners/MVWorldListener.java
index ba407ef88..578aab74f 100644
--- a/src/main/java/org/mvplugins/multiverse/core/listeners/MVWorldListener.java
+++ b/src/main/java/org/mvplugins/multiverse/core/listeners/MVWorldListener.java
@@ -15,7 +15,6 @@
 import org.bukkit.event.world.WorldUnloadEvent;
 import org.jvnet.hk2.annotations.Service;
 
-import org.mvplugins.multiverse.core.inject.InjectableListener;
 import org.mvplugins.multiverse.core.world.WorldManager;
 import org.mvplugins.multiverse.core.world.options.UnloadWorldOptions;
 import org.mvplugins.multiverse.core.world.reasons.LoadFailureReason;
@@ -25,7 +24,7 @@
  * Multiverse's World Listener.
  */
 @Service
-public class MVWorldListener implements InjectableListener {
+public class MVWorldListener implements CoreListener {
 
     private final WorldManager worldManager;