Update to align with new mv5 api

Multiverse · Jan 28, 2025 · 49d2d63 · 49d2d63
1 parent 1ab3a37
commit 49d2d63
Show file tree

Hide file tree

Showing 24 changed files with 68 additions and 159 deletions.
diff --git a/src/main/java/org/mvplugins/multiverse/portals/MVPortal.java b/src/main/java/org/mvplugins/multiverse/portals/MVPortal.java
@@ -16,12 +16,12 @@
 import java.util.regex.Pattern;
 
 import com.dumptruckman.minecraft.util.Logging;
-import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
-import org.mvplugins.multiverse.core.api.destination.DestinationsProvider;
-import org.mvplugins.multiverse.core.api.teleportation.BlockSafety;
-import org.mvplugins.multiverse.core.api.world.LoadedMultiverseWorld;
-import org.mvplugins.multiverse.core.api.world.MultiverseWorld;
-import org.mvplugins.multiverse.core.api.world.WorldManager;
+import org.mvplugins.multiverse.core.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.destination.DestinationsProvider;
+import org.mvplugins.multiverse.core.teleportation.BlockSafety;
+import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
+import org.mvplugins.multiverse.core.world.MultiverseWorld;
+import org.mvplugins.multiverse.core.world.WorldManager;
 import org.mvplugins.multiverse.core.utils.MaterialConverter;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.portals.enums.PortalType;

diff --git a/src/main/java/org/mvplugins/multiverse/portals/MultiversePortals.java b/src/main/java/org/mvplugins/multiverse/portals/MultiversePortals.java
@@ -24,12 +24,16 @@
 
 import com.dumptruckman.minecraft.util.Logging;
 import org.mvplugins.multiverse.core.MultiverseCore;
-import org.mvplugins.multiverse.core.api.config.MVCoreConfig;
-import org.mvplugins.multiverse.core.api.destination.DestinationsProvider;
+import org.mvplugins.multiverse.core.MultiverseCoreApi;
+import org.mvplugins.multiverse.core.MultiversePlugin;
+import org.mvplugins.multiverse.core.config.MVCoreConfig;
+import org.mvplugins.multiverse.core.destination.DestinationsProvider;
 import org.mvplugins.multiverse.core.commandtools.MVCommandManager;
 import org.mvplugins.multiverse.core.inject.PluginServiceLocator;
-import org.mvplugins.multiverse.core.submodules.MVPlugin;
+import org.mvplugins.multiverse.core.inject.PluginServiceLocatorFactory;
 import org.mvplugins.multiverse.core.utils.MaterialConverter;
+import org.mvplugins.multiverse.core.utils.StringFormatter;
+import org.mvplugins.multiverse.external.glassfish.hk2.api.ServiceLocatorFactory;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jakarta.inject.Provider;
 import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
@@ -61,9 +65,9 @@
 import org.mvplugins.multiverse.portals.utils.PortalManager;
 
 @Service
-public class MultiversePortals extends JavaPlugin implements MVPlugin {
+public class MultiversePortals extends MultiversePlugin {
 
-    private MultiverseCore core;
+    private MultiverseCoreApi core;
     private PluginServiceLocator serviceLocator;
 
     @Inject
@@ -102,36 +106,19 @@ public class MultiversePortals extends JavaPlugin implements MVPlugin {
     public static List<Material> FrameMaterials = null;
 
     public void onLoad() {
+        super.onLoad();
         getDataFolder().mkdirs();
     }
 
     public void onEnable() {
+        super.onEnable();
         Logging.init(this);
-        this.core = (MultiverseCore) getServer().getPluginManager().getPlugin("Multiverse-Core");
-
-        // Test if the Core was found, if not we'll disable this plugin.
-        if (this.core == null) {
-            Logging.info("Multiverse-Core not found, will keep looking.");
-            getServer().getPluginManager().disablePlugin(this);
-            return;
-        }
-        if (this.core.getProtocolVersion() < requiresProtocol) {
-            Logging.severe("Your Multiverse-Core is OUT OF DATE");
-            Logging.severe("This version of Multiverse Portals 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://ci.onarandombox.com/view/Multiverse/job/Multiverse-Core/");
-            getServer().getPluginManager().disablePlugin(this);
-            return;
-        }
+        this.core = MultiverseCoreApi.get();
 
         initializeDependencyInjection();
 
         Logging.setDebugLevel(mvCoreConfig.get().getGlobalDebug());
 
-        // Register ourselves with Core
-        this.core.incrementPluginCount();
-
         // Register our commands
         this.registerCommands();
 
@@ -152,11 +139,11 @@ public void onEnable() {
 
         getServer().getPluginManager().registerEvents(new WorldEditPluginListener(), this);
 
-        Logging.log(true, Level.INFO, " Enabled - By %s", getAuthors());
+        Logging.log(true, Level.INFO, " Enabled - By %s", StringFormatter.joinAnd(getDescription().getAuthors()));
     }
 
     private void initializeDependencyInjection() {
-        serviceLocator = core.getServiceLocatorFactory()
+        serviceLocator = PluginServiceLocatorFactory.get()
                 .registerPlugin(new MultiversePortalsPluginBinder(this), core.getServiceLocator())
                 .flatMap(PluginServiceLocator::enable)
                 .getOrElseThrow(exception -> {
@@ -370,24 +357,6 @@ private void registerCommands() {
                 });
     }
 
-    /**
-     * Parse the Authors Array into a readable String with ',' and 'and'.
-     *
-     * @return String containing all the authors formatted correctly with ',' and 'and'.
-     */
-    @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);
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -396,6 +365,11 @@ public PluginServiceLocator getServiceLocator() {
         return serviceLocator;
     }
 
+    @Override
+    public int getTargetCoreProtocolVersion() {
+        return requiresProtocol;
+    }
+
     /**
      * Returns the WorldEdit compatibility object. Use this to check for WorldEdit and get a player's WorldEdit selection.
      *
@@ -405,23 +379,10 @@ public WorldEditConnection getWorldEditConnection() {
         return worldEditConnection;
     }
 
-    public MultiverseCore getCore() {
-        return this.core;
-    }
-
     public FileConfiguration getPortalsConfig() {
         return this.MVPPortalConfig;
     }
 
-    public void setCore(MultiverseCore multiverseCore) {
-        this.core = multiverseCore;
-    }
-
-    @Override
-    public int getProtocolVersion() {
-        return 1;
-    }
-
     public FileConfiguration getMainConfig() {
         return this.MVPConfig;
     }

diff --git a/src/main/java/org/mvplugins/multiverse/portals/MultiversePortalsPluginBinder.java b/src/main/java/org/mvplugins/multiverse/portals/MultiversePortalsPluginBinder.java
@@ -1,6 +1,6 @@
 package org.mvplugins.multiverse.portals;
 
-import org.mvplugins.multiverse.core.submodules.MVPlugin;
+import org.mvplugins.multiverse.core.MultiversePlugin;
 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 +14,6 @@ protected MultiversePortalsPluginBinder(@NotNull MultiversePortals plugin) {
     @Override
     protected ScopedBindingBuilder<MultiversePortals> bindPluginClass(
             ScopedBindingBuilder<MultiversePortals> bindingBuilder) {
-        return super.bindPluginClass(bindingBuilder).to(MVPlugin.class).to(MultiversePortals.class);
+        return super.bindPluginClass(bindingBuilder).to(MultiversePlugin.class).to(MultiversePortals.class);
     }
 }
diff --git a/src/main/java/org/mvplugins/multiverse/portals/PortalLocation.java b/src/main/java/org/mvplugins/multiverse/portals/PortalLocation.java
@@ -14,7 +14,7 @@
 import com.sk89q.worldedit.math.BlockVector3;
 import org.bukkit.util.Vector;
 
-import org.mvplugins.multiverse.core.api.world.LoadedMultiverseWorld;
+import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
 import org.mvplugins.multiverse.portals.utils.MultiverseRegion;
 
 public class PortalLocation {

diff --git a/src/main/java/org/mvplugins/multiverse/portals/PortalPlayerSession.java b/src/main/java/org/mvplugins/multiverse/portals/PortalPlayerSession.java
@@ -11,8 +11,8 @@
 
 import com.dumptruckman.minecraft.util.Logging;
 import org.mvplugins.multiverse.core.economy.MVEconomist;
-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.portals.enums.MoveType;
 import org.mvplugins.multiverse.portals.utils.DisplayUtils;
 import org.bukkit.ChatColor;

diff --git a/src/main/java/org/mvplugins/multiverse/portals/commands/CreateCommand.java b/src/main/java/org/mvplugins/multiverse/portals/commands/CreateCommand.java
@@ -2,8 +2,8 @@
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
-import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
-import org.mvplugins.multiverse.core.api.world.LoadedMultiverseWorld;
+import org.mvplugins.multiverse.core.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
 import org.mvplugins.multiverse.core.commandtools.MVCommandManager;
 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/portals/commands/ListCommand.java b/src/main/java/org/mvplugins/multiverse/portals/commands/ListCommand.java
@@ -2,8 +2,8 @@
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-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.core.commandtools.MVCommandManager;
 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/portals/commands/ModifyCommand.java b/src/main/java/org/mvplugins/multiverse/portals/commands/ModifyCommand.java
@@ -3,8 +3,8 @@
 import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.ChatColor;
 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.commandtools.MVCommandIssuer;
 import org.mvplugins.multiverse.core.commandtools.MVCommandManager;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/portals/commands/SelectCommand.java b/src/main/java/org/mvplugins/multiverse/portals/commands/SelectCommand.java
@@ -2,8 +2,6 @@
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.mvplugins.multiverse.core.commandtools.MVCommandIssuer;
 import org.mvplugins.multiverse.core.commandtools.MVCommandManager;
 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/portals/destination/PortalDestination.java b/src/main/java/org/mvplugins/multiverse/portals/destination/PortalDestination.java
@@ -1,9 +1,9 @@
 package org.mvplugins.multiverse.portals.destination;
 
-import org.mvplugins.multiverse.core.api.destination.Destination;
-import org.mvplugins.multiverse.core.api.destination.DestinationSuggestionPacket;
-import org.mvplugins.multiverse.core.api.teleportation.LocationManipulation;
-import org.mvplugins.multiverse.external.acf.commands.BukkitCommandIssuer;
+import org.bukkit.command.CommandSender;
+import org.mvplugins.multiverse.core.destination.Destination;
+import org.mvplugins.multiverse.core.destination.DestinationSuggestionPacket;
+import org.mvplugins.multiverse.core.teleportation.LocationManipulation;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.external.jetbrains.annotations.Nullable;
@@ -12,7 +12,6 @@
 import org.mvplugins.multiverse.portals.utils.PortalManager;
 
 import java.util.Collection;
-import java.util.List;
 
 @Service
 public class PortalDestination implements Destination<PortalDestination, PortalDestinationInstance> {
@@ -51,7 +50,7 @@ public class PortalDestination implements Destination<PortalDestination, PortalD
     }
 
     @Override
-    public @NotNull Collection<DestinationSuggestionPacket> suggestDestinations(@NotNull BukkitCommandIssuer bukkitCommandIssuer, @Nullable String s) {
+    public @NotNull Collection<DestinationSuggestionPacket> suggestDestinations(@NotNull CommandSender sender, @Nullable String s) {
         return portalManager.getAllPortals().stream()
                 .map(p -> new DestinationSuggestionPacket(p.getName(), p.getName()))
                 .toList();

diff --git a/src/main/java/org/mvplugins/multiverse/portals/destination/PortalDestinationInstance.java b/src/main/java/org/mvplugins/multiverse/portals/destination/PortalDestinationInstance.java
@@ -3,7 +3,7 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.Vector;
-import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.destination.DestinationInstance;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.external.jetbrains.annotations.Nullable;
 import org.mvplugins.multiverse.external.vavr.control.Option;

diff --git a/src/main/java/org/mvplugins/multiverse/portals/destination/RandomPortalDestination.java b/src/main/java/org/mvplugins/multiverse/portals/destination/RandomPortalDestination.java
@@ -1,7 +1,8 @@
 package org.mvplugins.multiverse.portals.destination;
 
-import org.mvplugins.multiverse.core.api.destination.Destination;
-import org.mvplugins.multiverse.core.api.destination.DestinationSuggestionPacket;
+import org.bukkit.command.CommandSender;
+import org.mvplugins.multiverse.core.destination.Destination;
+import org.mvplugins.multiverse.core.destination.DestinationSuggestionPacket;
 import org.mvplugins.multiverse.external.acf.commands.BukkitCommandIssuer;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
@@ -35,7 +36,7 @@ public class RandomPortalDestination implements Destination<RandomPortalDestinat
     }
 
     @Override
-    public @NotNull Collection<DestinationSuggestionPacket> suggestDestinations(@NotNull BukkitCommandIssuer bukkitCommandIssuer, @Nullable String s) {
+    public @NotNull Collection<DestinationSuggestionPacket> suggestDestinations(@NotNull CommandSender sender, @Nullable String s) {
         // todo: suggest all the portal names comma seperated
         return List.of();
     }

diff --git a/...in/java/org/mvplugins/multiverse/portals/destination/RandomPortalDestinationInstance.java b/...in/java/org/mvplugins/multiverse/portals/destination/RandomPortalDestinationInstance.java
@@ -3,7 +3,7 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.Vector;
-import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.destination.DestinationInstance;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.external.vavr.control.Option;
 import org.mvplugins.multiverse.portals.MVPortal;

diff --git a/src/main/java/org/mvplugins/multiverse/portals/event/MVPortalEvent.java b/src/main/java/org/mvplugins/multiverse/portals/event/MVPortalEvent.java
@@ -12,7 +12,7 @@
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
-import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.destination.DestinationInstance;
 import org.mvplugins.multiverse.portals.MVPortal;
 import org.mvplugins.multiverse.portals.enums.PortalType;
 

diff --git a/src/main/java/org/mvplugins/multiverse/portals/listeners/MVPCoreListener.java b/src/main/java/org/mvplugins/multiverse/portals/listeners/MVPCoreListener.java
@@ -10,10 +10,10 @@
 import java.io.File;
 
 import com.dumptruckman.minecraft.util.Logging;
-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.api.event.MVPlayerTouchedPortalEvent;
+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.core.event.MVPlayerTouchedPortalEvent;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
 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/portals/listeners/MVPPlayerListener.java b/src/main/java/org/mvplugins/multiverse/portals/listeners/MVPPlayerListener.java
@@ -8,12 +8,12 @@
 package org.mvplugins.multiverse.portals.listeners;
 
 import com.dumptruckman.minecraft.util.Logging;
-import org.mvplugins.multiverse.core.api.teleportation.BlockSafety;
-import org.mvplugins.multiverse.core.api.teleportation.LocationManipulation;
-import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.teleportation.BlockSafety;
+import org.mvplugins.multiverse.core.teleportation.LocationManipulation;
+import org.mvplugins.multiverse.core.destination.DestinationInstance;
 import org.mvplugins.multiverse.core.economy.MVEconomist;
-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/portals/listeners/MVPPlayerMoveListener.java b/src/main/java/org/mvplugins/multiverse/portals/listeners/MVPPlayerMoveListener.java
@@ -9,9 +9,9 @@
 
 import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.event.Listener;
-import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.destination.DestinationInstance;
 import org.mvplugins.multiverse.core.economy.MVEconomist;
-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;