refactor!: Rename back to MVWorldManager

src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java

@@ -26,7 +26,7 @@
 import com.onarandombox.MultiverseCore.api.MVCore;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.api.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.commands.CheckCommand;
 import com.onarandombox.MultiverseCore.commands.CloneCommand;
 import com.onarandombox.MultiverseCore.commands.ConfirmCommand;
@@ -62,7 +62,7 @@
 import com.onarandombox.MultiverseCore.utils.TestingMode;
 import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper;
 import com.onarandombox.MultiverseCore.utils.metrics.MetricsConfigurator;
-import com.onarandombox.MultiverseCore.world.SimpleWorldManager;
+import com.onarandombox.MultiverseCore.world.SimpleMVWorldManager;
 import com.onarandombox.MultiverseCore.world.WorldProperties;
 import me.main__.util.SerializationConfig.SerializationConfig;
 import org.bukkit.configuration.Configuration;
@@ -91,7 +91,7 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
     private final MVPermissions mvPermissions = new MVPermissions(this);
     private SafeTTeleporter safeTTeleporter = new SimpleSafeTTeleporter(this);
     private final UnsafeCallWrapper unsafeCallWrapper = new UnsafeCallWrapper(this);
-    private final WorldManager worldManager = new SimpleWorldManager(this);
+    private final MVWorldManager worldManager = new SimpleMVWorldManager(this);
 
     // Configurations
     private FileConfiguration multiverseConfig;
@@ -333,7 +333,7 @@ public String getAuthors() {
      * {@inheritDoc}
      */
     @Override
-    public MVCommandManager getCommandManager() {
+    public MVCommandManager getMVCommandManager() {
         return this.commandManager;
     }
 
@@ -373,7 +373,7 @@ public DestinationsProvider getDestinationsProvider() {
      * {@inheritDoc}
      */
     @Override
-    public WorldManager getMVWorldManager() {
+    public MVWorldManager getMVWorldManager() {
         return this.worldManager;
     }
 

src/main/java/com/onarandombox/MultiverseCore/api/MVCore.java

@@ -72,7 +72,7 @@ public interface MVCore extends MVPlugin {
      *
      * @return A non-null {@link MVCommandManager}.
      */
-    MVCommandManager getCommandManager();
+    MVCommandManager getMVCommandManager();
 
     /**
      * Gets the class responsible for loading many different destinations
@@ -85,9 +85,9 @@ public interface MVCore extends MVPlugin {
     /**
      * Gets the primary class responsible for managing Multiverse Worlds.
      *
-     * @return {@link WorldManager}.
+     * @return {@link MVWorldManager}.
      */
-    WorldManager getMVWorldManager();
+    MVWorldManager getMVWorldManager();
 
     /**
      * Saves the Multiverse-Config.

src/main/java/com/onarandombox/MultiverseCore/api/WorldManager.java → src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java

@@ -24,7 +24,7 @@
  * This API contains all of the world managing
  * functions that your heart desires!
  */
-public interface WorldManager {
+public interface MVWorldManager {
     /**
      * Add a new World to the Multiverse Setup.
      *
@@ -224,7 +224,7 @@ boolean addWorld(String name, Environment env, String seedString, WorldType type
     /**
      * Gets the {@link WorldPurger}.
      * <p>
-     * @return The {@link WorldPurger} this {@link WorldManager} is using.
+     * @return The {@link WorldPurger} this {@link MVWorldManager} is using.
      * @see WorldPurger
      * @see SimpleWorldPurger
      */

src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java

@@ -18,6 +18,6 @@ public ConfirmCommand(@NotNull MultiverseCore plugin) {
     @CommandPermission("multiverse.core.confirm")
     @Description("Confirms dangerous commands before executing them.")
     public void onConfirmCommand(@NotNull BukkitCommandIssuer issuer) {
-        this.plugin.getCommandManager().getCommandQueueManager().runQueuedCommand(issuer.getIssuer());
+        this.plugin.getMVCommandManager().getCommandQueueManager().runQueuedCommand(issuer.getIssuer());
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java

@@ -33,7 +33,7 @@ public void onDeleteCommand(BukkitCommandIssuer issuer,
                                 @Description("The world you want to delete.")
                                 String worldName
     ) {
-        this.plugin.getCommandManager().getCommandQueueManager().addToQueue(new QueuedCommand(
+        this.plugin.getMVCommandManager().getCommandQueueManager().addToQueue(new QueuedCommand(
                 issuer.getIssuer(),
                 () -> {
                     issuer.sendMessage(String.format("Deleting world '%s'...", worldName));

src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java

@@ -2,7 +2,7 @@
 
 import co.aikar.commands.BaseCommand;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
 import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagsManager;
 import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
@@ -13,15 +13,15 @@
  */
 public class MultiverseCommand extends BaseCommand {
     protected final MultiverseCore plugin;
-    protected final WorldManager worldManager;
+    protected final MVWorldManager worldManager;
     protected final CommandFlagsManager flagsManager;
 
     private String flagGroupName;
 
     protected MultiverseCommand(@NotNull MultiverseCore plugin) {
         this.plugin = plugin;
         this.worldManager = plugin.getMVWorldManager();
-        this.flagsManager = plugin.getCommandManager().getFlagsManager();
+        this.flagsManager = plugin.getMVCommandManager().getFlagsManager();
     }
 
     protected void registerFlagGroup(@NotNull CommandFlagGroup flagGroup) {

src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java

@@ -57,7 +57,7 @@ public void onRegenCommand(BukkitCommandIssuer issuer,
     ) {
         ParsedCommandFlags parsedFlags = parseFlags(flags);
 
-        this.plugin.getCommandManager().getCommandQueueManager().addToQueue(new QueuedCommand(
+        this.plugin.getMVCommandManager().getCommandQueueManager().addToQueue(new QueuedCommand(
                 issuer.getIssuer(),
                 () -> {
                     issuer.sendMessage(String.format("Regenerating world '%s'...", worldName));

src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java

@@ -10,13 +10,13 @@
 import co.aikar.commands.PaperCommandCompletions;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorld;
-import com.onarandombox.MultiverseCore.api.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import org.jetbrains.annotations.NotNull;
 
 public class MVCommandCompletions extends PaperCommandCompletions {
     protected final MVCommandManager commandManager;
     private final MultiverseCore plugin;
-    private final WorldManager worldManager;
+    private final MVWorldManager worldManager;
 
     public MVCommandCompletions(MVCommandManager mvCommandManager, MultiverseCore plugin) {
         super(mvCommandManager);

src/main/java/com/onarandombox/MultiverseCore/listeners/MVChatListener.java

@@ -1,7 +1,7 @@
 package com.onarandombox.MultiverseCore.listeners;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 
 import org.bukkit.ChatColor;
@@ -14,7 +14,7 @@
  */
 public class MVChatListener implements Listener {
     private final MultiverseCore plugin;
-    private final WorldManager worldManager;
+    private final MVWorldManager worldManager;
     private final MVPlayerListener playerListener;
 
     public MVChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {

src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java

@@ -9,7 +9,7 @@
 
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import org.bukkit.World;
 import org.bukkit.entity.EntityType;
@@ -28,7 +28,7 @@
  */
 public class MVEntityListener implements Listener {
     private MultiverseCore plugin;
-    private WorldManager worldManager;
+    private MVWorldManager worldManager;
 
     public MVEntityListener(MultiverseCore plugin) {
         this.plugin = plugin;

src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java

@@ -12,7 +12,7 @@
 
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import com.onarandombox.MultiverseCore.event.MVRespawnEvent;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
@@ -37,7 +37,7 @@
  */
 public class MVPlayerListener implements Listener {
     private final MultiverseCore plugin;
-    private final WorldManager worldManager;
+    private final MVWorldManager worldManager;
     private final PermissionTools pt;
 
     private final Map<String, String> playerWorld = new ConcurrentHashMap<String, String>();

src/main/java/com/onarandombox/MultiverseCore/listeners/MVWorldListener.java

@@ -8,7 +8,7 @@
 package com.onarandombox.MultiverseCore.listeners;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import org.bukkit.World;
 import org.bukkit.event.EventHandler;
@@ -21,7 +21,7 @@
  */
 public class MVWorldListener implements Listener {
     private MultiverseCore plugin;
-    private WorldManager worldManager;
+    private MVWorldManager worldManager;
 
     public MVWorldListener(MultiverseCore plugin) {
         this.plugin = plugin;

src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java

@@ -12,7 +12,7 @@
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.api.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -27,7 +27,7 @@
 public class MVPermissions {
 
     private MultiverseCore plugin;
-    private WorldManager worldMgr;
+    private MVWorldManager worldMgr;
 
     public MVPermissions(MultiverseCore plugin) {
         this.plugin = plugin;

src/main/java/com/onarandombox/MultiverseCore/utils/metrics/MetricsConfigurator.java

@@ -6,7 +6,7 @@
 
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import org.apache.commons.lang.WordUtils;
 import org.bstats.bukkit.Metrics;
@@ -30,7 +30,7 @@ private MetricsConfigurator(MultiverseCore plugin) {
         this.metrics = new Metrics(plugin, PLUGIN_ID);
     }
 
-    private WorldManager getWorldManager() {
+    private MVWorldManager getWorldManager() {
         return plugin.getMVWorldManager();
     }
 

src/main/java/com/onarandombox/MultiverseCore/world/SimpleWorldManager.java → src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorldManager.java

@@ -27,7 +27,7 @@
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.MultiverseCoreConfiguration;
-import com.onarandombox.MultiverseCore.api.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.api.WorldPurger;
@@ -52,7 +52,7 @@
 /**
  * Public facing API to add/remove Multiverse worlds.
  */
-public class SimpleWorldManager implements WorldManager {
+public class SimpleMVWorldManager implements MVWorldManager {
     private final MultiverseCore plugin;
     private final WorldPurger worldPurger;
     private final Map<String, MVWorld> worlds;
@@ -61,7 +61,7 @@ public class SimpleWorldManager implements WorldManager {
     private Map<String, String> defaultGens;
     private String firstSpawn;
 
-    public SimpleWorldManager(MultiverseCore core) {
+    public SimpleMVWorldManager(MultiverseCore core) {
         this.plugin = core;
         this.worldsFromTheConfig = new HashMap<String, WorldProperties>();
         this.worlds = new ConcurrentHashMap<String, MVWorld>();
@@ -968,8 +968,8 @@ private <T> boolean setGameRuleValue(World world, GameRule<T> gameRule, Object v
     }
 
     /**
-     * Gets the {@link FileConfiguration} that this {@link SimpleWorldManager} is using.
-     * @return The {@link FileConfiguration} that this {@link SimpleWorldManager} is using.
+     * Gets the {@link FileConfiguration} that this {@link SimpleMVWorldManager} is using.
+     * @return The {@link FileConfiguration} that this {@link SimpleMVWorldManager} is using.
      */
     public FileConfiguration getConfigWorlds() {
         return this.configWorlds;

src/test/java/com/onarandombox/MultiverseCore/TestEntitySpawnRules.java

@@ -1,6 +1,6 @@
 package com.onarandombox.MultiverseCore;
 
-import com.onarandombox.MultiverseCore.api.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
 import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
@@ -55,7 +55,7 @@ public void setUp() throws Exception {
         cbworld = MockWorldFactory.makeNewMockWorld("world", World.Environment.NORMAL, WorldType.NORMAL);
         when(mvWorld.getCBWorld()).thenReturn(cbworld);
 
-        WorldManager worldman = mock(WorldManager.class);
+        MVWorldManager worldman = mock(MVWorldManager.class);
         when(worldman.isMVWorld(anyString())).thenReturn(true);
         when(worldman.getMVWorld(anyString())).thenReturn(mvWorld);
         Field worldmanfield = MVEntityListener.class.getDeclaredField("worldManager");

src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java

@@ -9,7 +9,7 @@
 
 import java.io.File;
 
-import com.onarandombox.MultiverseCore.api.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import com.onarandombox.MultiverseCore.world.configuration.SpawnLocation;
 import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
@@ -125,7 +125,7 @@ public void test() throws Exception {
         // ////////////////////////////////////////////////
         // let's set some world-properties
         // we can test the API with this, too :D
-        WorldManager worldManager = core.getMVWorldManager();
+        MVWorldManager worldManager = core.getMVWorldManager();
         assertNotNull(worldManager);
 
         MVWorld mvWorld = worldManager.getMVWorld("world");

src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java

@@ -13,7 +13,7 @@
 import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
 import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
 import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
-import com.onarandombox.MultiverseCore.world.SimpleWorldManager;
+import com.onarandombox.MultiverseCore.world.SimpleMVWorldManager;
 import junit.framework.Assert;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -218,7 +218,7 @@ public Integer answer(InvocationOnMock invocation) throws Throwable {
             buscriptfield.set(core, buscript);
 
             // Set worldManager
-            SimpleWorldManager wm = spy(new SimpleWorldManager(core));
+            SimpleMVWorldManager wm = spy(new SimpleMVWorldManager(core));
             Field worldmanagerfield = MultiverseCore.class.getDeclaredField("worldManager");
             worldmanagerfield.setAccessible(true);
             worldmanagerfield.set(core, wm);