Update to align with new mv5 api

benwoo1110 · benwoo1110 · commit dbdd944ba967 · 2025-01-28T13:52:55.000+08:00
diff --git a/src/main/java/org/mvplugins/multiverse/netherportals/MultiverseNetherPortals.java b/src/main/java/org/mvplugins/multiverse/netherportals/MultiverseNetherPortals.java
@@ -8,6 +8,10 @@
 import java.util.logging.Level;
 
 import com.dumptruckman.minecraft.util.Logging;
+import org.mvplugins.multiverse.core.MultiverseCoreApi;
+import org.mvplugins.multiverse.core.MultiversePlugin;
+import org.mvplugins.multiverse.core.inject.PluginServiceLocatorFactory;
+import org.mvplugins.multiverse.core.utils.StringFormatter;
 import org.mvplugins.multiverse.netherportals.commands.NetherPortalsCommand;
 import org.mvplugins.multiverse.netherportals.listeners.MVNPListener;
 import org.bukkit.Location;
@@ -16,28 +20,25 @@
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.mvplugins.multiverse.core.MultiverseCore;
-import org.mvplugins.multiverse.core.submodules.MVPlugin;
 import org.mvplugins.multiverse.core.commandtools.MVCommandManager;
-import org.mvplugins.multiverse.core.api.config.MVCoreConfig;
+import org.mvplugins.multiverse.core.config.MVCoreConfig;
 import org.mvplugins.multiverse.core.inject.PluginServiceLocator;
 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;
 
-public class MultiverseNetherPortals extends JavaPlugin implements MVPlugin {
+public class MultiverseNetherPortals extends MultiversePlugin {
 
     private static final String NETHER_PORTALS_CONFIG = "config.yml";
     private static final String DEFAULT_NETHER_PREFIX = "";
     private static final String DEFAULT_NETHER_SUFFIX = "_nether";
     private static final String DEFAULT_END_PREFIX = "";
     private static final String DEFAULT_END_SUFFIX = "_the_end";
-    private final static int requiresProtocol = 24;
+    private final static int requiresProtocol = 50;
   
-    protected MultiverseCore core;
+    protected MultiverseCoreApi core;
     protected Plugin multiversePortals;
     protected FileConfiguration MVNPConfiguration;
     private Map<String, String> linkMap;
@@ -51,13 +52,15 @@ public class MultiverseNetherPortals extends JavaPlugin implements MVPlugin {
 
     @Override
     public void onLoad() {
+        super.onEnable();
         getDataFolder().mkdirs();
     }
 
     @Override
     public void onEnable() {
+        super.onEnable();
         Logging.init(this);
-        this.core = (MultiverseCore) getServer().getPluginManager().getPlugin("Multiverse-Core");
+        this.core = MultiverseCoreApi.get();
         this.multiversePortals = getServer().getPluginManager().getPlugin("Multiverse-Portals");
 
         // Test if the Core was found, if not we'll disable this plugin.
@@ -66,31 +69,19 @@ public void onEnable() {
             getServer().getPluginManager().disablePlugin(this);
             return;
         }
-        if (this.core.getProtocolVersion() < requiresProtocol) {
-            Logging.severe("Your Multiverse-Core is OUT OF DATE");
-            Logging.severe("This version of NetherPortals requires Protocol Level: " + requiresProtocol);
-            Logging.severe("Your of Core Protocol Level is: " + this.core.getProtocolVersion());
-            Logging.severe("Grab an updated copy at: ");
-            Logging.severe("http://dev.bukkit.org/bukkit-plugins/multiverse-core/");
-            getServer().getPluginManager().disablePlugin(this);
-            return;
-        }
 
         initializeDependencyInjection();
         Logging.setDebugLevel(mvCoreConfig.get().getGlobalDebug());
 
-        this.core.incrementPluginCount();
-        // As soon as we know MVCore was found, we can use the debug log!
-
         loadConfig();
         this.registerCommands();
         this.registerEvents();
 
-        Logging.log(true, Level.INFO, " Enabled - By %s", getAuthors());
+        Logging.log(true, Level.INFO, " Enabled - By %s", StringFormatter.joinAnd(this.getDescription().getAuthors()));
     }
 
     private void initializeDependencyInjection() {
-        serviceLocator = core.getServiceLocatorFactory()
+        serviceLocator = PluginServiceLocatorFactory.get()
                 .registerPlugin(new MultiverseNetherPortalsPluginBinder(this), core.getServiceLocator())
                 .flatMap(PluginServiceLocator::enable)
                 .getOrElseThrow(exception -> {
@@ -196,16 +187,8 @@ public void onDisable() {
     }
 
     @Override
-    public String getAuthors() {
-        String authors = "";
-        for (int i = 0; i < this.getDescription().getAuthors().size(); i++) {
-            if (i == this.getDescription().getAuthors().size() - 1) {
-                authors += " and " + this.getDescription().getAuthors().get(i);
-            } else {
-                authors += ", " + this.getDescription().getAuthors().get(i);
-            }
-        }
-        return authors.substring(2);
+    public int getTargetCoreProtocolVersion() {
+        return requiresProtocol;
     }
 
     @Override
@@ -360,20 +343,6 @@ public void setPortals(Plugin multiversePortals) {
         this.multiversePortals = multiversePortals;
     }
 
-    public Plugin getPortals() {
-        return multiversePortals;
-    }
-
-    @Override
-    public MultiverseCore getCore() {
-        return this.core;
-    }
-
-    @Override
-    public int getProtocolVersion() {
-        return 1;
-    }
-
     public String getDebugInfo() {
         return "[Multiverse-NetherPortals] Multiverse-NetherPortals Version: " + this.getDescription().getVersion() + '\n'
                 + "[Multiverse-NetherPortals] Nether Prefix: " + this.getNetherPrefix() + '\n'
diff --git a/src/main/java/org/mvplugins/multiverse/netherportals/MultiverseNetherPortalsPluginBinder.java b/src/main/java/org/mvplugins/multiverse/netherportals/MultiverseNetherPortalsPluginBinder.java
@@ -1,6 +1,5 @@
 package org.mvplugins.multiverse.netherportals;
 
-import org.mvplugins.multiverse.core.submodules.MVPlugin;
 import org.mvplugins.multiverse.core.inject.binder.JavaPluginBinder;
 import org.mvplugins.multiverse.external.glassfish.hk2.utilities.binding.ScopedBindingBuilder;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
@@ -14,6 +13,6 @@ protected MultiverseNetherPortalsPluginBinder(@NotNull MultiverseNetherPortals p
     @Override
     protected ScopedBindingBuilder<MultiverseNetherPortals> bindPluginClass(
             ScopedBindingBuilder<MultiverseNetherPortals> bindingBuilder) {
-        return super.bindPluginClass(bindingBuilder).to(MVPlugin.class).to(MultiverseNetherPortals.class);
+        return super.bindPluginClass(bindingBuilder).to(MultiverseNetherPortals.class);
     }
 }
diff --git a/src/main/java/org/mvplugins/multiverse/netherportals/commands/LinkCommand.java b/src/main/java/org/mvplugins/multiverse/netherportals/commands/LinkCommand.java
@@ -4,7 +4,7 @@
 import org.bukkit.PortalType;
 import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer;
 import org.mvplugins.multiverse.core.commandtools.MVCommandManager;
-import org.mvplugins.multiverse.core.api.world.MultiverseWorld;
+import org.mvplugins.multiverse.core.world.MultiverseWorld;
 import org.mvplugins.multiverse.external.acf.commands.InvalidCommandArgument;
 import org.mvplugins.multiverse.external.acf.commands.annotation.CommandAlias;
 import org.mvplugins.multiverse.external.acf.commands.annotation.CommandCompletion;
diff --git a/src/main/java/org/mvplugins/multiverse/netherportals/commands/ListCommand.java b/src/main/java/org/mvplugins/multiverse/netherportals/commands/ListCommand.java
@@ -7,8 +7,8 @@
 import org.mvplugins.multiverse.core.display.ContentDisplay;
 import org.mvplugins.multiverse.core.display.handlers.PagedSendHandler;
 import org.mvplugins.multiverse.core.display.parsers.ListContentProvider;
-import org.mvplugins.multiverse.core.api.world.MultiverseWorld;
-import org.mvplugins.multiverse.core.api.world.WorldManager;
+import org.mvplugins.multiverse.core.world.MultiverseWorld;
+import org.mvplugins.multiverse.core.world.WorldManager;
 import org.mvplugins.multiverse.external.acf.commands.annotation.CommandAlias;
 import org.mvplugins.multiverse.external.acf.commands.annotation.CommandCompletion;
 import org.mvplugins.multiverse.external.acf.commands.annotation.CommandPermission;
diff --git a/src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPCoreListener.java b/src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPCoreListener.java
@@ -3,9 +3,9 @@
 import com.dumptruckman.minecraft.util.Logging;
 import org.mvplugins.multiverse.netherportals.MultiverseNetherPortals;
 import org.bukkit.event.EventHandler;
-import org.mvplugins.multiverse.core.api.event.MVConfigReloadEvent;
-import org.mvplugins.multiverse.core.api.event.MVDebugModeEvent;
-import org.mvplugins.multiverse.core.api.event.MVDumpsDebugInfoEvent;
+import org.mvplugins.multiverse.core.event.MVConfigReloadEvent;
+import org.mvplugins.multiverse.core.event.MVDebugModeEvent;
+import org.mvplugins.multiverse.core.event.MVDumpsDebugInfoEvent;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
 
diff --git a/src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPEntityListener.java b/src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPEntityListener.java
@@ -20,10 +20,10 @@
 import org.bukkit.event.entity.EntityPortalEvent;
 import org.bukkit.event.entity.EntityPortalExitEvent;
 import org.bukkit.util.Vector;
-import org.mvplugins.multiverse.core.api.teleportation.LocationManipulation;
-import org.mvplugins.multiverse.core.api.event.MVPlayerTouchedPortalEvent;
-import org.mvplugins.multiverse.core.api.world.LoadedMultiverseWorld;
-import org.mvplugins.multiverse.core.api.world.WorldManager;
+import org.mvplugins.multiverse.core.teleportation.LocationManipulation;
+import org.mvplugins.multiverse.core.event.MVPlayerTouchedPortalEvent;
+import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
+import org.mvplugins.multiverse.core.world.WorldManager;
 import org.mvplugins.multiverse.core.world.entrycheck.WorldEntryCheckerProvider;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
diff --git a/src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPPlayerListener.java b/src/main/java/org/mvplugins/multiverse/netherportals/listeners/MVNPPlayerListener.java
@@ -15,8 +15,8 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerPortalEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
-import org.mvplugins.multiverse.core.api.world.LoadedMultiverseWorld;
-import org.mvplugins.multiverse.core.api.world.WorldManager;
+import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
+import org.mvplugins.multiverse.core.world.WorldManager;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
diff --git a/src/main/java/org/mvplugins/multiverse/netherportals/utils/EndPlatformCreator.java b/src/main/java/org/mvplugins/multiverse/netherportals/utils/EndPlatformCreator.java
@@ -8,7 +8,7 @@
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.mvplugins.multiverse.core.api.world.LoadedMultiverseWorld;
+import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
 import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
 
 @Service
diff --git a/src/main/java/org/mvplugins/multiverse/netherportals/utils/MVLinkChecker.java b/src/main/java/org/mvplugins/multiverse/netherportals/utils/MVLinkChecker.java
@@ -4,8 +4,8 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.mvplugins.multiverse.core.api.world.LoadedMultiverseWorld;
-import org.mvplugins.multiverse.core.api.world.WorldManager;
+import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
+import org.mvplugins.multiverse.core.world.WorldManager;
 import org.mvplugins.multiverse.core.world.entrycheck.WorldEntryCheckerProvider;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
diff --git a/src/main/java/org/mvplugins/multiverse/netherportals/utils/MVNameChecker.java b/src/main/java/org/mvplugins/multiverse/netherportals/utils/MVNameChecker.java
@@ -3,7 +3,7 @@
 import com.dumptruckman.minecraft.util.Logging;
 import org.mvplugins.multiverse.netherportals.MultiverseNetherPortals;
 import org.bukkit.PortalType;
-import org.mvplugins.multiverse.core.api.world.WorldManager;
+import org.mvplugins.multiverse.core.world.WorldManager;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package org.mvplugins.multiverse.netherportals;`
`2`	`2`
`3`		`-import org.mvplugins.multiverse.core.submodules.MVPlugin;`
`4`	`3`	`import org.mvplugins.multiverse.core.inject.binder.JavaPluginBinder;`
`5`	`4`	`import org.mvplugins.multiverse.external.glassfish.hk2.utilities.binding.ScopedBindingBuilder;`
`6`	`5`	`import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;`
`@@ -14,6 +13,6 @@ protected MultiverseNetherPortalsPluginBinder(@NotNull MultiverseNetherPortals p`
`14`	`13`	`@Override`
`15`	`14`	`protected ScopedBindingBuilder<MultiverseNetherPortals> bindPluginClass(`
`16`	`15`	`ScopedBindingBuilder<MultiverseNetherPortals> bindingBuilder) {`
`17`		`- return super.bindPluginClass(bindingBuilder).to(MVPlugin.class).to(MultiverseNetherPortals.class);`
	`16`	`+ return super.bindPluginClass(bindingBuilder).to(MultiverseNetherPortals.class);`
`18`	`17`	`}`
`19`	`18`	`}`