Merge pull request #286 from Multiverse/fix/entity-portal-ready

Use EntityPortalReadyEvent to support handling portals on servers with disabled nether/end

Author: benwoo1110

build.gradle

@@ -14,7 +14,7 @@ repositories {
 }
 
 configure(apiDependencies) {
-    serverApiVersion = '1.18.2-R0.1-SNAPSHOT'
+    serverApiVersion = '1.19.4-R0.1-SNAPSHOT'
     mockBukkitServerApiVersion = '1.21'
     mockBukkitVersion = '4.31.1'
 }

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

@@ -12,7 +12,7 @@
 import java.io.File;
 
 @Service
-public class MVNPCoreListener implements MVNPListener {
+final class MVNPCoreListener implements MVNPListener {
 
     private final MultiverseNetherPortals plugin;
 

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

@@ -35,7 +35,7 @@
 import java.util.Map;
 
 @Service
-public class MVNPEntityListener implements MVNPListener {
+final class MVNPEntityListener implements MVNPListener {
 
     private static final int COOLDOWN = 250;
 

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

@@ -0,0 +1,82 @@
+package org.mvplugins.multiverse.netherportals.listeners;
+
+import com.dumptruckman.minecraft.util.Logging;
+import io.papermc.paper.event.entity.EntityPortalReadyEvent;
+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.external.jakarta.inject.Inject;
+import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
+import org.mvplugins.multiverse.netherportals.MultiverseNetherPortals;
+import org.mvplugins.multiverse.netherportals.utils.MVNameChecker;
+
+@Service
+final class MVNPEntityPortalReadyListener implements MVNPListener {
+
+    private final MultiverseNetherPortals plugin;
+    private final MVNameChecker nameChecker;
+
+    @Inject
+    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) {
+                String fromWorld = event.getEntity().getWorld().getName();
+                String linkedWorld = getLinkedWorld(fromWorld, event.getPortalType());
+                if (linkedWorld == null) {
+                    Logging.fine("No linked world found for world '%s'", fromWorld);
+                    return;
+                }
+                World bukkitLinkedWorld = Bukkit.getWorld(linkedWorld);
+                if (bukkitLinkedWorld == null) {
+                    Logging.fine("Target linked world '%s' not a loaded bukkit world.", linkedWorld);
+                    return;
+                }
+                Logging.fine("Found linked world '%s' for world '%s'", linkedWorld, fromWorld);
+                event.setTargetWorld(bukkitLinkedWorld);
+            }
+        };
+    }
+
+    private String getLinkedWorld(String currentWorld, PortalType type) {
+        String linkedWorld = plugin.getWorldLink(currentWorld, type);
+        if (linkedWorld != null) {
+            Logging.finer("Got manually linked world '%s' for world '%s'", linkedWorld, currentWorld);
+            return linkedWorld;
+        }
+        if (nameChecker.isValidEndName(currentWorld)) {
+            if (type == PortalType.ENDER) {
+                return nameChecker.getNormalName(currentWorld, type);
+            } else if (type == PortalType.NETHER) {
+                return nameChecker.getNetherName(this.nameChecker.getNormalName(currentWorld, type));
+            }
+        } else if (this.nameChecker.isValidNetherName(currentWorld)) {
+            if (type == PortalType.ENDER) {
+                return nameChecker.getEndName(this.nameChecker.getNormalName(currentWorld, type));
+            } else if (type == PortalType.NETHER) {
+                return nameChecker.getNormalName(currentWorld, type);
+            }
+        } else {
+            if (type == PortalType.ENDER) {
+                return nameChecker.getEndName(currentWorld);
+            } else if (type == PortalType.NETHER) {
+                return nameChecker.getNetherName(currentWorld);
+            }
+        }
+        return null;
+    }
+}

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

@@ -23,7 +23,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 @Service
-public class MVNPPlayerListener implements MVNPListener {
+final class MVNPPlayerListener implements MVNPListener {
 
     private final MultiverseNetherPortals plugin;
     private final MVNameChecker nameChecker;

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

@@ -9,7 +9,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 @Service
-public class MVNPPluginListener implements MVNPListener {
+final class MVNPPluginListener implements MVNPListener {
 
     private final MultiverseNetherPortals plugin;