Merge pull request #287 from Multiverse/chore/update-to-dynamic-listener

Use our new dynamic listener api

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/netherportals/MultiverseNetherPortals.java

@@ -23,7 +23,6 @@
 import org.mvplugins.multiverse.core.command.MVCommandManager;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jakarta.inject.Provider;
-import org.mvplugins.multiverse.external.vavr.control.Try;
 import org.mvplugins.multiverse.portals.MultiversePortals;
 import org.mvplugins.multiverse.portals.utils.PortalManager;
 
@@ -73,7 +72,7 @@ public void onEnable() {
 
         loadConfig();
         this.registerCommands(NetherPortalsCommand.class);
-        this.registerEvents();
+        this.registerDynamicListeners(MVNPListener.class);
 
         Logging.log(true, Level.INFO, " Enabled - By %s", StringFormatter.joinAnd(this.getDescription().getAuthors()));
     }
@@ -145,16 +144,6 @@ private void initMVNPConfig() {
         }
     }
 
-    private void registerEvents() {
-        var pluginManager = getServer().getPluginManager();
-
-        Try.run(() -> serviceLocator.getAllServices(MVNPListener.class).forEach(
-                        listener -> pluginManager.registerEvents(listener, this)))
-                .onFailure(e -> {
-                    throw new RuntimeException("Failed to register listeners. Terminating...", e);
-                });
-    }
-
     @Override
     public void onDisable() {
         shutdownDependencyInjection();

src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPCoreListener.java

@@ -1,8 +1,8 @@
 package org.mvplugins.multiverse.netherportals.listeners;
 
 import com.dumptruckman.minecraft.util.Logging;
+import org.mvplugins.multiverse.core.dynamiclistener.annotations.EventMethod;
 import org.mvplugins.multiverse.netherportals.MultiverseNetherPortals;
-import org.bukkit.event.EventHandler;
 import org.mvplugins.multiverse.core.event.MVConfigReloadEvent;
 import org.mvplugins.multiverse.core.event.MVDebugModeEvent;
 import org.mvplugins.multiverse.core.event.MVDumpsDebugInfoEvent;
@@ -26,7 +26,7 @@ final class MVNPCoreListener implements MVNPListener {
      *
      * @param event The Config Reload event.
      */
-    @EventHandler
+    @EventMethod
     public void configReloadEvent(MVConfigReloadEvent event) {
         this.plugin.loadConfig();
         event.addConfig("Multiverse-NetherPortals - config.yml");
@@ -37,7 +37,7 @@ public void configReloadEvent(MVConfigReloadEvent event) {
      *
      * @param event The Version event.
      */
-    @EventHandler
+    @EventMethod
     public void versionEvent(MVDumpsDebugInfoEvent event) {
         event.appendDebugInfo(this.plugin.getDebugInfo());
         File configFile = new File(this.plugin.getDataFolder(), "config.yml");
@@ -49,7 +49,7 @@ public void versionEvent(MVDumpsDebugInfoEvent event) {
      *
      * @param event The Debug Mode event.
      */
-    @EventHandler
+    @EventMethod
     public void debugModeChange(MVDebugModeEvent event) {
         Logging.setDebugLevel(event.getLevel());
     }

src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPEntityListener.java

@@ -1,6 +1,8 @@
 package org.mvplugins.multiverse.netherportals.listeners;
 
 import com.dumptruckman.minecraft.util.Logging;
+import org.mvplugins.multiverse.core.dynamiclistener.annotations.DefaultEventPriority;
+import org.mvplugins.multiverse.core.dynamiclistener.annotations.EventMethod;
 import org.mvplugins.multiverse.netherportals.MultiverseNetherPortals;
 import org.mvplugins.multiverse.netherportals.utils.EndPlatformCreator;
 import org.mvplugins.multiverse.netherportals.utils.MVEventRecord;
@@ -14,7 +16,6 @@
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.EntityPortalEnterEvent;
 import org.bukkit.event.entity.EntityPortalEvent;
@@ -87,7 +88,7 @@ final class MVNPEntityListener implements MVNPListener {
      * @param type  The type of portal the Player is trying to enter.
      * @return      {@code true} iff the player was bounced back.
      */
-    protected boolean shootPlayer(Player p, Block block, PortalType type) {
+    private boolean shootPlayer(Player p, Block block, PortalType type) {
         if (!plugin.isUsingBounceBack()) {
             Logging.finest("Bounceback is disabled. The player is free to walk into the portal!");
             return false;
@@ -186,7 +187,8 @@ private Location getLocation(Entity e, Location currentLocation, PortalType type
         return newTo;
     }
 
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventMethod
+    @DefaultEventPriority(EventPriority.MONITOR)
     public void onEntityPortalEnter(EntityPortalEnterEvent event) {
         if (!(event.getEntity() instanceof Player)) {
             return;
@@ -294,7 +296,7 @@ public void onEntityPortalEnter(EntityPortalEnterEvent event) {
                 });
     }
 
-    @EventHandler
+    @EventMethod
     public void onEntityPortal(EntityPortalEvent event) {
         if (event.isCancelled()) {
             Logging.finest("EntityPortalEvent was cancelled! NOT teleporting!");
@@ -377,7 +379,7 @@ else if (newToWorld.getEnvironment() == World.Environment.THE_END && type == Por
         }
     }
 
-    @EventHandler
+    @EventMethod
     public void onEntityPortalExit(EntityPortalExitEvent event) {
         if (event.getEntity() instanceof Player) {
             Player player = (Player) event.getEntity();

src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPEntityPortalReadyListener.java

@@ -5,10 +5,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.PortalType;
 import org.bukkit.World;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 import org.jvnet.hk2.annotations.Service;
-import org.mvplugins.multiverse.core.utils.ReflectHelper;
+import org.mvplugins.multiverse.core.dynamiclistener.EventRunnable;
+import org.mvplugins.multiverse.core.dynamiclistener.annotations.EventClass;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.netherportals.MultiverseNetherPortals;
@@ -24,17 +23,12 @@ final class MVNPEntityPortalReadyListener implements MVNPListener {
     MVNPEntityPortalReadyListener(@NotNull MultiverseNetherPortals plugin, @NotNull MVNameChecker nameChecker) {
         this.plugin = plugin;
         this.nameChecker = nameChecker;
-
-        if (ReflectHelper.hasClass("io.papermc.paper.event.entity.EntityPortalReadyEvent")) {
-            Bukkit.getPluginManager().registerEvents(entityPortalReadyEvent(), plugin);
-            Logging.finer("Registered EntityPortalReadyEvent listener.");
-        }
     }
 
-    private Listener entityPortalReadyEvent() {
-        return new Listener() {
-            @EventHandler
-            public void onEntityPortalReady(EntityPortalReadyEvent event) {
+    @EventClass("io.papermc.paper.event.entity.EntityPortalReadyEvent")
+    private EventRunnable entityPortalReadyEvent() {
+        return new EventRunnable<EntityPortalReadyEvent>() {
+            public void onEvent(EntityPortalReadyEvent event) {
                 String fromWorld = event.getEntity().getWorld().getName();
                 String linkedWorld = getLinkedWorld(fromWorld, event.getPortalType());
                 if (linkedWorld == null) {

src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPListener.java

@@ -1,8 +1,8 @@
 package org.mvplugins.multiverse.netherportals.listeners;
 
-import org.bukkit.event.Listener;
 import org.jvnet.hk2.annotations.Contract;
+import org.mvplugins.multiverse.core.dynamiclistener.DynamicListener;
 
 @Contract
-public interface MVNPListener extends Listener {
+public interface MVNPListener extends DynamicListener {
 }

src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPPlayerListener.java

@@ -1,6 +1,7 @@
 package org.mvplugins.multiverse.netherportals.listeners;
 
 import com.dumptruckman.minecraft.util.Logging;
+import org.mvplugins.multiverse.core.dynamiclistener.annotations.EventMethod;
 import org.mvplugins.multiverse.external.vavr.control.Try;
 import org.mvplugins.multiverse.netherportals.MultiverseNetherPortals;
 import org.mvplugins.multiverse.netherportals.utils.EndPlatformCreator;
@@ -60,7 +61,7 @@ private Advancement tryGetAdvancement(String advancementName) {
                 .getOrNull();
     }
 
-    @EventHandler
+    @EventMethod
     public void onPlayerPortal(PlayerPortalEvent event) {
         if (event.isCancelled()) {
             Logging.finest("PlayerPortalEvent was cancelled! NOT teleporting!");

src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPPluginListener.java

@@ -4,6 +4,7 @@
 import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
 
+import org.mvplugins.multiverse.core.dynamiclistener.annotations.EventMethod;
 import org.mvplugins.multiverse.netherportals.MultiverseNetherPortals;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.jvnet.hk2.annotations.Service;
@@ -18,14 +19,14 @@ public MVNPPluginListener(MultiverseNetherPortals plugin) {
         this.plugin = plugin;
     }
 
-    @EventHandler
+    @EventMethod
     public void onPluginEnable(PluginEnableEvent event) {
         if (event.getPlugin().getDescription().getName().equals("Multiverse-Portals")) {
             this.plugin.setPortals(event.getPlugin());
         }
     }
 
-    @EventHandler
+    @EventMethod
     public void onPluginDisable(PluginDisableEvent event) {
         if (event.getPlugin().getDescription().getName().equals("Multiverse-Portals")) {
             this.plugin.setPortals(null);