Update src/main/java/com/onarandombox/MultiverseCore/utils/WorldManager.java

Co-authored-by: montlikadani <montlikada@gmail.com>

pom.xml

@@ -215,7 +215,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.1.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -264,19 +264,13 @@
             <plugin>
                 <groupId>se.eris</groupId>
                 <artifactId>notnull-instrumenter-maven-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>0.6.8</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>instrument</goal>
                             <goal>tests-instrument</goal>
                         </goals>
-                        <configuration>
-                            <notNull>
-                                <param>org.jetbrains.annotations.NotNull</param>
-                                <param>javax.validation.constraints.NotNull</param>
-                            </notNull>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -325,7 +319,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.8</version>
+            <version>1.7</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>
@@ -359,21 +353,21 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.0</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-easymock</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.0</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito2</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.0</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>

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

@@ -214,7 +214,7 @@ public class MVWorld implements MultiverseWorld {
         public Double validateChange(String property, Double newValue, Double oldValue,
                 MVWorld object) throws ChangeDeniedException {
             if (newValue <= 0) {
-                Logging.fine("Someone tried to set a scale <= 0, aborting!");
+                plugin.log(Level.FINE, "Someone tried to set a scale <= 0, aborting!");
                 throw new ChangeDeniedException();
             }
             return super.validateChange(property, newValue, oldValue, object);
@@ -297,7 +297,7 @@ public class MVWorld implements MultiverseWorld {
         public GameMode validateChange(String property, GameMode newValue, GameMode oldValue,
                 MVWorld object) throws ChangeDeniedException {
             for (Player p : plugin.getServer().getWorld(getName()).getPlayers()) {
-                Logging.finer(String.format("Setting %s's GameMode to %s",
+                plugin.log(Level.FINER, String.format("Setting %s's GameMode to %s",
                         p.getName(), newValue.toString()));
                 plugin.getPlayerListener().handleGameModeAndFlight(p, MVWorld.this);
             }
@@ -319,16 +319,16 @@ public class MVWorld implements MultiverseWorld {
                 // verify that the location is safe
                 if (!bs.playerCanSpawnHereSafely(newValue)) {
                     // it's not ==> find a better one!
-                    Logging.warning(String.format("Somebody tried to set the spawn location for '%s' to an unsafe value! Adjusting...", getAlias()));
-                    Logging.warning("Old Location: " + plugin.getLocationManipulation().strCoordsRaw(oldValue));
-                    Logging.warning("New (unsafe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
+                    plugin.log(Level.WARNING, String.format("Somebody tried to set the spawn location for '%s' to an unsafe value! Adjusting...", getAlias()));
+                    plugin.log(Level.WARNING, "Old Location: " + plugin.getLocationManipulation().strCoordsRaw(oldValue));
+                    plugin.log(Level.WARNING, "New (unsafe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
                     SafeTTeleporter teleporter = plugin.getSafeTTeleporter();
                     newValue = teleporter.getSafeLocation(newValue, SPAWN_LOCATION_SEARCH_TOLERANCE, SPAWN_LOCATION_SEARCH_RADIUS);
                     if (newValue == null) {
-                        Logging.warning("Couldn't fix the location. I have to abort the spawn location-change :/");
+                        plugin.log(Level.WARNING, "Couldn't fix the location. I have to abort the spawn location-change :/");
                         throw new ChangeDeniedException();
                     }
-                    Logging.warning("New (safe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
+                    plugin.log(Level.WARNING, "New (safe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
                 }
             }
             return super.validateChange(property, newValue, oldValue, object);
@@ -411,7 +411,7 @@ public class MVWorld implements MultiverseWorld {
             // Add limit bypass to it's parent
             this.limitbypassperm.addParent("mv.bypass.playerlimit.*", true);
         } catch (IllegalArgumentException e) {
-            Logging.finer("Permissions nodes were already added for " + this.name);
+            this.plugin.log(Level.FINER, "Permissions nodes were already added for " + this.name);
         }
     }
 
@@ -422,16 +422,16 @@ public class MVWorld implements MultiverseWorld {
         // Verify that location was safe
         if (!bs.playerCanSpawnHereSafely(location)) {
             if (!this.getAdjustSpawn()) {
-                Logging.fine("Spawn location from world.dat file was unsafe!!");
-                Logging.fine("NOT adjusting spawn for '" + this.getAlias() + "' because you told me not to.");
-                Logging.fine("To turn on spawn adjustment for this world simply type:");
-                Logging.fine("/mvm set adjustspawn true " + this.getAlias());
+                this.plugin.log(Level.FINE, "Spawn location from world.dat file was unsafe!!");
+                this.plugin.log(Level.FINE, "NOT adjusting spawn for '" + this.getAlias() + "' because you told me not to.");
+                this.plugin.log(Level.FINE, "To turn on spawn adjustment for this world simply type:");
+                this.plugin.log(Level.FINE, "/mvm set adjustspawn true " + this.getAlias());
                 return location;
             }
             // If it's not, find a better one.
             SafeTTeleporter teleporter = this.plugin.getSafeTTeleporter();
-            Logging.warning("Spawn location from world.dat file was unsafe. Adjusting...");
-            Logging.warning("Original Location: " + plugin.getLocationManipulation().strCoordsRaw(location));
+            this.plugin.log(Level.WARNING, "Spawn location from world.dat file was unsafe. Adjusting...");
+            this.plugin.log(Level.WARNING, "Original Location: " + plugin.getLocationManipulation().strCoordsRaw(location));
             Location newSpawn = teleporter.getSafeLocation(location,
                     SPAWN_LOCATION_SEARCH_TOLERANCE, SPAWN_LOCATION_SEARCH_RADIUS);
             // I think we could also do this, as I think this is what Notch does.
@@ -450,7 +450,7 @@ public class MVWorld implements MultiverseWorld {
                             this.getName(), plugin.getLocationManipulation().locationToString(newerSpawn));
                     return newerSpawn;
                 } else {
-                    Logging.severe("Safe spawn NOT found!!!");
+                    this.plugin.log(Level.SEVERE, "Safe spawn NOT found!!!");
                 }
             }
         }

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

@@ -88,7 +88,6 @@ import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
 import com.onarandombox.MultiverseCore.listeners.MVWorldInitListener;
 import com.onarandombox.MultiverseCore.listeners.MVWorldListener;
 import com.onarandombox.MultiverseCore.utils.AnchorManager;
-import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
 import com.onarandombox.MultiverseCore.utils.MVEconomist;
 import com.onarandombox.MultiverseCore.utils.MVMessaging;
 import com.onarandombox.MultiverseCore.utils.MVPermissions;
@@ -255,8 +254,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         // Setup our SafeTTeleporter
         this.safeTTeleporter = new SimpleSafeTTeleporter(this);
         this.unsafeCallWrapper = new UnsafeCallWrapper(this);
-        // Setup our CompatibilityLayer
-        CompatibilityLayer.init();
     }
 
 
@@ -309,7 +306,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
             this.worldManager.loadDefaultWorlds();
             this.worldManager.loadWorlds(true);
         } else {
-            Logging.severe("Your configs were not loaded. Very little will function in Multiverse.");
+            this.log(Level.SEVERE, "Your configs were not loaded. Very little will function in Multiverse.");
         }
         this.anchorManager.loadAnchors();
 
@@ -356,16 +353,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
      * Initializes the buscript javascript library.
      */
     private void initializeBuscript() {
-        buscript = null;
-
-        if (this.getMVConfig().getEnableBuscript()) {
-            try {
-                buscript = new Buscript(this);
-                // Add global variable "multiverse" to javascript environment
-                buscript.setScriptVariable("multiverse", this);
-            } catch (NullPointerException e) {
-                Logging.warning("Buscript failed to load! The script command will be disabled!");
-            }
+        try {
+            buscript = new Buscript(this);
+            // Add global variable "multiverse" to javascript environment
+            buscript.setScriptVariable("multiverse", this);
+        } catch (NullPointerException e) {
+            buscript = null;
+            Logging.warning("Buscript failed to load! The script command will be disabled!");
         }
     }
 
@@ -389,7 +383,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         pm.registerEvents(this.entityListener, this);
         pm.registerEvents(this.weatherListener, this);
         pm.registerEvents(this.portalListener, this);
-        Logging.info(ChatColor.GREEN + "We are aware of the warning about the deprecated event. There is no alternative that allows us to do what we need to do and performance impact is negligible. It is safe to ignore.");
+        log(Level.INFO, ChatColor.GREEN + "We are aware of the warning about the deprecated event. There is no alternative that allows us to do what we need to do and performance impact is negligible. It is safe to ignore.");
         pm.registerEvents(this.worldListener, this);
         pm.registerEvents(new MVMapListener(this), this);
     }
@@ -508,13 +502,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         try {
             wconf.load(worldsFile);
         } catch (IOException e) {
-            Logging.warning("Cannot load worlds.yml");
+            log(Level.WARNING, "Cannot load worlds.yml");
         } catch (InvalidConfigurationException e) {
-            Logging.warning("Your worlds.yml is invalid!");
+            log(Level.WARNING, "Your worlds.yml is invalid!");
         }
 
         if (!wconf.isConfigurationSection("worlds")) { // empty config
-            Logging.fine("No worlds to migrate!");
+            this.log(Level.FINE, "No worlds to migrate!");
             return;
         }
 
@@ -527,7 +521,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                 // fine
                 newValues.put(entry.getKey(), entry.getValue());
             } else if (entry.getValue() instanceof ConfigurationSection) {
-                Logging.fine("Migrating: " + entry.getKey());
+                this.log(Level.FINE, "Migrating: " + entry.getKey());
                 // we have to migrate this
                 WorldProperties world = new WorldProperties(Collections.EMPTY_MAP);
                 ConfigurationSection section = (ConfigurationSection) entry.getValue();
@@ -693,8 +687,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                     try {
                         difficulty = Difficulty.valueOf(section.getString("difficulty").toUpperCase());
                     } catch (IllegalArgumentException e) {
-                        Logging.warning("Could not parse difficulty: " + section.getString("difficulty"));
-                        Logging.warning("Setting world " + entry.getKey() + " difficulty to NORMAL");
+                        this.log(Level.WARNING, "Could not parse difficulty: " + section.getString("difficulty"));
+                        this.log(Level.WARNING, "Setting world " + entry.getKey() + " difficulty to NORMAL");
                         difficulty = Difficulty.NORMAL;
                     }
                     if (difficulty != null) {
@@ -711,7 +705,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                 wasChanged = true;
             } else {
                 // huh?
-                Logging.warning("Removing unknown entry in the config: " + entry);
+                this.log(Level.WARNING, "Removing unknown entry in the config: " + entry);
                 // just don't add to newValues
                 wasChanged = true;
             }
@@ -845,12 +839,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
     /**
      * {@inheritDoc}
-     *
-     * @deprecated This is now deprecated, nobody needs it any longer.
-     * All logging is now done with {@link Logging}.
      */
     @Override
-    @Deprecated
     public void log(Level level, String msg) {
         Logging.log(level, msg);
     }
@@ -1069,7 +1059,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
             this.multiverseConfig.save(new File(getDataFolder(), "config.yml"));
             return true;
         } catch (IOException e) {
-            Logging.severe("Could not save Multiverse config.yml config. Please check your file permissions.");
+            this.log(Level.SEVERE, "Could not save Multiverse config.yml config. Please check your file permissions.");
             return false;
         }
     }

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

@@ -56,8 +56,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     @Property
     private volatile boolean displaypermerrors;
     @Property
-    private volatile boolean enablebuscript;
-    @Property
     private volatile int globaldebug;
     @Property
     private volatile boolean silentstart;
@@ -101,7 +99,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         teleportintercept = true;
         firstspawnoverride = true;
         displaypermerrors = true;
-        enablebuscript = true;
         globaldebug = 0;
         messagecooldown = 5000;
         teleportcooldown = 1000;
@@ -216,22 +213,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         return this.displaypermerrors;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getEnableBuscript() {
-        return this.enablebuscript;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setEnableBuscript(boolean enableBuscript) {
-        this.enablebuscript = enableBuscript;
-    }
-
     /**
      * {@inheritDoc}
      */

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

@@ -7,17 +7,11 @@
 
 package com.onarandombox.MultiverseCore.api;
 
-import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.Server;
 
 import java.util.logging.Level;
 
-/**
- * A simple API to require plugins to have a log method.
- *
- * @deprecated Replaced by {@link Logging}.
- * */
-@Deprecated
+/** A simple API to require plugins to have a log method. */
 public interface LoggablePlugin {
     /**
      * Logs a message at the specified level.

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

@@ -86,18 +86,6 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      */
     boolean getDisplayPermErrors();
 
-    /**
-     * Sets enableBuscript.
-     * @param enableBuscript The new value.
-     */
-    void setEnableBuscript(boolean enableBuscript);
-
-    /**
-     * Gets enableBuscript.
-     * @return enableBuscript.
-     */
-    boolean getEnableBuscript();
-
     /**
      * Sets firstSpawnOverride.
      * @param firstSpawnOverride The new value.

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

@@ -37,7 +37,7 @@ public class CheckCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        Player p = this.plugin.getServer().getPlayerExact(args.get(0));
+        Player p = this.plugin.getServer().getPlayer(args.get(0));
         if (p == null) {
             sender.sendMessage("Could not find player " + ChatColor.GREEN + args.get(0));
             sender.sendMessage("Are they online?");

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

@@ -8,12 +8,7 @@
 package com.onarandombox.MultiverseCore.commands;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.Core;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagParseFailedException;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
@@ -31,16 +26,7 @@ import java.util.List;
  * Creates a new world and loads it.
  */
 public class CreateCommand extends MultiverseCommand {
-
-    private static final FlagGroup FLAG_GROUP = FlagGroup.of(
-            CoreFlags.SEED,
-            CoreFlags.WORLD_TYPE,
-            CoreFlags.GENERATOR,
-            CoreFlags.GENERATE_STRUCTURES,
-            CoreFlags.SPAWN_ADJUST
-    );
-
-    private final MVWorldManager worldManager;
+    private MVWorldManager worldManager;
 
     public CreateCommand(MultiverseCore plugin) {
         super(plugin);
@@ -64,7 +50,22 @@ public class CreateCommand extends MultiverseCommand {
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
         String worldName = args.get(0);
+        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
         String env = args.get(1);
+        String seed = CommandHandler.getFlag("-s", args);
+        String generator = CommandHandler.getFlag("-g", args);
+        boolean allowStructures = true;
+        String structureString = CommandHandler.getFlag("-a", args);
+        if (structureString != null) {
+            allowStructures = Boolean.parseBoolean(structureString);
+        }
+        String typeString = CommandHandler.getFlag("-t", args);
+        boolean useSpawnAdjust = true;
+        for (String s : args) {
+            if (s.equalsIgnoreCase("-n")) {
+                useSpawnAdjust = false;
+            }
+        }
 
         if (this.worldManager.isMVWorld(worldName)) {
             sender.sendMessage(ChatColor.RED + "Multiverse cannot create " + ChatColor.GOLD + ChatColor.UNDERLINE
@@ -72,7 +73,6 @@ public class CreateCommand extends MultiverseCommand {
             return;
         }
 
-        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
         if (worldFile.exists()) {
             sender.sendMessage(ChatColor.RED + "A Folder/World already exists with this name!");
             sender.sendMessage(ChatColor.RED + "If you are confident it is a world you can import with /mvimport");
@@ -86,28 +86,35 @@ public class CreateCommand extends MultiverseCommand {
             return;
         }
 
-        FlagResult flags;
-        try {
-            flags = FLAG_GROUP.calculateResult(args.subList(2, args.size()).toArray(new String[0]));
-        } catch (FlagParseFailedException e) {
-            sender.sendMessage(String.format("%sError: %s", ChatColor.RED, e.getMessage()));
+        // If they didn't specify a type, default to NORMAL
+        if (typeString == null) {
+            typeString = "NORMAL";
+        }
+        WorldType type = EnvironmentCommand.getWorldTypeFromString(typeString);
+        if (type == null) {
+            sender.sendMessage(ChatColor.RED + "That is not a valid World Type.");
+            EnvironmentCommand.showWorldTypes(sender);
             return;
         }
-
+        // Determine if the generator is valid. #918
+        if (generator != null) {
+            List<String> genarray = new ArrayList<String>(Arrays.asList(generator.split(":")));
+            if (genarray.size() < 2) {
+                // If there was only one arg specified, pad with another empty one.
+                genarray.add("");
+            }
+            if (this.worldManager.getChunkGenerator(genarray.get(0), genarray.get(1), "test") == null) {
+                // We have an invalid generator.
+                sender.sendMessage("Invalid generator! '" + generator + "'. " + ChatColor.RED + "Aborting world creation.");
+                return;
+            }
+        }
         Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'...");
 
-        if (this.worldManager.addWorld(
-                worldName,
-                environment,
-                flags.getValue(CoreFlags.SEED),
-                flags.getValue(CoreFlags.WORLD_TYPE),
-                flags.getValue(CoreFlags.GENERATE_STRUCTURES),
-                flags.getValue(CoreFlags.GENERATOR),
-                flags.getValue(CoreFlags.SPAWN_ADJUST))) {
-
+        if (this.worldManager.addWorld(worldName, environment, seed, type, allowStructures, generator, useSpawnAdjust)) {
             Command.broadcastCommandMessage(sender, "Complete!");
-            return;
+        } else {
+            Command.broadcastCommandMessage(sender, "FAILED.");
         }
-        Command.broadcastCommandMessage(sender, "FAILED.");
     }
 }

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

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.commands;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -61,7 +60,7 @@ public class DebugCommand extends MultiverseCommand {
             sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
         } else {
             sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel);
-            Logging.fine("Multiverse Debug ENABLED");
+            this.plugin.log(Level.FINE, "Multiverse Debug ENABLED");
         }
     }
 }

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

@@ -115,7 +115,6 @@ public class InfoCommand extends MultiverseCommand {
         FancyColorScheme colors = new FancyColorScheme(ChatColor.AQUA, ChatColor.AQUA, ChatColor.GOLD, ChatColor.WHITE);
         message.add(new FancyHeader("General Info", colors));
         message.add(new FancyMessage("World Name: ", world.getName(), colors));
-        message.add(new FancyMessage("World UID: ", world.getCBWorld().getUID().toString(), colors));
         message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
         message.add(new FancyMessage("Game Mode: ", world.getGameMode().toString(), colors));
         message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
@@ -152,7 +151,6 @@ public class InfoCommand extends MultiverseCommand {
         message = new ArrayList<FancyText>();
         message.add(new FancyHeader("More World Settings", colors));
         message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
-        message.add(new FancyMessage("Generator: ", world.getGenerator(), colors));
         message.add(new FancyMessage("Structures: ", world.getCBWorld().canGenerateStructures() + "", colors));
         message.add(new FancyMessage("Weather: ", world.isWeatherEnabled() + "", colors));
         message.add(new FancyMessage("Players will get hungry: ", world.getHunger() + "", colors));

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

@@ -50,7 +50,7 @@ public class SpawnCommand extends MultiverseCommand {
                 sender.sendMessage("You don't have permission to teleport another player to spawn. (multiverse.core.spawn.other)");
                 return;
             }
-            Player target = this.plugin.getServer().getPlayerExact(args.get(0));
+            Player target = this.plugin.getServer().getPlayer(args.get(0));
             if (target != null) {
                 target.sendMessage("Teleporting to this world's spawn...");
                 spawnAccurately(target);

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

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.commands;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.Teleporter;
 import com.onarandombox.MultiverseCore.api.MVDestination;
@@ -59,7 +58,7 @@ public class TeleportCommand extends MultiverseCommand {
         String destinationName;
 
         if (args.size() == 2) {
-            teleportee = this.plugin.getServer().getPlayerExact(args.get(0));
+            teleportee = this.plugin.getServer().getPlayer(args.get(0));
             if (teleportee == null) {
                 this.messaging.sendMessage(sender, String.format("Sorry, I couldn't find player: %s%s",
                         ChatColor.GOLD, args.get(0)), false);
@@ -95,7 +94,7 @@ public class TeleportCommand extends MultiverseCommand {
         MVTeleportEvent teleportEvent = new MVTeleportEvent(d, teleportee, teleporter, true);
         this.plugin.getServer().getPluginManager().callEvent(teleportEvent);
         if (teleportEvent.isCancelled()) {
-            Logging.fine("Someone else cancelled the MVTeleport Event!!!");
+            this.plugin.log(Level.FINE, "Someone else cancelled the MVTeleport Event!!!");
             return;
         }
 
@@ -163,9 +162,9 @@ public class TeleportCommand extends MultiverseCommand {
                 ((CustomTeleporterDestination)d).getTeleporter() : this.playerTeleporter;
         TeleportResult result = teleportObject.teleport(teleporter, teleportee, d);
         if (result == TeleportResult.FAIL_UNSAFE) {
-            Logging.fine("Could not teleport " + teleportee.getName()
+            this.plugin.log(Level.FINE, "Could not teleport " + teleportee.getName()
                     + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
-            Logging.fine("Queueing Command");
+            this.plugin.log(Level.FINE, "Queueing Command");
             Class<?>[] paramTypes = { CommandSender.class, Player.class, Location.class };
             List<Object> items = new ArrayList<Object>();
             items.add(teleporter);

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

@@ -64,7 +64,6 @@ public class VersionCommand extends MultiverseCommand {
                 + "[Multiverse-Core]   teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + '\n'
                 + "[Multiverse-Core]   firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + '\n'
                 + "[Multiverse-Core]   displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + '\n'
-                + "[Multiverse-Core]   enablebuscript: " + plugin.getMVConfig().getEnableBuscript() + '\n'
                 + "[Multiverse-Core]   globaldebug: " + plugin.getMVConfig().getGlobalDebug() + '\n'
                 + "[Multiverse-Core]   silentstart: " + plugin.getMVConfig().getSilentStart() + '\n'
                 + "[Multiverse-Core]   messagecooldown: " + plugin.getMessaging().getCooldown() + '\n'

src/main/java/com/onarandombox/MultiverseCore/commandtools/flag/CommandFlag.java

@@ -1,136 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * <p>Represents a flag that can be used in commands. This works as a key value pair.</p>
- *
- * <p>Key is the {@link #identifier} and {@link #aliases} set.</p>
- * <p>Value is the {@link T} parsed based on 3 scenarios during command input:</p>
- * <ol>
- *     <li>Flag completely not present. {@link #getDefaultValue()}</li>
- *     <li>Flag key present but no value. {@link #getValue()}</li>
- *     <li>Flag key and value present. {@link #getValue(String)}</li>
- * </ol>
- *
- * @param <T>   The flag Type.
- */
-public abstract class CommandFlag<T> {
-
-    protected final String name;
-    protected final String identifier;
-    protected final Class<T> type;
-    protected final Collection<String> aliases;
-
-    /**
-     * @param name          Readable name for the flag.
-     * @param identifier    Unique key to identify the flag in command arguments.
-     * @param type          The type of value this flag represents.
-     */
-    protected CommandFlag(@NotNull String name,
-                          @NotNull String identifier,
-                          @NotNull Class<T> type) {
-
-        this.name = name;
-        this.identifier = identifier;
-        this.type = type;
-        this.aliases = new ArrayList<>();
-    }
-
-    /**
-     * Gets name of the Command Flag.
-     *
-     * @return The Command Flag name.
-     */
-    @NotNull
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * Gets identifier of the Command Flag.
-     *
-     * @return The Command Flag identifier.
-     */
-    @NotNull
-    public String getIdentifier() {
-        return this.identifier;
-    }
-
-    /**
-     * Gets {@link T} Type of the Command Flag.
-     *
-     * @return The Command Flag type.
-     */
-    @NotNull
-    public Class<T> getType() {
-        return this.type;
-    }
-
-    /**
-     * Gets all the alternative key identifiers set for this Command Flag.
-     *
-     * @return Collection of aliases.
-     */
-    @NotNull
-    public Collection<String> getAliases() {
-        return this.aliases;
-    }
-
-    /**
-     * Add alternative key identifiers for this Command Flag.
-     *
-     * @param aliases   Alias(es) to be added.
-     * @return A {@link CommandFlag}.
-     */
-    public CommandFlag<T> addAliases(String...aliases) {
-        Collections.addAll(this.aliases, aliases);
-        return this;
-    }
-
-    /**
-     * Tab-complete suggestion for this Command Flag values.
-     *
-     * @return Collection of suggested values available.
-     */
-    public abstract Collection<String> suggestValue();
-
-    /**
-     * When this Command Flag can get value by a user input.
-     *
-     * @return The {@link T} value.
-     */
-    public abstract T getValue(@NotNull String input) throws FlagParseFailedException;
-
-    /**
-     * When this Command Flag user input value is null/not present.
-     *
-     * @return The {@link T} value.
-     */
-    public T getValue() throws FlagParseFailedException {
-        return null;
-    }
-
-    /**
-     * When this Command Flag is not present in command input.
-     *
-     * @return The {@link T} value.
-     */
-    public T getDefaultValue() {
-        return null;
-    }
-
-    @Override
-    public String toString() {
-        return "CommandFlag{" +
-                "name='" + name + '\'' +
-                ", identifier='" + identifier + '\'' +
-                ", type=" + type +
-                ", aliases=" + aliases +
-                '}';
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flag/CoreFlags.java

@@ -1,217 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
-import org.bukkit.Bukkit;
-import org.bukkit.WorldType;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.stream.Collectors;
-
-public class CoreFlags {
-
-    private static MultiverseCore multiverse;
-
-    public static void setCoreInstance(MultiverseCore plugin) {
-        multiverse = plugin;
-    }
-
-    /**
-     * Flag for custom seed.
-     */
-    public static final CommandFlag<String> SEED = new RequiredCommandFlag<String>
-            ("Seed", "--seed", String.class) {
-        @Override
-        public Collection<String> suggestValue() {
-            return Collections.singleton(String.valueOf(new Random().nextLong()));
-        }
-
-        @Override
-        public String getValue(@NotNull String input) throws FlagParseFailedException {
-            return input;
-        }
-    }.addAliases("-s");
-
-    /**
-     * Flag for custom seed. No value means random seed.
-     */
-    public static final CommandFlag<String> RANDOM_SEED = new OptionalCommandFlag<String>
-            ("Seed", "--seed", String.class) {
-        @Override
-        public Collection<String> suggestValue() {
-            return Collections.singletonList(String.valueOf(new Random().nextLong()));
-        }
-
-        @Override
-        public String getValue(@NotNull String input) throws FlagParseFailedException {
-            return input;
-        }
-    }.addAliases("-s");
-
-    /**
-     * Flag for world type used.
-     */
-    public static final CommandFlag<WorldType> WORLD_TYPE = new RequiredCommandFlag<WorldType>
-            ("WorldType", "--type", WorldType.class) {
-
-        private final Map<String, String> typeAlias = new HashMap<String, String>(4){{
-            put("normal", "NORMAL");
-            put("flat", "FLAT");
-            put("largebiomes", "LARGE_BIOMES");
-            put("amplified", "AMPLIFIED");
-        }};
-
-        @Override
-        public Collection<String> suggestValue() {
-            return typeAlias.keySet();
-        }
-
-        @Override
-        public WorldType getValue(@NotNull String input) throws FlagParseFailedException {
-            String typeName = typeAlias.getOrDefault(input, input);
-            try {
-                return WorldType.valueOf(input.toUpperCase());
-            }
-            catch (IllegalArgumentException e) {
-                throw new FlagParseFailedException("'%s' is not a valid World Type. See /mv env for available World Types.", input);
-            }
-        }
-
-        @Override
-        public WorldType getDefaultValue() {
-            return WorldType.NORMAL;
-        }
-    }.addAliases("-t");
-
-    /**
-     * Flag for world generator.
-     */
-    public static final CommandFlag<String> GENERATOR = new RequiredCommandFlag<String>
-            ("Generator", "--gen", String.class) {
-        @Override
-        public Collection<String> suggestValue() {
-            return Arrays.stream(Bukkit.getServer().getPluginManager().getPlugins())
-                    .filter(Plugin::isEnabled)
-                    .filter(plugin -> multiverse.getUnsafeCallWrapper().wrap(
-                            () -> plugin.getDefaultWorldGenerator("world", ""),
-                            plugin.getName(),
-                            "Get generator"
-                    ) != null)
-                    .map(plugin -> plugin.getDescription().getName())
-                    .collect(Collectors.toList());
-        }
-
-        @Override
-        public String getValue(@NotNull String input) throws FlagParseFailedException {
-            String[] genArray = input.split(":");
-            String generator = genArray[0];
-            String generatorId = (genArray.length > 1) ? genArray[1] : "";
-            try {
-                if (multiverse.getMVWorldManager().getChunkGenerator(generator, generatorId, "test") == null) {
-                    throw new Exception();
-                }
-            } catch (Exception e) {
-                throw new FlagParseFailedException("Invalid generator string '%s'. See /mv gens for available generators.", input);
-            }
-            return input;
-        }
-    }.addAliases("-g");
-
-    /**
-     * Flag to toggle if world should generate structures.
-     */
-    public static final CommandFlag<Boolean> GENERATE_STRUCTURES = new RequiredCommandFlag<Boolean>
-            ("GenerateStructures", "--structures", Boolean.class) {
-        @Override
-        public Collection<String> suggestValue() {
-            return Arrays.asList("true", "false");
-        }
-
-        @Override
-        public Boolean getValue(@NotNull String input) throws FlagParseFailedException {
-            return input.equalsIgnoreCase("true");
-        }
-
-        @Override
-        public Boolean getDefaultValue() {
-            return true;
-        }
-    }.addAliases("--structure", "-a");
-
-    /**
-     * Flag to toggle if world spawn should be adjusted.
-     */
-    public static final CommandFlag<Boolean> SPAWN_ADJUST = new NoValueCommandFlag<Boolean>
-            ("AdjustSpawn", "--dont-adjust-spawn", Boolean.class) {
-        @Override
-        public Boolean getValue() throws FlagParseFailedException {
-            return false;
-        }
-
-        @Override
-        public Boolean getDefaultValue() {
-            return true;
-        }
-    }.addAliases("-n");
-
-    /**
-     * Flag to specify a paste service.
-     */
-    public static final CommandFlag<PasteServiceType> PASTE_SERVICE_TYPE = new OptionalCommandFlag<PasteServiceType>
-            ("PasteServiceType", "--paste", PasteServiceType.class) {
-
-        private final List<String> pasteTypes = Arrays.stream(PasteServiceType.values())
-                .filter(pt -> pt != PasteServiceType.NONE)
-                .map(p -> p.toString().toLowerCase())
-                .collect(Collectors.toList());
-
-        @Override
-        public Collection<String> suggestValue() {
-            return pasteTypes;
-        }
-
-        @Override
-        public PasteServiceType getValue(@NotNull String input) throws FlagParseFailedException {
-            try {
-                return PasteServiceType.valueOf(input.toUpperCase());
-            }
-            catch (IllegalArgumentException e) {
-                throw new FlagParseFailedException(String.format("Invalid paste service type '%s'.", input));
-            }
-        }
-
-        @Override
-        public PasteServiceType getValue() throws FlagParseFailedException {
-            return PasteServiceType.PASTEGG;
-        }
-
-        @Override
-        public PasteServiceType getDefaultValue() {
-            return PasteServiceType.NONE;
-        }
-    }.addAliases("-p");
-
-    /**
-     * Flag to toggle if plugin list should be included.
-     */
-    public static final CommandFlag<Boolean> INCLUDE_PLUGIN_LIST = new NoValueCommandFlag<Boolean>
-            ("IncludePlugins", "--include-plugin-list", Boolean.class) {
-        @Override
-        public Boolean getValue() throws FlagParseFailedException {
-            return true;
-        }
-
-        @Override
-        public Boolean getDefaultValue() {
-            return true;
-        }
-    }.addAliases("-pl");
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flag/FlagGroup.java

@@ -1,96 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A group of {@link CommandFlag}, with indexed keys for efficient lookup.
- */
-public class FlagGroup {
-
-    /**
-     * Create a new Flag Group with multiple {@link CommandFlag}.
-     *
-     * @param flags Multiple flags.
-     * @return A new {@link FlagGroup} generated from the flags.
-     */
-    public static FlagGroup of(CommandFlag<?>...flags) {
-        return new FlagGroup(flags);
-    }
-
-    private final List<String> identifiers;
-    private final Map<String, CommandFlag<?>> keyMap;
-
-    /**
-     * Create a new Flag Group with multiple {@link CommandFlag}.
-     *
-     * @param commandFlags Array of flags
-     */
-    public FlagGroup(CommandFlag<?>[] commandFlags) {
-        this.identifiers = new ArrayList<>(commandFlags.length);
-        this.keyMap = new HashMap<>();
-        for (CommandFlag<?> flag : commandFlags) {
-            addFlag(flag);
-        }
-    }
-
-    /**
-     * Add and indexes a flag.
-     *
-     * @param flag  The flag to add.
-     */
-    private void addFlag(CommandFlag<?> flag) {
-        this.identifiers.add(flag.getIdentifier());
-        this.keyMap.put(flag.getIdentifier(), flag);
-        for (String flagAlias : flag.getAliases()) {
-            this.keyMap.put(flagAlias, flag);
-        }
-    }
-
-    /**
-     * Parse the arguments to get it's flag values.
-     *
-     * @param args  The arguments to parse.
-     * @return A {@link FlagResult} containing value results.
-     * @throws FlagParseFailedException When there is an error parsing, such as invalid format.
-     */
-    @NotNull
-    public FlagResult calculateResult(String[] args) throws FlagParseFailedException {
-        return FlagResult.parse(args,this);
-    }
-
-    /**
-     * Gets flag from pre-indexed key mapping.
-     *
-     * @param key   The target key.
-     * @return A {@link CommandFlag} if found, else null.
-     */
-    @Nullable
-    public CommandFlag<?> getByKey(String key) {
-        return this.keyMap.get(key);
-    }
-
-    /**
-     * Suggest possible identifiers available for this Flag Group.
-     *
-     * @return A collection of identifier strings.
-     */
-    @NotNull
-    public Collection<String> suggestIdentifiers() {
-        return identifiers;
-    }
-
-    @Override
-    public String toString() {
-        return "FlagGroup{" +
-                "flagIdentifiers=" + identifiers +
-                ", keyFlagMap=" + keyMap +
-                '}';
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flag/FlagParseFailedException.java

@@ -1,27 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-/**
- * Thrown when there is an issue with parsing flags from string arguments.
- */
-//TODO: extend this from ACF CommandArgumentFailed exception class.
-public class FlagParseFailedException extends Exception {
-
-    public FlagParseFailedException() {
-    }
-
-    public FlagParseFailedException(String message, Object...replacements) {
-        super(String.format(message, replacements));
-    }
-
-    public FlagParseFailedException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public FlagParseFailedException(Throwable cause) {
-        super(cause);
-    }
-
-    public FlagParseFailedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flag/FlagResult.java

@@ -1,198 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Represents the value result parsed from command arguments.
- */
-public class FlagResult {
-
-    /**
-     * Parse arguments into its flag key and values.
-     *
-     * @param args      The arguments to parse.
-     * @param flagGroup The flags available to parse into.
-     * @return The {@link FlagResult} from the parse.
-     * @throws FlagParseFailedException there is an issue with parsing flags from string arguments.
-     */
-    public static FlagResult parse(@Nullable String[] args,
-                                   @NotNull FlagGroup flagGroup) throws FlagParseFailedException {
-
-        FlagResult flagResult = new FlagResult();
-
-        // No args to parse.
-        if (args == null || args.length <= 0) {
-            return flagResult;
-        }
-
-        // First arg must be a flag.
-        CommandFlag<?> currentFlag = flagGroup.getByKey(args[0]);
-        boolean completed = false;
-
-        // Parse the arguments.
-        for (int i = 1, argsLength = args.length; i <= argsLength; i++) {
-            if (currentFlag == null) {
-                throw new FlagParseFailedException("%s is not a valid flag.", args[i-1]);
-            }
-            // This ensures that flag is not null during final parse.
-            if (i >= argsLength) {
-                break;
-            }
-
-            String arg = args[i];
-            if (arg == null) {
-                throw new FlagParseFailedException("Arguments cannot be null!");
-            }
-
-            CommandFlag<?> nextFlag = flagGroup.getByKey(arg);
-
-            // Arg must be a flag key.
-            if (currentFlag instanceof NoValueCommandFlag) {
-                flagResult.add(currentFlag, currentFlag.getValue(), false);
-                currentFlag = nextFlag;
-                continue;
-            }
-
-            // Arg can be a flag key or value.
-            if (currentFlag instanceof OptionalCommandFlag) {
-                if (nextFlag != null) {
-                    // It's a key.
-                    flagResult.add(currentFlag, currentFlag.getValue(), false);
-                    currentFlag = nextFlag;
-                    continue;
-                }
-                // It's a value.
-                flagResult.add(currentFlag, currentFlag.getValue(arg), true);
-                if (i == argsLength - 1) {
-                    completed = true;
-                    break;
-                }
-                currentFlag = flagGroup.getByKey(args[++i]);
-                continue;
-            }
-
-            // Arg must be a flag value.
-            if (currentFlag instanceof RequiredCommandFlag) {
-                if (nextFlag != null) {
-                    // It's a key, error!
-                    throw new FlagParseFailedException("%s flag '%s' requires a value input.",
-                            currentFlag.getName(), currentFlag.getIdentifier());
-                }
-                // It's a value.
-                flagResult.add(currentFlag, currentFlag.getValue(arg), true);
-                if (i == argsLength - 1) {
-                    completed = true;
-                    break;
-                }
-                currentFlag = flagGroup.getByKey(args[++i]);
-            }
-        }
-
-        // Parse last flag.
-        if (!completed) {
-            if (currentFlag instanceof RequiredCommandFlag) {
-                throw new FlagParseFailedException("%s flag '%s' requires a value input.",
-                        currentFlag.getName(), currentFlag.getIdentifier());
-            }
-            flagResult.add(currentFlag, currentFlag.getValue(), false);
-        }
-
-        return flagResult;
-    }
-
-    private final Map<CommandFlag<?>, SingleFlagResult<?>> resultMap;
-
-    private FlagResult() {
-        resultMap = new HashMap<>();
-    }
-
-    /**
-     * Add a new value result from parsing arguments.
-     *
-     * @param flag      The flag that the value represents.
-     * @param value     The value of the flag.
-     * @param fromInput Denotes if flag was parsed by a user input.
-     */
-    private void add(CommandFlag<?> flag, Object value, boolean fromInput) {
-        resultMap.put(flag, new SingleFlagResult<>(value, fromInput));
-    }
-
-    /**
-     * Gets value of a flag.
-     *
-     * @param flag  The flag to get value from.
-     * @param <T>   The type of value.
-     * @return The value which is associated with the flag.
-     */
-    public <T> T getValue(CommandFlag<T> flag) {
-        SingleFlagResult<?> result = resultMap.get(flag);
-        if (result == null) {
-            return flag.getDefaultValue();
-        }
-        return (T) result.value;
-    }
-
-    /**
-     * Gets if the flag value is by a user input.
-     *
-     * @param flag  The flag to check against.
-     * @return True if value is by user input, else false.
-     */
-    public boolean isByUserInput(CommandFlag<?> flag) {
-        SingleFlagResult<?> result = resultMap.get(flag);
-        if (result == null) {
-            return false;
-        }
-        return result.isFromUserInput;
-    }
-
-    /**
-     * Gets if the flag is a default value, and key was not present in user's command arguments.
-     * i.e. Not in the {@link #resultMap}.
-     *
-     * @param flag  The flag to check against.
-     * @return True if flag was not present in user's command arguments, else false.
-     */
-    public boolean isDefaulted(CommandFlag<?> flag) {
-        return resultMap.get(flag) != null;
-    }
-
-    @Override
-    public String toString() {
-        return "FlagResult{" +
-                "resultMap=" + resultMap +
-                '}';
-    }
-
-    /**
-     * Represents a single value result parsed.
-     * Stores value and addition data such as if value is by user input.
-     *
-     * @param <T>   The type of value.
-     */
-    private static class SingleFlagResult<T> {
-        private final T value;
-        private final boolean isFromUserInput;
-
-        /**
-         * @param value     The resultant value from argument parsing.
-         * @param fromInput Indicates if value is parsed by user input.
-         */
-        private SingleFlagResult(T value, boolean fromInput) {
-            this.value = value;
-            this.isFromUserInput = fromInput;
-        }
-
-        @Override
-        public String toString() {
-            return "SingleFlagResult{" +
-                    "value=" + value +
-                    ", isFromUserInput=" + isFromUserInput +
-                    '}';
-        }
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flag/NoValueCommandFlag.java

@@ -1,39 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * This flag will always not require a user input to parse value.
- *
- * @param <T>   The flag Type.
- */
-public abstract class NoValueCommandFlag<T> extends CommandFlag<T> {
-
-    /**
-     * {@inheritDoc}
-     */
-    public NoValueCommandFlag(String name, String identifier, Class<T> type) {
-        super(name, identifier, type);
-    }
-
-    /**
-     * {@link NoValueCommandFlag} will always not require a user input to parse value.
-     * Thus, no value suggestion needed.
-     */
-    @Override
-    public final Collection<String> suggestValue() {
-        return Collections.emptyList();
-    }
-
-    /**
-     * {@link NoValueCommandFlag} will always not require a user input to parse value.
-     * Thus, this operation is not allowed.
-     */
-    @Override
-    public final T getValue(@NotNull String input) throws FlagParseFailedException {
-        throw new FlagParseFailedException("%s flag '%s' does not require a value.", this.name, this.identifier);
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flag/OptionalCommandFlag.java

@@ -1,16 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-/**
- * Command Flag that optionally allows a user input value.
- *
- * @param <T>   The flag Type.
- */
-public abstract class OptionalCommandFlag<T> extends CommandFlag<T> {
-
-    /**
-     * {@inheritDoc}
-     */
-    public OptionalCommandFlag(String name, String identifier, Class<T> type) {
-        super(name, identifier, type);
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flag/RequiredCommandFlag.java

@@ -1,25 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-/**
- * This flag will always require a user input to parse value.
- *
- * @param <T>   The flag Type.
- */
-public abstract class RequiredCommandFlag<T> extends CommandFlag<T> {
-
-    /**
-     * {@inheritDoc}
-     */
-    public RequiredCommandFlag(String name, String identifier, Class<T> type) {
-        super(name, identifier, type);
-    }
-
-    /**
-     * {@link RequiredCommandFlag} will always require a user input to parse value.
-     * Thus, this operation is not allowed.
-     */
-    @Override
-    public final T getValue() throws FlagParseFailedException {
-        throw new FlagParseFailedException("%s flag '%s' requires a value input.", this.name, this.identifier);
-    }
-}

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

@@ -22,8 +22,6 @@ public class EntryFee extends SerializationConfig {
     @Nullable
     private Material currency;
 
-    private final Material DISABLED_MATERIAL = Material.AIR;
-
     public EntryFee() {
         super();
     }
@@ -53,9 +51,6 @@ public class EntryFee extends SerializationConfig {
      */
     @Nullable
     public Material getCurrency() {
-        if (currency == null || currency.equals(DISABLED_MATERIAL)) {
-            return null;
-        }
         return currency;
     }
 

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

@@ -50,7 +50,7 @@ public class PlayerDestination implements MVDestination {
      */
     @Override
     public Location getLocation(Entity e) {
-        Player p = plugin.getServer().getPlayerExact(this.player);
+        Player p = plugin.getServer().getPlayer(this.player);
         Player plLoc = null;
         if (e instanceof Player) {
             plLoc = (Player) e;

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

@@ -1,7 +0,0 @@
-package com.onarandombox.MultiverseCore.enums;
-
-public enum RespawnType {
-    BED,
-    ANCHOR,
-    OTHER
-}

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

@@ -9,7 +9,6 @@ package com.onarandombox.MultiverseCore.listeners;
 
 import java.util.logging.Level;
 
-import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 
@@ -21,7 +20,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 public class MVAsyncPlayerChatListener extends MVChatListener {
     public MVAsyncPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
         super(plugin, playerListener);
-        Logging.fine("Created AsyncPlayerChatEvent listener.");
+        plugin.log(Level.FINE, "Created AsyncPlayerChatEvent listener.");
     }
 
     /**

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

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.listeners;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
@@ -99,7 +98,7 @@ public class MVEntityListener implements Listener {
          * Handle people with non-standard animals: ie a patched craftbukkit.
          */
         if (type == null || type.getName() == null) {
-            Logging.finer("Found a null typed creature.");
+            this.plugin.log(Level.FINER, "Found a null typed creature.");
             return;
         }
 

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

@@ -9,7 +9,6 @@ package com.onarandombox.MultiverseCore.listeners;
 
 import java.util.logging.Level;
 
-import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerChatEvent;
 
@@ -22,7 +21,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 public class MVPlayerChatListener extends MVChatListener {
     public MVPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
         super(plugin, playerListener);
-        Logging.fine("Registered PlayerChatEvent listener.");
+        plugin.log(Level.FINE, "Registered PlayerChatEvent listener.");
     }
 
     /**

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

@@ -15,9 +15,7 @@ import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.enums.RespawnType;
 import com.onarandombox.MultiverseCore.event.MVRespawnEvent;
-import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -71,16 +69,9 @@ public class MVPlayerListener implements Listener {
             return;
         }
 
-        RespawnType respawnType = RespawnType.OTHER;
-        if (event.isBedSpawn()) {
-            respawnType = RespawnType.BED;
-        }
-        if (CompatibilityLayer.isAnchorSpawn(event)) {
-            respawnType = RespawnType.ANCHOR;
-        }
 
-        if (mvWorld.getBedRespawn() && (respawnType == RespawnType.BED || respawnType == RespawnType.ANCHOR)) {
-            Logging.fine("Spawning %s at their %s", event.getPlayer().getName(), respawnType);
+        if (mvWorld.getBedRespawn() && event.isBedSpawn()) {
+            this.plugin.log(Level.FINE, "Spawning " + event.getPlayer().getName() + " at their bed");
             return;
         }
 
@@ -119,15 +110,15 @@ public class MVPlayerListener implements Listener {
     public void playerJoin(PlayerJoinEvent event) {
         Player p = event.getPlayer();
         if (!p.hasPlayedBefore()) {
-            Logging.finer("Player joined for the FIRST time!");
+            this.plugin.log(Level.FINER, "Player joined for the FIRST time!");
             if (plugin.getMVConfig().getFirstSpawnOverride()) {
-                Logging.fine("Moving NEW player to(firstspawnoverride): "
+                this.plugin.log(Level.FINE, "Moving NEW player to(firstspawnoverride): "
                         + worldManager.getFirstSpawnWorld().getSpawnLocation());
                 this.sendPlayerToDefaultWorld(p);
             }
             return;
         } else {
-            Logging.finer("Player joined AGAIN!");
+            this.plugin.log(Level.FINER, "Player joined AGAIN!");
             if (this.plugin.getMVConfig().getEnforceAccess() // check this only if we're enforcing access!
                     && !this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + p.getWorld().getName(), false)) {
                 p.sendMessage("[MV] - Sorry you can't be in this world anymore!");
@@ -165,7 +156,7 @@ public class MVPlayerListener implements Listener {
      */
     @EventHandler(priority = EventPriority.HIGHEST)
     public void playerTeleport(PlayerTeleportEvent event) {
-        Logging.finer("Got teleport event for player '"
+        this.plugin.log(Level.FINER, "Got teleport event for player '"
                 + event.getPlayer().getName() + "' with cause '" + event.getCause() + "'");
         if (event.isCancelled()) {
             return;
@@ -175,25 +166,25 @@ public class MVPlayerListener implements Listener {
         String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName());
         if (teleporterName != null) {
             if (teleporterName.equals("CONSOLE")) {
-                Logging.finer("We know the teleporter is the console! Magical!");
+                this.plugin.log(Level.FINER, "We know the teleporter is the console! Magical!");
                 teleporter = this.plugin.getServer().getConsoleSender();
             } else {
-                teleporter = this.plugin.getServer().getPlayerExact(teleporterName);
+                teleporter = this.plugin.getServer().getPlayer(teleporterName);
             }
         }
-        Logging.finer("Inferred sender '" + teleporter + "' from name '"
+        this.plugin.log(Level.FINER, "Inferred sender '" + teleporter + "' from name '"
                 + teleporterName + "', fetched from name '" + teleportee.getName() + "'");
         MultiverseWorld fromWorld = this.worldManager.getMVWorld(event.getFrom().getWorld().getName());
         MultiverseWorld toWorld = this.worldManager.getMVWorld(event.getTo().getWorld().getName());
         if (toWorld == null) {
-            Logging.fine("Player '" + teleportee.getName() + "' is teleporting to world '"
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName() + "' is teleporting to world '"
                     + event.getTo().getWorld().getName() + "' which is not managed by Multiverse-Core.  No further "
                     + "actions will be taken by Multiverse-Core.");
             return;
         }
         if (event.getFrom().getWorld().equals(event.getTo().getWorld())) {
             // The player is Teleporting to the same world.
-            Logging.finer("Player '" + teleportee.getName() + "' is teleporting to the same world.");
+            this.plugin.log(Level.FINER, "Player '" + teleportee.getName() + "' is teleporting to the same world.");
             this.stateSuccess(teleportee.getName(), toWorld.getAlias());
             return;
         }
@@ -201,7 +192,7 @@ public class MVPlayerListener implements Listener {
         // Charge the teleporter
         event.setCancelled(!pt.playerHasMoneyToEnter(fromWorld, toWorld, teleporter, teleportee, true));
         if (event.isCancelled() && teleporter != null) {
-            Logging.fine("Player '" + teleportee.getName()
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                     + "' was DENIED ACCESS to '" + toWorld.getAlias()
                     + "' because '" + teleporter.getName()
                     + "' don't have the FUNDS required to enter it.");
@@ -212,14 +203,14 @@ public class MVPlayerListener implements Listener {
         if (plugin.getMVConfig().getEnforceAccess()) {
             event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, teleporter, teleportee));
             if (event.isCancelled() && teleporter != null) {
-                Logging.fine("Player '" + teleportee.getName()
+                this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                         + "' was DENIED ACCESS to '" + toWorld.getAlias()
                         + "' because '" + teleporter.getName()
                         + "' don't have: multiverse.access." + event.getTo().getWorld().getName());
                 return;
             }
         } else {
-            Logging.fine("Player '" + teleportee.getName()
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                     + "' was allowed to go to '" + toWorld.getAlias() + "' because enforceaccess is off.");
         }
 
@@ -229,7 +220,7 @@ public class MVPlayerListener implements Listener {
             if (toWorld.getCBWorld().getPlayers().size() >= toWorld.getPlayerLimit()) {
                 // Ouch the world is full, lets see if the player can bypass that limitation
                 if (!pt.playerCanBypassPlayerLimit(toWorld, teleporter, teleportee)) {
-                    Logging.fine("Player '" + teleportee.getName()
+                    this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                             + "' was DENIED ACCESS to '" + toWorld.getAlias()
                             + "' because the world is full and '" + teleporter.getName()
                             + "' doesn't have: mv.bypass.playerlimit." + event.getTo().getWorld().getName());
@@ -244,7 +235,7 @@ public class MVPlayerListener implements Listener {
     }
 
     private void stateSuccess(String playerName, String worldName) {
-        Logging.fine("MV-Core is allowing Player '" + playerName
+        this.plugin.log(Level.FINE, "MV-Core is allowing Player '" + playerName
                 + "' to go to '" + worldName + "'.");
     }
 
@@ -291,12 +282,12 @@ public class MVPlayerListener implements Listener {
         MultiverseWorld toWorld = this.worldManager.getMVWorld(event.getTo().getWorld().getName());
         if (event.getFrom().getWorld().equals(event.getTo().getWorld())) {
             // The player is Portaling to the same world.
-            Logging.finer("Player '" + event.getPlayer().getName() + "' is portaling to the same world.");
+            this.plugin.log(Level.FINER, "Player '" + event.getPlayer().getName() + "' is portaling to the same world.");
             return;
         }
         event.setCancelled(!pt.playerHasMoneyToEnter(fromWorld, toWorld, event.getPlayer(), event.getPlayer(), true));
         if (event.isCancelled()) {
-            Logging.fine("Player '" + event.getPlayer().getName()
+            this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
                     + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName()
                     + "' because they don't have the FUNDS required to enter.");
             return;
@@ -304,12 +295,12 @@ public class MVPlayerListener implements Listener {
         if (plugin.getMVConfig().getEnforceAccess()) {
             event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, event.getPlayer(), event.getPlayer()));
             if (event.isCancelled()) {
-                Logging.fine("Player '" + event.getPlayer().getName()
+                this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
                         + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName()
                         + "' because they don't have: multiverse.access." + event.getTo().getWorld().getName());
             }
         } else {
-            Logging.fine("Player '" + event.getPlayer().getName()
+            this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
                     + "' was allowed to go to '" + event.getTo().getWorld().getName()
                     + "' because enforceaccess is off.");
         }
@@ -320,7 +311,7 @@ public class MVPlayerListener implements Listener {
                     event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
                 }
             } catch (ClassNotFoundException ignore) {
-                Logging.fine("TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
+                plugin.log(Level.FINE, "TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
             }
 
         }
@@ -344,7 +335,7 @@ public class MVPlayerListener implements Listener {
         if (mvWorld != null) {
             this.handleGameModeAndFlight(player, mvWorld);
         } else {
-            Logging.finer("Not handling gamemode and flight for world '" + world.getName()
+            this.plugin.log(Level.FINER, "Not handling gamemode and flight for world '" + world.getName()
                     + "' not managed by Multiverse.");
         }
     }
@@ -385,7 +376,7 @@ public class MVPlayerListener implements Listener {
                                         player.getName(), player.getWorld().getName(), world.getName());
                             }
                         } else {
-                            Logging.fine("Player: " + player.getName() + " is IMMUNE to gamemode changes!");
+                            MVPlayerListener.this.plugin.log(Level.FINE, "Player: " + player.getName() + " is IMMUNE to gamemode changes!");
                         }
                     }
                 }, 1L);

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

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.listeners;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.Material;
@@ -57,7 +56,7 @@ public class MVPortalListener implements Listener {
     public void portalForm(PortalCreateEvent event) {
         MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getWorld());
         if (world != null && !world.getAllowedPortals().isPortalAllowed(PortalType.NETHER)) {
-            Logging.fine("Cancelling creation of nether portal because portalForm disallows.");
+            plugin.log(Level.FINE, "Cancelling creation of nether portal because portalForm disallows.");
             event.setCancelled(true);
         }
     }
@@ -80,7 +79,7 @@ public class MVPortalListener implements Listener {
         }
         MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getPlayer().getWorld());
         if (world != null && !world.getAllowedPortals().isPortalAllowed(PortalType.ENDER)) {
-            Logging.fine("Cancelling creation of ender portal because portalForm disallows.");
+            plugin.log(Level.FINE, "Cancelling creation of ender portal because portalForm disallows.");
             event.setCancelled(true);
         }
     }

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

@@ -74,7 +74,7 @@ public class AnchorManager {
             this.anchorConfig.save(new File(this.plugin.getDataFolder(), "anchors.yml"));
             return true;
         } catch (IOException e) {
-            Logging.severe("Failed to save anchors.yml. Please check your file permissions.");
+            this.plugin.log(Level.SEVERE, "Failed to save anchors.yml. Please check your file permissions.");
             return false;
         }
     }

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

@@ -2,7 +2,6 @@ package com.onarandombox.MultiverseCore.utils;
 
 import java.util.logging.Level;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.destination.CannonDestination;
 import org.bukkit.Location;
@@ -90,7 +89,7 @@ public class BukkitTravelAgent implements TravelAgent {
     private Location getSafeLocation() {
         // At this time, these can never use the velocity.
         if (agent.destination instanceof CannonDestination) {
-            Logging.fine("Using Stock TP method. This cannon will have 0 velocity");
+            agent.core.log(Level.FINE, "Using Stock TP method. This cannon will have 0 velocity");
         }
         SafeTTeleporter teleporter = agent.core.getSafeTTeleporter();
         Location newLoc = agent.destination.getLocation(agent.player);

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

@@ -1,46 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.Bukkit;
-import org.bukkit.event.player.PlayerRespawnEvent;
-
-import java.lang.reflect.Method;
-
-/**
- * A utility class to enable version specific minecraft features.
- */
-public class CompatibilityLayer {
-
-    private static Method checkAnchorSpawn;
-
-    /**
-     * Initialise the reflection methods.
-     */
-    public static void init() {
-        try {
-            checkAnchorSpawn = PlayerRespawnEvent.class.getDeclaredMethod("isAnchorSpawn");
-        } catch (NoSuchMethodException e) {
-            Logging.fine("%s does not support respawn anchors.", Bukkit.getVersion());
-        }
-    }
-
-    /**
-     * Check if the respawn point is of respawn anchor type.
-     * Introduced in minecraft 1.16
-     *
-     * @param event A player respawn event.
-     * @return If the respawn location is an anchor point.
-     */
-    public static boolean isAnchorSpawn(PlayerRespawnEvent event) {
-        if (checkAnchorSpawn == null) {
-            return false;
-        }
-        try {
-            return (boolean) checkAnchorSpawn.invoke(event);
-        } catch (Exception e) {
-            Logging.warning("Error checking for: %s", checkAnchorSpawn);
-            e.printStackTrace();
-        }
-        return false;
-    }
-}

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

@@ -72,11 +72,12 @@ public class FileUtils {
      * Helper method to copy the world-folder.
      * @param source Source-File
      * @param target Target-File
+     * @param log A logger that logs the operation
      *
      * @return true if it had success
      */
-    public static boolean copyFolder(File source, File target) {
-        return copyFolder(source, target, null);
+    public static boolean copyFolder(File source, File target, Logger log) {
+        return copyFolder(source, target, null, log);
     }
 
     /**
@@ -84,10 +85,11 @@ public class FileUtils {
      * @param source Source-File
      * @param target Target-File
      * @param excludeFiles files to ignore and not copy over to Target-File
+     * @param log A logger that logs the operation
      *
      * @return true if it had success
      */
-    public static boolean copyFolder(File source, File target, List<String> excludeFiles) {
+    public static boolean copyFolder(File source, File target, List<String> excludeFiles, Logger log) {
         Path sourceDir = source.toPath();
         Path targetDir = target.toPath();
 
@@ -95,7 +97,7 @@ public class FileUtils {
             Files.walkFileTree(sourceDir, new CopyDirFileVisitor(sourceDir, targetDir, excludeFiles));
             return true;
         } catch (IOException e) {
-            Logging.warning("Unable to copy directory", e);
+            log.log(Level.WARNING, "Unable to copy directory", e);
             return false;
         }
     }

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

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -101,7 +100,7 @@ public class MVPermissions implements PermissionsInterface {
     public boolean canEnterWorld(Player p, MultiverseWorld w) {
         // If we're not enforcing access, anyone can enter.
         if (!plugin.getMVConfig().getEnforceAccess()) {
-            Logging.finest("EnforceAccess is OFF. Player was allowed in " + w.getAlias());
+            this.plugin.log(Level.FINEST, "EnforceAccess is OFF. Player was allowed in " + w.getAlias());
             return true;
         }
         return this.hasPermission(p, "multiverse.access." + w.getName(), false);
@@ -258,14 +257,14 @@ public class MVPermissions implements PermissionsInterface {
 
         boolean hasPermission = sender.hasPermission(node);
         if (!sender.isPermissionSet(node)) {
-            Logging.finer(String.format("The node [%s%s%s] was %sNOT%s set for [%s%s%s].",
+            this.plugin.log(Level.FINER, String.format("The node [%s%s%s] was %sNOT%s set for [%s%s%s].",
                     ChatColor.RED, node, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE, ChatColor.AQUA,
                     player.getDisplayName(), ChatColor.WHITE));
         }
         if (hasPermission) {
-            Logging.finer("Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
+            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
         } else {
-            Logging.finer("Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
+            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
         }
         return hasPermission;
     }

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

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.Material;
@@ -196,7 +195,7 @@ public class PermissionTools {
      * @return True if they can't go to the world, False if they can.
      */
     public boolean playerCanGoFromTo(MultiverseWorld fromWorld, MultiverseWorld toWorld, CommandSender teleporter, Player teleportee) {
-        Logging.finest("Checking '" + teleporter + "' can send '" + teleportee + "' somewhere");
+        this.plugin.log(Level.FINEST, "Checking '" + teleporter + "' can send '" + teleportee + "' somewhere");
 
         Player teleporterPlayer;
         if (plugin.getMVConfig().getTeleportIntercept()) {

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

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 
@@ -87,7 +86,7 @@ public class PurgeWorlds {
         }
         int entitiesKilled = 0;
         for (Entity e : world.getEntities()) {
-            Logging.finest("Entity list (aval for purge) from WORLD < " + mvworld.getName() + " >: " + e.toString());
+            this.plugin.log(Level.FINEST, "Entity list (aval for purge) from WORLD < " + mvworld.getName() + " >: " + e.toString());
 
             // Check against Monsters
             if (killMonster(mvworld, e, thingsToKill, negateMonsters)) {
@@ -134,16 +133,16 @@ public class PurgeWorlds {
             entityName = e.toString().replaceAll("Craft", "").toUpperCase();
         }
         if (e instanceof Slime || e instanceof Monster || e instanceof Ghast || e instanceof EnderDragon) {
-            Logging.finest("Looking at a monster: " + e);
+            this.plugin.log(Level.FINEST, "Looking at a monster: " + e);
             if (creaturesToKill.contains(entityName) || creaturesToKill.contains("ALL") || creaturesToKill.contains("MONSTERS")) {
                 if (!negate) {
-                    Logging.finest("Removing a monster: " + e);
+                    this.plugin.log(Level.FINEST, "Removing a monster: " + e);
                     e.remove();
                     return true;
                 }
             } else {
                 if (negate) {
-                    Logging.finest("Removing a monster: " + e);
+                    this.plugin.log(Level.FINEST, "Removing a monster: " + e);
                     e.remove();
                     return true;
                 }

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

@@ -40,15 +40,6 @@ public class SimpleLocationManipulation implements LocationManipulation {
         orientationInts.put("w", 90);
         orientationInts.put("nw", 135);
 
-        orientationInts.put("north", 180);
-        orientationInts.put("northeast", 225);
-        orientationInts.put("east", 270);
-        orientationInts.put("southeast", 315);
-        orientationInts.put("south", 0);
-        orientationInts.put("southwest", 45);
-        orientationInts.put("west", 90);
-        orientationInts.put("northwest", 135);
-
         // "freeze" the map:
         ORIENTATION_INTS = Collections.unmodifiableMap(orientationInts);
         // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck

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

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.api.MVDestination;
@@ -59,9 +58,9 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
         if (safe != null) {
             safe.setX(safe.getBlockX() + .5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
             safe.setZ(safe.getBlockZ() + .5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-            Logging.fine("Hey! I found one: " + plugin.getLocationManipulation().strCoordsRaw(safe));
+            this.plugin.log(Level.FINE, "Hey! I found one: " + plugin.getLocationManipulation().strCoordsRaw(safe));
         } else {
-            Logging.fine("Uh oh! No safe place found!");
+            this.plugin.log(Level.FINE, "Uh oh! No safe place found!");
         }
         return safe;
     }
@@ -73,8 +72,8 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
         }
         // We want half of it, so we can go up and down
         tolerance /= 2;
-        Logging.finer("Given Location of: " + plugin.getLocationManipulation().strCoordsRaw(l));
-        Logging.finer("Checking +-" + tolerance + " with a radius of " + radius);
+        this.plugin.log(Level.FINER, "Given Location of: " + plugin.getLocationManipulation().strCoordsRaw(l));
+        this.plugin.log(Level.FINER, "Checking +-" + tolerance + " with a radius of " + radius);
 
         // For now this will just do a straight up block.
         Location locToCheck = l.clone();
@@ -192,7 +191,7 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
     @Override
     public TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, MVDestination d) {
         if (d instanceof InvalidDestination) {
-            Logging.finer("Entity tried to teleport to an invalid destination");
+            this.plugin.log(Level.FINER, "Entity tried to teleport to an invalid destination");
             return TeleportResult.FAIL_INVALID;
         }
         Player teleporteePlayer = null;
@@ -249,7 +248,7 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
     public Location getSafeLocation(Entity e, MVDestination d) {
         Location l = d.getLocation(e);
         if (plugin.getBlockSafety().playerCanSpawnHereSafely(l)) {
-            Logging.fine("The first location you gave me was safe.");
+            plugin.log(Level.FINE, "The first location you gave me was safe.");
             return l;
         }
         if (e instanceof Minecart) {
@@ -268,21 +267,21 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
             // Add offset to account for a vehicle on dry land!
             if (e instanceof Minecart && !plugin.getBlockSafety().isEntitiyOnTrack(safeLocation)) {
                 safeLocation.setY(safeLocation.getBlockY() + .5);
-                Logging.finer("Player was inside a minecart. Offsetting Y location.");
+                this.plugin.log(Level.FINER, "Player was inside a minecart. Offsetting Y location.");
             }
-            Logging.finer("Had to look for a bit, but I found a safe place for ya!");
+            this.plugin.log(Level.FINE, "Had to look for a bit, but I found a safe place for ya!");
             return safeLocation;
         }
         if (e instanceof Player) {
             Player p = (Player) e;
             this.plugin.getMessaging().sendMessage(p, "No safe locations found!", false);
-            Logging.finer("No safe location found for " + p.getName());
+            this.plugin.log(Level.FINER, "No safe location found for " + p.getName());
         } else if (e.getPassenger() instanceof Player) {
             Player p = (Player) e.getPassenger();
             this.plugin.getMessaging().sendMessage(p, "No safe locations found!", false);
-            Logging.finer("No safe location found for " + p.getName());
+            this.plugin.log(Level.FINER, "No safe location found for " + p.getName());
         }
-        Logging.fine("Sorry champ, you're basically trying to teleport into a minefield. I should just kill you now.");
+        this.plugin.log(Level.FINE, "Sorry champ, you're basically trying to teleport into a minefield. I should just kill you now.");
         return null;
     }
 

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

@@ -47,7 +47,6 @@ import java.util.Arrays;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -63,6 +62,8 @@ public class WorldManager implements MVWorldManager {
     private Map<String, String> defaultGens;
     private String firstSpawn;
 
+    private static final List<String> CLONE_IGNORE_FILES = Arrays.asList("session.lock", "uid.dat");
+
     public WorldManager(MultiverseCore core) {
         this.plugin = core;
         this.worldsFromTheConfig = new HashMap<String, WorldProperties>();
@@ -91,7 +92,191 @@ public class WorldManager implements MVWorldManager {
                 }
             }
         } else {
-            Logging.warning("Could not read 'bukkit.yml'. Any Default worldgenerators will not be loaded!");
+            this.plugin.log(Level.WARNING, "Could not read 'bukkit.yml'. Any Default worldgenerators will not be loaded!");
+        }
+    }
+
+    /**
+     * Makes cloning easier to understand and manage.
+     */
+    private class CloneHelper {
+        private String oldName;
+        private String newName;
+        private File oldWorldFile;
+        private File newWorldFile;
+        private MultiverseWorld oldWorld;
+
+        public CloneHelper(String oldName, String newName) {
+            this.oldName = oldName;
+            this.newName = newName;
+        }
+
+        /**
+         * The clone operation.
+         *
+         * @return True if clone is successful, false otherwise.
+         */
+        public boolean run() {
+            if (!validCloneParameters()) {
+                Logging.warning("Invalid clone parameters");
+                return false;
+            }
+
+            initWorldFiles();
+            if (newWorldFile.exists()) {
+                Logging.warning("Folder for new world '%s' already exists", newName);
+                return false;
+            }
+
+            oldWorld = getMVWorld(oldName);
+            if (!isOldWorldLoadable()) {
+                Logging.severe("Old world '%s' is not loadable", oldName);
+                return false;
+            }
+
+            boolean wasAutoSave = manuallySaveWorld();
+
+            if (!copyWorldFolder()) {
+                return false;
+            }
+
+            revertBackAutoSave(wasAutoSave);
+
+            return initNewCloneWorld();
+        }
+
+        /**
+         * Ensure that world with oldName can be clone to a world called newName.
+         *
+         * @return True if parameters are valid, otherwise false.
+         */
+        private boolean validCloneParameters() {
+            String originalOldName = oldName;
+           if (!isWorldFromConfig(oldName)) {
+               oldName = getWorldByAliasFromConfig(oldName);
+           }
+
+            if (oldName == null) {
+                Logging.warning("Old world '%s' does not exist", originalOldName);
+                return false;
+            }
+            if (isWorldFromConfig(newName)) {
+                Logging.warning("New world '%s' already exists", newName);
+                return false;
+            }
+            if (!isValidWorldName(newName)) {
+                Logging.warning("New world name '%s' is invalid", newName);
+                return false;
+            }
+            return true;
+        }
+
+        /**
+         * Get world folders from world container.
+         */
+        private void initWorldFiles() {
+            oldWorldFile = new File(plugin.getServer().getWorldContainer(), oldName);
+            newWorldFile = new File(plugin.getServer().getWorldContainer(), newName);
+        }
+
+        /**
+         * Ensure that old world can be loaded and saved properly.
+         *
+         * @return True if old world can be loaded successfully, false otherwise.
+         */
+        private boolean isOldWorldLoadable() {
+            if (oldWorld != null) {
+                return true;
+            }
+
+            Logging.fine("Old world '%s' is currently unloaded. Attempting to load it...", oldName);
+            WorldProperties props = worldsFromTheConfig.get(oldName);
+            boolean wasLoadSpawn = worldsFromTheConfig.get(oldName).isKeepingSpawnInMemory();
+            if (wasLoadSpawn) {
+                props.setKeepSpawnInMemory(false);
+            }
+
+            if (!loadWorld(oldName)) {
+                Logging.severe("Failed to load the old world '%s'", oldName);
+                return false;
+            }
+
+            getMVWorld(oldName).getCBWorld().setAutoSave(false);
+
+            if (!unloadWorld(oldName, true)) {
+                Logging.severe("Failed to unload the old world '%S'", oldName);
+                return false;
+            }
+
+            if (wasLoadSpawn) {
+                props.setKeepSpawnInMemory(true);
+            }
+
+            return true;
+        }
+
+        /**
+         * Duplicating old world folder to the new world folder.
+         *
+         * @return True if copy process was successful, false otherwise.
+         */
+        private boolean copyWorldFolder() {
+            Logging.fine("Copying files for world '%s'", oldName);
+            if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, CLONE_IGNORE_FILES, Logging.getLogger()) || !newWorldFile.exists()) {
+                Logging.severe("Failed to copy files for world '%s', see the log info", newName);
+                return false;
+            }
+            Logging.fine("Succeeded at copying files");
+            return true;
+        }
+
+        /**
+         * Ensure world is save being copying world files.
+         *
+         * @return Previous auto-save setting for the old world.
+         */
+        private boolean manuallySaveWorld() {
+            if (oldWorld != null && oldWorld.getCBWorld().isAutoSave()) {
+                Logging.config("Saving world '%s'", oldName);
+                oldWorld.getCBWorld().setAutoSave(false);
+                oldWorld.getCBWorld().save();
+                return true;
+            }
+            return false;
+        }
+
+        private void revertBackAutoSave(boolean wasAutoSave) {
+            if (oldWorld != null && wasAutoSave) {
+                Logging.fine("Revert back to enabling auto-save");
+                oldWorld.getCBWorld().setAutoSave(true);
+            }
+        }
+
+        /**
+         * Initialize new properties with old ones.
+         */
+        private void copyPropertiesToNewWorld() {
+            WorldProperties newProps = new WorldProperties();
+            newProps.copyValues(worldsFromTheConfig.get(oldName));
+            newProps.setAlias(""); // don't keep the alias the same -- that would be useless
+            worldsFromTheConfig.put(newName, newProps);
+        }
+
+        /**
+         * Load up the newly copied clone world.
+         */
+        private boolean initNewCloneWorld() {
+            copyPropertiesToNewWorld();
+            if (!saveWorldsConfig()) {
+                Logging.severe("Failed to save worlds.yml");
+                return false;
+            }
+            if (!doLoad(newName)) {
+                Logging.severe("Failed to load the cloned world '" + newName + "'");
+                return false;
+            }
+            Logging.fine("Succeeded at loading cloned world '" + newName + "'");
+            return true;
         }
     }
 
@@ -110,113 +295,7 @@ public class WorldManager implements MVWorldManager {
      */
     @Override
     public boolean cloneWorld(String oldName, String newName) {
-        // Make sure we already know about the old world and that we don't
-        // already know about the new world.
-        if (!this.worldsFromTheConfig.containsKey(oldName)) {
-            for (Map.Entry<String, WorldProperties> entry : this.worldsFromTheConfig.entrySet()) {
-                if (oldName.equals(entry.getValue().getAlias())) {
-                    oldName = entry.getKey();
-                    break;
-                }
-            }
-            if (!this.worldsFromTheConfig.containsKey(oldName)) {
-                Logging.warning("Old world '%s' does not exist", oldName);
-                return false;
-            }
-        }
-        if (this.isMVWorld(newName)) {
-            Logging.warning("New world '%s' already exists", newName);
-            return false;
-        }
-
-        // Check for valid world name
-        if (!(isValidWorldName(oldName) && isValidWorldName(newName))) {
-            return false;
-        }
-
-        final File oldWorldFile = new File(this.plugin.getServer().getWorldContainer(), oldName);
-        final File newWorldFile = new File(this.plugin.getServer().getWorldContainer(), newName);
-        final List<String> ignoreFiles = new ArrayList<>(Arrays.asList("session.lock", "uid.dat"));
-
-        // Make sure the new world doesn't exist outside of multiverse.
-        if (newWorldFile.exists()) {
-            Logging.warning("Folder for new world '%s' already exists", newName);
-            return false;
-        }
-
-        // Load the old world... but just the metadata.
-        boolean wasJustLoaded = false;
-        boolean wasLoadSpawn = false;
-        if (this.plugin.getServer().getWorld(oldName) == null) {
-            wasJustLoaded = true;
-            WorldProperties props = this.worldsFromTheConfig.get(oldName);
-            wasLoadSpawn = props.isKeepingSpawnInMemory();
-            if (wasLoadSpawn) {
-                // No chunks please.
-                props.setKeepSpawnInMemory(false);
-            }
-            if (!this.loadWorld(oldName)) {
-                return false;
-            }
-            this.plugin.getServer().getWorld(oldName).setAutoSave(false);
-        }
-        
-        // Grab a bit of metadata from the old world.
-        MultiverseWorld oldWorld = getMVWorld(oldName);
-
-        // Don't need the loaded world anymore.
-        if (wasJustLoaded) {
-            this.unloadWorld(oldName, true);
-            oldWorld = null;
-            if (wasLoadSpawn) {
-                this.worldsFromTheConfig.get(oldName).setKeepSpawnInMemory(true);
-            }
-        }
-
-        boolean wasAutoSave = false;
-        if (oldWorld != null && oldWorld.getCBWorld().isAutoSave()) {
-            wasAutoSave = true;
-            Logging.config("Saving world '%s'", oldName);
-            oldWorld.getCBWorld().setAutoSave(false);
-            oldWorld.getCBWorld().save();
-        }
-        Logging.config("Copying files for world '%s'", oldName);
-        if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, ignoreFiles)) {
-            Logging.warning("Failed to copy files for world '%s', see the log info", newName);
-            return false;
-        }
-        if (oldWorld != null && wasAutoSave) {
-            oldWorld.getCBWorld().setAutoSave(true);
-        }
-        
-        if (newWorldFile.exists()) {
-            Logging.fine("Succeeded at copying files");
-
-            // initialize new properties with old ones
-            WorldProperties newProps = new WorldProperties();
-            newProps.copyValues(this.worldsFromTheConfig.get(oldName));
-            // don't keep the alias the same -- that would be useless
-            newProps.setAlias("");
-            // store the new properties in worlds config map
-            this.worldsFromTheConfig.put(newName, newProps);
-
-            // save the worlds config to disk (worlds.yml)
-            if (!saveWorldsConfig()) {
-                Logging.severe("Failed to save worlds.yml");
-                return false;
-            }
-
-            // actually load the world
-            if (doLoad(newName)) {
-               Logging.fine("Succeeded at loading cloned world '" + newName + "'");
-               return true;
-            }
-            Logging.severe("Failed to load the cloned world '" + newName + "'");
-            return false;
-        }
-
-        Logging.warning("Failed to copy files for world '%s', see the log info", newName);
-        return false;
+        return new CloneHelper(oldName, newName).run();
     }
 
     /**
@@ -284,7 +363,7 @@ public class WorldManager implements MVWorldManager {
         Logging.info(builder.toString());
 
         if (!doLoad(c, true)) {
-            Logging.severe("Failed to Create/Load the world '" + name + "'");
+            this.plugin.log(Level.SEVERE, "Failed to Create/Load the world '" + name + "'");
             return false;
         }
 
@@ -357,7 +436,7 @@ public class WorldManager implements MVWorldManager {
         MultiverseWorld world = this.getMVWorld(this.firstSpawn);
         if (world == null) {
             // If the spawn world was unloaded, get the default world
-            Logging.warning("The world specified as the spawn world (" + this.firstSpawn + ") did not exist!!");
+            this.plugin.log(Level.WARNING, "The world specified as the spawn world (" + this.firstSpawn + ") did not exist!!");
             try {
                 return this.getMVWorld(this.plugin.getServer().getWorlds().get(0));
             } catch (IndexOutOfBoundsException e) {
@@ -440,15 +519,15 @@ public class WorldManager implements MVWorldManager {
     }
 
     private void brokenWorld(String name) {
-        Logging.severe("The world '" + name + "' could NOT be loaded because it contains errors and is probably corrupt!");
-        Logging.severe("Try using Minecraft Region Fixer to repair your world! '" + name + "'");
-        Logging.severe("https://github.com/Fenixin/Minecraft-Region-Fixer");
+        this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because it contains errors and is probably corrupt!");
+        this.plugin.log(Level.SEVERE, "Try using Minecraft Region Fixer to repair your world! '" + name + "'");
+        this.plugin.log(Level.SEVERE, "https://github.com/Fenixin/Minecraft-Region-Fixer");
     }
 
     private void nullWorld(String name) {
-        Logging.severe("The world '" + name + "' could NOT be loaded because the server didn't like it!");
-        Logging.severe("We don't really know why this is. Contact the developer of your server software!");
-        Logging.severe("Server version info: " + Bukkit.getServer().getVersion());
+        this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because the server didn't like it!");
+        this.plugin.log(Level.SEVERE, "We don't really know why this is. Contact the developer of your server software!");
+        this.plugin.log(Level.SEVERE, "Server version info: " + Bukkit.getServer().getVersion());
     }
 
     private boolean doLoad(String name) {
@@ -488,8 +567,8 @@ public class WorldManager implements MVWorldManager {
             throw new IllegalArgumentException("That world is already loaded!");
 
         if (!ignoreExists && !new File(this.plugin.getServer().getWorldContainer(), worldName).exists() && !new File(this.plugin.getServer().getWorldContainer().getParent(), worldName).exists()) {
-            Logging.warning("WorldManager: Can't load this world because the folder was deleted/moved: " + worldName);
-            Logging.warning("Use '/mv remove' to remove it from the config!");
+            this.plugin.log(Level.WARNING, "WorldManager: Can't load this world because the folder was deleted/moved: " + worldName);
+            this.plugin.log(Level.WARNING, "Use '/mv remove' to remove it from the config!");
             return false;
         }
 
@@ -536,7 +615,7 @@ public class WorldManager implements MVWorldManager {
         MVWorldDeleteEvent mvwde = new MVWorldDeleteEvent(getMVWorld(name), removeFromConfig);
         this.plugin.getServer().getPluginManager().callEvent(mvwde);
         if (mvwde.isCancelled()) {
-            Logging.fine("Tried to delete a world, but the event was cancelled!");
+            this.plugin.log(Level.FINE, "Tried to delete a world, but the event was cancelled!");
             return false;
         }
 
@@ -552,7 +631,7 @@ public class WorldManager implements MVWorldManager {
 
         try {
             File worldFile = world.getWorldFolder();
-            Logging.finer("deleteWorld(): worldFile: " + worldFile.getAbsolutePath());
+            plugin.log(Level.FINER, "deleteWorld(): worldFile: " + worldFile.getAbsolutePath());
             if (deleteWorldFolder ? FileUtils.deleteFolder(worldFile) : FileUtils.deleteFolderContents(worldFile)) {
                 Logging.info("World '%s' was DELETED.", name);
                 return true;
@@ -697,6 +776,19 @@ public class WorldManager implements MVWorldManager {
         return false;
     }
 
+    private boolean isWorldFromConfig(String name) {
+        return this.worldsFromTheConfig.containsKey(name);
+    }
+
+    private String getWorldByAliasFromConfig(String name) {
+        return this.worldsFromTheConfig.entrySet()
+                .stream()
+                .filter(worldEntry -> name.equals(worldEntry.getValue().getAlias()))
+                .map(Map.Entry::getKey)
+                .findFirst()
+                .orElse(null);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -866,7 +958,7 @@ public class WorldManager implements MVWorldManager {
             this.configWorlds.save(new File(this.plugin.getDataFolder(), "worlds.yml"));
             return true;
         } catch (IOException e) {
-            Logging.severe("Could not save worlds.yml. Please check your settings.");
+            this.plugin.log(Level.SEVERE, "Could not save worlds.yml. Please check your settings.");
             return false;
         }
     }

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteServiceType.java

@@ -22,9 +22,5 @@ public enum PasteServiceType {
     /**
      * @see GitHubPasteService
      */
-    GITHUB,
-    /**
-     * No paste service used.
-     */
-    NONE
+    GITHUB
 }

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

@@ -50,10 +50,6 @@ public class TestEntryFeeConversion {
         WorldProperties props = new WorldProperties(config);
         assertNull(props.entryfee.getCurrency());
 
-        entryFee.put("currency", 0);
-        props = new WorldProperties(config);
-        assertNull(props.entryfee.getCurrency());
-
         entryFee.put("currency", 1);
         props = new WorldProperties(config);
         assertEquals(Material.STONE, props.entryfee.getCurrency());

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

@@ -207,7 +207,7 @@ public class TestWorldStuff {
         assertEquals(0, creator.getCore().getMVWorldManager().getMVWorlds().size());
 
         // Verify
-        verify(mockCommandSender).sendMessage("§cError: Invalid generator string 'BogusGen'. See /mv gens for available generators.");
+        verify(mockCommandSender).sendMessage("Invalid generator! 'BogusGen'. " + ChatColor.RED + "Aborting world creation.");
     }
 
     @Test

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

@@ -81,7 +81,7 @@ public class FileUtilsTest {
         assertFalse(Files.isDirectory(targetChildDir));
         assertFalse(Files.isRegularFile(targetChildDirFile));
 
-        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile()));
+        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
 
         assertTrue(Files.isDirectory(targetDir));
         assertTrue(Files.isRegularFile(targetFile));
@@ -107,7 +107,7 @@ public class FileUtilsTest {
         assertFalse(Files.isRegularFile(targetChildDirFile));
         assertFalse(Files.isRegularFile(targetChildIgnoreFile));
 
-        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), excludeFiles));
+        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), excludeFiles, Logging.getLogger()));
 
         assertTrue(Files.isDirectory(targetDir));
         assertTrue(Files.isRegularFile(targetFile));
@@ -129,7 +129,7 @@ public class FileUtilsTest {
         assertFalse(Files.isDirectory(targetChildDir));
         assertFalse(Files.isRegularFile(targetChildDirFile));
 
-        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile()));
+        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
 
         assertTrue(Files.isDirectory(targetDir));
         assertTrue(Files.isRegularFile(targetFile));
@@ -145,6 +145,6 @@ public class FileUtilsTest {
         assertTrue(Files.isDirectory(targetDir));
         assertTrue(Files.isRegularFile(targetFile));
 
-        assertFalse(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile()));
+        assertFalse(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
     }
 }

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

@@ -214,18 +214,11 @@ public class TestInstanceCreator {
             serverfield.set(core, mockServer);
 
             // Set buscript
-            Buscript buscript;
+            Buscript buscript = PowerMockito.spy(new Buscript(core));
             Field buscriptfield = MultiverseCore.class.getDeclaredField("buscript");
             buscriptfield.setAccessible(true);
-
-            try {
-                buscript = PowerMockito.spy(new Buscript(core));
-                when(buscript.getPlugin()).thenReturn(core);
-            } catch (NullPointerException e) {
-                buscript = null;
-            }
-
             buscriptfield.set(core, buscript);
+            when(buscript.getPlugin()).thenReturn(core);
 
             // Set worldManager
             WorldManager wm = PowerMockito.spy(new WorldManager(core));