From 7757067a5b57827d79432d4458a1118cb4f72ca4 Mon Sep 17 00:00:00 2001 From: Ben Woo <30431861+benwoo1110@users.noreply.github.com> Date: Thu, 9 Feb 2023 13:56:16 +0800 Subject: [PATCH] refactor!: Rename back to MVWorldManager --- .../api/{WorldManager.java => MVWorldManager.java} | 4 ++-- .../MultiverseCore/commands/MultiverseCommand.java | 4 ++-- .../MultiverseCore/listeners/MVPlayerListener.java | 4 ++-- ...mpleWorldManager.java => SimpleMVWorldManager.java} | 10 +++++----- .../MultiverseCore/TestWorldProperties.java | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) rename src/main/java/com/onarandombox/MultiverseCore/api/{WorldManager.java => MVWorldManager.java} (99%) rename src/main/java/com/onarandombox/MultiverseCore/world/{SimpleWorldManager.java => SimpleMVWorldManager.java} (99%) diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/WorldManager.java b/src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/api/WorldManager.java rename to src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java index 825c1a25a..98b7c7c83 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/WorldManager.java +++ b/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}. *

- * @return The {@link WorldPurger} this {@link WorldManager} is using. + * @return The {@link WorldPurger} this {@link MVWorldManager} is using. * @see WorldPurger * @see SimpleWorldPurger */ diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java index 08ccb1353..2c2deaa27 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java +++ b/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,7 +13,7 @@ */ public class MultiverseCommand extends BaseCommand { protected final MultiverseCore plugin; - protected final WorldManager worldManager; + protected final MVWorldManager worldManager; protected final CommandFlagsManager flagsManager; private String flagGroupName; diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java index 3937f1c8a..54f76a82f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java +++ b/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 playerWorld = new ConcurrentHashMap(); diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/SimpleWorldManager.java b/src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorldManager.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/world/SimpleWorldManager.java rename to src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorldManager.java index 873724b41..214f34962 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/world/SimpleWorldManager.java +++ b/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 worlds; @@ -61,7 +61,7 @@ public class SimpleWorldManager implements WorldManager { private Map defaultGens; private String firstSpawn; - public SimpleWorldManager(MultiverseCore core) { + public SimpleMVWorldManager(MultiverseCore core) { this.plugin = core; this.worldsFromTheConfig = new HashMap(); this.worlds = new ConcurrentHashMap(); @@ -968,8 +968,8 @@ private boolean setGameRuleValue(World world, GameRule 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; diff --git a/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java b/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java index 09100f92e..4c7c701f1 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java +++ b/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");