Update to align with new mv5 api

Multiverse · Jan 18, 2025 · 1ab3a37 · 1ab3a37
1 parent d77237e
commit 1ab3a37
Show file tree

Hide file tree

Showing 23 changed files with 57 additions and 55 deletions.
diff --git a/src/main/java/org/mvplugins/multiverse/portals/MVPortal.java b/src/main/java/org/mvplugins/multiverse/portals/MVPortal.java
@@ -16,13 +16,13 @@
 import java.util.regex.Pattern;
 
 import com.dumptruckman.minecraft.util.Logging;
-import org.mvplugins.multiverse.core.api.BlockSafety;
-import org.mvplugins.multiverse.core.destination.DestinationInstance;
-import org.mvplugins.multiverse.core.destination.DestinationsProvider;
+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.utils.MaterialConverter;
-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.external.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.portals.enums.PortalType;
 import org.bukkit.Location;
@@ -334,7 +334,7 @@ private double getMinimumWith2Air(int finalX, int finalZ, int y, int yMax, World
         // If this class exists, then this Multiverse-Core MUST exist!
         // TODO there really ought to be a better way!
         for (int i = y; i < yMax; i++) {
-            if (blockSafety.playerCanSpawnHereSafely(w, finalX, i, finalZ)) {
+            if (blockSafety.canSpawnAtLocationSafely(new Location(w, finalX, i, finalZ))) {
                 return i;
             }
         }

diff --git a/src/main/java/org/mvplugins/multiverse/portals/MultiversePortals.java b/src/main/java/org/mvplugins/multiverse/portals/MultiversePortals.java
@@ -24,11 +24,11 @@
 
 import com.dumptruckman.minecraft.util.Logging;
 import org.mvplugins.multiverse.core.MultiverseCore;
-import org.mvplugins.multiverse.core.api.MVPlugin;
+import org.mvplugins.multiverse.core.api.config.MVCoreConfig;
+import org.mvplugins.multiverse.core.api.destination.DestinationsProvider;
 import org.mvplugins.multiverse.core.commandtools.MVCommandManager;
-import org.mvplugins.multiverse.core.config.MVCoreConfig;
-import org.mvplugins.multiverse.core.destination.DestinationsProvider;
 import org.mvplugins.multiverse.core.inject.PluginServiceLocator;
+import org.mvplugins.multiverse.core.submodules.MVPlugin;
 import org.mvplugins.multiverse.core.utils.MaterialConverter;
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jakarta.inject.Provider;

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.api.MVPlugin;
+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;

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.world.LoadedMultiverseWorld;
+import org.mvplugins.multiverse.core.api.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,13 +11,12 @@
 
 import com.dumptruckman.minecraft.util.Logging;
 import org.mvplugins.multiverse.core.economy.MVEconomist;
-import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
-import org.mvplugins.multiverse.core.world.WorldManager;
+import org.mvplugins.multiverse.core.api.world.LoadedMultiverseWorld;
+import org.mvplugins.multiverse.core.api.world.WorldManager;
 import org.mvplugins.multiverse.portals.enums.MoveType;
 import org.mvplugins.multiverse.portals.utils.DisplayUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 

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,9 +2,9 @@
 
 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.commandtools.MVCommandManager;
-import org.mvplugins.multiverse.core.destination.DestinationInstance;
-import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
 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/portals/commands/ListCommand.java b/src/main/java/org/mvplugins/multiverse/portals/commands/ListCommand.java
@@ -2,9 +2,9 @@
 
 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.commandtools.MVCommandManager;
-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/portals/commands/ModifyCommand.java b/src/main/java/org/mvplugins/multiverse/portals/commands/ModifyCommand.java
@@ -3,11 +3,10 @@
 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.commandtools.MVCommandIssuer;
-import org.mvplugins.multiverse.core.commandtools.MVCommandManager;
-import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
-import org.mvplugins.multiverse.core.world.WorldManager;
-import org.mvplugins.multiverse.external.acf.commands.annotation.CommandAlias;
+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;
 import org.mvplugins.multiverse.external.acf.commands.annotation.CommandPermission;
 import org.mvplugins.multiverse.external.acf.commands.annotation.Description;

diff --git a/src/main/java/org/mvplugins/multiverse/portals/commands/PortalsCommand.java b/src/main/java/org/mvplugins/multiverse/portals/commands/PortalsCommand.java
@@ -11,6 +11,6 @@
 @Contract
 public abstract class PortalsCommand extends MultiverseCommand {
     protected PortalsCommand(@NotNull MVCommandManager commandManager) {
-        super(commandManager);
+        super(commandManager, "mvp");
     }
 }
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,7 +1,8 @@
 package org.mvplugins.multiverse.portals.destination;
 
-import org.mvplugins.multiverse.core.api.LocationManipulation;
-import org.mvplugins.multiverse.core.destination.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.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
@@ -11,6 +12,7 @@
 import org.mvplugins.multiverse.portals.utils.PortalManager;
 
 import java.util.Collection;
+import java.util.List;
 
 @Service
 public class PortalDestination implements Destination<PortalDestination, PortalDestinationInstance> {
@@ -49,7 +51,9 @@ public class PortalDestination implements Destination<PortalDestination, PortalD
     }
 
     @Override
-    public @NotNull Collection<String> suggestDestinations(@NotNull BukkitCommandIssuer bukkitCommandIssuer, @Nullable String s) {
-        return portalManager.getAllPortals().stream().map(MVPortal::getName).toList();
+    public @NotNull Collection<DestinationSuggestionPacket> suggestDestinations(@NotNull BukkitCommandIssuer bukkitCommandIssuer, @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.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.api.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,6 +1,7 @@
 package org.mvplugins.multiverse.portals.destination;
 
-import org.mvplugins.multiverse.core.destination.Destination;
+import org.mvplugins.multiverse.core.api.destination.Destination;
+import org.mvplugins.multiverse.core.api.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;
@@ -34,7 +35,7 @@ public class RandomPortalDestination implements Destination<RandomPortalDestinat
     }
 
     @Override
-    public @NotNull Collection<String> suggestDestinations(@NotNull BukkitCommandIssuer bukkitCommandIssuer, @Nullable String s) {
+    public @NotNull Collection<DestinationSuggestionPacket> suggestDestinations(@NotNull BukkitCommandIssuer bukkitCommandIssuer, @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.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.api.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.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.api.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,11 +10,11 @@
 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.external.jetbrains.annotations.NotNull;
-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.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
 import org.mvplugins.multiverse.portals.MVPortal;

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.BlockSafety;
-import org.mvplugins.multiverse.core.api.LocationManipulation;
-import org.mvplugins.multiverse.core.destination.DestinationInstance;
+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.economy.MVEconomist;
-import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
-import org.mvplugins.multiverse.core.world.WorldManager;
+import org.mvplugins.multiverse.core.api.world.LoadedMultiverseWorld;
+import org.mvplugins.multiverse.core.api.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;
@@ -280,7 +280,7 @@ public void playerPortal(PlayerPortalEvent event) {
                 }
 
                 if (portalDest.checkTeleportSafety()) {
-                    Location safeLocation = blockSafety.getSafeLocation(portalDest.getLocation(event.getPlayer()).getOrNull());
+                    Location safeLocation = blockSafety.findSafeSpawnLocation(portalDest.getLocation(event.getPlayer()).getOrNull());
                     if (safeLocation == null) {
                         event.setCancelled(true);
                         Logging.warning("Portal " + portal.getName() + " destination is not safe!");

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.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
 import org.mvplugins.multiverse.core.economy.MVEconomist;
-import org.mvplugins.multiverse.core.world.WorldManager;
+import org.mvplugins.multiverse.core.api.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/MVPVehicleListener.java b/src/main/java/org/mvplugins/multiverse/portals/listeners/MVPVehicleListener.java
@@ -11,8 +11,8 @@
 
 import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.event.Listener;
-import org.mvplugins.multiverse.core.api.LocationManipulation;
-import org.mvplugins.multiverse.core.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.api.teleportation.LocationManipulation;
 import org.mvplugins.multiverse.core.teleportation.AsyncSafetyTeleporter;
 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/portals/listeners/PlayerListenerHelper.java b/src/main/java/org/mvplugins/multiverse/portals/listeners/PlayerListenerHelper.java
@@ -3,7 +3,7 @@
 import java.util.Date;
 
 import com.dumptruckman.minecraft.util.Logging;
-import org.mvplugins.multiverse.core.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
 import org.mvplugins.multiverse.core.teleportation.AsyncSafetyTeleporter;
 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/portals/utils/DisplayUtils.java b/src/main/java/org/mvplugins/multiverse/portals/utils/DisplayUtils.java
@@ -1,8 +1,8 @@
 package org.mvplugins.multiverse.portals.utils;
 
 import org.mvplugins.multiverse.core.economy.MVEconomist;
-import org.mvplugins.multiverse.core.world.MultiverseWorld;
-import org.mvplugins.multiverse.core.world.WorldManager;
+import org.mvplugins.multiverse.core.api.world.MultiverseWorld;
+import org.mvplugins.multiverse.core.api.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;
@@ -78,5 +78,4 @@ public void showPortalPriceInfo(MVPortal portal, CommandSender sender) {
             sender.sendMessage("Price: " + ChatColor.GREEN + "FREE!");
         }
     }
-
 }
diff --git a/src/main/java/org/mvplugins/multiverse/portals/utils/MultiverseRegion.java b/src/main/java/org/mvplugins/multiverse/portals/utils/MultiverseRegion.java
@@ -9,7 +9,7 @@
 
 import org.bukkit.Location;
 import org.bukkit.util.Vector;
-import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
+import org.mvplugins.multiverse.core.api.world.LoadedMultiverseWorld;
 
 /**
  * This is a placeholder of good things to come...

diff --git a/src/main/java/org/mvplugins/multiverse/portals/utils/PortalFiller.java b/src/main/java/org/mvplugins/multiverse/portals/utils/PortalFiller.java
@@ -16,7 +16,7 @@
 import org.bukkit.block.data.Orientable;
 import org.bukkit.entity.Player;
 
-import org.mvplugins.multiverse.core.api.LocationManipulation;
+import org.mvplugins.multiverse.core.api.teleportation.LocationManipulation;
 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/utils/PortalManager.java b/src/main/java/org/mvplugins/multiverse/portals/utils/PortalManager.java
@@ -23,8 +23,8 @@
 import org.bukkit.permissions.Permission;
 import org.bukkit.util.Vector;
 
-import org.mvplugins.multiverse.core.world.MultiverseWorld;
-import org.mvplugins.multiverse.core.world.WorldManager;
+import org.mvplugins.multiverse.core.api.world.MultiverseWorld;
+import org.mvplugins.multiverse.core.api.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;