Merge branch 'master' of github.com:Multiverse/Multiverse-Core into generate-structures

Conflicts:
	pom.xml
	src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java
	src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java

config/mv_checks.xml

@@ -76,10 +76,7 @@
         <module name="UnusedImports">
             <property name="processJavadoc" value="true"/>
         </module>
-        <module name="MethodLength">
-            <property name="severity" value="warning"/>
-            <property name="countEmpty" value="false"/>
-        </module>
+        <module name="MethodLength"/>
         <module name="ParameterNumber"/>
         <module name="EmptyForIteratorPad"/>
         <module name="MethodParamPad"/>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.onarandombox.multiversecore</groupId>
     <artifactId>Multiverse-Core</artifactId>
-    <version>2.5</version>
+    <version>2.4</version>
     <name>Multiverse-Core</name>
     <description>World Management Plugin</description>
     <properties>
@@ -20,16 +20,6 @@
             <id>Bukkit Official</id>
             <url>http://repo.bukkit.org/content/repositories/public</url>
         </repository>
-        <!-- Required for Metrics -->
-        <repository>
-            <id>mcstats</id>
-            <url>http://repo.mcstats.org/content/repositories/snapshots</url>
-        </repository>
-        <!-- Required for Vault -->
-        <repository>
-            <id>herocraft</id>
-            <url>http://ci.herocraftonline.com/plugin/repository/everything/</url>
-        </repository>
     </repositories>
 
     <pluginRepositories>
@@ -111,6 +101,12 @@
                     </archive>
                 </configuration>
             </plugin>
+            <!-- Maven Source Plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.2</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -140,33 +136,6 @@
                     <configLocation>${project.basedir}/config/mv_checks.xml</configLocation>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8.1</version>
-                <executions>
-                    <execution>
-                        <id>javadoc-jar</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -181,11 +150,8 @@
                             <artifactSet>
                                 <includes>
                                     <include>me.main__.util:SerializationConfig</include>
-                                    <include>com.pneumaticraft.commandhandler:CommandHandler</include>
-                                    <include>com.dumptruckman.minecraft:buscript</include>
-                                    <include>org.mcstats:metrics</include>
-                                    <include>com.dumptruckman.minecraft:Logging</include>
                                     <include>com.fernferret.allpay:AllPay</include>
+                                    <include>com.pneumaticraft.commandhandler:CommandHandler</include>
                                 </includes>
                             </artifactSet>
                             <relocations>
@@ -201,22 +167,6 @@
                                     <pattern>com.pneumaticraft.commandhandler</pattern>
                                     <shadedPattern>com.pneumaticraft.commandhandler.multiverse</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>buscript</pattern>
-                                    <shadedPattern>buscript.multiverse</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.mcstats</pattern>
-                                    <shadedPattern>org.mcstats.multiverse</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.dumptruckman.minecraft.util.Logging</pattern>
-                                    <shadedPattern>com.onarandombox.MultiverseCore.utils.CoreLogging</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.dumptruckman.minecraft.util.DebugLog</pattern>
-                                    <shadedPattern>com.onarandombox.MultiverseCore.utils.DebugFileLogger</shadedPattern>
-                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
@@ -230,81 +180,45 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.3.2-R2.1-SNAPSHOT</version>
-            <!-- If you want the lates, use this -->
-            <!-- <version>LATEST</version> -->
+            <version>1.1-R5-SNAPSHOT</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
         <!-- Bukkit Dependency -->
-        <!-- Start of Spout (disabled because we aren't using it)
+        <!-- Start of Spout -->
         <dependency>
             <groupId>org.getspout</groupId>
             <artifactId>spoutpluginapi</artifactId>
             <version>dev-SNAPSHOT</version>
         </dependency>
-             End of Spout -->
+        <!-- End of Spout -->
         <!-- SerializationConfig Dependency -->
         <dependency>
             <groupId>me.main__.util</groupId>
             <artifactId>SerializationConfig</artifactId>
-            <version>1.6c</version>
+            <version>1.3</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
         <!-- End of SerializationConfig Dependency -->
-        <!-- Start of Economy Dependency -->
+        <!-- Start of AllPay Dependency -->
         <dependency>
             <groupId>com.fernferret.allpay</groupId>
             <artifactId>AllPay</artifactId>
-            <version>10</version>
+            <version>8</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>net.milkbowl.vault</groupId>
-            <artifactId>Vault</artifactId>
-            <version>1.2.19-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of Economy Dependency -->
+        <!-- End of AllPay Dependency -->
         <!-- Start of CommandHandler Dependency -->
         <dependency>
             <groupId>com.pneumaticraft.commandhandler</groupId>
             <artifactId>CommandHandler</artifactId>
-            <version>7</version>
+            <version>6</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
         <!-- End of CommandHandler Dependency -->
-        <!-- Start of Buscript Dependency -->
-        <dependency>
-            <groupId>com.dumptruckman.minecraft</groupId>
-            <artifactId>buscript</artifactId>
-            <version>1.0</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of Buscript Dependency -->
-        <!-- Start of Metrics Dependency -->
-        <dependency>
-            <groupId>org.mcstats</groupId>
-            <artifactId>metrics</artifactId>
-            <version>1.2-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of Metrics Dependency -->
-        <!-- Start of Logging Dependency -->
-        <dependency>
-            <groupId>com.dumptruckman.minecraft</groupId>
-            <artifactId>Logging</artifactId>
-            <version>1.0.9</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of Logging Dependency -->
         <!-- Start of Test Dependencies -->
         <dependency>
             <groupId>junit</groupId>

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

@@ -7,8 +7,6 @@
 
 package com.onarandombox.MultiverseCore;
 
-import buscript.Buscript;
-import com.dumptruckman.minecraft.util.Logging;
 import com.fernferret.allpay.AllPay;
 import com.fernferret.allpay.GenericBank;
 import com.onarandombox.MultiverseCore.api.BlockSafety;
@@ -20,39 +18,7 @@ import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
 import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.commands.AnchorCommand;
-import com.onarandombox.MultiverseCore.commands.CheckCommand;
-import com.onarandombox.MultiverseCore.commands.CloneCommand;
-import com.onarandombox.MultiverseCore.commands.ConfigCommand;
-import com.onarandombox.MultiverseCore.commands.ConfirmCommand;
-import com.onarandombox.MultiverseCore.commands.CoordCommand;
-import com.onarandombox.MultiverseCore.commands.CreateCommand;
-import com.onarandombox.MultiverseCore.commands.DebugCommand;
-import com.onarandombox.MultiverseCore.commands.DeleteCommand;
-import com.onarandombox.MultiverseCore.commands.EnvironmentCommand;
-import com.onarandombox.MultiverseCore.commands.GeneratorCommand;
-import com.onarandombox.MultiverseCore.commands.HelpCommand;
-import com.onarandombox.MultiverseCore.commands.ImportCommand;
-import com.onarandombox.MultiverseCore.commands.InfoCommand;
-import com.onarandombox.MultiverseCore.commands.ListCommand;
-import com.onarandombox.MultiverseCore.commands.LoadCommand;
-import com.onarandombox.MultiverseCore.commands.ModifyAddCommand;
-import com.onarandombox.MultiverseCore.commands.ModifyClearCommand;
-import com.onarandombox.MultiverseCore.commands.ModifyCommand;
-import com.onarandombox.MultiverseCore.commands.ModifyRemoveCommand;
-import com.onarandombox.MultiverseCore.commands.ModifySetCommand;
-import com.onarandombox.MultiverseCore.commands.PurgeCommand;
-import com.onarandombox.MultiverseCore.commands.RegenCommand;
-import com.onarandombox.MultiverseCore.commands.ReloadCommand;
-import com.onarandombox.MultiverseCore.commands.RemoveCommand;
-import com.onarandombox.MultiverseCore.commands.ScriptCommand;
-import com.onarandombox.MultiverseCore.commands.SetSpawnCommand;
-import com.onarandombox.MultiverseCore.commands.SilentCommand;
-import com.onarandombox.MultiverseCore.commands.SpawnCommand;
-import com.onarandombox.MultiverseCore.commands.TeleportCommand;
-import com.onarandombox.MultiverseCore.commands.UnloadCommand;
-import com.onarandombox.MultiverseCore.commands.VersionCommand;
-import com.onarandombox.MultiverseCore.commands.WhoCommand;
+import com.onarandombox.MultiverseCore.commands.*;
 import com.onarandombox.MultiverseCore.destination.AnchorDestination;
 import com.onarandombox.MultiverseCore.destination.BedDestination;
 import com.onarandombox.MultiverseCore.destination.CannonDestination;
@@ -61,74 +27,50 @@ import com.onarandombox.MultiverseCore.destination.ExactDestination;
 import com.onarandombox.MultiverseCore.destination.PlayerDestination;
 import com.onarandombox.MultiverseCore.destination.WorldDestination;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
-import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
-import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
-import com.onarandombox.MultiverseCore.listeners.MVChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
-import com.onarandombox.MultiverseCore.listeners.MVPlayerChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
 import com.onarandombox.MultiverseCore.listeners.MVPluginListener;
-import com.onarandombox.MultiverseCore.localization.LazyLocaleMessageProvider;
-import com.onarandombox.MultiverseCore.localization.LocalizationLoadingException;
-import com.onarandombox.MultiverseCore.localization.MessageProvider;
-import com.onarandombox.MultiverseCore.localization.MessageProviding;
-import com.onarandombox.MultiverseCore.localization.NoSuchLocalizationException;
-import com.onarandombox.MultiverseCore.listeners.MVPortalListener;
 import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
-import com.onarandombox.MultiverseCore.localization.SimpleMessageProvider;
-import com.onarandombox.MultiverseCore.utils.AnchorManager;
-import com.onarandombox.MultiverseCore.utils.MVMessaging;
-import com.onarandombox.MultiverseCore.utils.MVPermissions;
-import com.onarandombox.MultiverseCore.utils.MVPlayerSession;
-import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety;
-import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
-import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
-import com.onarandombox.MultiverseCore.utils.VaultHandler;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
+import com.onarandombox.MultiverseCore.listeners.MVPortalListener;
+import com.onarandombox.MultiverseCore.utils.*;
 import com.pneumaticraft.commandhandler.CommandHandler;
+
 import me.main__.util.SerializationConfig.SerializationConfig;
+
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.World.Environment;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.Configuration;
-import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.mcstats.Metrics;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
+import java.util.Random;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * The implementation of the Multiverse-{@link Core}.
  */
-public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, MessageProviding {
-    private static final int PROTOCOL = 18;
+public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
+    private static final int PROTOCOL = 14;
     // TODO: Investigate if this one is really needed to be static.
     // Doubt it. -- FernFerret
     private static Map<String, String> teleportQueue = new HashMap<String, String>();
 
     private AnchorManager anchorManager = new AnchorManager(this);
-    private MessageProvider messageProvider = new SimpleMessageProvider(this);
     // TODO please let's make this non-static
-    private volatile MultiverseCoreConfiguration config;
+    private static MultiverseCoreConfiguration config;
 
     /**
      * This method is used to find out who is teleporting a player.
@@ -151,7 +93,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
      * @param teleportee The name of the player that was teleported.
      */
     public static void addPlayerToTeleportQueue(String teleporter, String teleportee) {
-        Logging.finest("Adding mapping '%s' => '%s' to teleport queue", teleporter, teleportee);
+        staticLog(Level.FINEST, "Adding mapping '" + teleporter + "' => '" + teleportee + "' to teleport queue");
         teleportQueue.put(teleportee, teleporter);
     }
 
@@ -187,6 +129,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
         return MultiverseCore.PROTOCOL;
     }
 
+    // Useless stuff to keep us going.
+    private static final Logger LOGGER = Logger.getLogger("Minecraft");
+    private static DebugLog debugLog;
+
     // Setup our Map for our Commands using the CommandHandler.
     private CommandHandler commandHandler;
 
@@ -198,25 +144,22 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
     // Configurations
     private FileConfiguration multiverseConfig = null;
 
-    private final MVWorldManager worldManager = new WorldManager(this);
+    private MVWorldManager worldManager = new WorldManager(this);
 
     // Setup the block/player/entity listener.
-    private final MVPlayerListener playerListener = new MVPlayerListener(this);
-    private final MVEntityListener entityListener = new MVEntityListener(this);
-    private final MVPluginListener pluginListener = new MVPluginListener(this);
-    private final MVWeatherListener weatherListener = new MVWeatherListener(this);
-    private final MVPortalListener portalListener = new MVPortalListener(this);
-    private MVChatListener chatListener;
+    private MVPlayerListener playerListener = new MVPlayerListener(this);
+    private MVEntityListener entityListener = new MVEntityListener(this);
+    private MVPluginListener pluginListener = new MVPluginListener(this);
+    private MVWeatherListener weatherListener = new MVWeatherListener(this);
+    private MVPortalListener portalListener = new MVPortalListener(this);
 
     // HashMap to contain information relating to the Players.
     private HashMap<String, MVPlayerSession> playerSessions;
-    private VaultHandler vaultHandler;
     private GenericBank bank = null;
     private AllPay banker;
-    private Buscript buscript;
     private int pluginCount;
     private DestinationFactory destFactory;
-    //private SpoutInterface spoutInterface = null;
+    private SpoutInterface spoutInterface = null;
     private MultiverseMessaging messaging;
     private BlockSafety blockSafety;
     private LocationManipulation locationManipulation;
@@ -228,13 +171,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
     public void onLoad() {
         // Register our config
         SerializationConfig.registerAll(MultiverseCoreConfiguration.class);
-        // Register our world
-        SerializationConfig.registerAll(MVWorld.class);
         // Create our DataFolder
         getDataFolder().mkdirs();
         // Setup our Debug Log
-        Logging.init(this);
-        SerializationConfig.initLogging(Logging.getLogger());
+        debugLog = new DebugLog("Multiverse-Core", getDataFolder() + File.separator + "debug.log");
         // Setup our BlockSafety
         this.blockSafety = new SimpleBlockSafety(this);
         // Setup our LocationManipulation
@@ -255,27 +195,21 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
 
     /**
      * {@inheritDoc}
-     * @deprecated Now using Vault.
      */
     @Override
-    @Deprecated
     public GenericBank getBank() {
         return this.bank;
     }
 
-    @Override
-    public VaultHandler getVaultHandler() {
-        return vaultHandler;
-    }
-
     /**
      * {@inheritDoc}
      */
     @Override
     public void onEnable() {
-        this.messaging = new MVMessaging(this);
+        this.messaging = new MVMessaging();
         this.banker = new AllPay(this, LOG_TAG + " ");
-        this.vaultHandler = new VaultHandler(this);
+        // Output a little snippet to show it's enabled.
+        this.log(Level.INFO, "- Version " + this.getDescription().getVersion() + " (API v" + PROTOCOL + ") Enabled - By " + getAuthors());
         // Load the defaultWorldGenerators
         this.worldManager.getDefaultWorldGenerators();
 
@@ -303,28 +237,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
         // this function will be called every time a plugin registers a new envtype with MV
         // Setup & Load our Configuration files.
         loadConfigs();
-        try {
-            Locale l = (this.config.getLocale() == null) ? Locale.getDefault() : this.config.getLocale();
-            if (this.messageProvider instanceof LazyLocaleMessageProvider)
-                ((LazyLocaleMessageProvider)this.messageProvider).loadLocale(l);
-            this.messageProvider.setLocale(l);
-        } catch (NoSuchLocalizationException e) {
-            if (this.config.getLocale() != null)
-                this.log(Level.SEVERE, String.format(
-                        "Multiverse couldn't find any translations for the selected locale '%s'. '%s' will be used instead.",
-                        this.config.getLocale(), this.messageProvider.getLocale()));
-        } catch (LocalizationLoadingException e) {
-            this.log(Level.SEVERE, String.format("Failed to load the selected locale '%s'. '%s' will be used instead.",
-                    this.config.getLocale(), this.messageProvider.getLocale()));
-            e.printStackTrace();
-        } catch (IllegalArgumentException e) {
-            this.log(Level.SEVERE, e.getMessage());
-            this.getServer().getPluginManager().disablePlugin(this);
-            return;
-        }
         if (this.multiverseConfig != null) {
-            Logging.setDebugLevel(getMVConfig().getGlobalDebug());
-            Logging.setShowingConfig(!getMVConfig().getSilentStart());
             this.worldManager.loadDefaultWorlds();
             this.worldManager.loadWorlds(true);
         } else {
@@ -333,138 +246,18 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
         this.anchorManager.loadAnchors();
 
         // Now set the firstspawnworld (after the worlds are loaded):
-        this.worldManager.setFirstSpawnWorld(getMVConfig().getFirstSpawnWorld());
+        this.worldManager.setFirstSpawnWorld(config.getFirstSpawnWorld());
         try {
-            getMVConfig().setFirstSpawnWorld(this.worldManager.getFirstSpawnWorld().getName());
+            config.setFirstSpawnWorld(this.worldManager.getFirstSpawnWorld().getName());
         } catch (NullPointerException e) {
             // A test that had no worlds loaded was being run. This should never happen in production
         }
         this.saveMVConfig();
-        // Register async or sync player chat according to config
-        try {
-            Class.forName("org.bukkit.event.player.AsyncPlayerChatEvent");
-        } catch (ClassNotFoundException e) {
-            getMVConfig().setUseAsyncChat(false);
-        }
-        if (getMVConfig().getUseAsyncChat()) {
-            this.chatListener = new MVAsyncPlayerChatListener(this, this.playerListener);
-        } else {
-            this.chatListener = new MVPlayerChatListener(this, this.playerListener);
-        }
-        getServer().getPluginManager().registerEvents(this.chatListener, this);
-        /*
         // Check to see if spout was already loaded (most likely):
         if (this.getServer().getPluginManager().getPlugin("Spout") != null) {
             this.setSpout();
             this.log(Level.INFO, "Spout integration enabled.");
         }
-        */
-
-        this.initializeBuscript();
-        this.setupMetrics();
-
-        // Output a little snippet to show it's enabled.
-        Logging.config("Version %s (API v%s) Enabled - By %s", this.getDescription().getVersion(), PROTOCOL, getAuthors());
-    }
-
-    /**
-     * Initializes the buscript javascript library.
-     */
-    private void initializeBuscript() {
-        buscript = new Buscript(this);
-        // Add global variable "multiverse" to javascript environment
-        buscript.getGlobalScope().put("multiverse", buscript.getGlobalScope(), this);
-    }
-
-    /**
-     * Plotter for Environment-Values.
-     */
-    private static final class EnvironmentPlotter extends Metrics.Plotter {
-        private MultiverseCore core;
-        private final Environment env;
-
-        public EnvironmentPlotter(MultiverseCore core, Environment env) {
-            super(envToString(env));
-            this.core = core;
-            this.env = env;
-        }
-
-        private static String envToString(Environment env) {
-            return new StringBuilder().append(env.name().toUpperCase().charAt(0))
-                    .append(env.name().toLowerCase().substring(1)).toString();
-        }
-
-        @Override
-        public int getValue() {
-            int count = 0;
-            for (MultiverseWorld w : core.getMVWorldManager().getMVWorlds())
-                if (w.getEnvironment() == env)
-                    count++;
-            core.log(Level.FINE, String.format("Tracking %d worlds of type %s", count, env));
-            return count;
-        }
-    }
-
-    /**
-     * Plotter for Generator-Values.
-     */
-    private static final class GeneratorPlotter extends Metrics.Plotter {
-        private MultiverseCore core;
-        private final String gen;
-
-        public GeneratorPlotter(MultiverseCore core, String gen) {
-            super(gen);
-            this.core = core;
-            this.gen = gen;
-        }
-
-        @Override
-        public int getValue() {
-            int count = 0;
-            for (MultiverseWorld w : core.getMVWorldManager().getMVWorlds())
-                if (gen.equals(w.getGenerator()))
-                    count++;
-            core.log(Level.FINE, String.format("Tracking %d worlds of type %s", count, gen));
-            return count;
-        }
-    }
-
-    private void setupMetrics() {
-        try {
-            Metrics m = new Metrics(this);
-
-            Metrics.Graph envGraph = m.createGraph("worlds_by_env");
-            for (Environment env : Environment.values())
-                envGraph.addPlotter(new EnvironmentPlotter(this, env));
-
-            m.addCustomData(new Metrics.Plotter("Loaded worlds") {
-                @Override
-                public int getValue() {
-                    return getMVWorldManager().getMVWorlds().size();
-                }
-            });
-            m.addCustomData(new Metrics.Plotter("Total number of worlds") {
-                @Override
-                public int getValue() {
-                    return getMVWorldManager().getMVWorlds().size()
-                            + getMVWorldManager().getUnloadedWorlds().size();
-                }
-            });
-
-            Set<String> gens = new HashSet<String>();
-            for (MultiverseWorld w : this.getMVWorldManager().getMVWorlds())
-                gens.add(w.getGenerator());
-            gens.remove(null);
-            gens.remove("null");
-            Metrics.Graph genGraph = m.createGraph("custom_gens");
-            for (String gen : gens)
-                genGraph.addPlotter(new GeneratorPlotter(this, gen));
-
-            m.start();
-            log(Level.FINE, "Metrics have run!");
-        } catch (IOException e) {
-            log(Level.WARNING, "There was an issue while enabling metrics: " + e.getMessage());
-        }
     }
 
     private void initializeDestinationFactory() {
@@ -502,18 +295,18 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
         this.multiverseConfig.setDefaults(coreDefaults);
         this.multiverseConfig.options().copyDefaults(false);
         this.multiverseConfig.options().copyHeader(true);
+        this.worldManager.loadWorldConfig(new File(getDataFolder(), "worlds.yml"));
 
         MultiverseCoreConfiguration wantedConfig = null;
         try {
             wantedConfig = (MultiverseCoreConfiguration) multiverseConfig.get("multiverse-configuration");
-        } catch (Exception ignore) {
+        } catch (Exception e) {
+            // We're just thinking "no risk no fun" and therefore have to catch and forget this exception
         } finally {
             config = ((wantedConfig == null) ? new MultiverseCoreConfiguration() : wantedConfig);
         }
-        this.migrateWorldConfig();
-        this.worldManager.loadWorldConfig(new File(getDataFolder(), "worlds.yml"));
 
-        this.messaging.setCooldown(getMVConfig().getMessageCooldown());
+        this.messaging.setCooldown(config.getMessageCooldown());
 
         // Remove old values.
         this.multiverseConfig.set("enforcegamemodes", null);
@@ -531,261 +324,51 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
      */
     private void migrate22Values() {
         if (this.multiverseConfig.isSet("worldnameprefix")) {
-            Logging.config("Migrating 'worldnameprefix'...");
-            this.getMVConfig().setPrefixChat(this.multiverseConfig.getBoolean("worldnameprefix"));
+            this.log(Level.INFO, "Migrating 'worldnameprefix'...");
+            this.config.setPrefixChat(this.multiverseConfig.getBoolean("worldnameprefix"));
             this.multiverseConfig.set("worldnameprefix", null);
         }
         if (this.multiverseConfig.isSet("firstspawnworld")) {
-            Logging.config("Migrating 'firstspawnworld'...");
-            this.getMVConfig().setFirstSpawnWorld(this.multiverseConfig.getString("firstspawnworld"));
+            this.log(Level.INFO, "Migrating 'firstspawnworld'...");
+            this.config.setFirstSpawnWorld(this.multiverseConfig.getString("firstspawnworld"));
             this.multiverseConfig.set("firstspawnworld", null);
         }
         if (this.multiverseConfig.isSet("enforceaccess")) {
-            Logging.config("Migrating 'enforceaccess'...");
-            this.getMVConfig().setEnforceAccess(this.multiverseConfig.getBoolean("enforceaccess"));
+            this.log(Level.INFO, "Migrating 'enforceaccess'...");
+            this.config.setEnforceAccess(this.multiverseConfig.getBoolean("enforceaccess"));
             this.multiverseConfig.set("enforceaccess", null);
         }
         if (this.multiverseConfig.isSet("displaypermerrors")) {
-            Logging.config("Migrating 'displaypermerrors'...");
-            this.getMVConfig().setDisplayPermErrors(this.multiverseConfig.getBoolean("displaypermerrors"));
+            this.log(Level.INFO, "Migrating 'displaypermerrors'...");
+            this.config.setDisplayPermErrors(this.multiverseConfig.getBoolean("displaypermerrors"));
             this.multiverseConfig.set("displaypermerrors", null);
         }
         if (this.multiverseConfig.isSet("teleportintercept")) {
-            Logging.config("Migrating 'teleportintercept'...");
-            this.getMVConfig().setTeleportIntercept(this.multiverseConfig.getBoolean("teleportintercept"));
+            this.log(Level.INFO, "Migrating 'teleportintercept'...");
+            this.config.setTeleportIntercept(this.multiverseConfig.getBoolean("teleportintercept"));
             this.multiverseConfig.set("teleportintercept", null);
         }
         if (this.multiverseConfig.isSet("firstspawnoverride")) {
-            Logging.config("Migrating 'firstspawnoverride'...");
-            this.getMVConfig().setFirstSpawnOverride(this.multiverseConfig.getBoolean("firstspawnoverride"));
+            this.log(Level.INFO, "Migrating 'firstspawnoverride'...");
+            this.config.setFirstSpawnOverride(this.multiverseConfig.getBoolean("firstspawnoverride"));
             this.multiverseConfig.set("firstspawnoverride", null);
         }
         if (this.multiverseConfig.isSet("messagecooldown")) {
-            Logging.config("Migrating 'messagecooldown'...");
-            this.getMVConfig().setMessageCooldown(this.multiverseConfig.getInt("messagecooldown"));
+            this.log(Level.INFO, "Migrating 'messagecooldown'...");
+            this.config.setMessageCooldown(this.multiverseConfig.getInt("messagecooldown"));
             this.multiverseConfig.set("messagecooldown", null);
         }
         if (this.multiverseConfig.isSet("debug")) {
-            Logging.config("Migrating 'debug'...");
-            this.getMVConfig().setGlobalDebug(this.multiverseConfig.getInt("debug"));
+            this.log(Level.INFO, "Migrating 'debug'...");
+            this.config.setGlobalDebug(this.multiverseConfig.getInt("debug"));
             this.multiverseConfig.set("debug", null);
         }
         if (this.multiverseConfig.isSet("version")) {
-            Logging.config("Migrating 'version'...");
+            this.log(Level.INFO, "Migrating 'version'...");
             this.multiverseConfig.set("version", null);
         }
     }
 
-    /**
-     * Migrate the worlds.yml to SerializationConfig.
-     */
-    private void migrateWorldConfig() { // SUPPRESS CHECKSTYLE: MethodLength
-        FileConfiguration wconf = YamlConfiguration
-                .loadConfiguration(new File(getDataFolder(), "worlds.yml"));
-
-        if (!wconf.isConfigurationSection("worlds")) { // empty config
-            this.log(Level.FINE, "No worlds to migrate!");
-            return;
-        }
-
-        Map<String, Object> values = wconf.getConfigurationSection("worlds").getValues(false);
-
-        boolean wasChanged = false;
-        Map<String, Object> newValues = new LinkedHashMap<String, Object>(values.size());
-        for (Map.Entry<String, Object> entry : values.entrySet()) {
-            if (entry.getValue() instanceof MVWorld) {
-                // fine
-                newValues.put(entry.getKey(), entry.getValue());
-            } else if (entry.getValue() instanceof ConfigurationSection) {
-                this.log(Level.FINE, "Migrating: " + entry.getKey());
-                // we have to migrate this
-                MVWorld world = new MVWorld(Collections.EMPTY_MAP);
-                ConfigurationSection section = (ConfigurationSection) entry.getValue();
-
-                // migrate animals and monsters
-                if (section.isConfigurationSection("animals")) {
-                    ConfigurationSection animalSection = section.getConfigurationSection("animals");
-                    if (animalSection.contains("spawn")) {
-                        if (animalSection.isBoolean("spawn"))
-                            world.setAllowAnimalSpawn(animalSection.getBoolean("spawn"));
-                        else
-                            world.setAllowAnimalSpawn(Boolean.parseBoolean(animalSection.getString("spawn")));
-                    }
-                    if (animalSection.isList("exceptions")) {
-                        world.getAnimalList().clear();
-                        world.getAnimalList().addAll(animalSection.getStringList("exceptions"));
-                    }
-                }
-                if (section.isConfigurationSection("monsters")) {
-                    ConfigurationSection monsterSection = section.getConfigurationSection("monsters");
-                    if (monsterSection.contains("spawn")) {
-                        if (monsterSection.isBoolean("spawn"))
-                            world.setAllowMonsterSpawn(monsterSection.getBoolean("spawn"));
-                        else
-                            world.setAllowMonsterSpawn(Boolean.parseBoolean(monsterSection.getString("spawn")));
-                    }
-                    if (monsterSection.isList("exceptions")) {
-                        world.getMonsterList().clear();
-                        world.getMonsterList().addAll(monsterSection.getStringList("exceptions"));
-                    }
-                }
-
-                // migrate entryfee
-                if (section.isConfigurationSection("entryfee")) {
-                    ConfigurationSection feeSection = section.getConfigurationSection("entryfee");
-                    if (feeSection.isInt("currency"))
-                        world.setCurrency(feeSection.getInt("currency"));
-
-                    if (feeSection.isDouble("amount"))
-                        world.setPrice(feeSection.getDouble("amount"));
-                    else if (feeSection.isInt("amount"))
-                        world.setPrice(feeSection.getInt("amount"));
-                }
-
-                // migrate pvp
-                if (section.isBoolean("pvp")) {
-                    world.setPVPMode(section.getBoolean("pvp"));
-                }
-
-                // migrate alias
-                if (section.isConfigurationSection("alias")) {
-                    ConfigurationSection aliasSection = section.getConfigurationSection("alias");
-                    if (aliasSection.isString("color"))
-                        world.setColor(aliasSection.getString("color"));
-                    if (aliasSection.isString("name"))
-                        world.setAlias(aliasSection.getString("name"));
-                }
-
-                // migrate worldblacklist
-                if (section.isList("worldblacklist")) {
-                    world.getWorldBlacklist().clear();
-                    world.getWorldBlacklist().addAll(section.getStringList("worldblacklist"));
-                }
-
-                // migrate scale
-                if (section.isDouble("scale")) {
-                    world.setScaling(section.getDouble("scale"));
-                }
-
-                // migrate gamemode
-                if (section.isString("gamemode")) {
-                    try {
-                        world.setPropertyValue("gamemode", section.getString("gamemode"));
-                    } catch (PropertyDoesNotExistException e) {
-                        throw new RuntimeException("Who forgot to update the migrator?", e);
-                    }
-                }
-
-                // migrate hunger
-                if (section.isBoolean("hunger")) {
-                    world.setHunger(section.getBoolean("hunger"));
-                }
-
-                // migrate hidden
-                if (section.isBoolean("hidden")) {
-                    world.setHidden(section.getBoolean("hidden"));
-                }
-
-                // migrate autoheal
-                if (section.isBoolean("autoheal")) {
-                    world.setAutoHeal(section.getBoolean("autoheal"));
-                }
-
-                // migrate portalform
-                if (section.isString("portalform")) {
-                    try {
-                        world.setPropertyValue("portalform", section.getString("portalform"));
-                    } catch (PropertyDoesNotExistException e) {
-                        throw new RuntimeException("Who forgot to update the migrator?", e);
-                    }
-                }
-
-                // migrate environment
-                if (section.isString("environment")) {
-                    try {
-                        world.setPropertyValue("environment", section.getString("environment"));
-                    } catch (PropertyDoesNotExistException e) {
-                        throw new RuntimeException("Who forgot to update the migrator?", e);
-                    }
-                }
-
-                // migrate generator
-                if (section.isString("generator")) {
-                    world.setGenerator(section.getString("generator"));
-                }
-
-                // migrate seed
-                if (section.isLong("seed")) {
-                    world.setSeed(section.getLong("seed"));
-                }
-
-                // migrate weather
-                if (section.isBoolean("allowweather")) {
-                    world.setEnableWeather(section.getBoolean("allowweather"));
-                }
-
-                // migrate adjustspawn
-                if (section.isBoolean("adjustspawn")) {
-                    world.setAdjustSpawn(section.getBoolean("adjustspawn"));
-                }
-
-                // migrate autoload
-                if (section.isBoolean("autoload")) {
-                    world.setAutoLoad(section.getBoolean("autoload"));
-                }
-
-                // migrate bedrespawn
-                if (section.isBoolean("bedrespawn")) {
-                    world.setBedRespawn(section.getBoolean("bedrespawn"));
-                }
-
-                // migrate spawn
-                if (section.isConfigurationSection("spawn")) {
-                    ConfigurationSection spawnSect = section.getConfigurationSection("spawn");
-                    Location spawnLoc = world.getSpawnLocation();
-                    if (spawnSect.isDouble("yaw"))
-                        spawnLoc.setYaw((float) spawnSect.getDouble("yaw"));
-                    if (spawnSect.isDouble("pitch"))
-                        spawnLoc.setPitch((float) spawnSect.getDouble("pitch"));
-                    if (spawnSect.isDouble("x"))
-                        spawnLoc.setX(spawnSect.getDouble("x"));
-                    if (spawnSect.isDouble("y"))
-                        spawnLoc.setY(spawnSect.getDouble("y"));
-                    if (spawnSect.isDouble("z"))
-                        spawnLoc.setZ(spawnSect.getDouble("z"));
-
-                    world.setSpawnLocation(spawnLoc);
-                }
-
-                newValues.put(entry.getKey(), world);
-                wasChanged = true;
-            } else {
-                // huh?
-                this.log(Level.WARNING, "Removing unknown entry in the config: " + entry);
-                // just don't add to newValues
-                wasChanged = true;
-            }
-        }
-
-        if (wasChanged) {
-            // clear config
-            wconf.set("worlds", null);
-
-            // and rebuild it
-            ConfigurationSection rootSection = wconf.createSection("worlds");
-            for (Map.Entry<String, Object> entry : newValues.entrySet()) {
-                rootSection.set(entry.getKey(), entry.getValue());
-            }
-
-            try {
-                wconf.save(new File(getDataFolder(), "worlds.yml"));
-            } catch (IOException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -804,7 +387,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
         this.commandHandler.registerCommand(new ListCommand(this));
         this.commandHandler.registerCommand(new InfoCommand(this));
         this.commandHandler.registerCommand(new CreateCommand(this));
-        this.commandHandler.registerCommand(new CloneCommand(this));
         this.commandHandler.registerCommand(new ImportCommand(this));
         this.commandHandler.registerCommand(new ReloadCommand(this));
         this.commandHandler.registerCommand(new SetSpawnCommand(this));
@@ -831,10 +413,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
         // Misc Commands
         this.commandHandler.registerCommand(new EnvironmentCommand(this));
         this.commandHandler.registerCommand(new DebugCommand(this));
-        this.commandHandler.registerCommand(new SilentCommand(this));
         this.commandHandler.registerCommand(new GeneratorCommand(this));
         this.commandHandler.registerCommand(new CheckCommand(this));
-        this.commandHandler.registerCommand(new ScriptCommand(this));
     }
 
     /**
@@ -842,10 +422,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
      */
     @Override
     public void onDisable() {
-        this.saveMVConfigs();
+        debugLog.close();
         this.banker = null;
         this.bank = null;
-        Logging.shutdown();
+        log(Level.INFO, "- Disabled");
     }
 
     /**
@@ -856,7 +436,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
         if (this.playerSessions.containsKey(player.getName())) {
             return this.playerSessions.get(player.getName());
         } else {
-            this.playerSessions.put(player.getName(), new MVPlayerSession(player, getMVConfig()));
+            this.playerSessions.put(player.getName(), new MVPlayerSession(player, config));
             return this.playerSessions.get(player.getName());
         }
     }
@@ -886,19 +466,12 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
     @Override
     public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args) {
         if (!this.isEnabled()) {
-            this.messaging.sendMessage(sender, MultiverseMessage.CH_PLUGIN_DISABLED);
+            sender.sendMessage("This plugin is Disabled!");
             return true;
         }
         ArrayList<String> allArgs = new ArrayList<String>(Arrays.asList(args));
         allArgs.add(0, command.getName());
-        try {
-            return this.commandHandler.locateAndRunCommand(sender, allArgs, getMVConfig().getDisplayPermErrors());
-        } catch (Exception e) {
-            e.printStackTrace();
-            this.messaging.sendMessage(sender, MultiverseMessage.CH_INTERNAL_ERROR);
-            this.messaging.sendMessage(sender, sender.isOp() ? MultiverseMessage.CH_ADMIN_DEBUG : MultiverseMessage.CH_USER_DEBUG);
-            return true;
-        }
+        return this.commandHandler.locateAndRunCommand(sender, allArgs, config.getDisplayPermErrors());
     }
 
     /**
@@ -906,7 +479,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
      */
     @Override
     public void log(Level level, String msg) {
-        Logging.log(level, msg);
+        staticLog(level, msg);
     }
 
     /**
@@ -914,28 +487,33 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
      *
      * @param level The Log-{@link Level}.
      * @param msg The message to log.
-     *
-     * @deprecated Replaced by {@link Logging}.  Please refrain from using this from a third party plugin as the
-     * messages will appear to originate from Multiverse-Core.
      */
-    @Deprecated
     public static void staticLog(Level level, String msg) {
-        Logging.log(level, msg);
+        if (level == Level.FINE && config.getGlobalDebug() >= 1) {
+            staticDebugLog(Level.INFO, msg);
+            return;
+        } else if (level == Level.FINER && config.getGlobalDebug() >= 2) {
+            staticDebugLog(Level.INFO, msg);
+            return;
+        } else if (level == Level.FINEST && config.getGlobalDebug() >= 3) {
+            staticDebugLog(Level.INFO, msg);
+            return;
+        } else if (level != Level.FINE && level != Level.FINER && level != Level.FINEST) {
+            LOGGER.log(level, String.format("%s %s", LOG_TAG, msg));
+            debugLog.log(level, String.format("%s %s", LOG_TAG, msg));
+        }
     }
 
     /**
-     * Print messages to the Debug Log, if the servers in Debug Mode then we also want to print the messages to the
+     * Print messages to the Debug Log, if the servers in Debug Mode then we also wan't to print the messages to the
      * standard Server Console.
      *
      * @param level The Log-{@link Level}
-     * @param msg   The message
-     *
-     * @deprecated Replaced by {@link Logging}.  Please refrain from using this from a third party plugin as the
-     * messages will appear to originate from Multiverse-Core.
+     * @param msg The message
      */
-    @Deprecated
     public static void staticDebugLog(Level level, String msg) {
-        Logging.log(level, msg);
+        LOGGER.log(level, "[MVCore-Debug] " + msg);
+        debugLog.log(level, "[MVCore-Debug] " + msg);
     }
 
     /**
@@ -944,7 +522,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
     @Override
     public String getAuthors() {
         String authors = "";
-        List<String> auths = this.getDescription().getAuthors();
+        ArrayList<String> auths = this.getDescription().getAuthors();
         if (auths.size() == 0) {
             return "";
         }
@@ -988,8 +566,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
      * @param worldName The name of the invalid world
      */
     public void showNotMVWorldMessage(CommandSender sender, String worldName) {
-        // TODO remove this method because we can now send this message in one line
-        this.messaging.sendMessage(sender, MultiverseMessage.GENERIC_NOT_MV_WORLD, worldName);
+        sender.sendMessage("Multiverse doesn't know about " + ChatColor.DARK_AQUA + worldName + ChatColor.WHITE + " yet.");
+        sender.sendMessage("Type " + ChatColor.DARK_AQUA + "/mv import ?" + ChatColor.WHITE + " for help!");
     }
 
     /**
@@ -1029,20 +607,16 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
 
     /**
      * {@inheritDoc}
-     * @deprecated Now using Vault.
      */
     @Override
-    @Deprecated
     public AllPay getBanker() {
         return this.banker;
     }
 
     /**
      * {@inheritDoc}
-     * @deprecated Now using Vault.
      */
     @Override
-    @Deprecated
     public void setBank(GenericBank bank) {
         this.bank = bank;
     }
@@ -1088,10 +662,9 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
         this.serverFolder = newServerFolder;
     }
 
-    /*
     /**
      * Initializes Spout.
-     * /
+     */
     public void setSpout() {
         this.spoutInterface = new SpoutInterface();
         this.commandHandler.registerCommand(new SpoutCommand(this));
@@ -1101,11 +674,10 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
      * Gets our {@link SpoutInterface}.
      *
      * @return The {@link SpoutInterface} we're using.
-     * /
+     */
     public SpoutInterface getSpout() {
         return this.spoutInterface;
     }
-    */
 
     /**
      * {@inheritDoc}
@@ -1124,15 +696,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
         return this.playerListener;
     }
 
-    /**
-     * Gets the {@link MVChatListener}.
-     *
-     * @return The {@link MVChatListener}.
-     */
-    public MVChatListener getChatListener() {
-        return this.chatListener;
-    }
-
     /**
      * Gets the {@link MVEntityListener}.
      *
@@ -1158,7 +721,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
      */
     public boolean saveMVConfig() {
         try {
-            this.multiverseConfig.set("multiverse-configuration", getMVConfig());
+            this.multiverseConfig.set("multiverse-configuration", config);
             this.multiverseConfig.save(new File(getDataFolder(), "config.yml"));
             return true;
         } catch (IOException e) {
@@ -1195,27 +758,38 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
         return this.worldManager.deleteWorld(name);
     }
 
-    /**
-     * NOT deprecated for the time as queued commands use this.
-     * However, this is not in the API and other plugins should therefore not use it.
-     *
-     * @param oldName   World to copy
-     * @param newName   World to create
-     * @param generator The Custom generator plugin to use.
-     * @return True if success, false if fail.
-     */
-    public Boolean cloneWorld(String oldName, String newName, String generator) {
-        return this.worldManager.cloneWorld(oldName, newName, generator);
-    }
-
     /**
      * {@inheritDoc}
-     * @deprecated This is deprecated!
      */
     @Override
-    @Deprecated
     public Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed) {
-        return this.worldManager.regenWorld(name, useNewSeed, randomSeed, seed);
+        MultiverseWorld world = this.worldManager.getMVWorld(name);
+        if (world == null) {
+            return false;
+        }
+
+        List<Player> ps = world.getCBWorld().getPlayers();
+
+        if (useNewSeed) {
+            // Set the worldseed.
+            if (randomSeed) {
+                Random random = new Random();
+                Long newseed = random.nextLong();
+                seed = newseed.toString();
+            }
+            ((WorldManager) this.worldManager).getConfigWorlds().set("worlds." + name + ".seed", seed);
+        }
+        if (this.worldManager.deleteWorld(name, false)) {
+            this.worldManager.loadWorlds(false);
+            SafeTTeleporter teleporter = this.getSafeTTeleporter();
+            Location newSpawn = this.getServer().getWorld(name).getSpawnLocation();
+            // Send all players that were in the old world, BACK to it!
+            for (Player p : ps) {
+                teleporter.safelyTeleport(null, p, newSpawn, true);
+            }
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -1226,25 +800,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
         return this.anchorManager;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public MessageProvider getMessageProvider() {
-        return messageProvider;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setMessageProvider(MessageProvider provider) {
-        if (provider == null)
-            throw new IllegalArgumentException("The new provider can't be null!");
-
-        messageProvider = provider;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -1309,11 +864,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
      */
     @Deprecated
     public static MultiverseCoreConfiguration getStaticConfig() {
-        return MultiverseCoreConfiguration.getInstance();
-    }
-
-    @Override
-    public Buscript getScriptAPI() {
-        return buscript;
+        return config;
     }
 }

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

@@ -1,91 +1,52 @@
 package com.onarandombox.MultiverseCore;
 
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
-import com.onarandombox.MultiverseCore.configuration.LocaleSerializor;
+import java.util.Map;
+
+import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
 
-import me.main__.util.SerializationConfig.NoSuchPropertyException;
 import me.main__.util.SerializationConfig.Property;
 import me.main__.util.SerializationConfig.SerializationConfig;
-import java.util.Locale;
-import java.util.Map;
 
 /**
  * Our configuration.
  */
 public class MultiverseCoreConfiguration extends SerializationConfig implements MultiverseCoreConfig {
-    private static MultiverseCoreConfiguration instance;
-
-    /**
-     * Sets the statically saved instance.
-     * @param instance The new instance.
-     */
-    public static void setInstance(MultiverseCoreConfiguration instance) {
-        MultiverseCoreConfiguration.instance = instance;
-    }
-
-    /**
-     * @return True if the static instance of config is set.
-     */
-    public static boolean isSet() {
-        return instance != null;
-    }
-
-    /**
-     * Gets the statically saved instance.
-     * @return The statically saved instance.
-     */
-    public static MultiverseCoreConfiguration getInstance() {
-        if (instance == null)
-            throw new IllegalStateException("The instance wasn't set!");
-        return instance;
-    }
-
     @Property
-    private volatile boolean enforceaccess;
+    private boolean enforceaccess;
     @Property
-    private volatile boolean prefixchat;
+    private boolean prefixchat;
     @Property
-    private volatile boolean useasyncchat;
+    private boolean teleportintercept;
     @Property
-    private volatile boolean teleportintercept;
+    private boolean firstspawnoverride;
     @Property
-    private volatile boolean firstspawnoverride;
+    private boolean displaypermerrors;
     @Property
-    private volatile boolean displaypermerrors;
+    private int globaldebug;
     @Property
-    private volatile int globaldebug;
+    private int messagecooldown;
     @Property
-    private volatile boolean silentstart;
+    private double version;
     @Property
-    private volatile int messagecooldown;
+    private String firstspawnworld;
     @Property
-    private volatile double version;
-    @Property
-    private volatile String firstspawnworld;
-    @Property
-    private volatile int teleportcooldown;
-    @Property(serializor = LocaleSerializor.class)
-    private volatile Locale locale;
+    private int teleportcooldown;
 
     public MultiverseCoreConfiguration() {
         super();
-        MultiverseCoreConfiguration.setInstance(this);
     }
 
     public MultiverseCoreConfiguration(Map<String, Object> values) {
         super(values);
-        MultiverseCoreConfiguration.setInstance(this);
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    protected void setDefaults() {
+    public void setDefaults() {
         // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
         enforceaccess = false;
-        useasyncchat = true;
         prefixchat = true;
         teleportintercept = true;
         firstspawnoverride = true;
@@ -94,22 +55,9 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
         messagecooldown = 5000;
         teleportcooldown = 1000;
         this.version = 2.9;
-        silentstart = false;
         // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean setConfigProperty(String property, String value) {
-        try {
-            return this.setProperty(property, value, true);
-        } catch (NoSuchPropertyException e) {
-            return false;
-        }
-    }
-
     // And here we go:
 
     /**
@@ -206,7 +154,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     @Override
     public void setGlobalDebug(int globalDebug) {
         this.globaldebug = globalDebug;
-        Logging.setDebugLevel(globalDebug);
     }
 
     /**
@@ -272,35 +219,4 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     public void setTeleportCooldown(int teleportCooldown) {
         this.teleportcooldown = teleportCooldown;
     }
-
-    @Override
-    public void setUseAsyncChat(boolean useAsyncChat) {
-        this.useasyncchat = useAsyncChat;
-    }
-
-    @Override
-    public boolean getUseAsyncChat() {
-        return this.useasyncchat;
-    }
-
-    @Override
-    public Locale getLocale() {
-        return locale;
-    }
-
-    @Override
-    public void setLocale(Locale locale) {
-        this.locale = locale;
-    }
-
-    @Override
-    public void setSilentStart(boolean silentStart) {
-        Logging.setShowingConfig(!silentStart);
-        this.silentstart = silentStart;
-    }
-
-    @Override
-    public boolean getSilentStart() {
-        return silentstart;
-    }
 }

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

@@ -35,13 +35,6 @@ public interface BlockSafety {
      */
     boolean playerCanSpawnHereSafely(Location l);
 
-    /**
-     * Gets a safe bed spawn location OR null if the bed is invalid.
-     * @param l The location of the bead head (block with the pillow on it).
-     * @return Safe location around the bed or null if no location was found.
-     */
-    Location getSafeBedSpawn(Location l);
-
     /**
      * Gets the location of the top block at the specified {@link Location}.
      * @param l Any {@link Location}.

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

@@ -7,18 +7,10 @@
 
 package com.onarandombox.MultiverseCore.api;
 
-import buscript.Buscript;
 import com.fernferret.allpay.AllPay;
 import com.fernferret.allpay.GenericBank;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
-import com.onarandombox.MultiverseCore.utils.AnchorManager;
-import com.onarandombox.MultiverseCore.utils.MVPermissions;
-import com.onarandombox.MultiverseCore.utils.MVPlayerSession;
-import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety;
-import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
-import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
-import com.onarandombox.MultiverseCore.utils.VaultHandler;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
+import com.onarandombox.MultiverseCore.utils.*;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
@@ -43,19 +35,9 @@ public interface Core {
      * Gets the Banking system that Multiverse-Core has hooked into.
      *
      * @return A {@link GenericBank} that can be used for payments.
-     * @deprecated Now using vault, see {@link VaultHandler#getEconomy}
      */
-    @Deprecated
     GenericBank getBank();
 
-    /**
-     * Returns the Vault handler used by Multiverse.  The returned object will have all methods necessary for
-     * interfacing with Vault.
-     *
-     * @return the Vault handler for Multiverse.
-     */
-    VaultHandler getVaultHandler();
-
     /**
      * Reloads the Multiverse Configuration files:
      * worlds.yml and config.yml.
@@ -146,28 +128,21 @@ public interface Core {
      * @param seed The seed of the world.
      *
      * @return True if success, false if fail.
-     *
-     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String)} instead.
      */
-    @Deprecated
     Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed);
 
     /**
      * Sets the {@link GenericBank}-Bank AllPay is using.
      *
      * @param bank The new {@link GenericBank}
-     * @deprecated Now using vault, see {@link VaultHandler#getEconomy}
      */
-    @Deprecated
     void setBank(GenericBank bank);
 
     /**
      * Gets this plugin's {@link AllPay}-Banker.
      *
      * @return An {@link AllPay}-Banker
-     * @deprecated Now using vault, see {@link VaultHandler#getEconomy}
      */
-    @Deprecated
     AllPay getBanker();
 
     /**
@@ -247,11 +222,4 @@ public interface Core {
      * @return The configuration.
      */
     MultiverseCoreConfig getMVConfig();
-
-    /**
-     * Gets the buscript object for Multiverse.  This is what handles Javascript processing.
-     *
-     * @return The Multiverse buscript object.
-     */
-    Buscript getScriptAPI();
 }

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

@@ -60,16 +60,6 @@ public interface MVWorldManager {
     boolean addWorld(String name, Environment env, String seedString, WorldType type, Boolean generateStructures,
                      String generator, boolean useSpawnAdjust);
 
-    /**
-     * Make a copy of a world.
-     *
-     * @param oldName            Name of world to be copied
-     * @param newName            Name of world to be created
-     * @param generator          The Custom generator plugin to use.
-     * @return True if the world is copied successfully, false if not.
-     */
-    boolean cloneWorld(String oldName, String newName, String generator);
-
     /**
      * Remove the world from the Multiverse list, from the
      * config and deletes the folder.
@@ -90,17 +80,6 @@ public interface MVWorldManager {
      */
     boolean deleteWorld(String name, boolean removeConfig);
 
-    /**
-     *
-     * @param name The name of the world to remove
-     * @param removeFromConfig If true(default), we'll remove the entries from the
-     *                         config. If false, they'll stay and the world may come back.
-     * @param deleteWorldFolder If true the world folder will be completely deleted. If false
-     *                          only the contents of the world folder will be deleted
-     * @return True if success, false if failure.
-     */
-    boolean deleteWorld(String name, boolean removeFromConfig, boolean deleteWorldFolder);
-
     /**
      * Unload a world from Multiverse.
      *
@@ -266,16 +245,4 @@ public interface MVWorldManager {
      * @return The {@link MultiverseWorld} new players should spawn in.
      */
     MultiverseWorld getFirstSpawnWorld();
-
-    /**
-     * Regenerates a world.
-     *
-     * @param name Name of the world to regenerate
-     * @param useNewSeed If a new seed should be used
-     * @param randomSeed IF the new seed should be random
-     * @param seed The seed of the world.
-     *
-     * @return True if success, false if fail.
-     */
-    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed);
 }

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

@@ -1,7 +1,5 @@
 package com.onarandombox.MultiverseCore.api;
 
-import java.util.Locale;
-
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
 
 /**
@@ -14,7 +12,7 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      * @param value The value.
      * @return True on success, false if the operation failed.
      */
-    boolean setConfigProperty(String property, String value);
+    boolean setProperty(String property, String value);
 
     /**
      * Sets portalCooldown.
@@ -135,42 +133,4 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
      * @return enforceAccess.
      */
     boolean getEnforceAccess();
-
-    /**
-     * Sets useasyncchat.
-     * @param useAsyncChat The new value.
-     */
-    void setUseAsyncChat(boolean useAsyncChat);
-
-    /**
-     * Gets useasyncchat.
-     * @return useasyncchat.
-     */
-    boolean getUseAsyncChat();
-
-    /**
-     * Sets the locale.
-     * @param locale The new value.
-     */
-    void setLocale(Locale locale);
-
-    /**
-     * Gets the locale.
-     * @return locale
-     */
-    Locale getLocale();
-
-    /**
-     * Sets whether to suppress startup messages.
-     *
-     * @param silentStart true to suppress messages.
-     */
-    void setSilentStart(boolean silentStart);
-
-    /**
-     * Whether we are suppressing startup messages.
-     *
-     * @return true if we are suppressing startup messages.
-     */
-    boolean getSilentStart();
 }

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

@@ -4,8 +4,6 @@ import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
 
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
-
 /**
  * Multiverse-messaging.
  */
@@ -16,27 +14,6 @@ public interface MultiverseMessaging {
      */
     void setCooldown(int milliseconds);
 
-    /**
-     * Sends a message to the specified sender if the cooldown has passed.
-     *
-     * @param sender         The person/console to send the message to.
-     * @param message        The message to send.
-     * @param formatArgs     Format arguments for the message.
-     * @return true if the message was sent, false if not.
-     */
-    boolean sendMessage(CommandSender sender, MultiverseMessage message, Object...formatArgs);
-
-    /**
-     * Sends a message to the specified sender if the cooldown has passed.
-     *
-     * @param sender         The person/console to send the message to.
-     * @param message        The message to send.
-     * @param ignoreCooldown If true this message will always be sent. Useful for things like menus
-     * @param formatArgs     Format arguments for the message.
-     * @return true if the message was sent, false if not.
-     */
-    boolean sendMessage(CommandSender sender, MultiverseMessage message, boolean ignoreCooldown, Object... formatArgs);
-
     /**
      * Sends a message to the specified sender if the cooldown has passed.
      *

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

@@ -1,162 +0,0 @@
-package com.onarandombox.MultiverseCore.api;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
-import com.onarandombox.MultiverseCore.utils.DebugLog;
-import com.pneumaticraft.commandhandler.CommandHandler;
-
-/**
- * Make things easier for MV-Plugins!
- */
-public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
-    private MultiverseCore core;
-    /**
-     * Prefix for standard log entrys.
-     */
-    protected String logTag;
-    private DebugLog debugLog;
-
-    /**
-     * {@inheritDoc}
-     *
-     * Note: You can't override this, use {@link #onPluginEnable()} instead!
-     * @see #onPluginEnable()
-     */
-    @Override
-    public final void onEnable() {
-        MultiverseCore theCore = (MultiverseCore) this.getServer().getPluginManager().getPlugin("Multiverse-Core");
-        if (theCore == null) {
-            this.getLogger().severe("Core not found! The plugin dev needs to add a dependency!");
-            this.getLogger().severe("Disabling!");
-            this.getServer().getPluginManager().disablePlugin(this);
-            return;
-        }
-        if (theCore.getProtocolVersion() < this.getProtocolVersion()) {
-            this.getLogger().severe("You need a newer version of Multiverse-Core!");
-            this.getLogger().severe("Disabling!");
-            this.getServer().getPluginManager().disablePlugin(this);
-            return;
-        }
-        this.setCore(theCore);
-
-        this.getServer().getLogger().info(String.format("%s - Version %s enabled - By %s",
-                this.getDescription().getName(), this.getDescription().getVersion(), getAuthors()));
-        getDataFolder().mkdirs();
-        File debugLogFile = new File(getDataFolder(), "debug.log");
-        try {
-            debugLogFile.createNewFile();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        debugLog = new DebugLog(this.getDescription().getName(), getDataFolder() + File.separator + "debug.log");
-        debugLog.setTag(String.format("[%s-Debug]", this.getDescription().getName()));
-
-        this.onPluginEnable();
-    }
-
-    /**
-     * Parse the Authors Array into a readable String with ',' and 'and'.
-     *
-     * @return The readable authors-{@link String}
-     */
-    protected String getAuthors() {
-        String authors = "";
-        List<String> auths = this.getDescription().getAuthors();
-        if (auths.size() == 0) {
-            return "";
-        }
-
-        if (auths.size() == 1) {
-            return auths.get(0);
-        }
-
-        for (int i = 0; i < auths.size(); i++) {
-            if (i == this.getDescription().getAuthors().size() - 1) {
-                authors += " and " + this.getDescription().getAuthors().get(i);
-            } else {
-                authors += ", " + this.getDescription().getAuthors().get(i);
-            }
-        }
-        return authors.substring(2);
-    }
-
-    /**
-     * Called when the plugin is enabled.
-     * @see #onEnable()
-     */
-    protected abstract void onPluginEnable();
-
-    /**
-     * You can register commands here.
-     * @param handler The CommandHandler.
-     */
-    protected abstract void registerCommands(CommandHandler handler);
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!this.isEnabled()) {
-            this.core.getMessaging().sendMessage(sender, MultiverseMessage.CH_PLUGIN_DISABLED);
-            return true;
-        }
-
-        ArrayList<String> allArgs = new ArrayList<String>(args.length + 1);
-        allArgs.add(command.getName());
-        allArgs.addAll(Arrays.asList(args));
-        return this.getCore().getCommandHandler().locateAndRunCommand(sender, allArgs);
-    }
-
-    @Override
-    public void log(Level level, String msg) {
-        int debugLevel = this.getCore().getMVConfig().getGlobalDebug();
-        if ((level == Level.FINE && debugLevel >= 1) || (level == Level.FINER && debugLevel >= 2)
-                || (level == Level.FINEST && debugLevel >= 3)) {
-            debugLog.log(level, msg);
-        } else if (level != Level.FINE && level != Level.FINER && level != Level.FINEST) {
-            String message = new StringBuilder(getLogTag()).append(msg).toString();
-            this.getServer().getLogger().log(level, message);
-            debugLog.log(level, message);
-        }
-    }
-
-    private String getLogTag() {
-        if (logTag == null)
-            logTag = String.format("[%s]", this.getDescription().getName());
-        return logTag;
-    }
-
-    /**
-     * Sets the debug log-tag.
-     * @param tag The new tag.
-     */
-    protected final void setDebugLogTag(String tag) {
-        this.debugLog.setTag(tag);
-    }
-
-    @Override
-    public final String dumpVersionInfo(String buffer) {
-        throw new UnsupportedOperationException("This is gone.");
-    }
-
-    @Override
-    public final MultiverseCore getCore() {
-        if (this.core == null)
-            throw new IllegalStateException("Core is null!");
-        return this.core;
-    }
-
-    @Override
-    public final void setCore(MultiverseCore core) {
-        this.core = core;
-    }
-}

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

@@ -7,6 +7,7 @@
 
 package com.onarandombox.MultiverseCore.api;
 
+import com.onarandombox.MultiverseCore.configuration.MVConfigProperty;
 import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
 import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
 
@@ -25,6 +26,7 @@ import java.util.List;
  * The API for a Multiverse Handled World.
  */
 public interface MultiverseWorld {
+
     /**
      * Returns the Bukkit world object that this world describes.
      *
@@ -33,24 +35,79 @@ public interface MultiverseWorld {
     World getCBWorld();
 
     /**
-     * Gets the name of this world. The name cannot be changed.
-     * <p>
-     * Note for plugin developers: Usually {@link #getAlias()}
-     * is what you want to use instead of this method.
+     * Adds the property to the given value.
+     * It will throw a PropertyDoesNotExistException if the property is not found.
      *
-     * @return The name of the world as a String.
+     * @param property The name of a world property to set.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @param sender   The sender who wants this value to be set.
+     * @return True if the value was set, false if not.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
      */
-    String getName();
+    boolean setProperty(String property, String value, CommandSender sender) throws PropertyDoesNotExistException;
 
     /**
-     * Gets the type of this world. As of 1.2 this will be:
-     * FLAT, NORMAL or VERSION_1_1
-     * <p>
-     * This is <b>not</b> the generator.
+     * Gets the actual MVConfigProperty from this world.
+     * It will throw a PropertyDoesNotExistException if the property is not found.
      *
-     * @return The Type of this world.
+     * @param property The name of a world property to get.
+     * @return A valid MVWorldProperty.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     * @deprecated Use {@link #getProperty(String, Class)} instead
      */
-    WorldType getWorldType();
+    @Deprecated
+    MVConfigProperty<?> getProperty(String property) throws PropertyDoesNotExistException;
+
+    /**
+     * Gets the string representation of a property.
+     * It will throw a PropertyDoesNotExistException if the property is not found.
+     *
+     * @param property The name of a world property to get.
+     * @return A valid MVWorldProperty.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     */
+    String getPropertyValue(String property) throws PropertyDoesNotExistException;
+
+    /**
+     * Gets the actual MVConfigProperty from this world.
+     * It will throw a PropertyDoesNotExistException if the property is not found.
+     *
+     * @param property The name of a world property to get.
+     * @param expected The type of the expected property. Use Object.class if this doesn't matter for you.
+     * @param <T> The type of the expected property.
+     *
+     * @return A valid MVWorldProperty.
+     *
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     */
+    <T> MVConfigProperty<T> getProperty(String property, Class<T> expected) throws PropertyDoesNotExistException;
+
+    /**
+     * Removes all values from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     *
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to clear.
+     * @return True if it was cleared, false if not.
+     */
+    boolean clearVariable(String property);
+
+    /**
+     * Adds a value to the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     *
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to add a value to.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @return True if the value was added, false if not.
+     */
+    boolean addToVariable(String property, String value);
+
+    /**
+     * Removes a value from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     *
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to remove a value
+     *                 from.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @return True if the value was removed, false if not.
+     */
+    boolean removeFromVariable(String property, String value);
 
     /**
      * Gets the environment of this world.
@@ -68,168 +125,27 @@ public interface MultiverseWorld {
      */
     void setEnvironment(World.Environment environment);
 
-    /**
-     * Gets the difficulty of this world.
-     *
-     * @return The difficulty of this world.
-     */
-    Difficulty getDifficulty();
-
-    /**
-     * Sets the difficulty of this world and returns true if success.
-     * Valid string values are either an integer of difficulty(0-3) or
-     * the name that resides in the Bukkit enum, ex. {@code PEACEFUL}
-     *
-     * @param difficulty The difficulty to set the world to as a string.
-     * @return True if success, false if the provided string
-     *         could not be translated to a difficulty.
-     * @deprecated Use {@link #setDifficulty(Difficulty)} or, if you have to
-     * pass a string, use {@link #setPropertyValue(String, String)} instead.
-     */
-    @Deprecated
-    boolean setDifficulty(String difficulty);
-
-    /**
-     * Sets the difficulty of this world and returns {@code true} on success.
-     * Valid string values are either an integer of difficulty(0-3) or
-     * the name that resides in the Bukkit enum, ex. PEACEFUL
-     *
-     * @param difficulty The new difficulty.
-     * @return True if success, false if the operation failed... for whatever reason.
-     */
-    boolean setDifficulty(Difficulty difficulty);
-
     /**
      * Gets the world seed of this world.
      *
      * @return The Long version of the seed.
      */
-    long getSeed();
+    Long getSeed();
 
     /**
      * Sets the seed of this world.
      *
      * @param seed A Long that is the seed.
      */
-    void setSeed(long seed);
+    void setSeed(Long seed);
 
     /**
-     * Gets the generator of this world.
+     * Gets the name of this world. This cannot be changed.
      *
-     * @return The name of the generator.
+     * @return The name of the world as a String.
      */
-    String getGenerator();
+    String getName();
 
-    /**
-     * Sets the generator of this world.
-     *
-     * @param generator The new generator's name.
-     */
-    void setGenerator(String generator);
-
-    /**
-     * Gets the help-message for a property.
-     * @param property The name of the property.
-     * @return The help-message.
-     * @throws PropertyDoesNotExistException Thrown if the property was not found.
-     */
-    String getPropertyHelp(String property) throws PropertyDoesNotExistException;
-
-    /**
-     * Gets a property as {@link String}.
-     *
-     * @param property The name of a world property to get.
-     * @return The string-representation of that property.
-     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
-     */
-    String getPropertyValue(String property) throws PropertyDoesNotExistException;
-
-    /**
-     * Sets a property to a given value.
-     *
-     * @param property The name of a world property to set.
-     * @param value    A value in string representation, it will be parsed to the correct type.
-     * @return True if the value was set, false if not.
-     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
-     */
-    boolean setPropertyValue(String property, String value) throws PropertyDoesNotExistException;
-
-    /**
-     * Gets the actual MVConfigProperty from this world.
-     * It will throw a PropertyDoesNotExistException if the property is not found.
-     *
-     * @param property The name of a world property to get.
-     * @param expected The type of the expected property. Use Object.class if this doesn't matter for you.
-     * @param <T> The type of the expected property.
-     *
-     * @return A valid MVWorldProperty.
-     *
-     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
-     * @deprecated We don't use {@link com.onarandombox.MultiverseCore.configuration.MVConfigProperty} any longer!
-     */
-    @Deprecated
-    <T> com.onarandombox.MultiverseCore.configuration.MVConfigProperty<T> getProperty(String property, Class<T> expected) throws PropertyDoesNotExistException;
-
-    // old config
-    /**
-     * Adds the property to the given value.
-     * It will throw a PropertyDoesNotExistException if the property is not found.
-     *
-     * @param property The name of a world property to set.
-     * @param value    A value in string representation, it will be parsed to the correct type.
-     * @param sender   The sender who wants this value to be set.
-     * @return True if the value was set, false if not.
-     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
-     * @deprecated Use {@link #setPropertyValue(String, String)} instead.
-     */
-    @Deprecated
-    boolean setProperty(String property, String value, CommandSender sender) throws PropertyDoesNotExistException;
-
-    /**
-     * Adds a value to the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
-     *
-     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to add a value to.
-     * @param value    A value in string representation, it will be parsed to the correct type.
-     * @return True if the value was added, false if not.
-     * @deprecated We changed the entire world-config-system. This is not compatible any more.
-     */
-    @Deprecated
-    boolean addToVariable(String property, String value);
-
-    /**
-     * Removes a value from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
-     *
-     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to remove a value
-     *                 from.
-     * @param value    A value in string representation, it will be parsed to the correct type.
-     * @return True if the value was removed, false if not.
-     * @deprecated We changed the entire world-config-system. This is not compatible any more.
-     */
-    @Deprecated
-    boolean removeFromVariable(String property, String value);
-
-    /**
-     * Removes all values from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
-     *
-     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to clear.
-     * @return True if it was cleared, false if not.
-     * @deprecated We changed the entire world-config-system. This is not compatible any more.
-     */
-    @Deprecated
-    boolean clearVariable(String property);
-
-    /**
-     * Clears a list property (sets it to []).
-     *
-     * @param property The property to clear.
-     * @return True if success, false if fail.
-     * @deprecated We changed the entire world-config-system. This is not compatible any more.
-     */
-    @Deprecated
-    boolean clearList(String property);
-    // end of old config stuff
-
-    // permission stuff
     /**
      * Gets the lowercased name of the world. This method is required, since the permissables
      * lowercase all permissions when recalculating.
@@ -242,21 +158,6 @@ public interface MultiverseWorld {
      */
     String getPermissibleName();
 
-    /**
-     * Gets the permission required to enter this world.
-     *
-     * @return The permission required to be exempt from charges to/from this world.
-     */
-    Permission getAccessPermission();
-
-    /**
-     * Gets the permission required to be exempt when entering.
-     *
-     * @return The permission required to be exempt when entering.
-     */
-    Permission getExemptPermission();
-    // end of permission stuff
-
     /**
      * Gets the alias of this world.
      * <p>
@@ -273,13 +174,6 @@ public interface MultiverseWorld {
      */
     void setAlias(String alias);
 
-    /**
-     * Gets the color that this world's name/alias will display as.
-     *
-     * @return The color of this world.
-     */
-    ChatColor getColor();
-
     /**
      * Sets the color that this world's name/alias will display as.
      *
@@ -289,29 +183,18 @@ public interface MultiverseWorld {
     boolean setColor(String color);
 
     /**
-     * Gets the style that this world's name/alias will display as.
+     * Gets the color that this world's name/alias will display as.
      *
-     * @return The style of this world. {@code null} for "normal" style.
+     * @return The color of this world.
      */
-    ChatColor getStyle();
-
-    /**
-     * Sets the style that this world's name/alias will display as.
-     *
-     * @param style A valid style name.
-     * @return True if the style was set, false if not.
-     */
-    boolean setStyle(String style);
+    ChatColor getColor();
 
     /**
      * Tells you if someone entered a valid color.
      *
      * @param color A string that may translate to a color.
      * @return True if it is a color, false if not.
-     *
-     * @deprecated This has been moved: {@link com.onarandombox.MultiverseCore.enums.EnglishChatColor#isValidAliasColor(String)}
      */
-    @Deprecated
     boolean isValidAliasColor(String color);
 
     /**
@@ -321,7 +204,6 @@ public interface MultiverseWorld {
      */
     String getColoredWorldString();
 
-    // animals&monster stuff
     /**
      * Gets whether or not animals are allowed to spawn in this world.
      *
@@ -329,22 +211,6 @@ public interface MultiverseWorld {
      */
     boolean canAnimalsSpawn();
 
-    /**
-     * Sets whether or not animals can spawn.
-     * If there are values in {@link #getAnimalList()} and this is false,
-     * those animals become the exceptions, and will spawn
-     *
-     * @param allowAnimalSpawn True to allow spawning of monsters, false to prevent.
-     */
-    void setAllowAnimalSpawn(boolean allowAnimalSpawn);
-
-    /**
-     * Returns a list of animals. This list always negates the {@link #canAnimalsSpawn()} result.
-     *
-     * @return A list of animals that will spawn if {@link #canAnimalsSpawn()} is false.
-     */
-    List<String> getAnimalList();
-
     /**
      * Gets whether or not monsters are allowed to spawn in this world.
      *
@@ -353,31 +219,7 @@ public interface MultiverseWorld {
     boolean canMonstersSpawn();
 
     /**
-     * Sets whether or not monsters can spawn.
-     * If there are values in {@link #getMonsterList()} and this is false,
-     * those monsters become the exceptions, and will spawn
-     *
-     * @param allowMonsterSpawn True to allow spawning of monsters, false to prevent.
-     */
-    void setAllowMonsterSpawn(boolean allowMonsterSpawn);
-
-    /**
-     * Returns a list of monsters. This list always negates the {@link #canMonstersSpawn()} result.
-     *
-     * @return A list of monsters that will spawn if {@link #canMonstersSpawn()} is false.
-     */
-    List<String> getMonsterList();
-    // end of animal&monster stuff
-
-    /**
-     * Gets whether or not PVP is enabled in this world in some form (fake or not).
-     *
-     * @return True if players can take damage from other players.
-     */
-    boolean isPVPEnabled();
-
-    /**
-     * Turn pvp on or off. This setting is used to set the world's PVP mode.
+     * Turn pvp on or off. This setting is used to set the world's PVP mode, and thus relies on fakePVP
      *
      * @param pvpMode True to enable PVP damage, false to disable it.
      */
@@ -392,6 +234,13 @@ public interface MultiverseWorld {
     @Deprecated
     boolean getFakePVP();
 
+    /**
+     * Gets whether or not PVP is enabled in this world in some form (fake or not).
+     *
+     * @return True if players can take damage from other players.
+     */
+    boolean isPVPEnabled();
+
     /**
      * Gets whether or not this world will display in chat, mvw and mvl regardless if a user has the
      * access permissions to go to this world.
@@ -408,13 +257,6 @@ public interface MultiverseWorld {
      */
     void setHidden(boolean hidden);
 
-    /**
-     * Gets whether weather is enabled in this world.
-     *
-     * @return True if weather events will occur, false if not.
-     */
-    boolean isWeatherEnabled();
-
     /**
      * Sets whether or not there will be weather events in a given world.
      * If set to false, Multiverse will disable the weather in the world immediately.
@@ -424,11 +266,11 @@ public interface MultiverseWorld {
     void setEnableWeather(boolean enableWeather);
 
     /**
-     * Gets whether or not CraftBukkit is keeping the chunks for this world in memory.
+     * Gets whether weather is enabled in this world.
      *
-     * @return True if CraftBukkit is keeping spawn chunks in memory.
+     * @return True if weather events will occur, false if not.
      */
-    boolean isKeepingSpawnInMemory();
+    boolean isWeatherEnabled();
 
     /**
      * If true, tells Craftbukkit to keep a worlds spawn chunks loaded in memory (default: true)
@@ -440,11 +282,29 @@ public interface MultiverseWorld {
     void setKeepSpawnInMemory(boolean keepSpawnInMemory);
 
     /**
-     * Gets the spawn location of this world.
+     * Gets whether or not CraftBukkit is keeping the chunks for this world in memory.
      *
-     * @return The spawn location of this world.
+     * @return True if CraftBukkit is keeping spawn chunks in memory.
      */
-    Location getSpawnLocation();
+    boolean isKeepingSpawnInMemory();
+
+    /**
+     * Sets the difficulty of this world and returns true if success.
+     * Valid string values are either an integer of difficulty(0-3) or
+     * the name that resides in the Bukkit enum, ex. PEACEFUL
+     *
+     * @param difficulty The difficulty to set the world to as a string.
+     * @return True if success, false if the provided string
+     *         could not be translated to a difficulty.
+     */
+    boolean setDifficulty(String difficulty);
+
+    /**
+     * Gets the difficulty of this world.
+     *
+     * @return The difficulty of this world.
+     */
+    Difficulty getDifficulty();
 
     /**
      * Sets the spawn location for a world.
@@ -454,11 +314,11 @@ public interface MultiverseWorld {
     void setSpawnLocation(Location spawnLocation);
 
     /**
-     * Gets whether or not the hunger level of players will go down in a world.
+     * Gets the spawn location of this world.
      *
-     * @return True if it will go down, false if it will remain steady.
+     * @return The spawn location of this world.
      */
-    boolean getHunger();
+    Location getSpawnLocation();
 
     /**
      * Sets whether or not the hunger level of players will go down in a world.
@@ -469,11 +329,11 @@ public interface MultiverseWorld {
     void setHunger(boolean hungerEnabled);
 
     /**
-     * Gets the GameMode of this world.
+     * Gets whether or not the hunger level of players will go down in a world.
      *
-     * @return The GameMode of this world.
+     * @return True if it will go down, false if it will remain steady.
      */
-    GameMode getGameMode();
+    boolean getHunger();
 
     /**
      * Sets the game mode of this world.
@@ -481,26 +341,29 @@ public interface MultiverseWorld {
      * @param gameMode A valid game mode string (either
      *                 an int ex. 0 or a string ex. creative).
      * @return True if the game mode was successfully changed, false if not.
-     * @deprecated Use {@link #setGameMode(GameMode)} instead. If you have to
-     * pass a string, use {@link #setPropertyValue(String, String)}.
      */
-    @Deprecated
     boolean setGameMode(String gameMode);
 
     /**
-     * Sets the game mode of this world.
+     * Gets the GameMode of this world.
      *
-     * @param gameMode The new {@link GameMode}.
-     * @return True if the game mode was successfully changed, false if not.
+     * @return The GameMode of this world.
      */
-    boolean setGameMode(GameMode gameMode);
+    GameMode getGameMode();
 
     /**
-     * Gets the amount of currency it requires to enter this world.
+     * Gets the permission required to enter this world.
      *
-     * @return The amount it costs to enter this world.
+     * @return The permission required to be exempt from charges to/from this world.
      */
-    double getPrice();
+    Permission getAccessPermission();
+
+    /**
+     * Gets the permission required to be exempt when entering.
+     *
+     * @return The permission required to be exempt when entering.
+     */
+    Permission getExemptPermission();
 
     /**
      * Sets the price for entry to this world.
@@ -512,11 +375,11 @@ public interface MultiverseWorld {
     void setPrice(double price);
 
     /**
-     * Gets the Type of currency that will be used when users enter this world.
+     * Gets the amount of currency it requires to enter this world.
      *
-     * @return The Type of currency that will be used when users enter this world.
+     * @return The amount it costs to enter this world.
      */
-    int getCurrency();
+    double getPrice();
 
     /**
      * Sets the type of item that will be required given the price is not 0.
@@ -527,11 +390,11 @@ public interface MultiverseWorld {
     void setCurrency(int item);
 
     /**
-     * Gets the world players will respawn in if they die in this one.
+     * Gets the Type of currency that will be used when users enter this world.
      *
-     * @return A world that exists on the server.
+     * @return The Type of currency that will be used when users enter this world.
      */
-    World getRespawnToWorld();
+    int getCurrency();
 
     /**
      * Sets the world players will respawn in if they die in this one.
@@ -543,12 +406,11 @@ public interface MultiverseWorld {
     boolean setRespawnToWorld(String respawnWorld);
 
     /**
-     * Gets the scaling value of this world.Really only has an effect if you use
-     * Multiverse-NetherPortals.
+     * Gets the world players will respawn in if they die in this one.
      *
-     * @return This world's non-negative, non-zero scale.
+     * @return A world that exists on the server.
      */
-    double getScaling();
+    World getRespawnToWorld();
 
     /**
      * Sets the scale of this world. Really only has an effect if you use
@@ -560,11 +422,60 @@ public interface MultiverseWorld {
     boolean setScaling(double scaling);
 
     /**
-     * Gets whether or not a world will auto-heal players if the difficulty is on peaceful.
+     * Gets the scaling value of this world.Really only has an effect if you use
+     * Multiverse-NetherPortals.
      *
-     * @return True if the world should heal (default), false if not.
+     * @return This world's non-negative, non-zero scale.
      */
-    boolean getAutoHeal();
+    double getScaling();
+
+    /**
+     * Gets a list of all the worlds that players CANNOT travel to from this world,
+     * regardless of their access permissions.
+     *
+     * @return A List of world names.
+     */
+    List<String> getWorldBlacklist();
+
+    /**
+     * Returns a list of animals. This list always negates the {@link #canAnimalsSpawn()} result.
+     *
+     * @return A list of animals that will spawn if {@link #canAnimalsSpawn()} is false.
+     */
+    List<String> getAnimalList();
+
+    /**
+     * Sets whether or not animals can spawn.
+     * If there are values in {@link #getAnimalList()} and this is false,
+     * those animals become the exceptions, and will spawn
+     *
+     * @param allowAnimalSpawn True to allow spawning of monsters, false to prevent.
+     */
+    void setAllowAnimalSpawn(boolean allowAnimalSpawn);
+
+    /**
+     * Returns a list of monsters. This list always negates the {@link #canMonstersSpawn()} ()} result.
+     *
+     * @return A list of monsters that will spawn if {@link #canMonstersSpawn()} is false.
+     */
+    List<String> getMonsterList();
+
+    /**
+     * Sets whether or not monsters can spawn.
+     * If there are values in {@link #getMonsterList()} and this is false,
+     * those monsters become the exceptions, and will spawn
+     *
+     * @param allowMonsterSpawn True to allow spawning of monsters, false to prevent.
+     */
+    void setAllowMonsterSpawn(boolean allowMonsterSpawn);
+
+    /**
+     * Clears a list property (sets it to []).
+     *
+     * @param property The property to clear.
+     * @return True if success, false if fail.
+     */
+    boolean clearList(String property);
 
     /**
      * Sets whether or not a world will auto-heal players if the difficulty is on peaceful.
@@ -574,11 +485,11 @@ public interface MultiverseWorld {
     void setAutoHeal(boolean heal);
 
     /**
-     * Gets whether or not Multiverse should auto-adjust the spawn for this world.
+     * Gets whether or not a world will auto-heal players if the difficulty is on peaceful.
      *
-     * @return True if Multiverse should adjust the spawn, false if not.
+     * @return True if the world should heal (default), false if not.
      */
-    boolean getAdjustSpawn();
+    boolean getAutoHeal();
 
     /**
      * Sets whether or not Multiverse should auto-adjust the spawn for this world.
@@ -588,11 +499,11 @@ public interface MultiverseWorld {
     void setAdjustSpawn(boolean adjust);
 
     /**
-     * Gets whether or not Multiverse should auto-load this world.
+     * Gets whether or not Multiverse should auto-adjust the spawn for this world.
      *
-     * @return True if Multiverse should auto-load this world.
+     * @return True if Multiverse should adjust the spawn, false if not.
      */
-    boolean getAutoLoad();
+    boolean getAdjustSpawn();
 
     /**
      * Sets whether or not Multiverse should auto-load this world.
@@ -604,12 +515,11 @@ public interface MultiverseWorld {
     void setAutoLoad(boolean autoLoad);
 
     /**
-     * Gets whether or not a player who dies in this world will respawn in their
-     * bed or follow the normal respawn pattern.
+     * Gets whether or not Multiverse should auto-load this world.
      *
-     * @return True if players dying in this world should respawn at their bed.
+     * @return True if Multiverse should auto-load this world.
      */
-    boolean getBedRespawn();
+    boolean getAutoLoad();
 
     /**
      * Sets whether or not a player who dies in this world will respawn in their
@@ -620,28 +530,21 @@ public interface MultiverseWorld {
      * @param autoLoad True if players dying in this world respawn at their bed.
      */
     void setBedRespawn(boolean autoLoad);
-    
-    /**
-     * Sets the player limit for this world after which players without an override
-     * permission node will not be allowed in. A value of -1 or less signifies no limit
-     * 
-     * @param limit The new limit
-     */
-    void setPlayerLimit(int limit);
 
     /**
-     * Gets the player limit for this world after which players without an override
-     * permission node will not be allowed in. A value of -1 or less signifies no limit
-     * 
-     * @return The player limit
+     * Gets whether or not a player who dies in this world will respawn in their
+     * bed or follow the normal respawn pattern.
+     *
+     * @return True if players dying in this world should respawn at their bed.
      */
-    int getPlayerLimit();
+    boolean getBedRespawn();
 
     /**
-     * Same as {@link #getTime()}, but returns a string.
-     * @return The time as a short string: 12:34pm
+     * Gets all the names of all properties that can be SET.
+     *
+     * @return All property names, with alternating colors.
      */
-    String getTime();
+    String getAllPropertyNames();
 
     /**
      * Sets the current time in a world.
@@ -656,6 +559,22 @@ public interface MultiverseWorld {
      */
     boolean setTime(String timeAsString);
 
+    /**
+     * Same as {@link #getTime()}, but returns a string.
+     * @return The time as a short string: 12:34pm
+     */
+    String getTime();
+
+    /**
+     * Gets the type of this world. As of 1.1-R1 this will be:
+     * FLAT or NORMAL
+     * <p>
+     * This is *not* the generator.
+     *
+     * @return The Type of this world.
+     */
+    WorldType getWorldType();
+
     /**
      * Sets The types of portals that are allowed in this world.
      *
@@ -669,20 +588,4 @@ public interface MultiverseWorld {
      * @return The type of portals that are allowed.
      */
     AllowedPortalType getAllowedPortals();
-
-    // properties that are not "getter+setter" style
-    /**
-     * Gets a list of all the worlds that players CANNOT travel to from this world,
-     * regardless of their access permissions.
-     *
-     * @return A List of world names.
-     */
-    List<String> getWorldBlacklist();
-
-    /**
-     * Gets all the names of all properties that can be SET.
-     *
-     * @return All property names, with alternating colors.
-     */
-    String getAllPropertyNames();
 }

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

@@ -3,14 +3,14 @@ package com.onarandombox.MultiverseCore.api;
 import java.util.List;
 
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Entity;
 
 /**
  * Used to remove animals from worlds that don't belong there.
  */
 public interface WorldPurger {
+
     /**
-     * Synchronizes the given worlds with their settings.
+     * Synchronizes the given world with it's settings.
      *
      * @param worlds A list of {@link MultiverseWorld}
      */
@@ -46,23 +46,4 @@ public interface WorldPurger {
     void purgeWorld(MultiverseWorld mvworld, List<String> thingsToKill, boolean negateAnimals,
             boolean negateMonsters, CommandSender sender);
 
-    /**
-     * Determines whether the specified creature should be killed.
-     *
-     * @param e The creature.
-     * @param thingsToKill A {@link List} of animals/monsters to be killed.
-     * @param negateAnimals Whether the monsters in the list should be negated.
-     * @param negateMonsters Whether the animals in the list should be negated.
-     * @return {@code true} if the creature should be killed, otherwise {@code false}.
-     */
-    boolean shouldWeKillThisCreature(Entity e, List<String> thingsToKill, boolean negateAnimals, boolean negateMonsters);
-
-    /**
-     * Determines whether the specified creature should be killed and automatically reads the params from a world object.
-     *
-     * @param w The world.
-     * @param e The creature.
-     * @return {@code true} if the creature should be killed, otherwise {@code false}.
-     */
-    boolean shouldWeKillThisCreature(MultiverseWorld w, Entity e);
 }

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

@@ -8,12 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
-
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 
 import java.util.ArrayList;
@@ -37,11 +34,7 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
         this.addCommandExample("/mv anchor " + ChatColor.GREEN + "otherthing");
         this.addCommandExample("/mv anchor " + ChatColor.GREEN + "awesomething " + ChatColor.RED + "-d");
         this.addCommandExample("/mv anchors ");
-        this.setPermission("multiverse.core.anchor.list", "Allows a player to list all anchors.", PermissionDefault.OP);
-        this.addAdditonalPermission(new Permission("multiverse.core.anchor.create",
-                "Allows a player to create anchors.", PermissionDefault.OP));
-        this.addAdditonalPermission(new Permission("multiverse.core.anchor.delete",
-                "Allows a player to delete anchors.", PermissionDefault.OP));
+        this.setPermission("multiverse.core.anchor", "Allows management of Anchor Destinations.", PermissionDefault.OP);
         this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
     }
 
@@ -56,12 +49,7 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
     }
 
     private void showList(CommandSender sender, List<String> args) {
-        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.list", true)) {
-            this.plugin.getMessaging().sendMessage(sender, MultiverseMessage.CMD_ANCHOR_NOLISTPERM);
-            return;
-        }
-
-        this.plugin.getMessaging().sendMessage(sender, MultiverseMessage.CMD_ANCHOR_LISTHEADER);
+        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse Anchor List ]====");
         Player p = null;
         if (sender instanceof Player) {
             p = (Player) sender;
@@ -74,12 +62,13 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
         if (filterObject.getFilter().length() > 0) {
             availableAnchors = this.getFilteredItems(availableAnchors, filterObject.getFilter());
             if (availableAnchors.size() == 0) {
-                this.plugin.getMessaging().sendMessage(sender, MultiverseMessage.CMD_ANCHOR_NOMATCH, filterObject.getFilter());
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
+                        + "No anchors matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
                 return;
             }
         } else {
             if (availableAnchors.size() == 0) {
-                this.plugin.getMessaging().sendMessage(sender, MultiverseMessage.CMD_ANCHOR_NODEF);
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE + "No anchors were defined.");
                 return;
             }
         }
@@ -100,7 +89,7 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
             filterObject.setPage(1);
         }
 
-        this.plugin.getMessaging().sendMessage(sender, MultiverseMessage.CMD_ANCHOR_PAGEHEADER, filterObject.getPage(), totalPages);
+        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
 
         this.showPage(filterObject.getPage(), sender, availableAnchors);
     }
@@ -116,24 +105,26 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
             return;
         }
         if (args.size() == 2 && args.get(1).equalsIgnoreCase("-d")) {
-            if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.delete", true))
-                this.plugin.getMessaging().sendMessage(sender, MultiverseMessage.CMD_ANCHOR_NODELPERM);
-            else
-                this.plugin.getMessaging().sendMessage(sender, this.plugin.getAnchorManager().deleteAnchor(args.get(0))
-                        ? MultiverseMessage.CMD_ANCHOR_DELSUCCESS : MultiverseMessage.CMD_ANCHOR_DELFAIL, args.get(0));
+            if (this.plugin.getAnchorManager().deleteAnchor(args.get(0))) {
+                sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.RED + "deleted!");
+            } else {
+                sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "deleted!");
+            }
             return;
         }
 
         if (!(sender instanceof Player)) {
-            this.plugin.getMessaging().sendMessage(sender, MultiverseMessage.CMD_ANCHOR_CONSOLECREATE);
+            sender.sendMessage("You must be a player to create Anchors.");
             return;
         }
 
-        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.create", true))
-            this.plugin.getMessaging().sendMessage(sender, MultiverseMessage.CMD_ANCHOR_NOCREATEPERM);
-        else
-            this.plugin.getMessaging().sendMessage(sender, this.plugin.getAnchorManager().saveAnchorLocation(args.get(0), ((Player) sender).getLocation())
-                    ? MultiverseMessage.CMD_ANCHOR_CREATESUCCESS : MultiverseMessage.CMD_ANCHOR_CREATEFAIL, args.get(0));
+        Player player = (Player) sender;
+        if (this.plugin.getAnchorManager().saveAnchorLocation(args.get(0), player.getLocation())) {
+            sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.GREEN + "created!");
+        } else {
+            sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "created!");
+        }
+
     }
 
     @Override

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

@@ -10,7 +10,6 @@ package com.onarandombox.MultiverseCore.commands;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
 import com.onarandombox.MultiverseCore.utils.MVPermissions;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -40,12 +39,15 @@ public class CheckCommand extends MultiverseCommand {
     public void runCommand(CommandSender sender, List<String> args) {
         Player p = this.plugin.getServer().getPlayer(args.get(0));
         if (p == null) {
-            this.messaging.sendMessage(sender, MultiverseMessage.CMD_CHECK_NOSUCHPLAYER, args.get(0));
+            sender.sendMessage("Could not find player " + ChatColor.GREEN + args.get(0));
+            sender.sendMessage("Are they online?");
             return;
         }
         MVDestination dest = this.plugin.getDestFactory().getDestination(args.get(1));
         if (dest instanceof InvalidDestination) {
-            this.messaging.sendMessage(sender, MultiverseMessage.CMD_CHECK_NOSUCHDEST);
+            sender.sendMessage(String.format("You asked if '%s' could go to %s%s%s,",
+                    args.get(0), ChatColor.GREEN, args.get(0), ChatColor.WHITE));
+            sender.sendMessage("but I couldn't find a Destination of that name? Did you type it correctly?");
             return;
         }
 

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

@@ -1,60 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
-import com.pneumaticraft.commandhandler.CommandHandler;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Creates a clone of a world.
- */
-public class CloneCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
-
-    public CloneCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Clone World");
-        this.setCommandUsage("/mv clone" + ChatColor.GREEN + " {TARGET} {NAME}" + ChatColor.GOLD + " -g [GENERATOR[:ID]]");
-        this.setArgRange(2, 4); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-        this.addKey("mvclone");
-        this.addKey("mvcl");
-        this.addKey("mv cl");
-        this.addKey("mv clone");
-        this.addCommandExample("/mv clone " + ChatColor.GOLD + "world" + ChatColor.GREEN + " world_backup");
-        this.addCommandExample("/mv clone " + ChatColor.GOLD + "skyblock_pristine" + ChatColor.GREEN + " skyblock");
-        this.addCommandExample("To clone a world that uses a generator:");
-        this.addCommandExample("/mv clone " + ChatColor.GOLD + "CleanRoom"
-                + ChatColor.GREEN + " CleanRoomCopy" + ChatColor.DARK_AQUA + " -g CleanRoomGenerator");
-        this.setPermission("multiverse.core.clone", "Clones a world.", PermissionDefault.OP);
-        this.worldManager = this.plugin.getMVWorldManager();
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Class<?>[] paramTypes = {String.class, String.class, String.class};
-        List<Object> objectArgs = new ArrayList<Object>();
-        objectArgs.add(args.get(0));
-        objectArgs.add(args.get(1));
-        objectArgs.add(CommandHandler.getFlag("-g", args));
-        if (!this.worldManager.isMVWorld(args.get(0))) {
-            // If no world was found, we can't clone.
-            this.messaging.sendMessage(sender, MultiverseMessage.CMD_CLONE_NOSUCHWORLD, args.get(0));
-            return;
-        }
-        this.plugin.getCommandHandler().queueCommand(sender, "mvclone", "cloneWorld", objectArgs,
-                paramTypes, ChatColor.GREEN + "World Cloned!", ChatColor.RED + "World could NOT be cloned!");
-    }
-}

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

@@ -8,8 +8,6 @@
 package com.onarandombox.MultiverseCore.commands;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
-
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
@@ -53,8 +51,8 @@ public class ConfigCommand extends MultiverseCommand {
             sender.sendMessage(message);
             return;
         }
-        if (!this.plugin.getMVConfig().setConfigProperty(args.get(0).toLowerCase(), args.get(1))) {
-            this.messaging.sendMessage(sender, MultiverseMessage.CMD_CONFIG_SETFAIL, args.get(0), args.get(1));
+        if (!this.plugin.getMVConfig().setProperty(args.get(0).toLowerCase(), args.get(1))) {
+            sender.sendMessage(String.format("%sSetting '%s' to '%s' failed!", ChatColor.RED, args.get(0).toLowerCase(), args.get(1)));
             return;
         }
 
@@ -65,10 +63,10 @@ public class ConfigCommand extends MultiverseCommand {
         }
 
         if (this.plugin.saveMVConfigs()) {
-            this.messaging.sendMessage(sender, MultiverseMessage.CMD_CLONE_SUCCESS);
+            sender.sendMessage(ChatColor.GREEN + "SUCCESS!" + ChatColor.WHITE + " Values were updated successfully!");
             this.plugin.loadConfigs();
         } else {
-            this.messaging.sendMessage(sender, MultiverseMessage.CMD_CONFIG_FAIL);
+            sender.sendMessage(ChatColor.RED + "FAIL!" + ChatColor.WHITE + " Check your console for details!");
         }
     }
 }

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

@@ -9,7 +9,6 @@ package com.onarandombox.MultiverseCore.commands;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
@@ -19,8 +18,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -68,19 +65,15 @@ public class CreateCommand extends MultiverseCommand {
             }
         }
 
-        if (this.worldManager.isMVWorld(worldName)) {
-            this.messaging.sendMessage(sender, MultiverseMessage.CMD_CREATE_WORLDEXISTS, worldName);
-            return;
-        }
-
-        if (worldFile.exists()) {
-            this.messaging.sendMessage(sender, MultiverseMessage.CMD_CREATE_FILEEXISTS);
+        if (worldFile.exists() || this.worldManager.isMVWorld(worldName)) {
+            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");
             return;
         }
 
         Environment environment = EnvironmentCommand.getEnvFromString(env);
         if (environment == null) {
-            this.messaging.sendMessage(sender, MultiverseMessage.CMD_CREATE_INVALIDENV);
+            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
             EnvironmentCommand.showEnvironments(sender);
             return;
         }
@@ -91,29 +84,17 @@ public class CreateCommand extends MultiverseCommand {
         }
         WorldType type = EnvironmentCommand.getWorldTypeFromString(typeString);
         if (type == null) {
-            this.messaging.sendMessage(sender, MultiverseMessage.CMD_CREATE_INVALIDTYPE);
+            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.
-                this.messaging.sendMessage(sender, MultiverseMessage.CMD_CREATE_INVALIDGEN, generator);
-                return;
-            }
-        }
-        Command.broadcastCommandMessage(sender, this.plugin.getMessageProvider().getMessage(MultiverseMessage.CMD_CREATE_START, worldName));
+
+        Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'...");
 
         if (this.worldManager.addWorld(worldName, environment, seed, type, allowStructures, generator, useSpawnAdjust)) {
-            Command.broadcastCommandMessage(sender, this.plugin.getMessageProvider().getMessage(MultiverseMessage.CMD_CREATE_COMPLETE));
+            Command.broadcastCommandMessage(sender, "Complete!");
         } else {
-            Command.broadcastCommandMessage(sender, this.plugin.getMessageProvider().getMessage(MultiverseMessage.CMD_CREATE_FAILED));
+            Command.broadcastCommandMessage(sender, "FAILED.");
         }
     }
 }

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

@@ -23,7 +23,7 @@ public class DebugCommand extends MultiverseCommand {
     public DebugCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Turn Debug on/off?");
-        this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off|silent]");
+        this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off]");
         this.setArgRange(0, 1);
         this.addKey("mv debug");
         this.addKey("mv d");
@@ -48,18 +48,17 @@ public class DebugCommand extends MultiverseCommand {
                     sender.sendMessage(ChatColor.RED + "Error" + ChatColor.WHITE
                             + " setting debug level. Please use a number 0-3 " + ChatColor.AQUA + "(3 being many many messages!)");
                 }
+
             }
-            plugin.saveMVConfigs();
         }
         this.displayDebugMode(sender);
     }
 
     private void displayDebugMode(CommandSender sender) {
-        final int debugLevel = plugin.getMVConfig().getGlobalDebug();
-        if (debugLevel == 0) {
+        if (plugin.getMVConfig().getGlobalDebug() == 0) {
             sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
         } else {
-            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel);
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + plugin.getMVConfig().getGlobalDebug());
             this.plugin.log(Level.FINE, "Multiverse Debug ENABLED");
         }
     }

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

@@ -53,8 +53,8 @@ public class EnvironmentCommand extends MultiverseCommand {
      */
     public static void showWorldTypes(CommandSender sender) {
         sender.sendMessage(ChatColor.YELLOW + "Valid World Types are:");
-        sender.sendMessage(String.format("%sNORMAL%s, %sFLAT, %sLARGEBIOMES %sor %sVERSION_1_1",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, ChatColor.RED, ChatColor.WHITE, ChatColor.GOLD));
+        sender.sendMessage(String.format("%sNORMAL %sor %sFLAT",
+                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA));
     }
 
     @Override
@@ -75,9 +75,6 @@ public class EnvironmentCommand extends MultiverseCommand {
             type = "NORMAL";
         if (type.equalsIgnoreCase("flat"))
             type = "FLAT";
-        if (type.equalsIgnoreCase("largebiomes")) {
-            type = "LARGE_BIOMES";
-        }
         try {
             // Now that we've converted a potentially unfriendly value
             // to a friendly one, get it from the ENUM!

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

@@ -7,10 +7,7 @@
 
 package com.onarandombox.MultiverseCore.commands;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
-
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
@@ -18,6 +15,7 @@ import org.bukkit.plugin.Plugin;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
 
 /**
  * Returns a list of loaded generator plugins.
@@ -26,7 +24,7 @@ public class GeneratorCommand extends MultiverseCommand {
 
     public GeneratorCommand(MultiverseCore plugin) {
         super(plugin);
-        this.setName("Generator Information");
+        this.setName("World Information");
         this.setCommandUsage("/mv generators");
         this.setArgRange(0, 0);
         this.addKey("mv generators");
@@ -39,7 +37,7 @@ public class GeneratorCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        Logging.info("PLEASE IGNORE the 'Plugin X does not contain any generators' message below!");
+        this.plugin.log(Level.INFO, "PLEASE IGNORE the 'Plugin X does not contain any generators' message below!");
         Plugin[] plugins = this.plugin.getServer().getPluginManager().getPlugins();
         List<String> generators = new ArrayList<String>();
         for (Plugin p : plugins) {
@@ -47,16 +45,16 @@ public class GeneratorCommand extends MultiverseCommand {
                 generators.add(p.getDescription().getName());
             }
         }
-        this.messaging.sendMessage(sender, MultiverseMessage.CMD_GENERATOR_LISTHEADER);
+        sender.sendMessage(ChatColor.AQUA + "--- Loaded Generator Plugins ---");
         String loadedGens = "";
         boolean altColor = false;
         for (String s : generators) {
             loadedGens += (altColor ? ChatColor.YELLOW : ChatColor.WHITE) + s + " ";
             altColor = !altColor;
         }
-        if (loadedGens.length() == 0)
-            this.messaging.sendMessage(sender, MultiverseMessage.CMD_GENERATOR_NOGENSFOUND);
-        else
-            this.messaging.sendMessage(sender, loadedGens, false);
+        if (loadedGens.length() == 0) {
+            loadedGens = ChatColor.RED + "No Generator Plugins found.";
+        }
+        sender.sendMessage(loadedGens);
     }
 }

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

@@ -52,7 +52,7 @@ public class ImportCommand extends MultiverseCommand {
      * @param worldFolder The File that may be a world.
      * @return True if it looks like a world, false if not.
      */
-    private static boolean checkIfIsWorld(File worldFolder) {
+    private boolean checkIfIsWorld(File worldFolder) {
         if (worldFolder.isDirectory()) {
             File[] files = worldFolder.listFiles(new FilenameFilter() {
                 @Override

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

@@ -124,13 +124,8 @@ public class InfoCommand extends MultiverseCommand {
         message.add(new FancyMessage("Spawn Location: ", plugin.getLocationManipulation().strCoords(spawn), colors));
         message.add(new FancyMessage("World Scale: ", world.getScaling() + "", colors));
         if (world.getPrice() > 0) {
-            final String formattedAmount;
-            if (world.getCurrency() <= 0 && plugin.getVaultHandler().getEconomy() != null) {
-                formattedAmount = plugin.getVaultHandler().getEconomy().format(world.getPrice());
-            } else {
-                formattedAmount = this.plugin.getBank().getFormattedAmount(p, world.getPrice(), world.getCurrency());
-            }
-            message.add(new FancyMessage("Price to enter this world: ", formattedAmount, colors));
+            message.add(new FancyMessage("Price to enter this world: ",
+                    this.plugin.getBank().getFormattedAmount(p, world.getPrice(), world.getCurrency()), colors));
         } else {
             message.add(new FancyMessage("Price to enter this world: ", ChatColor.GREEN + "FREE!", colors));
         }
@@ -195,7 +190,7 @@ public class InfoCommand extends MultiverseCommand {
         return worldInfo;
     }
 
-    private static String toCommaSeperated(List<String> list) {
+    private String toCommaSeperated(List<String> list) {
         if (list == null || list.size() == 0) {
             return "";
         }
@@ -221,7 +216,7 @@ public class InfoCommand extends MultiverseCommand {
         return positive ? ChatColor.GREEN : ChatColor.RED;
     }
 
-    private static void showPage(int page, CommandSender sender, List<List<FancyText>> doc) {
+    private void showPage(int page, CommandSender sender, List<List<FancyText>> doc) {
         page = page < 0 ? 0 : page;
         page = page > doc.size() - 1 ? doc.size() - 1 : page;
         boolean altColor = false;

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

@@ -9,8 +9,6 @@ package com.onarandombox.MultiverseCore.commands;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.localization.MessageProvider;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
 import org.bukkit.command.CommandSender;
@@ -24,18 +22,16 @@ import java.util.List;
  * Displays a listing of all worlds that a player can enter.
  */
 public class ListCommand extends PaginatedCoreCommand<String> {
-    private MessageProvider provider;
 
     public ListCommand(MultiverseCore plugin) {
         super(plugin);
-        provider = plugin.getMessageProvider();
-        this.setName(provider.getMessage(MultiverseMessage.CMD_LIST_NAME));
+        this.setName("World Listing");
         this.setCommandUsage("/mv list");
         this.setArgRange(0, 2);
         this.addKey("mvlist");
         this.addKey("mvl");
         this.addKey("mv list");
-        this.setPermission("multiverse.core.list.worlds", provider.getMessage(MultiverseMessage.CMD_LIST_DESC), PermissionDefault.OP);
+        this.setPermission("multiverse.core.list.worlds", "Displays a listing of all worlds that you can enter.", PermissionDefault.OP);
         this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
     }
 
@@ -70,7 +66,7 @@ public class ListCommand extends PaginatedCoreCommand<String> {
         }
         for (String name : this.plugin.getMVWorldManager().getUnloadedWorlds()) {
             if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + name, true)) {
-                worldList.add(ChatColor.GRAY + name + " - " + "UNLOADED");
+                worldList.add(ChatColor.GRAY + name + " - UNLOADED");
             }
         }
         return worldList;
@@ -95,7 +91,7 @@ public class ListCommand extends PaginatedCoreCommand<String> {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ " + this.provider.getMessage(MultiverseMessage.CMD_LIST_TITLE) + " ]====");
+        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse World List ]====");
         Player p = null;
         if (sender instanceof Player) {
             p = (Player) sender;
@@ -108,7 +104,8 @@ public class ListCommand extends PaginatedCoreCommand<String> {
         if (filterObject.getFilter().length() > 0) {
             availableWorlds = this.getFilteredItems(availableWorlds, filterObject.getFilter());
             if (availableWorlds.size() == 0) {
-                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE + provider.getMessage(MultiverseMessage.CMD_LIST_NO_MATCH) + " " + ChatColor.AQUA + filterObject.getFilter());
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
+                        + "No worlds matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
                 return;
             }
         }

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

@@ -81,13 +81,9 @@ public class ModifyAddCommand extends MultiverseCommand {
             return;
         }
 
-        // TODO fix this
         if (world.addToVariable(property, value)) {
             sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA
                     + value + ChatColor.WHITE + " was " + ChatColor.GREEN + "added to " + ChatColor.GREEN + property);
-            if (!plugin.saveWorldConfig()) {
-                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
-            }
         } else {
             sender.sendMessage(value + " could not be added to " + property);
         }

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

@@ -75,14 +75,10 @@ public class ModifyClearCommand extends MultiverseCommand {
             sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/cgB2B");
             return;
         }
-        // TODO fix this
         if (world.clearList(property)) {
             sender.sendMessage(property + " was cleared. It contains 0 values now.");
             sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + property + ChatColor.WHITE + " was "
                     + ChatColor.GREEN + "CLEARED" + ChatColor.WHITE + ". It contains " + ChatColor.LIGHT_PURPLE + "0" + ChatColor.WHITE + " values now.");
-            if (!plugin.saveWorldConfig()) {
-                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
-            }
         } else {
             sender.sendMessage(ChatColor.RED + "Error: " + ChatColor.GOLD + property
                     + ChatColor.WHITE + " was " + ChatColor.GOLD + "NOT" + ChatColor.WHITE + " cleared.");

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

@@ -81,13 +81,9 @@ public class ModifyRemoveCommand extends MultiverseCommand {
             sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/4W8cY");
             return;
         }
-        // TODO fix this
         if (world.removeFromVariable(property, value)) {
             sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + value + ChatColor.WHITE
                     + " was " + ChatColor.RED + "removed from " + ChatColor.GREEN + property);
-            if (!plugin.saveWorldConfig()) {
-                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
-            }
         } else {
             sender.sendMessage(ChatColor.RED + "There was an error removing " + ChatColor.GRAY
                     + value + ChatColor.WHITE + " from " + ChatColor.GOLD + property);

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

@@ -102,24 +102,22 @@ public class ModifySetCommand extends MultiverseCommand {
             return;
         }
 
-        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !EnglishChatColor.isValidAliasColor(value)) {
+        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !world.isValidAliasColor(value)) {
             sender.sendMessage(value + " is not a valid color. Please pick one of the following:");
             sender.sendMessage(EnglishChatColor.getAllColors());
             return;
         }
         try {
-            if (world.setPropertyValue(property, value)) {
+            if (world.setProperty(property, value, sender)) {
                 sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Property " + ChatColor.AQUA + property
                         + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
-                if (!plugin.saveWorldConfig()) {
-                    sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
-                }
             } else {
-                sender.sendMessage(ChatColor.RED + world.getPropertyHelp(property));
+                sender.sendMessage(world.getProperty(property, Object.class).getHelp());
             }
         } catch (PropertyDoesNotExistException e) {
             sender.sendMessage(ChatColor.RED + "Sorry, You can't set: '" + ChatColor.GRAY + property + ChatColor.RED + "'");
-            sender.sendMessage("Valid world-properties: " + world.getAllPropertyNames());
+            // TODO: Display the list
+            sender.sendMessage(ChatColor.GOLD + "For a full list of thingys, see our wiki.");
         }
     }
 }

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

@@ -65,7 +65,7 @@ public class PurgeCommand extends MultiverseCommand {
         }
 
         if (!worldName.equalsIgnoreCase("all") && !this.worldManager.isMVWorld(worldName)) {
-            this.plugin.showNotMVWorldMessage(sender, worldName);
+            ((MultiverseCore) this.plugin).showNotMVWorldMessage(sender, worldName);
             sender.sendMessage("It cannot be purged.");
             return;
         }

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

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.io.File;
-import java.util.List;
-
-/**
- * States who is in what world.
- */
-public class ScriptCommand extends MultiverseCommand {
-
-    public ScriptCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Runs a script.");
-        this.setCommandUsage("/mv script" + ChatColor.GOLD + " {script} [target]");
-        this.setArgRange(1, 2);
-        this.addKey("mv script");
-        this.addKey("mvscript");
-        this.addCommandExample(String.format("/mv script %sscript.txt", ChatColor.GOLD));
-        this.addCommandExample(String.format("/mv script %stest.txt %ssomeplayer", ChatColor.GOLD, ChatColor.GREEN));
-        this.setPermission("multiverse.core.script", "Runs a script.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        File file = new File(plugin.getScriptAPI().getScriptFolder(), args.get(0));
-        if (!file.exists()) {
-            sender.sendMessage("That script file does not exist in the Multiverse-Core scripts directory!");
-            return;
-        }
-        Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-        String target = null;
-        if (args.size() == 2) {
-            target = args.get(1);
-        }
-        plugin.getScriptAPI().executeScript(file, target, player);
-        sender.sendMessage(String.format("Script '%s%s%s' finished!", ChatColor.GOLD, file.getName(), ChatColor.WHITE));
-    }
-}

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

@@ -1,52 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-
-/**
- * Enables debug-information.
- */
-public class SilentCommand extends MultiverseCommand {
-
-    public SilentCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Turn silent mode on/off?");
-        this.setCommandUsage("/mv silent" + ChatColor.GOLD + " [true|false|on|off]");
-        this.setArgRange(0, 1);
-        this.addKey("mv silent");
-        this.addKey("mvsilent");
-        this.addCommandExample("/mv silent " + ChatColor.GOLD + "true");
-        this.setPermission("multiverse.core.silent", "Reduces the amount of startup messages.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (args.size() == 1) {
-            if (args.get(0).equalsIgnoreCase("on")) {
-                args.set(0, "true");
-            }
-            plugin.getMVConfig().setSilentStart(Boolean.valueOf(args.get(0)));
-            plugin.saveMVConfigs();
-        }
-        this.displaySilentMode(sender);
-    }
-
-    private void displaySilentMode(CommandSender sender) {
-        if (plugin.getMVConfig().getSilentStart()) {
-            sender.sendMessage("Multiverse Silent Start mode is " + ChatColor.GREEN + "ON");
-        } else {
-            sender.sendMessage("Multiverse Silent Start mode is " + ChatColor.RED + "OFF");
-        }
-    }
-}

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

@@ -4,7 +4,7 @@
  * For more information please check the README.md file included              *
  * with this project.                                                         *
  ******************************************************************************/
-/*
+
 package com.onarandombox.MultiverseCore.commands;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
@@ -21,7 +21,7 @@ import java.util.List;
 
 /**
  * Edit a world with spout.
- * /
+ */
 public class SpoutCommand extends MultiverseCommand {
 
     public SpoutCommand(MultiverseCore plugin) {
@@ -51,7 +51,7 @@ public class SpoutCommand extends MultiverseCommand {
         }
         PopupScreen pop = new GenericPopup();
         GenericButton button = new GenericButton("Fish");
-        // TO-DO maybe use constants for these
+        // TODO maybe use constants for these
         // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
         button.setX(50);
         button.setY(50);
@@ -63,4 +63,3 @@ public class SpoutCommand extends MultiverseCommand {
         p.getMainScreen().attachPopupScreen(pop);
     }
 }
-*/

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

@@ -50,8 +50,12 @@ public class TeleportCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
+        // Check if the command was sent from a Player.
         CommandSender teleporter = sender;
         Player teleportee = null;
+        if (sender instanceof Player) {
+            teleporter = (Player) sender;
+        }
 
         String destinationName;
 

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

@@ -7,27 +7,24 @@
 
 package com.onarandombox.MultiverseCore.commands;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
-import com.onarandombox.MultiverseCore.utils.webpaste.BitlyURLShortener;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteFailedException;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteService;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
-import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 
 import java.util.List;
+import java.util.logging.Level;
 
 /**
  * Dumps version info to the console.
  */
 public class VersionCommand extends MultiverseCommand {
-    private static final URLShortener SHORTENER = new BitlyURLShortener();
 
     public VersionCommand(MultiverseCore plugin) {
         super(plugin);
@@ -42,7 +39,7 @@ public class VersionCommand extends MultiverseCommand {
     }
 
     @Override
-    public void runCommand(final CommandSender sender, final List<String> args) {
+    public void runCommand(CommandSender sender, List<String> args) {
         // Check if the command was sent from a Player.
         if (sender instanceof Player) {
             sender.sendMessage("Version info dumped to console. Please check your server logs.");
@@ -51,15 +48,9 @@ public class VersionCommand extends MultiverseCommand {
         StringBuilder buffer = new StringBuilder();
         buffer.append("[Multiverse-Core] Multiverse-Core Version: ").append(this.plugin.getDescription().getVersion()).append('\n');
         buffer.append("[Multiverse-Core] Bukkit Version: ").append(this.plugin.getServer().getVersion()).append('\n');
-        buffer.append("[Multiverse-Core] Loaded Worlds: ").append(this.plugin.getMVWorldManager().getMVWorlds()).append('\n');
+        buffer.append("[Multiverse-Core] Loaded Worlds: ").append(this.plugin.getMVWorldManager().getMVWorlds().size()).append('\n');
         buffer.append("[Multiverse-Core] Multiverse Plugins Loaded: ").append(this.plugin.getPluginCount()).append('\n');
-        final boolean usingVault = plugin.getVaultHandler().getEconomy() != null;
-        buffer.append("[Multiverse-Core] Using Vault: ").append(usingVault).append('\n');
-        if (usingVault) {
-            buffer.append("[Multiverse-Core] Economy being used: ").append(plugin.getVaultHandler().getEconomy().getName()).append('\n');
-        } else {
-            buffer.append("[Multiverse-Core] Economy being used: ").append(this.plugin.getBank().getEconUsed()).append('\n');
-        }
+        buffer.append("[Multiverse-Core] Economy being used: ").append(this.plugin.getBank().getEconUsed()).append('\n');
         buffer.append("[Multiverse-Core] Permissions Plugin: ").append(this.plugin.getMVPerms().getType()).append('\n');
         buffer.append("[Multiverse-Core] Dumping Config Values: (version ")
                 .append(this.plugin.getMVConfig().getVersion()).append(")").append('\n');
@@ -78,30 +69,25 @@ public class VersionCommand extends MultiverseCommand {
         this.plugin.getServer().getPluginManager().callEvent(versionEvent);
 
         // log to console
-        final String data = versionEvent.getVersionInfo();
+        String data = versionEvent.getVersionInfo();
         String[] lines = data.split("\n");
         for (String line : lines) {
-            Logging.info(line);
+            this.plugin.log(Level.INFO, line);
         }
 
-        this.plugin.getServer().getScheduler().scheduleAsyncDelayedTask(this.plugin, new Runnable() {
-            @Override
-            public void run() {
-                if (args.size() == 1) {
-                    String pasteUrl;
-                    if (args.get(0).equalsIgnoreCase("-p")) {
-                        pasteUrl = postToService(PasteServiceType.PASTIE, true, data); // private post to pastie
-                    } else if (args.get(0).equalsIgnoreCase("-b")) {
-                        pasteUrl = postToService(PasteServiceType.PASTEBIN, true, data); // private post to pastie
-                    } else {
-                        return;
-                    }
-
-                    sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
-                    Logging.info("Version info dumped here: %s", pasteUrl);
-                }
+        if (args.size() == 1) {
+            String pasteUrl = "";
+            if (args.get(0).equalsIgnoreCase("-p")) {
+                pasteUrl = postToService(PasteServiceType.PASTIE, true, data); // private post to pastie
+            } else if (args.get(0).equalsIgnoreCase("-b")) {
+                pasteUrl = postToService(PasteServiceType.PASTEBIN, true, data); // private post to pastie
+            } else {
+                return;
             }
-        });
+
+            sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
+            this.plugin.log(Level.INFO, "Version info dumped here: " + pasteUrl);
+        }
     }
 
     /**
@@ -114,7 +100,7 @@ public class VersionCommand extends MultiverseCommand {
     private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData) {
         PasteService ps = PasteServiceFactory.getService(type, isPrivate);
         try {
-            return SHORTENER.shorten(ps.postData(ps.encodeData(pasteData), ps.getPostURL()));
+            return ps.postData(ps.encodeData(pasteData), ps.getPostURL());
         } catch (PasteFailedException e) {
             System.out.print(e);
             return "Error posting to service";

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

@@ -15,8 +15,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 
-import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 
 /**
@@ -52,14 +50,6 @@ public class WhoCommand extends MultiverseCommand {
             showAll = false;
         }
 
-        final Player[] onlinePlayers = plugin.getServer().getOnlinePlayers();
-        final Collection<Player> visiblePlayers = new HashSet<Player>(onlinePlayers.length);
-        for (final Player player : onlinePlayers) {
-            if (p == null || p.canSee(player)) {
-                visiblePlayers.add(player);
-            }
-        }
-
         if (args.size()  == 1) {
             if (args.get(0).equalsIgnoreCase("--all") || args.get(0).equalsIgnoreCase("-a")) {
                 showAll = true;
@@ -78,19 +68,18 @@ public class WhoCommand extends MultiverseCommand {
 
                 sender.sendMessage(String.format("%s--- Players in %s%s ---", ChatColor.AQUA,
                         world.getColoredWorldString(), ChatColor.AQUA));
-                sender.sendMessage(this.buildPlayerString(world, p, visiblePlayers));
+                sender.sendMessage(buildPlayerString(world));
                 return;
             }
         }
 
         // multiworld mode
-        sender.sendMessage(ChatColor.AQUA + "--- Worlds and their players --- "
-                + visiblePlayers.size() + "/" + plugin.getServer().getMaxPlayers());
+        sender.sendMessage(ChatColor.AQUA + "--- Worlds and their players ---");
         boolean shownOne = false;
         for (MultiverseWorld world : this.worldManager.getMVWorlds()) {
             if (this.plugin.getMVPerms().canEnterWorld(p, world)) { // only show world if the player can access it
                 if (showAll || !world.getCBWorld().getPlayers().isEmpty()) { // either show all or show if the world is not empty
-                    sender.sendMessage(String.format("%s%s - %s", world.getColoredWorldString(), ChatColor.WHITE, buildPlayerString(world, p, visiblePlayers)));
+                    sender.sendMessage(String.format("%s%s - %s", world.getColoredWorldString(), ChatColor.WHITE, buildPlayerString(world)));
                     shownOne = true;
                 }
             }
@@ -101,18 +90,17 @@ public class WhoCommand extends MultiverseCommand {
         return;
     }
 
-    private static String buildPlayerString(MultiverseWorld world, Player viewer, final Collection<Player> visiblePlayers) {
-        // Retrieve the players in this world
+    private String buildPlayerString(MultiverseWorld world) {
         List<Player> players = world.getCBWorld().getPlayers();
-        StringBuilder playerBuilder = new StringBuilder();
-        for (Player player : players) {
-            // If the viewer is the console or the viewier is allowed to see the player, show them.
-            // Make sure we're also ONLY showing online players.
-            // Since we already checked visible players, we'll just make sure who we're about to show is in that.
-            if (visiblePlayers.contains(player))
+        if (players.size() == 0) {
+            return "No players found.";
+        } else {
+            StringBuilder playerBuilder = new StringBuilder();
+            for (Player player : players) {
                 playerBuilder.append(player.getDisplayName()).append(", ");
+            }
+            String bString = playerBuilder.toString();
+            return bString.substring(0, bString.length() - 2);
         }
-        String bString = playerBuilder.toString();
-        return (bString.length() == 0) ? "No players found." : bString.substring(0, bString.length() - 2);
     }
 }

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

@@ -0,0 +1,115 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2012.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+/**
+ * A {@link String} config-property that will NOT be saved to the config.
+ */
+public class ActiveStringConfigProperty implements MVActiveConfigProperty<String> {
+    private String name;
+    private String value;
+    private String method;
+    private String help;
+
+    public ActiveStringConfigProperty(String name, String defaultValue, String help) {
+        this.name = name;
+        this.help = help;
+        this.value = defaultValue;
+        this.parseValue(defaultValue);
+    }
+
+    public ActiveStringConfigProperty(String name, String defaultValue, String help, String method) {
+        this(name, defaultValue, help);
+        this.method = method;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getMethod() {
+        return this.method;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setMethod(String methodName) {
+        this.method = methodName;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Class<?> getPropertyClass() {
+        return String.class;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        if (value == null) {
+            return false;
+        }
+        this.setValue(value);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return "";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(String value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+}

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

@@ -0,0 +1,135 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link Boolean} config-property.
+ */
+public class BooleanConfigProperty implements MVActiveConfigProperty<Boolean> {
+    private String name;
+    private Boolean value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+    private String method;
+
+    public BooleanConfigProperty(ConfigurationSection section, String name, Boolean defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public BooleanConfigProperty(ConfigurationSection section, String name, Boolean defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.setValue(this.section.getBoolean(this.configNode, defaultValue));
+    }
+
+    public BooleanConfigProperty(ConfigurationSection section, String name, Boolean defaultValue, String configNode, String help, String method) {
+        this(section, name, defaultValue, configNode, help);
+        this.method = method;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Boolean getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(Boolean value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        if (value == null) {
+            return false;
+        }
+        if (value.toLowerCase().equals("true") || value.toLowerCase().equals("false")) {
+            this.setValue(Boolean.parseBoolean(value));
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Gets the method that will be executed.
+     *
+     * @return The name of the method in MVWorld to be called.
+     */
+    @Override
+    public String getMethod() {
+        return this.method;
+    }
+
+    /**
+     * Sets the method that will be executed.
+     *
+     * @param methodName The name of the method in MVWorld to be called.
+     */
+    @Override
+    public void setMethod(String methodName) {
+        this.method = methodName;
+    }
+
+    /**
+     * Returns the class of the object we're looking at.
+     *
+     * @return the class of the object we're looking at.
+     */
+    @Override
+    public Class<?> getPropertyClass() {
+        return Boolean.class;
+    }
+}

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

@@ -0,0 +1,98 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link EnglishChatColor} config-property.
+ */
+public class ColorConfigProperty implements MVConfigProperty<EnglishChatColor> {
+    private String name;
+    private EnglishChatColor value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+
+    public ColorConfigProperty(ConfigurationSection section, String name, EnglishChatColor defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public ColorConfigProperty(ConfigurationSection section, String name, EnglishChatColor defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.parseValue(this.section.getString(this.configNode, defaultValue.toString()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public EnglishChatColor getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(EnglishChatColor value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value.getText());
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        EnglishChatColor color = EnglishChatColor.fromString(value);
+        if (color == null) {
+            return false;
+        }
+        this.setValue(color);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+}

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

@@ -0,0 +1,306 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2012.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
+import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
+import org.bukkit.Difficulty;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.configuration.ConfigurationSection;
+
+/** A factory to create config properties for a given world. */
+public class ConfigPropertyFactory {
+    private ConfigurationSection section;
+
+    public ConfigPropertyFactory(ConfigurationSection section) {
+        this.section = section;
+    }
+
+    // Booleans
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public BooleanConfigProperty getNewProperty(String name, boolean defaultValue, String help) {
+        return new BooleanConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public BooleanConfigProperty getNewProperty(String name, boolean defaultValue, String node, String help) {
+        return new BooleanConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    /**
+     * Constructs a new ActiveBooleanConfigProperty
+     *
+     * This property will execute 'method' after it has been successfully set.
+     *
+     * @param name The name of this ConifgProperty
+     * @param defaultValue The default value.
+     * @param help What string is shown for help.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param method The method that should be executed.
+     * @return The ActiveStringConfigProperty
+     */
+    public BooleanConfigProperty getNewProperty(String name, boolean defaultValue, String help, String node, String method) {
+        return new BooleanConfigProperty(this.section, name, defaultValue, help, node, method);
+    }
+
+    // Integers
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public IntegerConfigProperty getNewProperty(String name, int defaultValue, String help) {
+        return new IntegerConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public IntegerConfigProperty getNewProperty(String name, int defaultValue, String node, String help) {
+        return new IntegerConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    // Doubles
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public DoubleConfigProperty getNewProperty(String name, double defaultValue, String help) {
+        return new DoubleConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public DoubleConfigProperty getNewProperty(String name, double defaultValue, String node, String help) {
+        return new DoubleConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @param method The name of the method that's used to set this property.
+     * @return The ConfigProperty.
+     */
+    public DoubleConfigProperty getNewProperty(String name, double defaultValue, String node, String help, String method) {
+        return new DoubleConfigProperty(this.section, name, defaultValue, node, help, method);
+    }
+
+    // Strings
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public StringConfigProperty getNewProperty(String name, String defaultValue, String help) {
+        return new StringConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public StringConfigProperty getNewProperty(String name, String defaultValue, String node, String help) {
+        return new StringConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    // Colors
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public ColorConfigProperty getNewProperty(String name, EnglishChatColor defaultValue, String help) {
+        return new ColorConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public ColorConfigProperty getNewProperty(String name, EnglishChatColor defaultValue, String node, String help) {
+        return new ColorConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    // Difficulty
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public DifficultyConfigProperty getNewProperty(String name, Difficulty defaultValue, String help) {
+        return new DifficultyConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public DifficultyConfigProperty getNewProperty(String name, Difficulty defaultValue, String node, String help) {
+        return new DifficultyConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    // GameMode
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public GameModeConfigProperty getNewProperty(String name, GameMode defaultValue, String help) {
+        return new GameModeConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public GameModeConfigProperty getNewProperty(String name, GameMode defaultValue, String node, String help) {
+        return new GameModeConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    // Location
+    /**
+     * Constructs a new LocationConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public LocationConfigProperty getNewProperty(String name, Location defaultValue, String help) {
+        return new LocationConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public LocationConfigProperty getNewProperty(String name, Location defaultValue, String node, String help) {
+        return new LocationConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @param method The name of the method that's used to set this property.
+     * @return The ConfigProperty.
+     */
+    public LocationConfigProperty getNewProperty(String name, Location defaultValue, String node, String help, String method) {
+        return new LocationConfigProperty(this.section, name, defaultValue, node, help, method);
+    }
+
+        // GameMode
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public PortalTypeConfigProperty getNewProperty(String name, AllowedPortalType defaultValue, String help) {
+        return new PortalTypeConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ActiveStringConfigProperty
+     *
+     * This property will execute 'method' after it has been successfully set.
+     * This string will NOT be saved to the config file.
+     *
+     * @param name The name of this ConifgProperty
+     * @param defaultValue The default value.
+     * @param help What string is shown for help.
+     * @param method The method that should be executed.
+     * @param saveToConfig Should the variable save to the config?
+     * @return The ActiveStringConfigProperty
+     */
+    public ActiveStringConfigProperty getNewProperty(String name, String defaultValue, String help, String method, boolean saveToConfig) {
+        return new ActiveStringConfigProperty(name, defaultValue, help, method);
+    }
+}

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

@@ -0,0 +1,129 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.Difficulty;
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link Difficulty} config-property.
+ */
+public class DifficultyConfigProperty implements MVActiveConfigProperty<Difficulty> {
+    private String name;
+    private Difficulty value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+
+    public DifficultyConfigProperty(ConfigurationSection section, String name, Difficulty defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public DifficultyConfigProperty(ConfigurationSection section, String name, Difficulty defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.parseValue(this.section.getString(this.configNode, defaultValue.toString()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Difficulty getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(Difficulty value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value.toString());
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        try {
+            return this.setValue(Difficulty.getByValue(Integer.parseInt(value)));
+        } catch (NumberFormatException nfe) {
+            try {
+                return this.setValue(Difficulty.valueOf(value.toUpperCase()));
+            } catch (Exception e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Gets the method that will be executed.
+     *
+     * @return The name of the method in MVWorld to be called.
+     */
+    @Override
+    public String getMethod() {
+        return "setActualDifficulty";
+    }
+
+    /**
+     * Sets the method that will be executed.
+     *
+     * @param methodName The name of the method in MVWorld to be called.
+     */
+    @Override
+    public void setMethod(String methodName) {
+        // Unused here. This will only ever be setDifficulty.
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Class<?> getPropertyClass() {
+        return Difficulty.class;
+    }
+}

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

@@ -0,0 +1,133 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link Double} config-property.
+ */
+public class DoubleConfigProperty implements MVActiveConfigProperty<Double> {
+    private String name;
+    private Double value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+    private String method;
+
+    public DoubleConfigProperty(ConfigurationSection section, String name, Double defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public DoubleConfigProperty(ConfigurationSection section, String name, Double defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.setValue(this.section.getDouble(this.configNode, defaultValue));
+    }
+
+    public DoubleConfigProperty(ConfigurationSection section, String name, Double defaultValue, String configNode, String help, String method) {
+        this(section, name, defaultValue, configNode, help);
+        this.method = method;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Double getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(Double value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        try {
+            this.setValue(Double.parseDouble(value));
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Gets the method that will be executed.
+     *
+     * @return The name of the method in MVWorld to be called.
+     */
+    @Override
+    public String getMethod() {
+        return this.method;
+    }
+
+    /**
+     * Sets the method that will be executed.
+     *
+     * @param methodName The name of the method in MVWorld to be called.
+     */
+    @Override
+    public void setMethod(String methodName) {
+        this.method = methodName;
+    }
+
+    /**
+     * Returns the class of the object we're looking at.
+     *
+     * @return the class of the object we're looking at.
+     */
+    @Override
+    public Class<?> getPropertyClass() {
+        return Double.class;
+    }
+}

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

@@ -1,66 +0,0 @@
-package com.onarandombox.MultiverseCore.configuration;
-
-import java.util.Map;
-
-import me.main__.util.SerializationConfig.Property;
-import me.main__.util.SerializationConfig.SerializationConfig;
-
-import org.bukkit.configuration.serialization.SerializableAs;
-
-/**
- * Entryfee-settings.
- */
-@SerializableAs("MVEntryFee")
-public class EntryFee extends SerializationConfig {
-    @Property
-    private double amount;
-    @Property
-    private int currency;
-
-    public EntryFee() {
-        super();
-    }
-
-    public EntryFee(Map<String, Object> values) {
-        super(values);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void setDefaults() {
-        amount = 0D;
-        currency = -1;
-    }
-
-    /**
-     * @return the amount
-     */
-    public double getAmount() {
-        return amount;
-    }
-
-    /**
-     * @return the currency
-     */
-    public int getCurrency() {
-        return currency;
-    }
-
-    /**
-     * Sets the amount.
-     * @param amount The new value.
-     */
-    public void setAmount(double amount) {
-        this.amount = amount;
-    }
-
-    /**
-     * Sets the currency.
-     * @param currency The new value.
-     */
-    public void setCurrency(int currency) {
-        this.currency = currency;
-    }
-}

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

@@ -0,0 +1,129 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.GameMode;
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link GameMode} config-property.
+ */
+public class GameModeConfigProperty implements MVActiveConfigProperty<GameMode> {
+    private String name;
+    private GameMode value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+
+    public GameModeConfigProperty(ConfigurationSection section, String name, GameMode defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public GameModeConfigProperty(ConfigurationSection section, String name, GameMode defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.parseValue(this.section.getString(this.configNode, defaultValue.toString()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GameMode getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(GameMode value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value.toString());
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        try {
+            return this.setValue(GameMode.getByValue(Integer.parseInt(value)));
+        } catch (NumberFormatException nfe) {
+            try {
+                return this.setValue(GameMode.valueOf(value.toUpperCase()));
+            } catch (Exception e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Gets the method that will be executed.
+     *
+     * @return The name of the method in MVWorld to be called.
+     */
+    @Override
+    public String getMethod() {
+        return "setActualGameMode";
+    }
+
+    /**
+     * Sets the method that will be executed.
+     *
+     * @param methodName The name of the method in MVWorld to be called.
+     */
+    @Override
+    public void setMethod(String methodName) {
+        // Not required. Gamemode will only ever be one.
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Class<?> getPropertyClass() {
+        return GameMode.class;
+    }
+}

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

@@ -0,0 +1,97 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link Integer} config-property.
+ */
+public class IntegerConfigProperty implements MVConfigProperty<Integer> {
+    private String name;
+    private Integer value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+
+    public IntegerConfigProperty(ConfigurationSection section, String name, Integer defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public IntegerConfigProperty(ConfigurationSection section, String name, Integer defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.setValue(this.section.getInt(this.configNode, defaultValue));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Integer getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(Integer value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        try {
+            this.setValue(Integer.parseInt(value));
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+}

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

@@ -1,24 +0,0 @@
-package com.onarandombox.MultiverseCore.configuration;
-
-import java.util.Locale;
-
-import me.main__.util.SerializationConfig.IllegalPropertyValueException;
-import me.main__.util.SerializationConfig.Serializor;
-
-public class LocaleSerializor implements Serializor<Locale, String> {
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Locale deserialize(String arg0, Class<Locale> arg1) throws IllegalPropertyValueException {
-        return new Locale(arg0);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String serialize(Locale arg0) {
-        return arg0.getLanguage();
-    }
-}

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

@@ -0,0 +1,154 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import com.onarandombox.MultiverseCore.utils.LocationManipulation;
+import org.bukkit.Location;
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link Location} config-property.
+ */
+public class LocationConfigProperty implements MVActiveConfigProperty<Location> {
+    private String name;
+    private Location value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+    private String method;
+
+    public LocationConfigProperty(ConfigurationSection section, String name, Location defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public LocationConfigProperty(ConfigurationSection section, String name, Location defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.setValue(this.getLocationFromConfig(defaultValue));
+    }
+
+    public LocationConfigProperty(ConfigurationSection section, String name, Location defaultValue, String configNode, String help, String method) {
+        this(section, name, defaultValue, configNode, help);
+        this.method = method;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Location getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        // TODO: oh my god, what should we do here?
+        Location parsed = LocationManipulation.stringToLocation(value);
+        return this.setValue(parsed);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(Location value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode + ".x", this.value.getX());
+        this.section.set(configNode + ".y", this.value.getY());
+        this.section.set(configNode + ".z", this.value.getZ());
+        this.section.set(configNode + ".pitch", this.value.getPitch());
+        this.section.set(configNode + ".yaw", this.value.getYaw());
+        this.section.set(configNode + ".world", this.value.getWorld().getName());
+
+        return true;
+    }
+
+    private Location getLocationFromConfig(Location defaultValue) {
+        double x = this.section.getDouble(this.configNode + ".x", defaultValue.getX());
+        double y = this.section.getDouble(this.configNode + ".y", defaultValue.getY());
+        double z = this.section.getDouble(this.configNode + ".z", defaultValue.getZ());
+        double pitch = this.section.getDouble(this.configNode + ".pitch", defaultValue.getPitch());
+        double yaw = this.section.getDouble(this.configNode + ".yaw", defaultValue.getYaw());
+        String w = this.section.getString(this.configNode + ".world", defaultValue.getWorld().getName());
+        Location found = LocationManipulation.stringToLocation(w + ":" + x + "," + y + "," + z + ":" + yaw + ":" + pitch);
+        // TODO: oh my god, what should we do here?
+        if (found != null) {
+            return found;
+        }
+        return defaultValue;
+    }
+
+    @Override
+    public String toString() {
+        // TODO: oh my god, what should we do here?
+        return LocationManipulation.strCoordsRaw(this.value);
+    }
+
+    /**
+     * Gets the method that will be executed.
+     *
+     * @return The name of the method in MVWorld to be called.
+     */
+    @Override
+    public String getMethod() {
+        return this.method;
+    }
+
+    /**
+     * Sets the method that will be executed.
+     *
+     * @param methodName The name of the method in MVWorld to be called.
+     */
+    @Override
+    public void setMethod(String methodName) {
+        this.method = methodName;
+    }
+
+    /**
+     * Returns the class of the object we're looking at.
+     *
+     * @return the class of the object we're looking at.
+     */
+    @Override
+    public Class<?> getPropertyClass() {
+        return Location.class;
+    }
+}

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

@@ -10,10 +10,8 @@ package com.onarandombox.MultiverseCore.configuration;
 /**
  * An "active" {@link MVConfigProperty} that uses the specified method to be "actually" set.
  * @param <T> The type of the config-property.
- * @deprecated This is deprecated.
  * @see MVConfigProperty
  */
-@Deprecated
 public interface MVActiveConfigProperty<T> extends MVConfigProperty<T> {
     /**
      * Gets the method that will be executed.

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

@@ -11,9 +11,7 @@ package com.onarandombox.MultiverseCore.configuration;
  * A generic config-property.
  *
  * @param <T> The type of the config-property.
- * @deprecated This is deprecated.
  */
-@Deprecated
 public interface MVConfigProperty<T> {
     /**
      * Gets the name of this property.

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

@@ -0,0 +1,97 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2012.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link AllowedPortalType} config-property.
+ */
+public class PortalTypeConfigProperty implements MVConfigProperty<AllowedPortalType> {
+    private String name;
+    private AllowedPortalType value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+
+    public PortalTypeConfigProperty(ConfigurationSection section, String name, AllowedPortalType defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public PortalTypeConfigProperty(ConfigurationSection section, String name, AllowedPortalType defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.parseValue(this.section.getString(this.configNode, defaultValue.toString()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public AllowedPortalType getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(AllowedPortalType value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value.toString());
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        try {
+            return this.setValue(AllowedPortalType.valueOf(value.toUpperCase()));
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+}

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

@@ -1,98 +0,0 @@
-package com.onarandombox.MultiverseCore.configuration;
-
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
-import org.bukkit.configuration.serialization.SerializableAs;
-
-/**
- * Just like a regular {@link Location}, however {@code world} is usually {@code null}
- * or just a weak reference and it implements {@link ConfigurationSerializable}.
- */
-@SerializableAs("MVSpawnLocation")
-public class SpawnLocation extends Location implements ConfigurationSerializable {
-    private Reference<World> worldRef;
-
-    public SpawnLocation(double x, double y, double z) {
-        super(null, x, y, z);
-    }
-
-    public SpawnLocation(double x, double y, double z, float yaw, float pitch) {
-        super(null, x, y, z, yaw, pitch);
-    }
-
-    public SpawnLocation(Location loc) {
-        this(loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public World getWorld() {
-        return (this.worldRef != null) ? this.worldRef.get() : null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setWorld(World world) {
-        this.worldRef = new WeakReference<World>(world);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Chunk getChunk() {
-        if ((this.worldRef != null) && (this.worldRef.get() != null))
-            return this.worldRef.get().getChunkAt(this);
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Block getBlock() {
-        if ((this.worldRef != null) && (this.worldRef.get() != null))
-            return this.worldRef.get().getBlockAt(this);
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Map<String, Object> serialize() {
-        Map<String, Object> serialized = new HashMap<String, Object>(5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-        serialized.put("x", this.getX());
-        serialized.put("y", this.getY());
-        serialized.put("z", this.getZ());
-        serialized.put("pitch", this.getPitch());
-        serialized.put("yaw", this.getYaw());
-        return serialized;
-    }
-
-    /**
-     * Let Bukkit be able to deserialize this.
-     * @param args The map.
-     * @return The deserialized object.
-     */
-    public static SpawnLocation deserialize(Map<String, Object> args) {
-        double x = ((Number) args.get("x")).doubleValue();
-        double y = ((Number) args.get("y")).doubleValue();
-        double z = ((Number) args.get("z")).doubleValue();
-        float pitch = ((Number) args.get("pitch")).floatValue();
-        float yaw = ((Number) args.get("yaw")).floatValue();
-        return new SpawnLocation(x, y, z, yaw, pitch);
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.onarandombox.MultiverseCore.configuration;
-
-import java.util.Map;
-
-import me.main__.util.SerializationConfig.Property;
-import me.main__.util.SerializationConfig.SerializationConfig;
-
-import org.bukkit.configuration.serialization.SerializableAs;
-
-/**
- * Spawning-Settings.
- */
-@SerializableAs("MVSpawnSettings")
-public class SpawnSettings extends SerializationConfig {
-    @Property
-    private SubSpawnSettings animals;
-    @Property
-    private SubSpawnSettings monsters;
-
-    public SpawnSettings() {
-        super();
-    }
-
-    public SpawnSettings(Map<String, Object> values) {
-        super(values);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setDefaults() {
-        animals = new SubSpawnSettings();
-        monsters = new SubSpawnSettings();
-    }
-
-    /**
-     * @return the animal-settings
-     */
-    public SubSpawnSettings getAnimalSettings() {
-        return animals;
-    }
-
-    /**
-     * @return the monster-settings
-     */
-    public SubSpawnSettings getMonsterSettings() {
-        return monsters;
-    }
-}

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

@@ -0,0 +1,96 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link String} config-property.
+ */
+public class StringConfigProperty implements MVConfigProperty<String> {
+    private String name;
+    private String value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+
+    public StringConfigProperty(ConfigurationSection section, String name, String defaultValue, String help) {
+        this(section, name, defaultValue, defaultValue, help);
+    }
+
+    public StringConfigProperty(ConfigurationSection section, String name, String defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.parseValue(this.section.getString(this.configNode, defaultValue));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        if (value == null) {
+            return false;
+        }
+        this.setValue(value);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(String value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value);
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+}

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

@@ -1,76 +0,0 @@
-package com.onarandombox.MultiverseCore.configuration;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import me.main__.util.SerializationConfig.Property;
-import me.main__.util.SerializationConfig.SerializationConfig;
-
-import org.bukkit.configuration.serialization.SerializableAs;
-
-/**
- * SpawnSubSettings.
- */
-@SerializableAs("MVSpawnSubSettings")
-public class SubSpawnSettings extends SerializationConfig {
-    @Property
-    private boolean spawn;
-    @Property
-    private int spawnrate;
-    @Property
-    private List<String> exceptions;
-
-    public SubSpawnSettings() {
-        super();
-    }
-
-    public SubSpawnSettings(Map<String, Object> values) {
-        super(values);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setDefaults() {
-        spawn = true;
-        exceptions = new ArrayList<String>();
-        spawnrate = -1;
-    }
-
-    /**
-     * @return spawn
-     */
-    public boolean doSpawn() {
-        return spawn;
-    }
-
-    /**
-     * @param spawn The new value.
-     */
-    public void setSpawn(boolean spawn) {
-        this.spawn = spawn;
-    }
-
-    /**
-     * @return The exceptions
-     */
-    public List<String> getExceptions() {
-        return exceptions;
-    }
-
-    /**
-     * @param rate The new spawn rate
-     */
-    public void setSpawnRate(int rate) {
-        this.spawnrate = rate;
-    }
-
-    /**
-     * @return The spawn rate
-     */
-    public int getSpawnRate() {
-        return this.spawnrate;
-    }
-}

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

@@ -1,27 +0,0 @@
-package com.onarandombox.MultiverseCore.configuration;
-
-import org.bukkit.Bukkit;
-
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.event.MVWorldPropertyChangeEvent;
-
-import me.main__.util.SerializationConfig.ChangeDeniedException;
-import me.main__.util.SerializationConfig.ObjectUsingValidator;
-
-/**
- * Validates world-property-changes.
- * @param <T> The type of the property that should be validated.
- */
-public class WorldPropertyValidator<T> extends ObjectUsingValidator<T, MVWorld> {
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public T validateChange(String property, T newValue, T oldValue, MVWorld object) throws ChangeDeniedException {
-        MVWorldPropertyChangeEvent<T> event = new MVWorldPropertyChangeEvent<T>(object, null, property, newValue);
-        Bukkit.getPluginManager().callEvent(event);
-        if (event.isCancelled())
-            throw new ChangeDeniedException();
-        return event.getTheNewValue();
-    }
-}

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

@@ -7,9 +7,7 @@
 
 package com.onarandombox.MultiverseCore.destination;
 
-import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
-import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -23,7 +21,6 @@ public class BedDestination implements MVDestination {
 
     private boolean isValid;
     private Location knownBedLoc;
-    private MultiverseCore plugin;
 
     /**
      * {@inheritDoc}
@@ -49,10 +46,7 @@ public class BedDestination implements MVDestination {
     @Override
     public Location getLocation(Entity entity) {
         if (entity instanceof Player) {
-            this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(((Player) entity).getBedSpawnLocation());
-            if (this.knownBedLoc == null) {
-                ((Player) entity).sendMessage("Your bed was " + ChatColor.RED + "invalid or blocked" + ChatColor.RESET + ". Sorry.");
-            }
+            this.knownBedLoc = ((Player) entity).getBedSpawnLocation();
             return this.knownBedLoc;
         }
         return null;
@@ -71,7 +65,7 @@ public class BedDestination implements MVDestination {
      */
     @Override
     public void setDestination(JavaPlugin plugin, String destination) {
-        this.plugin = (MultiverseCore) plugin;
+        // Not needed.
     }
 
     /**

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

@@ -54,7 +54,7 @@ public class DestinationFactory {
             Class<? extends MVDestination> myClass = this.destList.get(idenChar);
             try {
                 MVDestination mydest = myClass.newInstance();
-                if (!mydest.isThisType(this.plugin, destination)) {
+                if (!mydest.isThisType((MultiverseCore) this.plugin, destination)) {
                     return new InvalidDestination();
                 }
                 mydest.setDestination(this.plugin, destination);

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

@@ -70,7 +70,7 @@ public class WorldDestination implements MVDestination {
         return spawnLoc;
     }
 
-    private static Location getAcurateSpawnLocation(Entity e, MultiverseWorld world) {
+    private Location getAcurateSpawnLocation(Entity e, MultiverseWorld world) {
         if (world != null) {
             return world.getSpawnLocation();
         } else {

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

@@ -11,33 +11,49 @@ import org.bukkit.ChatColor;
 
 /**
  * A regular {@link ChatColor} represented by an english string.
- * @see ChatColor
  */
 public enum EnglishChatColor {
-    // BEGIN CHECKSTYLE-SUPPRESSION: JavadocVariable
-    AQUA(ChatColor.AQUA),
-    BLACK(ChatColor.BLACK),
-    BLUE(ChatColor.BLUE),
-    DARKAQUA(ChatColor.DARK_AQUA),
-    DARKBLUE(ChatColor.DARK_BLUE),
-    DARKGRAY(ChatColor.DARK_GRAY),
-    DARKGREEN(ChatColor.DARK_GREEN),
-    DARKPURPLE(ChatColor.DARK_PURPLE),
-    DARKRED(ChatColor.DARK_RED),
-    GOLD(ChatColor.GOLD),
-    GRAY(ChatColor.GRAY),
-    GREEN(ChatColor.GREEN),
-    LIGHTPURPLE(ChatColor.LIGHT_PURPLE),
-    RED(ChatColor.RED),
-    YELLOW(ChatColor.YELLOW),
-    WHITE(ChatColor.WHITE);
-    // END CHECKSTYLE-SUPPRESSION: JavadocVariable
+    /*
+     * I know. this is quite ugly.
+     */
+    /** AQUA. */
+    AQUA("AQUA", ChatColor.AQUA),
+    /** BLACK. */
+    BLACK("BLACK", ChatColor.BLACK),
+    /** BLUE. */
+    BLUE("BLUE", ChatColor.BLUE),
+    /** DARKAQUA. */
+    DARKAQUA("DARKAQUA", ChatColor.DARK_AQUA),
+    /** DARKBLUE. */
+    DARKBLUE("DARKBLUE", ChatColor.DARK_BLUE),
+    /** DARKGRAY. */
+    DARKGRAY("DARKGRAY", ChatColor.DARK_GRAY),
+    /** DARKGREEN. */
+    DARKGREEN("DARKGREEN", ChatColor.DARK_GREEN),
+    /** DARKPURPLE. */
+    DARKPURPLE("DARKPURPLE", ChatColor.DARK_PURPLE),
+    /** DARKRED. */
+    DARKRED("DARKRED", ChatColor.DARK_RED),
+    /** GOLD. */
+    GOLD("GOLD", ChatColor.GOLD),
+    /** GRAY. */
+    GRAY("GRAY", ChatColor.GRAY),
+    /** GREEN. */
+    GREEN("GREEN", ChatColor.GREEN),
+    /** LIGHTPURPLE. */
+    LIGHTPURPLE("LIGHTPURPLE", ChatColor.LIGHT_PURPLE),
+    /** RED. */
+    RED("RED", ChatColor.RED),
+    /** YELLOW. */
+    YELLOW("YELLOW", ChatColor.YELLOW),
+    /** WHITE. */
+    WHITE("WHITE", ChatColor.WHITE);
+    private ChatColor color;
+    private String text;
 
-    private final ChatColor color;
-    //private final String text;
-
-    EnglishChatColor(ChatColor color) {
+    EnglishChatColor(String name, ChatColor color) {
         this.color = color;
+        this.text = name;
     }
 
     /**
@@ -45,7 +61,7 @@ public enum EnglishChatColor {
      * @return The text.
      */
     public String getText() {
-        return this.name();
+        return this.text;
     }
 
     /**
@@ -76,20 +92,11 @@ public enum EnglishChatColor {
     public static EnglishChatColor fromString(String text) {
         if (text != null) {
             for (EnglishChatColor c : EnglishChatColor.values()) {
-                if (text.equalsIgnoreCase(c.name())) {
+                if (text.equalsIgnoreCase(c.text)) {
                     return c;
                 }
             }
         }
         return null;
     }
-
-    /**
-     * Looks if the given-color name is a valid color.
-     * @param aliasColor A color-name.
-     * @return True if the name is a valid color, false if it isn't.
-     */
-    public static boolean isValidAliasColor(String aliasColor) {
-        return (EnglishChatColor.fromString(aliasColor) != null);
-    }
 }

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

@@ -1,49 +0,0 @@
-package com.onarandombox.MultiverseCore.enums;
-
-import org.bukkit.ChatColor;
-
-/**
- * A regular {@link ChatColor} represented by an english string.
- * @see ChatColor
- */
-public enum EnglishChatStyle {
-    // BEGIN CHECKSTYLE-SUPPRESSION: JavadocVariable
-    /** No style. */
-    NORMAL(null),
-    MAGIC(ChatColor.MAGIC),
-    BOLD(ChatColor.BOLD),
-    STRIKETHROUGH(ChatColor.STRIKETHROUGH),
-    UNDERLINE(ChatColor.UNDERLINE),
-    ITALIC(ChatColor.ITALIC);
-    // END CHECKSTYLE-SUPPRESSION: JavadocVariable
-
-    private final ChatColor color;
-
-    EnglishChatStyle(ChatColor color) {
-        this.color = color;
-    }
-
-    /**
-     * Gets the color.
-     * @return The color as {@link ChatColor}.
-     */
-    public ChatColor getColor() {
-        return color;
-    }
-
-    /**
-     * Constructs an {@link EnglishChatStyle} from a {@link String}.
-     * @param text The {@link String}.
-     * @return The {@link EnglishChatStyle}.
-     */
-    public static EnglishChatStyle fromString(String text) {
-        if (text != null) {
-            for (EnglishChatStyle c : EnglishChatStyle.values()) {
-                if (text.equalsIgnoreCase(c.name())) {
-                    return c;
-                }
-            }
-        }
-        return null;
-    }
-}

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

@@ -16,6 +16,7 @@ import java.util.List;
  * Called when the Multiverse-config should be reloaded.
  */
 public class MVConfigReloadEvent extends Event {
+    private static final long serialVersionUID = 3647950355746345397L;
     private List<String> configsLoaded;
 
     public MVConfigReloadEvent(List<String> configsLoaded) {

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

@@ -20,7 +20,6 @@ public class MVPlayerTouchedPortalEvent extends Event implements Cancellable {
     private Player p;
     private Location l;
     private boolean isCancelled;
-    private boolean canUse = true;
 
     public MVPlayerTouchedPortalEvent(Player p, Location l) {
         this.p = p;
@@ -61,26 +60,6 @@ public class MVPlayerTouchedPortalEvent extends Event implements Cancellable {
         return this.p;
     }
 
-    /**
-     * Gets whether or not the player in this event can use this portal.
-     *
-     * @return True if the player can use this portal.
-     */
-    public boolean canUseThisPortal() {
-        return this.canUse;
-    }
-
-    /**
-     * Sets whether or not the player in this event can use this portal.
-     * <p>
-     * Setting this to false will cause the player to bounce back!
-     *
-     * @param canUse Whether or not the user can go through this portal.
-     */
-    public void setCanUseThisPortal(boolean canUse) {
-        this.canUse = canUse;
-    }
-
     @Override
     public boolean isCancelled() {
         return this.isCancelled;

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

@@ -19,18 +19,16 @@ import org.bukkit.event.HandlerList;
  * If it is cancelled, no change will happen.
  * <p>
  * If you want to get the values of the world before the change, query the world.
- * To get the name of the property that was changed, use {@link #getPropertyName()}.
- * To get the new value, use {@link #getTheNewValue()}. To change it, use {@link #setTheNewValue(Object)}.
- * @param <T> The type of the property that was set.
+ * If you want to get the value being changed, use getProperty()
  */
-public class MVWorldPropertyChangeEvent<T> extends Event implements Cancellable {
+public class MVWorldPropertyChangeEvent extends Event implements Cancellable {
     private MultiverseWorld world;
     private CommandSender changer;
     private boolean isCancelled = false;
+    private String value;
     private String name;
-    private T value;
 
-    public MVWorldPropertyChangeEvent(MultiverseWorld world, CommandSender changer, String name, T value) {
+    public MVWorldPropertyChangeEvent(MultiverseWorld world, CommandSender changer, String name, String value) {
         this.world = world;
         this.changer = changer;
         this.name = name;
@@ -66,38 +64,16 @@ public class MVWorldPropertyChangeEvent<T> extends Event implements Cancellable
     /**
      * Gets the new value.
      * @return The new value.
-     * @deprecated Use {@link #getTheNewValue()} instead.
      */
-    @Deprecated
     public String getNewValue() {
-        return this.value.toString();
-    }
-
-    /**
-     * Gets the new value.
-     * @return The new value.
-     */
-    public T getTheNewValue() {
         return this.value;
     }
 
     /**
      * Sets the new value.
-     * <p>
-     * This method is only a stub, it'll <b>always</b> throw an {@link UnsupportedOperationException}!
      * @param value The new new value.
-     * @deprecated Use {@link #setTheNewValue(Object)} instead.
      */
-    @Deprecated
     public void setNewValue(String value) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Sets the new value.
-     * @param value The new value.
-     */
-    public void setTheNewValue(T value) {
         this.value = value;
     }
 
@@ -112,8 +88,6 @@ public class MVWorldPropertyChangeEvent<T> extends Event implements Cancellable
 
     /**
      * Gets the person (or console) who was responsible for the change.
-     * <p>
-     * This may be null!
      *
      * @return The person (or console) who was responsible for the change.
      */

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

@@ -14,8 +14,4 @@ public class PropertyDoesNotExistException extends Exception {
     public PropertyDoesNotExistException(String name) {
         super(name);
     }
-
-    public PropertyDoesNotExistException(String name, Throwable cause) {
-        super(name, cause);
-    }
 }

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

@@ -1,35 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-
-/**
- * A wrapper for the {@link AsyncPlayerChatEvent}.
- */
-public class AsyncChatEvent implements ChatEvent {
-    private final AsyncPlayerChatEvent event;
-
-    public AsyncChatEvent(AsyncPlayerChatEvent event) {
-        this.event = event;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return event.isCancelled();
-    }
-
-    @Override
-    public String getFormat() {
-        return event.getFormat();
-    }
-
-    @Override
-    public void setFormat(String s) {
-        event.setFormat(s);
-    }
-
-    @Override
-    public Player getPlayer() {
-        return event.getPlayer();
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import org.bukkit.entity.Player;
-
-/**
- * A wrapper for the two chat-events in Bukkit.
- */
-public interface ChatEvent {
-    /**
-     * @return Whether this event is cancelled.
-     */
-    boolean isCancelled();
-
-    /**
-     * @return The format.
-     */
-    String getFormat();
-
-    /**
-     * Sets the format.
-     * @param s The new format.
-     */
-    void setFormat(String s);
-
-    /**
-     * @return The player.
-     */
-    Player getPlayer();
-}

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

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.listeners;
-
-import java.util.logging.Level;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-/**
- * Multiverse's {@link org.bukkit.event.Listener} for players.
- */
-public class MVAsyncPlayerChatListener extends MVChatListener {
-    public MVAsyncPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
-        super(plugin, playerListener);
-        plugin.log(Level.FINE, "Created AsyncPlayerChatEvent listener.");
-    }
-
-    /**
-     * This method is called when a player wants to chat.
-     * @param event The Event that was fired.
-     */
-    @EventHandler
-    public void playerChat(AsyncPlayerChatEvent event) {
-        this.playerChat(new AsyncChatEvent(event));
-    }
-}

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

@@ -1,52 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import org.bukkit.event.Listener;
-
-/**
- * Multiverse's {@link org.bukkit.event.Listener} for players.
- */
-public abstract class MVChatListener implements Listener {
-    private final MultiverseCore plugin;
-    private final MVWorldManager worldManager;
-    private final MVPlayerListener playerListener;
-
-    public MVChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
-        this.plugin = plugin;
-        this.worldManager = plugin.getMVWorldManager();
-        this.playerListener = playerListener;
-    }
-
-    /**
-     * This handles a {@link ChatEvent}.
-     * @param event The {@link ChatEvent}.
-     */
-    public void playerChat(ChatEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-        // Check whether the Server is set to prefix the chat with the World name.
-        // If not we do nothing, if so we need to check if the World has an Alias.
-        if (plugin.getMVConfig().getPrefixChat()) {
-            String world = playerListener.getPlayerWorld().get(event.getPlayer().getName());
-            if (world == null) {
-                world = event.getPlayer().getWorld().getName();
-                playerListener.getPlayerWorld().put(event.getPlayer().getName(), world);
-            }
-            String prefix = "";
-            // If we're not a MV world, don't do anything
-            if (!this.worldManager.isMVWorld(world)) {
-                return;
-            }
-            MultiverseWorld mvworld = this.worldManager.getMVWorld(world);
-            if (mvworld.isHidden()) {
-                return;
-            }
-            prefix = mvworld.getColoredWorldString();
-            String format = event.getFormat();
-            event.setFormat("[" + prefix + "]" + format);
-        }
-    }
-}

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

@@ -11,8 +11,13 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.World;
-import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Animals;
+import org.bukkit.entity.CreatureType;
+import org.bukkit.entity.Ghast;
+import org.bukkit.entity.Monster;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Slime;
+import org.bukkit.entity.Squid;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
@@ -21,12 +26,14 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 
+import java.util.List;
 import java.util.logging.Level;
 
 /**
  * Multiverse's Entity {@link Listener}.
  */
 public class MVEntityListener implements Listener {
+
     private MultiverseCore plugin;
     private MVWorldManager worldManager;
 
@@ -80,8 +87,7 @@ public class MVEntityListener implements Listener {
     public void creatureSpawn(CreatureSpawnEvent event) {
         // Check to see if the Creature is spawned by a plugin, we don't want to prevent this behaviour.
         // TODO: Allow the egg thing to be a config param. Doubt this will be per world; seems silly.
-        if (event.getSpawnReason() == SpawnReason.CUSTOM || event.getSpawnReason() == SpawnReason.SPAWNER_EGG
-                || event.getSpawnReason() == SpawnReason.BREEDING) {
+        if (event.getSpawnReason() == SpawnReason.CUSTOM || event.getSpawnReason() == SpawnReason.SPAWNER_EGG) {
             return;
         }
 
@@ -93,17 +99,55 @@ public class MVEntityListener implements Listener {
         if (!(this.worldManager.isMVWorld(world.getName())))
             return;
 
-        EntityType type = event.getEntityType();
+        CreatureType creature = event.getCreatureType();
+
+        MultiverseWorld mvworld = this.worldManager.getMVWorld(world.getName());
+
         /**
          * Handle people with non-standard animals: ie a patched craftbukkit.
          */
-        if (type == null || type.getName() == null) {
+        if (creature == null) {
             this.plugin.log(Level.FINER, "Found a null typed creature.");
             return;
         }
 
-        MultiverseWorld mvworld = this.worldManager.getMVWorld(world.getName());
-        event.setCancelled(this.plugin.getMVWorldManager().getTheWorldPurger().shouldWeKillThisCreature(mvworld, event.getEntity()));
+        /**
+         * Animal Handling
+         */
+        if (event.getEntity() instanceof Animals || event.getEntity() instanceof Squid) {
+            event.setCancelled(this.shouldWeKillThisCreature(mvworld.getAnimalList(), mvworld.canAnimalsSpawn(), creature.toString().toUpperCase()));
+        }
+        /**
+         * Monster Handling
+         */
+        if (event.getEntity() instanceof Monster || event.getEntity() instanceof Ghast || event.getEntity() instanceof Slime) {
+            event.setCancelled(this.shouldWeKillThisCreature(mvworld.getMonsterList(), mvworld.canMonstersSpawn(), creature.toString().toUpperCase()));
+        }
+    }
+
+    private boolean shouldWeKillThisCreature(List<String> creatureList, boolean allowCreatureSpawning, String creature) {
+        if (creatureList.isEmpty() && allowCreatureSpawning) {
+            // 1. There are no exceptions and animals are allowed. Save it.
+            return false;
+        } else if (creatureList.isEmpty()) {
+            // 2. There are no exceptions and animals are NOT allowed. Kill it.
+            return true;
+        } else if (creatureList.contains(creature.toUpperCase()) && allowCreatureSpawning) {
+            // 3. There ARE exceptions and animals ARE allowed. Kill it.
+            return true;
+        } else if (!creatureList.contains(creature.toUpperCase()) && allowCreatureSpawning) {
+            // 4. There ARE exceptions and animals ARE NOT allowed. SAVE it.
+            return false;
+        } else if (creatureList.contains(creature.toUpperCase()) && !allowCreatureSpawning) {
+            // 5. No animals are allowed to be spawned, BUT this one can stay...
+            return false;
+        } else if (!creatureList.contains(creature.toUpperCase()) && !allowCreatureSpawning) {
+            // 6. Animals are NOT allowed to spawn, and this creature is not in the save list... KILL IT
+            return true;
+        } else {
+            // This code should NEVER execute. I just left the verbose conditions in right now.
+            throw new UnsupportedOperationException();
+        }
     }
 
 }

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

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.listeners;
-
-import java.util.logging.Level;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerChatEvent;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-/**
- * Multiverse's {@link org.bukkit.event.Listener} for players.
- */
-@SuppressWarnings("deprecation") // this exists only for downwards compatibility
-public class MVPlayerChatListener extends MVChatListener {
-    public MVPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
-        super(plugin, playerListener);
-        plugin.log(Level.FINE, "Registered PlayerChatEvent listener.");
-    }
-
-    /**
-     * This method is called when a player wants to chat.
-     * @param event The Event that was fired.
-     */
-    @EventHandler
-    public void playerChat(PlayerChatEvent event) {
-        this.playerChat(new NormalChatEvent(event));
-    }
-}

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

@@ -7,12 +7,10 @@
 
 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;
 import com.onarandombox.MultiverseCore.event.MVRespawnEvent;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -23,37 +21,55 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
+import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerPortalEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
 /**
  * Multiverse's {@link Listener} for players.
  */
 public class MVPlayerListener implements Listener {
-    private final MultiverseCore plugin;
-    private final MVWorldManager worldManager;
-    private final PermissionTools pt;
+    private MultiverseCore plugin;
+    private MVWorldManager worldManager;
+    private PermissionTools pt;
 
-    private final Map<String, String> playerWorld = new ConcurrentHashMap<String, String>();
 
     public MVPlayerListener(MultiverseCore plugin) {
         this.plugin = plugin;
         worldManager = plugin.getMVWorldManager();
         pt = new PermissionTools(plugin);
     }
-
     /**
-     * @return the playerWorld-map
+     * This method is called when a player wants to chat.
+     * @param event The Event that was fired.
      */
-    public Map<String, String> getPlayerWorld() {
-        return playerWorld;
+    @EventHandler
+    public void playerChat(PlayerChatEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+        // Check whether the Server is set to prefix the chat with the World name.
+        // If not we do nothing, if so we need to check if the World has an Alias.
+        if (plugin.getMVConfig().getPrefixChat()) {
+            String world = event.getPlayer().getWorld().getName();
+            String prefix = "";
+            // If we're not a MV world, don't do anything
+            if (!this.worldManager.isMVWorld(world)) {
+                return;
+            }
+            MultiverseWorld mvworld = this.worldManager.getMVWorld(world);
+            if (mvworld.isHidden()) {
+                return;
+            }
+            prefix = mvworld.getColoredWorldString();
+            String format = event.getFormat();
+            event.setFormat("[" + prefix + "]" + format);
+        }
     }
 
     /**
@@ -112,22 +128,20 @@ public class MVPlayerListener implements Listener {
         if (!p.hasPlayedBefore()) {
             this.plugin.log(Level.FINER, "Player joined for the FIRST time!");
             if (plugin.getMVConfig().getFirstSpawnOverride()) {
-                this.plugin.log(Level.FINE, "Moving NEW player to(firstspawnoverride): "
-                        + worldManager.getFirstSpawnWorld().getSpawnLocation());
+                this.plugin.log(Level.FINE, String.format("Moving NEW player to(firstspawnoverride): %s",
+                        worldManager.getFirstSpawnWorld().getSpawnLocation()));
                 this.sendPlayerToDefaultWorld(p);
             }
             return;
         } else {
             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)) {
-                this.plugin.getMessaging().sendMessage(p, MultiverseMessage.LISTENER_PLAYER_LOSTACCESSPERM);
+            if (!this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + p.getWorld().getName(), false)) {
+                p.sendMessage("[MV] - Sorry you can't be in this world anymore!");
                 this.sendPlayerToDefaultWorld(p);
             }
         }
         // Handle the Players GameMode setting for the new world.
         this.handleGameMode(event.getPlayer(), event.getPlayer().getWorld());
-        playerWorld.put(p.getName(), p.getWorld().getName());
     }
 
     /**
@@ -138,7 +152,6 @@ public class MVPlayerListener implements Listener {
     public void playerChangedWorld(PlayerChangedWorldEvent event) {
         // Permissions now determine whether or not to handle a gamemode.
         this.handleGameMode(event.getPlayer(), event.getPlayer().getWorld());
-        playerWorld.put(event.getPlayer().getName(), event.getPlayer().getWorld().getName());
     }
 
     /**
@@ -156,8 +169,9 @@ public class MVPlayerListener implements Listener {
      */
     @EventHandler(priority = EventPriority.HIGHEST)
     public void playerTeleport(PlayerTeleportEvent event) {
-        this.plugin.log(Level.FINER, "Got teleport event for player '"
-                + event.getPlayer().getName() + "' with cause '" + event.getCause() + "'");
+        this.plugin.log(Level.FINER, String.format(
+                "Got teleport event for player '%s' with cause '%s'",
+                event.getPlayer().getName(), event.getCause()));
         if (event.isCancelled()) {
             return;
         }
@@ -172,15 +186,14 @@ public class MVPlayerListener implements Listener {
                 teleporter = this.plugin.getServer().getPlayer(teleporterName);
             }
         }
-        this.plugin.log(Level.FINER, "Inferred sender '" + teleporter + "' from name '"
-                + teleporterName + "', fetched from name '" + teleportee.getName() + "'");
+        this.plugin.log(Level.FINER, String.format("Inferred sender '%s' from name '%s', fetched from name '%s'",
+                teleporter, teleporterName, teleportee.getName()));
         MultiverseWorld fromWorld = this.worldManager.getMVWorld(event.getFrom().getWorld().getName());
         MultiverseWorld toWorld = this.worldManager.getMVWorld(event.getTo().getWorld().getName());
-        if (fromWorld == null || toWorld == null)
-            return;
         if (event.getFrom().getWorld().equals(event.getTo().getWorld())) {
             // The player is Teleporting to the same world.
-            this.plugin.log(Level.FINER, "Player '" + teleportee.getName() + "' is teleporting to the same world.");
+            this.plugin.log(Level.FINER, String.format("Player '%s' is teleporting to the same world.",
+                    teleportee.getName()));
             this.stateSuccess(teleportee.getName(), toWorld.getAlias());
             return;
         }
@@ -188,51 +201,33 @@ public class MVPlayerListener implements Listener {
         // Charge the teleporter
         event.setCancelled(!pt.playerHasMoneyToEnter(fromWorld, toWorld, teleporter, teleportee, true));
         if (event.isCancelled() && teleporter != null) {
-            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.");
+            this.plugin.log(Level.FINE, String.format(
+                    "Player '%s' was DENIED ACCESS to '%s' because '%s' don't have the FUNDS required to enter it.",
+                    teleportee.getName(), toWorld.getAlias(), teleporter.getName()));
+
             return;
         }
-        
-        // Check if player is allowed to enter the world if we're enforcing permissions
         if (plugin.getMVConfig().getEnforceAccess()) {
             event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, teleporter, teleportee));
             if (event.isCancelled() && teleporter != null) {
-                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;
+                this.plugin.log(Level.FINE, String.format(
+                        "Player '%s' was DENIED ACCESS to '%s' because '%s' don't have: multiverse.access.%s",
+                        teleportee.getName(), toWorld.getAlias(), teleporter.getName(),
+                        event.getTo().getWorld().getName()));
+            } else {
+                this.stateSuccess(teleportee.getName(), toWorld.getAlias());
             }
         } else {
-            this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
-                    + "' was allowed to go to '" + toWorld.getAlias() + "' because enforceaccess is off.");
+            this.plugin.log(Level.FINE, String.format(
+                    "Player '%s' was allowed to go to '%s' because enforceaccess is off.",
+                    teleportee.getName(), toWorld.getAlias()));
         }
-        
-        // Does a limit actually exist?
-        if (toWorld.getPlayerLimit() > -1) {
-            // Are there equal or more people on the world than the limit?
-            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)) {
-                    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());
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-        
-        // By this point anything cancelling the event has returned on the method, meaning the teleport is a success \o/
-        this.stateSuccess(teleportee.getName(), toWorld.getAlias());
     }
 
     private void stateSuccess(String playerName, String worldName) {
-        this.plugin.log(Level.FINE, "MV-Core is allowing Player '" + playerName
-                + "' to go to '" + worldName + "'.");
+        this.plugin.log(Level.FINE, String.format(
+                                        "MV-Core is allowing Player '%s' to go to '%s'.",
+                                        playerName, worldName));
     }
 
     /**
@@ -242,6 +237,7 @@ public class MVPlayerListener implements Listener {
      */
     @EventHandler(priority = EventPriority.LOWEST)
     public void playerPortalCheck(PlayerPortalEvent event) {
+        this.plugin.log(Level.FINE, "CALLING CORE-ADJUST!!!");
         if (event.isCancelled() || event.getFrom() == null) {
             return;
         }
@@ -283,22 +279,19 @@ public class MVPlayerListener implements Listener {
         }
         event.setCancelled(!pt.playerHasMoneyToEnter(fromWorld, toWorld, event.getPlayer(), event.getPlayer(), true));
         if (event.isCancelled()) {
-            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.");
+            this.plugin.log(Level.FINE, String.format("Player '%s' was DENIED ACCESS to '%s' because they don't have the FUNDS required to enter.",
+                    event.getPlayer().getName(), event.getTo().getWorld().getName()));
             return;
         }
         if (plugin.getMVConfig().getEnforceAccess()) {
             event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, event.getPlayer(), event.getPlayer()));
             if (event.isCancelled()) {
-                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());
+                this.plugin.log(Level.FINE, String.format("Player '%s' was DENIED ACCESS to '%s' because they don't have: multiverse.access.%s",
+                        event.getPlayer().getName(), event.getTo().getWorld().getName(), event.getTo().getWorld().getName()));
             }
         } else {
-            this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
-                    + "' was allowed to go to '" + event.getTo().getWorld().getName()
-                    + "' because enforceaccess is off.");
+            this.plugin.log(Level.FINE, String.format("Player '%s' was allowed to go to '%s' because enforceaccess is off.",
+                    event.getPlayer().getName(), event.getTo().getWorld().getName()));
         }
     }
 
@@ -306,7 +299,6 @@ public class MVPlayerListener implements Listener {
         // Remove the player 1 tick after the login. I'm sure there's GOT to be a better way to do this...
         this.plugin.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin,
             new Runnable() {
-                @Override
                 public void run() {
                     player.teleport(plugin.getMVWorldManager().getFirstSpawnWorld().getSpawnLocation());
                 }
@@ -319,9 +311,6 @@ public class MVPlayerListener implements Listener {
         MultiverseWorld mvWorld = this.worldManager.getMVWorld(world.getName());
         if (mvWorld != null) {
             this.handleGameMode(player, mvWorld);
-        } else {
-            this.plugin.log(Level.FINER, "Not handling gamemode for world '" + world.getName()
-                    + "' not managed by Multiverse.");
         }
     }
 
@@ -336,22 +325,24 @@ public class MVPlayerListener implements Listener {
         if (!this.pt.playerCanIgnoreGameModeRestriction(world, player)) {
             this.plugin.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin,
                 new Runnable() {
-                    @Override
                     public void run() {
                         // Check that the player is in the new world and they haven't been teleported elsewhere or the event cancelled.
                         if (player.getWorld() == world.getCBWorld()) {
-                            Logging.fine("Handling gamemode for player: %s, Changing to %s", player.getName(), world.getGameMode().toString());
-                            Logging.finest("From World: %s", player.getWorld());
-                            Logging.finest("To World: %s", world);
+                            MultiverseCore.staticLog(Level.FINE, String.format(
+                                    "Handling gamemode for player: %s, Changing to %s",
+                                    player.getName(), world.getGameMode().toString()));
+                            MultiverseCore.staticLog(Level.FINEST, "From World: " + player.getWorld());
+                            MultiverseCore.staticLog(Level.FINEST, "To World: " + world);
                             player.setGameMode(world.getGameMode());
                         } else {
-                            Logging.fine("The gamemode was NOT changed for player '%s' because he is now in world '%s' instead of world '%s'",
-                                    player.getName(), player.getWorld().getName(), world.getName());
+                            MultiverseCore.staticLog(Level.FINE,
+                                    String.format("The gamemode was NOT changed for player '%s' because he is now in world '%s' instead of world '%s'",
+                                    player.getName(), player.getWorld().getName(), world.getName()));
                         }
                     }
                 }, 1L);
         } else {
-            this.plugin.log(Level.FINE, "Player: " + player.getName() + " is IMMUNE to gamemode changes!");
+            this.plugin.log(Level.FINE, String.format("Player: %s is IMMUNE to gamemode changes!", player.getName()));
         }
     }
 }

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

@@ -16,6 +16,7 @@ import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
 
 import java.util.Arrays;
+import java.util.logging.Level;
 
 /**
  * Multiverse's Plugin {@link Listener}.
@@ -34,21 +35,15 @@ public class MVPluginListener implements Listener {
      */
     @EventHandler(priority = EventPriority.MONITOR)
     public void pluginEnable(PluginEnableEvent event) {
-        if (plugin.getVaultHandler().getEconomy() != null) {
-            // Don't hook 2 economy plugins.
-            return;
-        }
         // Let AllPay handle all econ plugin loadings, only go for econ plugins we support
         if (Arrays.asList(AllPay.getValidEconPlugins()).contains(event.getPlugin().getDescription().getName())) {
             this.plugin.setBank(this.plugin.getBanker().loadEconPlugin());
         }
 
-        /*
         if (event.getPlugin().getDescription().getName().equals("Spout")) {
             this.plugin.setSpout();
             this.plugin.log(Level.INFO, "Spout integration enabled.");
         }
-        */
     }
 
     /**

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

@@ -41,7 +41,7 @@ public class MVPortalListener implements Listener {
         }
         MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getBlocks().get(0).getWorld());
         // We have to do it like this due to a bug in 1.1-R3
-        if (cancelPortalEvent(world, event.getPortalType())) {
+        if (this.cancelPortalEvent(world, event.getPortalType())) {
             event.setCancelled(true);
         }
     }
@@ -59,7 +59,7 @@ public class MVPortalListener implements Listener {
         for (Block b : event.getBlocks()) {
             if (b.getType() == Material.PORTAL) {
                 MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(b.getWorld());
-                if (cancelPortalEvent(world, PortalType.NETHER)) {
+                if (this.cancelPortalEvent(world, PortalType.NETHER)) {
                     event.setCancelled(true);
                     return;
                 }
@@ -67,12 +67,12 @@ public class MVPortalListener implements Listener {
         }
         // If We're here, then the Portal was an Ender type:
         MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getBlocks().get(0).getWorld());
-        if (cancelPortalEvent(world, PortalType.ENDER)) {
+        if (this.cancelPortalEvent(world, PortalType.ENDER)) {
             event.setCancelled(true);
         }
     }
 
-    private static boolean cancelPortalEvent(MultiverseWorld world, PortalType type) {
+    private boolean cancelPortalEvent(MultiverseWorld world, PortalType type) {
         if (world.getAllowedPortals() == AllowedPortalType.NONE) {
             return true;
         } else if (world.getAllowedPortals() != AllowedPortalType.ALL) {

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

@@ -1,37 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerChatEvent;
-
-/**
- * A wrapper for the {@link PlayerChatEvent}.
- * @deprecated This is deprecated like the {@link PlayerChatEvent}.
- */
-@Deprecated
-public class NormalChatEvent implements ChatEvent {
-    private final PlayerChatEvent event;
-
-    public NormalChatEvent(PlayerChatEvent event) {
-        this.event = event;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return event.isCancelled();
-    }
-
-    @Override
-    public String getFormat() {
-        return event.getFormat();
-    }
-
-    @Override
-    public void setFormat(String s) {
-        event.setFormat(s);
-    }
-
-    @Override
-    public Player getPlayer() {
-        return event.getPlayer();
-    }
-}

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

@@ -1,38 +0,0 @@
-package com.onarandombox.MultiverseCore.localization;
-
-import java.util.Locale;
-import java.util.Set;
-
-/**
- * Multiverse 2 LazyMessageProvider
- * <p>
- * This interface describes a Multiverse-MessageProvider that only loads locales when they're needed.
- */
-public interface LazyLocaleMessageProvider extends MessageProvider {
-
-    /**
-     * Loads a localization for a specified {@link Locale}.
-     * <p>
-     * If that localization is already loaded, this method will reload it.
-     *
-     * @param locale The desired {@link Locale}.
-     * @throws LocalizationLoadingException When an error occurs while trying to load the specified localization.
-     */
-    void loadLocale(Locale locale) throws LocalizationLoadingException;
-
-    /**
-     * Retrieves all loaded localizations.
-     *
-     * @return A {@link Set} of {@link Locale}s whose localizations are currently loaded.
-     */
-    Set<Locale> getLoadedLocales();
-
-    /**
-     * Detects if a localization is loaded for the specified {@link Locale}.
-     *
-     * @param locale The {@link Locale}.
-     * @return Whether a localization is loaded for the specified {@link Locale}.
-     */
-    boolean isLocaleLoaded(Locale locale);
-
-}

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

@@ -1,42 +0,0 @@
-package com.onarandombox.MultiverseCore.localization;
-
-import java.io.IOException;
-import java.util.Locale;
-
-/**
- * Thrown when an error occurs while a localization is loaded.
- */
-public class LocalizationLoadingException extends IOException {
-    private final Locale locale;
-
-    public LocalizationLoadingException(Locale locale) {
-        this.locale = locale;
-    }
-
-    public LocalizationLoadingException(String message, Locale locale) {
-        super(message);
-        this.locale = locale;
-    }
-
-    public LocalizationLoadingException(Throwable cause, Locale locale) {
-        super(cause);
-        this.locale = locale;
-    }
-
-    public LocalizationLoadingException(String message, Throwable cause, Locale locale) {
-        super(message, cause);
-        this.locale = locale;
-    }
-
-    /**
-     * @return The locale we were trying to load.
-     */
-    public Locale getLocale() {
-        return locale;
-    }
-
-    @Override
-    public String getMessage() {
-        return super.getMessage() + " (While trying to load localization for locale " + getLocale() + ")";
-    }
-}

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

@@ -1,46 +0,0 @@
-package com.onarandombox.MultiverseCore.localization;
-
-import java.util.Locale;
-
-/**
- * Multiverse 2 MessageProvider
- * <p>
- * This interface describes a Multiverse-MessageProvider.
- */
-public interface MessageProvider {
-    /**
-     * The default locale.
-     */
-    Locale DEFAULT_LOCALE = Locale.ENGLISH;
-
-    /**
-     * Returns a message (as {@link String}) for the specified key (as {@link MultiverseMessage}).
-     *
-     * @param key The key
-     * @param args Args for String.format()
-     * @return The message
-     */
-    String getMessage(MultiverseMessage key, Object... args);
-
-    /**
-     * Returns a message (as {@link String}) in a specified {@link Locale} for the specified key (as {@link MultiverseMessage}).
-     *
-     * @param key The Key
-     * @param locale The {@link Locale}
-     * @param args Args for String.format()
-     * @return The message
-     */
-    String getMessage(MultiverseMessage key, Locale locale, Object... args);
-
-    /**
-     * @return the Locale this MessageProvider is currently using.
-     */
-    Locale getLocale();
-
-    /**
-     * Sets the locale for this MessageProvider.
-     *
-     * @param locale The new {@link Locale}.
-     */
-    void setLocale(Locale locale);
-}

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

@@ -1,20 +0,0 @@
-package com.onarandombox.MultiverseCore.localization;
-
-/**
- * Multiverse 2 MessageProviding
- * <p>
- * This interface is implemented by classes that use a {@link MessageProvider}.
- */
-public interface MessageProviding {
-    /**
-     * @return The {@link MessageProvider} used by the Core.
-     */
-    MessageProvider getMessageProvider();
-
-    /**
-     * Sets the {@link MessageProvider} used by the core.
-     *
-     * @param provider The new {@link MessageProvider}. Must not be null!
-     */
-    void setMessageProvider(MessageProvider provider);
-}

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

@@ -1,90 +0,0 @@
-package com.onarandombox.MultiverseCore.localization;
-
-
-/**
- * An enum containing all messages/strings used by Multiverse.
- */
-public enum MultiverseMessage {
-    // BEGIN CHECKSTYLE-SUPPRESSION: JavadocVariable
-    TEST_STRING("a test-string from the enum"),
-
-    //// Command handling error messages
-    CH_PLUGIN_DISABLED("This plugin is disabled!"),
-    CH_INTERNAL_ERROR("&cAn internal error occurred when attempting to perform this command."),
-    CH_ADMIN_DEBUG("&cDetails were printed to the server console and logs, please add that to your bug report."),
-    CH_USER_DEBUG("&cTry again and contact the server owner or an admin if this problem persists."),
-
-    //// Not MV world message
-    GENERIC_NOT_MV_WORLD("Multiverse doesn't know about &3%s&f yet.\nType &3/mv import ?&f for help!"),
-
-    //// Commands
-    // Anchor Command
-    CMD_ANCHOR_NOLISTPERM("&cYou don't have the permission to list anchors!"),
-    CMD_ANCHOR_LISTHEADER("&d====[ Multiverse Anchor List ]===="),
-    CMD_ANCHOR_NOMATCH("&cSorry... &fNo anchors matched your filter: &b%s"),
-    CMD_ANCHOR_NODEF("&cSorry... &fNo anchors were defined."),
-    CMD_ANCHOR_PAGEHEADER("&b Page %d of %d"),
-    CMD_ANCHOR_NODELPERM("&cYou don't have the permission to delete anchors!"),
-    CMD_ANCHOR_NOCREATEPERM("&cYou don't have the permission to create anchors!"),
-    CMD_ANCHOR_DELSUCCESS("Anchor '%s' was successfully &cdeleted!"),
-    CMD_ANCHOR_DELFAIL("Anchor '%s' was &cNOT&f deleted!"),
-    CMD_ANCHOR_CREATESUCCESS("Anchor '%s' was &asuccessfully&f created!"),
-    CMD_ANCHOR_CREATEFAIL("Anchor '%s' was &cNOT&f created!"),
-    CMD_ANCHOR_CONSOLECREATE("You must be a player to create Anchors!"),
-    // Check Command
-    CMD_CHECK_NOSUCHPLAYER("Could not find player &d%s&f\nAre they online?"),
-    CMD_CHECK_NOSUCHDEST("You asked if '%s' could go to '&d%s&f', but I couldn't find a Destination of that name? Did you type it correctly?"),
-    // Clone Command
-    CMD_CLONE_NOSUCHWORLD("Sorry, Multiverse doesn't know about world '%s', so we can't clone it!\nCheck the &a/mv list&f command to verify it is listed."),
-    CMD_CLONE_SUCCESS("&aWorld Cloned!"),
-    CMD_CLONE_FAIL("&cWorld could NOT be cloned!"),
-    // Config Command
-    CMD_CONFIG_SETFAIL("&cSetting '%s' to '%s' failed!"),
-    CMD_CONFIG_SUCCESS("&aSUCCESS!&f Values were updated successfully!"),
-    CMD_CONFIG_FAIL("&cFAIL!&f Check your console for details!"),
-    // Create Command
-    CMD_CREATE_WORLDEXISTS("&cMultiverse cannot create &n&6another&r&c world named '%s'."),
-    CMD_CREATE_FILEEXISTS("&cA Folder/World already exists with this name!\n&cIf you are confident it is a world you can import it with &a/mv import"),
-    CMD_CREATE_INVALIDENV("&cThat is not a valid environment."),
-    CMD_CREATE_INVALIDTYPE("&cThat is not a valid World Type."),
-    CMD_CREATE_INVALIDGEN("Invalid generator '%s'! &cAborting world creation."),
-    CMD_CREATE_START("Starting creation of world '%s'..."),
-    CMD_CREATE_COMPLETE("Complete!"),
-    CMD_CREATE_FAILED("FAILED."),
-    // Generator Command
-    CMD_GENERATOR_LISTHEADER("&b--- Loaded Generator Plugins ---"),
-    CMD_GENERATOR_NOGENSFOUND("&cNo Generator Plugins found."),
-    // List Command
-    CMD_LIST_NAME("World Listing"),
-    CMD_LIST_DESC("Displays a listing of all worlds that you can enter."),
-    CMD_LIST_TITLE("Multiverse World List"),
-    CMD_LIST_NO_MATCH("No worlds matched your filter:"),
-
-    //// Listeners
-    // PlayerListener
-    LISTENER_PLAYER_LOSTACCESSPERM("[MV] - Sorry you can't be in this world anymore!"),
-
-    //// Permissions
-    PERMS_NOACCESS_SELF("You don't have access to go here..."),
-    PERMS_NOACCESS_OTHER("You can't send %s here..."),
-    PERMS_NOACCESS_BLACKLIST_SELF("You don't have access to go to %s from %s"),
-    PERMS_NOACCESS_BLACKLIST_OTHER("You don't have access to send %s from %s to %s"),
-
-    //// World purger
-    PURGER_ENTITIESKILLED("%d entities purged from the world '%s'"),
-    // END CHECKSTYLE-SUPPRESSION: JavadocVariable
-    ; // SUPPRESS CHECKSTYLE: Whitespace
-
-    private final String def;
-
-    MultiverseMessage(String def) {
-        this.def = def;
-    }
-
-    /**
-     * @return This {@link MultiverseMessage}'s default-message
-     */
-    public String getDefault() {
-        return def;
-    }
-}

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

@@ -1,25 +0,0 @@
-package com.onarandombox.MultiverseCore.localization;
-
-import java.util.Locale;
-
-/**
- * Thrown when the requested localization is not found.
- */
-public class NoSuchLocalizationException extends LocalizationLoadingException {
-
-    public NoSuchLocalizationException(Locale locale) {
-        super(locale);
-    }
-
-    public NoSuchLocalizationException(String message, Locale locale) {
-        super(message, locale);
-    }
-
-    public NoSuchLocalizationException(String message, Throwable cause, Locale locale) {
-        super(message, cause, locale);
-    }
-
-    public NoSuchLocalizationException(Throwable cause, Locale locale) {
-        super(cause, locale);
-    }
-}

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

@@ -1,212 +0,0 @@
-package com.onarandombox.MultiverseCore.localization;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.bukkit.ChatColor;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-/**
- * The normal {@link MessageProvider}-implementation.
- */
-public class SimpleMessageProvider implements LazyLocaleMessageProvider {
-    private static final String LOCALIZATION_FOLDER_NAME = "localization";
-
-    // Regex 1: replace all single & with the section char
-    private static final String FORMAT_PATTERN_1;
-    private static final String FORMAT_REPL_1;
-    static {
-        StringBuilder formatBuilder = new StringBuilder("([^&])&([");
-        for (ChatColor c : ChatColor.values())
-            formatBuilder.append(c.getChar());
-        FORMAT_PATTERN_1 = formatBuilder.append("])").toString();
-
-        FORMAT_REPL_1 = new StringBuilder().append("$1").append(ChatColor.COLOR_CHAR).append("$2").toString();
-    }
-
-    // Regex 2: replace all double & with single &
-    private static final String FORMAT_PATTERN_2 = "&&";
-    private static final String FORMAT_REPL_2 = "&";
-
-    private final Map<Locale, Map<MultiverseMessage, String>> messages;
-    private final MultiverseCore core;
-
-    private Locale locale = DEFAULT_LOCALE;
-
-    public SimpleMessageProvider(MultiverseCore core) {
-        this.core = core;
-        messages = new ConcurrentHashMap<Locale, Map<MultiverseMessage, String>>();
-
-        try {
-            loadLocale(locale);
-        } catch (NoSuchLocalizationException e) {
-            // let's take the defaults from the enum!
-        }
-    }
-
-    /**
-     * Loads a given {@link Locale} if and only if it wasn't already loaded.
-     * @param locale The locale
-     * @throws LocalizationLoadingException If the locale wasn't loaded successfully.
-     */
-    public void maybeLoadLocale(Locale locale) throws LocalizationLoadingException {
-        if (!isLocaleLoaded(locale)) {
-            try {
-                loadLocale(locale);
-            } catch (NoSuchLocalizationException e) {
-                throw e;
-            }
-        }
-        if (!isLocaleLoaded(locale))
-            throw new LocalizationLoadingException("Couldn't load the localization: "
-                    + locale.toString(), locale);
-    }
-
-    /**
-     * Formats the specified string.
-     * <p>
-     * You can use {@code &} to get colors. To get an {@code &} in the output, you have to write {@code &&}.
-     *
-     * @param string The {@link String}.
-     * @param args Args for {@link String#format(String, Object...)}.
-     * @return The formatted string.
-     */
-    public static String format(String string, Object... args) {
-        // Replaces & with the Section character
-        string = string.replaceAll(FORMAT_PATTERN_1, FORMAT_REPL_1).replaceAll(FORMAT_PATTERN_2, FORMAT_REPL_2);
-
-        return String.format(string, args);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void loadLocale(Locale l) throws NoSuchLocalizationException {
-        messages.remove(l);
-
-        InputStream resstream = null;
-        InputStream filestream = null;
-
-        try {
-            try {
-                filestream = new FileInputStream(new File(core.getDataFolder(), l.getLanguage()  + ".yml"));
-            } catch (FileNotFoundException e) {
-            }
-            try {
-                resstream = core.getResource(new StringBuilder(LOCALIZATION_FOLDER_NAME)
-                        .append("/").append(l.getLanguage()).append(".yml").toString());
-            } catch (Exception e) {
-            }
-            if ((resstream == null) && (filestream == null))
-                throw new NoSuchLocalizationException(l);
-
-            Map<MultiverseMessage, String> stringsMap = new HashMap<MultiverseMessage, String>();
-            FileConfiguration resconfig = (resstream == null) ? null : YamlConfiguration.loadConfiguration(resstream);
-            FileConfiguration fileconfig = (filestream == null) ? null : YamlConfiguration.loadConfiguration(filestream);
-            for (MultiverseMessage m : MultiverseMessage.values()) {
-                String value = m.getDefault();
-
-                if (resconfig != null)
-                    value = resconfig.getString(m.toString(), value);
-                if (fileconfig != null)
-                    value = fileconfig.getString(m.toString(), value);
-
-                stringsMap.put(m, value);
-            }
-
-            messages.put(l, Collections.unmodifiableMap(stringsMap));
-        } finally {
-            if (filestream != null)
-                try {
-                    filestream.close();
-                } catch (IOException e) {
-                    // silently discard
-                }
-            if (resstream != null)
-                try {
-                    resstream.close();
-                } catch (IOException e) {
-                    // silently discard
-                }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Set<Locale> getLoadedLocales() {
-        return messages.keySet();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isLocaleLoaded(Locale l) {
-        return messages.containsKey(l);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getMessage(MultiverseMessage key, Object... args) {
-        if (!isLocaleLoaded(locale))
-            return format(key.getDefault(), args);
-        else
-            return format(messages.get(locale).get(key), args);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getMessage(MultiverseMessage key, Locale locale, Object... args) {
-        try {
-            maybeLoadLocale(locale);
-        } catch (LocalizationLoadingException e) {
-            e.printStackTrace();
-            return getMessage(key);
-        }
-        return format(messages.get(locale).get(key), args);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Locale getLocale() {
-        return locale;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setLocale(Locale locale) {
-        if (locale == null)
-            throw new IllegalArgumentException("Can't set locale to null!");
-        try {
-            maybeLoadLocale(locale);
-        } catch (LocalizationLoadingException e) {
-            if (!locale.equals(DEFAULT_LOCALE))
-                throw new IllegalArgumentException("Error while trying to load localization for the given Locale!", e);
-        }
-
-        this.locale = locale;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/localization/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Contains localization.
- */
-package com.onarandombox.MultiverseCore.localization;

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

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
@@ -17,6 +16,7 @@ import org.bukkit.entity.Player;
 
 import java.io.File;
 import java.io.IOException;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -50,10 +50,10 @@ public class AnchorManager {
             //world:x,y,z:pitch:yaw
             Location anchorLocation = plugin.getLocationManipulation().stringToLocation(anchorsSection.getString(key, ""));
             if (anchorLocation != null) {
-                Logging.config("Loading anchor:  '%s'...", key);
+                MultiverseCore.staticLog(Level.INFO, "Loading anchor:  '" + key + "'...");
                 this.anchors.put(key, anchorLocation);
             } else {
-                Logging.warning("The location for anchor '%s' is INVALID.", key);
+                MultiverseCore.staticLog(Level.WARNING, "The location for anchor '" + key + "' is INVALID.");
             }
 
         }

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

@@ -7,13 +7,15 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Vehicle;
 
+import java.util.logging.Level;
+
 /**
  * Used to determine block/location-related facts.
  *
@@ -73,28 +75,28 @@ public class BlockSafety {
 
         if (this.isSolidBlock(world.getBlockAt(actual).getType())
                 || this.isSolidBlock(upOne.getBlock().getType())) {
-            Logging.finer("Error Here (Actual)? (%s)[%s]", actual.getBlock().getType(),
-                    this.isSolidBlock(actual.getBlock().getType()));
-            Logging.finer("Error Here (upOne)? (%s)[%s]", upOne.getBlock().getType(),
-                    this.isSolidBlock(upOne.getBlock().getType()));
+            MultiverseCore.staticLog(Level.FINER, "Error Here (Actual)? ("
+                + actual.getBlock().getType() + ")[" + this.isSolidBlock(actual.getBlock().getType()) + "]");
+            MultiverseCore.staticLog(Level.FINER, "Error Here (upOne)? ("
+                + upOne.getBlock().getType() + ")[" + this.isSolidBlock(upOne.getBlock().getType()) + "]");
             return false;
         }
 
         if (downOne.getBlock().getType() == Material.LAVA || downOne.getBlock().getType() == Material.STATIONARY_LAVA) {
-            Logging.finer("Error Here (downOne)? (%s)[%s]", downOne.getBlock().getType(),
-                    this.isSolidBlock(downOne.getBlock().getType()));
+            MultiverseCore.staticLog(Level.FINER, "Error Here (downOne)? ("
+                + downOne.getBlock().getType() + ")[" + this.isSolidBlock(downOne.getBlock().getType()) + "]");
             return false;
         }
 
         if (downOne.getBlock().getType() == Material.FIRE) {
-            Logging.finer("There's fire below! (%s)[%s]", actual.getBlock().getType(),
-                    this.isSolidBlock(actual.getBlock().getType()));
+            MultiverseCore.staticLog(Level.FINER, "There's fire below! ("
+                + actual.getBlock().getType() + ")[" + this.isSolidBlock(actual.getBlock().getType()) + "]");
             return false;
         }
 
         if (isBlockAboveAir(actual)) {
-            Logging.finer("Is block above air [%s]", isBlockAboveAir(actual));
-            Logging.finer("Has 2 blocks of water below [%s]", this.hasTwoBlocksofWaterBelow(actual));
+            MultiverseCore.staticLog(Level.FINER, "Is block above air [" + isBlockAboveAir(actual) + "]");
+            MultiverseCore.staticLog(Level.FINER, "Has 2 blocks of water below [" + this.hasTwoBlocksofWaterBelow(actual) + "]");
             return this.hasTwoBlocksofWaterBelow(actual);
         }
         return true;

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

@@ -7,14 +7,10 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.onarandombox.MultiverseCore.MultiverseCoreConfiguration;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.List;
 import java.util.logging.FileHandler;
 import java.util.logging.Formatter;
 import java.util.logging.Handler;
@@ -24,13 +20,11 @@ import java.util.logging.Logger;
 
 /**
  * The Multiverse debug-logger.
- * @deprecated Deprecated in favor of new Logging lib.  See {@link com.dumptruckman.minecraft.util.Logging}.
  */
-@Deprecated
-public class DebugLog extends Logger {
+public class DebugLog {
+
     private FileHandler fh;
-    private Logger standardLog = null;
-    private String prefix = "[MVCore-Debug] ";
+    private Logger log;
 
     /**
      * Creates a new debug logger.
@@ -39,16 +33,16 @@ public class DebugLog extends Logger {
      * @param file   The file to log to.
      */
     public DebugLog(String logger, String file) {
-        super(logger, null);
+        this.log = Logger.getLogger(logger);
+
         try {
             this.fh = new FileHandler(file, true);
-            this.setUseParentHandlers(false);
-            List<Handler> toRemove = Arrays.asList(this.getHandlers());
-            for (Handler handler : toRemove) {
-                this.removeHandler(handler);
+            this.log.setUseParentHandlers(false);
+            for (Handler handler : this.log.getHandlers()) {
+                this.log.removeHandler(handler);
             }
-            this.addHandler(this.fh);
-            this.setLevel(Level.ALL);
+            this.log.addHandler(this.fh);
+            this.log.setLevel(Level.ALL);
             this.fh.setFormatter(new LogFormatter());
         } catch (SecurityException e) {
             e.printStackTrace();
@@ -57,39 +51,14 @@ public class DebugLog extends Logger {
         }
     }
 
-    /**
-     * Sets the log-tag.
-     * @param tag The new tag.
-     */
-    public void setTag(String tag) {
-        this.prefix = tag + " ";
-    }
-
-    /**
-     * Specifies the logger to use to send debug messages to as the debug logger itself only sends messages to a file.
-     *
-     * @param logger Logger to send debug messages to.
-     */
-    public void setStandardLogger(Logger logger) {
-        this.standardLog = logger;
-    }
-
     /**
      * Log a message at a certain level.
      *
      * @param level The log-{@link Level}.
      * @param msg the message.
      */
-    @Override
-    public void log(final Level level, final String msg) {
-        if (MultiverseCoreConfiguration.isSet() && MultiverseCoreConfiguration.getInstance().getGlobalDebug() > 0) {
-            // only redirect to standardLog if it's lower than INFO so we don't log that twice!
-            if ((level.intValue() < Level.INFO.intValue()) && (standardLog != null)) {
-                standardLog.log(Level.INFO, prefix + msg);
-            }
-
-            super.log(level, prefix + msg);
-        }
+    public void log(Level level, String msg) {
+        this.log.log(level, msg);
     }
 
     /**

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

@@ -20,11 +20,9 @@ public class FancyMessage implements FancyText {
 
     /**
      * Allows easy creation of an alternating colored list.
-     * TODO: Documentation! Why does CheckStyle just ignore this?
      *
      * @param title
      * @param message
-     * @param scheme
      */
     public FancyMessage(String title, String message, FancyColorScheme scheme) {
         this.title = title;

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

@@ -8,13 +8,6 @@
 package com.onarandombox.MultiverseCore.utils;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.logging.Logger;
 
 /**
  * File-utilities.
@@ -32,91 +25,19 @@ public class FileUtils {
      */
     public static boolean deleteFolder(File file) {
         if (file.exists()) {
-            boolean ret = true;
             // If the file exists, and it has more than one file in it.
             if (file.isDirectory()) {
                 for (File f : file.listFiles()) {
-                    ret = ret && deleteFolder(f);
+                    if (!FileUtils.deleteFolder(f)) {
+                        return false;
+                    }
                 }
             }
-            return ret && file.delete();
+            file.delete();
+            return !file.exists();
         } else {
             return false;
         }
     }
 
-    /**
-     * Used to delete the contents of a folder, without deleting the folder itself.
-     *
-     * @param file The folder whose contents to delete.
-     * @return true if the contents were successfully deleted
-     */
-    public static boolean deleteFolderContents(File file) {
-        if (file.exists()) {
-            boolean ret = true;
-            // If the file exists, and it has more than one file in it.
-            if (file.isDirectory()) {
-                for (File f : file.listFiles()) {
-                    ret = ret && deleteFolder(f);
-                }
-            }
-            return ret;
-        } else {
-            return false;
-        }
-    }
-
-    private static final int COPY_BLOCK_SIZE = 1024;
-
-    /**
-     * Helper method to copy the world-folder.
-     * @param source Source-File
-     * @param target Target-File
-     * @param log A logger that logs the operation
-     *
-     * @return if it had success
-     */
-    public static boolean copyFolder(File source, File target, Logger log) {
-        InputStream in = null;
-        OutputStream out = null;
-        try {
-            if (source.isDirectory()) {
-
-                if (!target.exists())
-                    target.mkdir();
-
-                String[] children = source.list();
-                // for (int i=0; i<children.length; i++) {
-                for (String child : children) {
-                    copyFolder(new File(source, child), new File(target, child), log);
-                }
-            } else {
-                in = new FileInputStream(source);
-                out = new FileOutputStream(target);
-
-                byte[] buf = new byte[COPY_BLOCK_SIZE];
-                int len;
-                while ((len = in.read(buf)) > 0) {
-                    out.write(buf, 0, len);
-                }
-            }
-            return true;
-        } catch (FileNotFoundException e) {
-            log.warning("Exception while copying file: " + e.getMessage());
-        } catch (IOException e) {
-            log.warning("Exception while copying file: " + e.getMessage());
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException ignore) { }
-            }
-            if (out != null) {
-                try {
-                    out.close();
-                } catch (IOException ignore) { }
-            }
-        }
-        return false;
-    }
 }

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

@@ -11,8 +11,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
-import com.onarandombox.MultiverseCore.localization.MessageProviding;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -22,12 +20,10 @@ import java.util.Map;
  * The default-implementation of {@link MultiverseMessaging}.
  */
 public class MVMessaging implements MultiverseMessaging {
-    private final MessageProviding msgProviding;
     private Map<String, Long> sentList;
     private int cooldown;
 
-    public MVMessaging(MessageProviding msgProviding) {
-        this.msgProviding = msgProviding;
+    public MVMessaging() {
         this.sentList = new HashMap<String, Long>();
         this.cooldown = 5000; // SUPPRESS CHECKSTYLE: MagicNumberCheck
     }
@@ -54,17 +50,18 @@ public class MVMessaging implements MultiverseMessaging {
     @Override
     public boolean sendMessages(CommandSender sender, String[] messages, boolean ignoreCooldown) {
         if (!(sender instanceof Player) || ignoreCooldown) {
-            sendMessages(sender, messages);
+
+            this.sendMessages(sender, messages);
             return true;
         }
         if (!this.sentList.containsKey(sender.getName())) {
-            sendMessages(sender, messages);
+            this.sendMessages(sender, messages);
             this.sentList.put(sender.getName(), System.currentTimeMillis());
             return true;
         } else {
             long time = System.currentTimeMillis();
             if (time >= this.sentList.get(sender.getName()) + this.cooldown) {
-                sendMessages(sender, messages);
+                this.sendMessages(sender, messages);
                 this.sentList.put(sender.getName(), System.currentTimeMillis());
                 return true;
             }
@@ -80,7 +77,7 @@ public class MVMessaging implements MultiverseMessaging {
         return this.sendMessages(sender, messages.toArray(new String[0]), ignoreCooldown);
     }
 
-    private static void sendMessages(CommandSender sender, String[] messages) {
+    private void sendMessages(CommandSender sender, String[] messages) {
         for (String s : messages) {
             sender.sendMessage(s);
         }
@@ -93,20 +90,4 @@ public class MVMessaging implements MultiverseMessaging {
     public int getCooldown() {
         return cooldown;
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean sendMessage(CommandSender sender, MultiverseMessage message, Object... args) {
-        return this.sendMessage(sender, message, true, args); // TODO what is a good default value?
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean sendMessage(CommandSender sender, MultiverseMessage message, boolean ignoreCooldown, Object...args) {
-        return this.sendMessage(sender, this.msgProviding.getMessageProvider().getMessage(message, args), ignoreCooldown);
-    }
 }

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

@@ -76,10 +76,6 @@ public class MVPermissions implements PermissionsInterface {
      * @return Whether the {@link CommandSender} can travel to the specified {@link Location}.
      */
     public boolean canTravelFromLocation(CommandSender sender, Location location) {
-        // Now The Bed destination can return null now.
-        if (location == null) {
-            return false;
-        }
         if (!(sender instanceof Player)) {
             return true;
         }
@@ -233,7 +229,6 @@ public class MVPermissions implements PermissionsInterface {
      * @param isOpRequired @Deprecated. This is not used for anything anymore.
      * @return True if they have that permission or any parent.
      */
-    @Override
     public boolean hasPermission(CommandSender sender, String node, boolean isOpRequired) {
         if (!(sender instanceof Player)) {
             return true;
@@ -256,15 +251,10 @@ public class MVPermissions implements PermissionsInterface {
         Player player = (Player) sender;
 
         boolean hasPermission = sender.hasPermission(node);
-        if (!sender.isPermissionSet(node)) {
-            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) {
-            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
+            this.plugin.log(Level.FINEST, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
         } else {
-            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
+            this.plugin.log(Level.FINEST, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
         }
         return hasPermission;
     }
@@ -278,7 +268,6 @@ public class MVPermissions implements PermissionsInterface {
      * @param node   The permission node to check (possibly already a parent).
      * @return True if they have any parent perm, false if none.
      */
-    // TODO remove this...?
     private boolean hasAnyParentPermission(CommandSender sender, String node) {
         String parentPerm = this.pullOneLevelOff(node);
         // Base case
@@ -299,7 +288,7 @@ public class MVPermissions implements PermissionsInterface {
      * @param node The root node to check.
      * @return The parent of the node
      */
-    private static String pullOneLevelOff(String node) {
+    private String pullOneLevelOff(String node) {
         if (node == null) {
             return null;
         }
@@ -404,7 +393,7 @@ public class MVPermissions implements PermissionsInterface {
     /**
      * If the given permission was 'multiverse.core.tp.self', this would return 'multiverse.core.tp.*'.
      */
-    private static String getParentPerm(String[] seperated) {
+    private String getParentPerm(String[] seperated) {
         if (seperated.length == 1) {
             return null;
         }
@@ -414,4 +403,5 @@ public class MVPermissions implements PermissionsInterface {
         }
         return returnString + "*";
     }
+
 }

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

@@ -7,18 +7,15 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
+import java.util.logging.Level;
 import com.fernferret.allpay.GenericBank;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
-
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 
-import java.util.logging.Level;
-
 /**
  * Utility-class for permissions.
  */
@@ -81,7 +78,7 @@ public class PermissionTools {
      * @param separatedPermissionString The array of a dot separated perm string.
      * @return The dot separated parent permission string.
      */
-    private static String getParentPerm(String[] separatedPermissionString) {
+    private String getParentPerm(String[] separatedPermissionString) {
         if (separatedPermissionString.length == 1) {
             return null;
         }
@@ -137,48 +134,21 @@ public class PermissionTools {
 
         // Only check payments if it's a different world:
         if (!toWorld.equals(fromWorld)) {
-            // Don't bother checking economy stuff if it doesn't even cost to enter.
-            if (toWorld.getPrice() == 0D) {
-                return true;
-            }
             // If the player does not have to pay, return now.
             if (this.plugin.getMVPerms().hasPermission(teleporter, toWorld.getExemptPermission().getName(), true)) {
                 return true;
             }
-            final boolean usingVault;
-            final String formattedAmount;
-            if (toWorld.getCurrency() <= 0 && plugin.getVaultHandler().getEconomy() != null) {
-                usingVault = true;
-                formattedAmount = plugin.getVaultHandler().getEconomy().format(toWorld.getPrice());
-            } else {
-                usingVault = false;
-                formattedAmount = this.plugin.getBank().getFormattedAmount(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency());
-            }
-            String errString = "You need " + formattedAmount + " to send " + teleportee + " to " + toWorld.getColoredWorldString();
+            GenericBank bank = plugin.getBank();
+            String errString = "You need " + bank.getFormattedAmount(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency())
+                    + " to send " + teleportee + " to " + toWorld.getColoredWorldString();
             if (teleportee.equals(teleporter)) {
-                errString = "You need " + formattedAmount + " to enter " + toWorld.getColoredWorldString();
+                errString = "You need " + bank.getFormattedAmount(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency())
+                        + " to enter " + toWorld.getColoredWorldString();
             }
-            if (usingVault) {
-                if (!plugin.getVaultHandler().getEconomy().has(teleporterPlayer.getName(), toWorld.getPrice())) {
-                    return false;
-                } else if (pay) {
-                    if (toWorld.getPrice() < 0D) {
-                        plugin.getVaultHandler().getEconomy().depositPlayer(teleporterPlayer.getName(), toWorld.getPrice() * -1D);
-                    } else {
-                        plugin.getVaultHandler().getEconomy().withdrawPlayer(teleporterPlayer.getName(), toWorld.getPrice());
-                    }
-                }
-            } else {
-                GenericBank bank = plugin.getBank();
-                if (!bank.hasEnough(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency(), errString)) {
-                    return false;
-                } else if (pay) {
-                    if (toWorld.getPrice() < 0D) {
-                        bank.give(teleporterPlayer, toWorld.getPrice() * -1D, toWorld.getCurrency());
-                    } else {
-                        bank.take(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency());
-                    }
-                }
+            if (!bank.hasEnough(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency(), errString)) {
+                return false;
+            } else if (pay) {
+                bank.give(teleporterPlayer, toWorld.getPrice(), toWorld.getCurrency());
             }
         }
         return true;
@@ -233,10 +203,11 @@ public class PermissionTools {
         // Actual checks
         if (toWorld != null) {
             if (!this.plugin.getMVPerms().canEnterWorld(teleporterPlayer, toWorld)) {
-                if (teleportee.equals(teleporter))
-                    this.plugin.getMessaging().sendMessage(teleporter, MultiverseMessage.PERMS_NOACCESS_SELF);
-                else
-                    this.plugin.getMessaging().sendMessage(teleporter, MultiverseMessage.PERMS_NOACCESS_OTHER, teleportee.getName());
+                if (teleportee.equals(teleporter)) {
+                    teleporter.sendMessage("You don't have access to go here...");
+                } else {
+                    teleporter.sendMessage("You can't send " + teleportee.getName() + " here...");
+                }
 
                 return false;
             }
@@ -247,34 +218,17 @@ public class PermissionTools {
         }
         if (fromWorld != null) {
             if (fromWorld.getWorldBlacklist().contains(toWorld.getName())) {
-                if (teleportee.equals(teleporter))
-                    this.plugin.getMessaging().sendMessage(teleporter, MultiverseMessage.PERMS_NOACCESS_BLACKLIST_SELF, toWorld.getColoredWorldString(), fromWorld.getColoredWorldString());
-                else
-                    this.plugin.getMessaging().sendMessage(teleporter, MultiverseMessage.PERMS_NOACCESS_BLACKLIST_OTHER, teleportee.getName(), fromWorld.getColoredWorldString(), toWorld.getColoredWorldString());
+                if (teleportee.equals(teleporter)) {
+                    teleporter.sendMessage("You don't have access to go to " + toWorld.getColoredWorldString() + " from " + fromWorld.getColoredWorldString());
+                } else {
+                    teleporter.sendMessage("You don't have access to send " + teleportee.getName() + " from "
+                         + fromWorld.getColoredWorldString() + " to " + toWorld.getColoredWorldString());
+                }
                 return false;
             }
         }
         return true;
     }
-    
-    public boolean playerCanBypassPlayerLimit(MultiverseWorld toWorld, CommandSender teleporter, Player teleportee) {
-        
-        if (teleporter == null) {
-            teleporter = teleportee;
-        }
-        
-        if (!(teleporter instanceof Player)) {
-            return true;  
-        }
-        
-        MVPermissions perms = plugin.getMVPerms();
-        if (perms.hasPermission(teleportee, "mv.bypass.playerlimit." + toWorld.getName(), false)) {
-            return true;
-        } else {
-            teleporter.sendMessage("The world " + toWorld.getColoredWorldString() + " is full");
-            return false;
-        }
-    }
 
     /**
      * Checks to see if a player should bypass game mode restrictions.

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

@@ -7,38 +7,23 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.BlockSafety;
 import com.onarandombox.MultiverseCore.api.Core;
+
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Vehicle;
-import org.bukkit.material.Bed;
 
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.Set;
+import java.util.logging.Level;
 
 /**
  * The default-implementation of {@link BlockSafety}.
  */
 public class SimpleBlockSafety implements BlockSafety {
     private final Core plugin;
-    private static final Set<BlockFace> AROUND_BLOCK = EnumSet.noneOf(BlockFace.class);
-
-    static {
-        AROUND_BLOCK.add(BlockFace.NORTH);
-        AROUND_BLOCK.add(BlockFace.NORTH_EAST);
-        AROUND_BLOCK.add(BlockFace.EAST);
-        AROUND_BLOCK.add(BlockFace.SOUTH_EAST);
-        AROUND_BLOCK.add(BlockFace.SOUTH);
-        AROUND_BLOCK.add(BlockFace.SOUTH_WEST);
-        AROUND_BLOCK.add(BlockFace.WEST);
-        AROUND_BLOCK.add(BlockFace.NORTH_WEST);
-    }
 
     public SimpleBlockSafety(Core plugin) {
         this.plugin = plugin;
@@ -80,90 +65,35 @@ public class SimpleBlockSafety implements BlockSafety {
         upOne.setY(upOne.getY() + 1);
         downOne.setY(downOne.getY() - 1);
 
-        if (isSolidBlock(world.getBlockAt(actual).getType())
-                || isSolidBlock(upOne.getBlock().getType())) {
-            Logging.finer("Error Here (Actual)? (%s)[%s]", actual.getBlock().getType(),
-                    isSolidBlock(actual.getBlock().getType()));
-            Logging.finer("Error Here (upOne)? (%s)[%s]", upOne.getBlock().getType(),
-                    isSolidBlock(upOne.getBlock().getType()));
+        if (this.isSolidBlock(world.getBlockAt(actual).getType())
+                || this.isSolidBlock(upOne.getBlock().getType())) {
+            MultiverseCore.staticLog(Level.FINER, "Error Here (Actual)? ("
+                + actual.getBlock().getType() + ")[" + this.isSolidBlock(actual.getBlock().getType()) + "]");
+            MultiverseCore.staticLog(Level.FINER, "Error Here (upOne)? ("
+                + upOne.getBlock().getType() + ")[" + this.isSolidBlock(upOne.getBlock().getType()) + "]");
             return false;
         }
 
         if (downOne.getBlock().getType() == Material.LAVA || downOne.getBlock().getType() == Material.STATIONARY_LAVA) {
-            Logging.finer("Error Here (downOne)? (%s)[%s]", downOne.getBlock().getType(), isSolidBlock(downOne.getBlock().getType()));
+            MultiverseCore.staticLog(Level.FINER, "Error Here (downOne)? ("
+                + downOne.getBlock().getType() + ")[" + this.isSolidBlock(downOne.getBlock().getType()) + "]");
             return false;
         }
 
         if (downOne.getBlock().getType() == Material.FIRE) {
-            Logging.finer("There's fire below! (%s)[%s]", actual.getBlock().getType(), isSolidBlock(actual.getBlock().getType()));
+            MultiverseCore.staticLog(Level.FINER, "There's fire below! ("
+                + actual.getBlock().getType() + ")[" + this.isSolidBlock(actual.getBlock().getType()) + "]");
             return false;
         }
 
         if (isBlockAboveAir(actual)) {
-            Logging.finer("Is block above air [%s]", isBlockAboveAir(actual));
-            Logging.finer("Has 2 blocks of water below [%s]", this.hasTwoBlocksofWaterBelow(actual));
+            MultiverseCore.staticLog(Level.FINER, "Is block above air [" + isBlockAboveAir(actual) + "]");
+            MultiverseCore.staticLog(Level.FINER, "Has 2 blocks of water below [" + this.hasTwoBlocksofWaterBelow(actual) + "]");
             return this.hasTwoBlocksofWaterBelow(actual);
         }
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Location getSafeBedSpawn(Location l) {
-        // The passed location, may be null (if the bed is invalid)
-        if (l == null) {
-            return null;
-        }
-        final Location trySpawn = this.getSafeSpawnAroundABlock(l);
-        if (trySpawn != null) {
-            return trySpawn;
-        }
-        Location otherBlock = this.findOtherBedPiece(l);
-        if (otherBlock == null) {
-            return null;
-        }
-        // Now we have 2 locations, check around each, if the type is bed, skip it.
-        return this.getSafeSpawnAroundABlock(otherBlock);
-    }
-
-    /**
-     * Find a safe spawn around a location. (N,S,E,W,NE,NW,SE,SW)
-     * @param l Location to check around
-     * @return A safe location, or none if it wasn't found.
-     */
-    private Location getSafeSpawnAroundABlock(Location l) {
-        Iterator<BlockFace> checkblock = AROUND_BLOCK.iterator();
-        while (checkblock.hasNext()) {
-            final BlockFace face = checkblock.next();
-            if (this.playerCanSpawnHereSafely(l.getBlock().getRelative(face).getLocation())) {
-                // Don't forget to center the player.
-                return l.getBlock().getRelative(face).getLocation().add(.5, 0, .5);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Find the other bed block.
-     * @param checkLoc The location to check for the other piece at
-     * @return The location of the other bed piece, or null if it was a jacked up bed.
-     */
-    private Location findOtherBedPiece(Location checkLoc) {
-        if (checkLoc.getBlock().getType() != Material.BED_BLOCK) {
-            return null;
-        }
-        // Construct a bed object at this location
-        final Bed b = new Bed(Material.BED_BLOCK, checkLoc.getBlock().getData());
-        if (b.isHeadOfBed()) {
-            return checkLoc.getBlock().getRelative(b.getFacing().getOppositeFace()).getLocation();
-        }
-        // We shouldn't ever be looking at the foot, but here's the code for it.
-        return checkLoc.getBlock().getRelative(b.getFacing()).getLocation();
-    }
-
-
     /**
      * {@inheritDoc}
      */
@@ -199,7 +129,7 @@ public class SimpleBlockSafety implements BlockSafety {
     /*
      * If someone has a better way of this... Please either tell us, or submit a pull request!
      */
-    private static boolean isSolidBlock(Material type) {
+    private boolean isSolidBlock(Material type) {
         switch (type) {
             case AIR:
                 return false;

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

@@ -10,17 +10,11 @@ package com.onarandombox.MultiverseCore.utils;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.WorldPurger;
-import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
 
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Animals;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Ghast;
-import org.bukkit.entity.Golem;
-import org.bukkit.entity.Monster;
-import org.bukkit.entity.Slime;
 import org.bukkit.entity.Squid;
 
 import java.util.ArrayList;
@@ -64,16 +58,6 @@ public class SimpleWorldPurger implements WorldPurger {
         purgeWorld(world, allMobs, !world.canAnimalsSpawn(), !world.canMonstersSpawn());
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean shouldWeKillThisCreature(MultiverseWorld world, Entity e) {
-        ArrayList<String> allMobs = new ArrayList<String>(world.getAnimalList());
-        allMobs.addAll(world.getMonsterList());
-        return this.shouldWeKillThisCreature(e, allMobs, !world.canAnimalsSpawn(), !world.canMonstersSpawn());
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -92,66 +76,53 @@ public class SimpleWorldPurger implements WorldPurger {
         boolean specifiedAnimals = thingsToKill.contains("ANIMALS") || specifiedAll;
         boolean specifiedMonsters = thingsToKill.contains("MONSTERS") || specifiedAll;
         for (Entity e : world.getEntities()) {
-            if (killDecision(e, thingsToKill, negateAnimals, negateMonsters, specifiedAnimals, specifiedMonsters)) {
+            boolean negate;
+            boolean specified = false;
+            if (e instanceof Squid || e instanceof Animals) {
+                // it's an animal
+                if (specifiedAnimals && !negateAnimals) {
+                    this.plugin.log(Level.FINEST, "Removing an entity because I was told to remove all animals: " + e);
+                    e.remove();
+                    entitiesKilled++;
+                    continue;
+                }
+                if (specifiedAnimals)
+                    specified = true;
+                negate = negateAnimals;
+            } else {
+                // it's a monster
+                if (specifiedMonsters && !negateMonsters) {
+                    this.plugin.log(Level.FINEST, "Removing an entity because I was told to remove all monsters: " + e);
+                    e.remove();
+                    entitiesKilled++;
+                    continue;
+                }
+                if (specifiedMonsters)
+                    specified = true;
+                negate = negateMonsters;
+            }
+            for (String s : thingsToKill) {
+                if (e.getType().getName().equalsIgnoreCase(s)) {
+                    specified = true;
+                    if (!negate) {
+                        this.plugin.log(Level.FINEST, "Removing an entity because it WAS specified and we are NOT negating: " + e);
+                        e.remove();
+                        entitiesKilled++;
+                        continue;
+                    }
+                    break;
+                }
+            }
+            if (!specified && negate) {
+                this.plugin.log(Level.FINEST, "Removing an entity because it was NOT specified and we ARE negating: " + e);
                 e.remove();
                 entitiesKilled++;
+                continue;
             }
         }
-        if (sender != null)
-            this.plugin.getMessaging().sendMessage(sender, MultiverseMessage.PURGER_ENTITIESKILLED, entitiesKilled, world.getName());
-    }
-
-    private boolean killDecision(Entity e, List<String> thingsToKill, boolean negateAnimals,
-            boolean negateMonsters, boolean specifiedAnimals, boolean specifiedMonsters) {
-        boolean negate = false;
-        boolean specified = false;
-        if (e instanceof Golem || e instanceof Squid || e instanceof Animals) {
-            // it's an animal
-            if (specifiedAnimals && !negateAnimals) {
-                this.plugin.log(Level.FINEST, "Removing an entity because I was told to remove all animals: " + e);
-                return true;
-            }
-            if (specifiedAnimals)
-                specified = true;
-            negate = negateAnimals;
-        } else if (e instanceof Monster || e instanceof Ghast || e instanceof Slime) {
-            // it's a monster
-            if (specifiedMonsters && !negateMonsters) {
-                this.plugin.log(Level.FINEST, "Removing an entity because I was told to remove all monsters: " + e);
-                return true;
-            }
-            if (specifiedMonsters)
-                specified = true;
-            negate = negateMonsters;
+        if (sender != null) {
+            sender.sendMessage(entitiesKilled + " entities purged from the world '" + world.getName() + "'");
         }
-        for (String s : thingsToKill) {
-            EntityType type = EntityType.fromName(s);
-            if (type != null && type.equals(e.getType())) {
-                specified = true;
-                if (!negate) {
-                    this.plugin.log(Level.FINEST, "Removing an entity because it WAS specified and we are NOT negating: " + e);
-                    return true;
-                }
-                break;
-            }
-        }
-        if (!specified && negate) {
-            this.plugin.log(Level.FINEST, "Removing an entity because it was NOT specified and we ARE negating: " + e);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean shouldWeKillThisCreature(Entity e, List<String> thingsToKill, boolean negateAnimals, boolean negateMonsters) {
-        boolean specifiedAll = thingsToKill.contains("ALL");
-        boolean specifiedAnimals = thingsToKill.contains("ANIMALS") || specifiedAll;
-        boolean specifiedMonsters = thingsToKill.contains("MONSTERS") || specifiedAll;
-        return this.killDecision(e, thingsToKill, negateAnimals, negateMonsters, specifiedAnimals, specifiedMonsters);
     }
 
     /**

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

@@ -4,14 +4,14 @@
  * For more information please check the README.md file included              *
  * with this project.                                                         *
  ******************************************************************************/
-/*
+
 package com.onarandombox.MultiverseCore.utils;
 
 import org.getspout.spoutapi.SpoutManager;
 
 /**
  * A helper-class holding the {@link SpoutManager}.
- * /
+ */
 public class SpoutInterface {
     private SpoutManager spoutManager;
 
@@ -22,9 +22,8 @@ public class SpoutInterface {
     /**
      * Gets the {@link SpoutManager}.
      * @return The {@link SpoutManager}.
-     * /
+     */
     public SpoutManager getManager() {
         return this.spoutManager;
     }
 }
-*/

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

@@ -7,10 +7,7 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
-
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -57,7 +54,6 @@ public class UpdateChecker {
     }
 
     public void checkUpdate() {
-        BufferedReader rd = null;
         try {
             URL url = new URL("http://bukkit.onarandombox.com/multiverse/version.php?n=" + URLEncoder.encode(this.name, "UTF-8") + "&v=" + this.cversion);
             URLConnection conn = url.openConnection();
@@ -69,7 +65,7 @@ public class UpdateChecker {
                 return;
             }
 
-            rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
             String line;
             String version = null;
 
@@ -80,6 +76,7 @@ public class UpdateChecker {
             }
 
             if (version == null) {
+                rd.close();
                 return;
             }
 
@@ -89,18 +86,12 @@ public class UpdateChecker {
             int compare = v1.compareTo(v2);
 
             if (compare > 0) {
-                Logging.info("[%s] - Update Available (%s)", this.name, version);
+                log.info("[" + this.name + "]" + " - Update Available (" + version + ")");
             }
 
             rd.close();
         } catch (Exception e) {
             // No need to alert the user of any error here... it's not important.
-        } finally {
-            if (rd != null) {
-                try {
-                    rd.close();
-                } catch (IOException ignore) { }
-            }
         }
     }
 

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

@@ -1,69 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-import com.dumptruckman.minecraft.util.Logging;
-import net.milkbowl.vault.economy.Economy;
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.event.server.PluginEnableEvent;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredServiceProvider;
-
-/**
- * A class we use to interface with Vault when it is present.
- */
-public class VaultHandler implements Listener {
-
-    private Economy economy;
-
-    public VaultHandler(final Plugin plugin) {
-        Bukkit.getPluginManager().registerEvents(new VaultListener(), plugin);
-        setupVaultEconomy();
-    }
-
-    private boolean setupVaultEconomy() {
-        if (Bukkit.getPluginManager().getPlugin("Vault") != null) {
-            final RegisteredServiceProvider<Economy> economyProvider
-                    = Bukkit.getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
-            if (economyProvider != null) {
-                Logging.fine("Vault economy enabled.");
-                economy = economyProvider.getProvider();
-            } else {
-                Logging.finer("Vault economy not detected.");
-                economy = null;
-            }
-        } else {
-            Logging.finer("Vault was not found.");
-            economy = null;
-        }
-
-        return (economy != null);
-    }
-
-    private class VaultListener implements Listener {
-        @EventHandler
-        private void vaultEnabled(PluginEnableEvent event) {
-            if (event.getPlugin() != null && event.getPlugin().getName().equals("Vault")) {
-                setupVaultEconomy();
-            }
-        }
-
-        @EventHandler
-        private void vaultDisabled(PluginDisableEvent event) {
-            if (event.getPlugin() != null && event.getPlugin().getName().equals("Vault")) {
-                Logging.fine("Vault economy disabled");
-                setupVaultEconomy();
-            }
-        }
-    }
-
-    /**
-     * Returns the Vault economy system if Vault is present and has an economy system enabled.
-     *
-     * @return The vault economy system or null if not configured.
-     */
-    public Economy getEconomy() {
-        return economy;
-    }
-}

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

@@ -7,21 +7,18 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MVWorld;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.api.WorldPurger;
+import com.onarandombox.MultiverseCore.commands.EnvironmentCommand;
 import com.onarandombox.MultiverseCore.event.MVWorldDeleteEvent;
-import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
-import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldCreator;
 import org.bukkit.WorldType;
-import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
@@ -38,29 +35,25 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import java.util.Set;
-import java.util.Stack;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * Public facing API to add/remove Multiverse worlds.
  */
 public class WorldManager implements MVWorldManager {
-    private final MultiverseCore plugin;
-    private final WorldPurger worldPurger;
-    private final Map<String, MultiverseWorld> worlds;
-    private Map<String, MVWorld> worldsFromTheConfig;
+    private MultiverseCore plugin;
+    private WorldPurger worldPurger;
+    private Map<String, MultiverseWorld> worlds;
+    private List<String> unloadedWorlds;
     private FileConfiguration configWorlds = null;
     private Map<String, String> defaultGens;
     private String firstSpawn;
 
     public WorldManager(MultiverseCore core) {
         this.plugin = core;
-        this.worldsFromTheConfig = new HashMap<String, MVWorld>();
-        this.worlds = new ConcurrentHashMap<String, MultiverseWorld>();
+        this.worlds = new HashMap<String, MultiverseWorld>();
+        this.unloadedWorlds = new ArrayList<String>();
         this.worldPurger = new SimpleWorldPurger(plugin);
     }
 
@@ -76,7 +69,7 @@ public class WorldManager implements MVWorldManager {
                 return s.equalsIgnoreCase("bukkit.yml");
             }
         });
-        if (files != null && files.length == 1) {
+        if (files.length == 1) {
             FileConfiguration bukkitConfig = YamlConfiguration.loadConfiguration(files[0]);
             if (bukkitConfig.isConfigurationSection("worlds")) {
                 Set<String> keys = bukkitConfig.getConfigurationSection("worlds").getKeys(false);
@@ -84,90 +77,9 @@ public class WorldManager implements MVWorldManager {
                     defaultGens.put(key, bukkitConfig.getString("worlds." + key + ".generator", ""));
                 }
             }
-        } else {
-            this.plugin.log(Level.WARNING, "Could not read 'bukkit.yml'. Any Default worldgenerators will not be loaded!");
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean cloneWorld(String oldName, String newName, String generator) {
-        // Make sure we don't already know about the new world.
-        if (this.isMVWorld(newName)) {
-            return false;
-        }
-        // Make sure the old world is actually a world!
-        if (this.getUnloadedWorlds().contains(oldName) || !this.isMVWorld(oldName)) {
-            return false;
-        }
-
-        final File oldWorldFile = new File(this.plugin.getServer().getWorldContainer(), oldName);
-        final File newWorldFile = new File(this.plugin.getServer().getWorldContainer(), newName);
-
-        // Make sure the new world doesn't exist outside of multiverse.
-        if (newWorldFile.exists()) {
-            return false;
-        }
-
-        unloadWorld(oldName);
-
-        removePlayersFromWorld(oldName);
-
-        Logging.config("Copying data for world '%s'", oldName);
-        try {
-            Thread t = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    FileUtils.copyFolder(oldWorldFile, newWorldFile, Logger.getLogger("Minecraft"));
-                }
-            });
-            t.start();
-            try {
-                t.join();
-            } catch (InterruptedException e) {
-                // do nothing
-            }
-            File uidFile = new File(newWorldFile, "uid.dat");
-            uidFile.delete();
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return false;
-        }
-        Logging.fine("Kind of copied stuff");
-
-        WorldCreator worldCreator = new WorldCreator(newName);
-        Logging.fine("Started to copy settings");
-        worldCreator.copy(this.getMVWorld(oldName).getCBWorld());
-        Logging.fine("Copied lots of settings");
-
-        boolean useSpawnAdjust = this.getMVWorld(oldName).getAdjustSpawn();
-        Logging.fine("Copied more settings");
-
-        Environment environment = worldCreator.environment();
-        Logging.fine("Copied most settings");
-        if (newWorldFile.exists()) {
-            Logging.fine("Succeeded at copying stuff");
-            if (this.addWorld(newName, environment, null, null, null, generator, useSpawnAdjust)) {
-                // getMVWorld() doesn't actually return an MVWorld
-                Logging.fine("Succeeded at importing stuff");
-                MVWorld newWorld = (MVWorld) this.getMVWorld(newName);
-                MVWorld oldWorld = (MVWorld) this.getMVWorld(oldName);
-                newWorld.copyValues(oldWorld);
-                try {
-                    // don't keep the alias the same -- that would be useless
-                    newWorld.setPropertyValue("alias", newName);
-                } catch (PropertyDoesNotExistException e) {
-                    // this should never happen
-                    throw new RuntimeException(e);
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -206,10 +118,7 @@ public class WorldManager implements MVWorldManager {
             c.generateStructures(generateStructures);
         }
 
-        // Important: doLoad() needs the MVWorld-object in worldsFromTheConfig
-        if (!worldsFromTheConfig.containsKey(name))
-            worldsFromTheConfig.put(name, new MVWorld(useSpawnAdjust));
-
+        World world;
         StringBuilder builder = new StringBuilder();
         builder.append("Loading World & Settings - '").append(name).append("'");
         builder.append(" - Env: ").append(env);
@@ -220,20 +129,44 @@ public class WorldManager implements MVWorldManager {
         if (generator != null) {
             builder.append(" & generator: ").append(generator);
         }
-        Logging.info(builder.toString());
+        this.plugin.log(Level.INFO, builder.toString());
 
-        if (!doLoad(c, true)) {
+        try {
+            world = c.createWorld();
+        } catch (Exception e) {
+            this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because it contains errors!");
+            this.plugin.log(Level.SEVERE, "Try using Chukster to repair your world! '" + name + "'");
+            this.plugin.log(Level.SEVERE, "http://forums.bukkit.org/threads/admin-chunkster.8186/");
+            return false;
+        }
+
+        if (world == null) {
             this.plugin.log(Level.SEVERE, "Failed to Create/Load the world '" + name + "'");
             return false;
         }
 
-        // set generator (special case because we can't read it from org.bukkit.World)
-        this.worlds.get(name).setGenerator(generator);
-
-        this.saveWorldsConfig();
+        MultiverseWorld mvworld = new MVWorld(world, this.configWorlds, this.plugin,
+                this.plugin.getServer().getWorld(name).getSeed(), generator, useSpawnAdjust);
+        this.worldPurger.purgeWorld(mvworld);
+        this.worlds.put(name, mvworld);
+        if (this.unloadedWorlds.contains(name)) {
+            this.unloadedWorlds.remove(name);
+        }
         return true;
     }
 
+    /**
+     * Verifies that a given Plugin generator string exists.
+     *
+     * @param generator The name of the generator plugin. This should be something like CleanRoomGenerator.
+     * @return True if the plugin exists and is enabled, false if not.
+     */
+    // TODO maybe remove this since it's unused?
+    private boolean pluginExists(String generator) {
+        Plugin myPlugin = this.plugin.getServer().getPluginManager().getPlugin(generator);
+        return myPlugin != null && myPlugin.isEnabled();
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -259,14 +192,18 @@ public class WorldManager implements MVWorldManager {
         if (!unloadWorld(name)) {
             return false;
         }
-        if (this.worldsFromTheConfig.containsKey(name)) {
-            this.worldsFromTheConfig.remove(name);
-            Logging.info("World '%s' was removed from config.yml", name);
+        if (this.configWorlds.get("worlds." + name) != null) {
+            this.plugin.log(Level.INFO, "World '" + name + "' was removed from config.yml");
+            this.configWorlds.set("worlds." + name, null);
 
             this.saveWorldsConfig();
+            // Remove it from the list of unloaded worlds.
+            if (this.unloadedWorlds.contains(name)) {
+                this.unloadedWorlds.remove(name);
+            }
             return true;
         } else {
-            Logging.info("World '%s' was already removed from config.yml", name);
+            this.plugin.log(Level.INFO, "World '" + name + "' was already removed from config.yml");
         }
         return false;
     }
@@ -310,22 +247,18 @@ public class WorldManager implements MVWorldManager {
         if (this.worlds.containsKey(name)) {
             if (this.unloadWorldFromBukkit(name, true)) {
                 this.worlds.remove(name);
-                Logging.info("World '%s' was unloaded from memory.", name);
-
-                this.worldsFromTheConfig.get(name).tearDown();
-
+                this.plugin.log(Level.INFO, "World '" + name + "' was unloaded from memory.");
+                this.unloadedWorlds.add(name);
                 return true;
             } else {
-                Logging.warning("World '%s' could not be unloaded. Is it a default world?", name);
+                this.plugin.log(Level.WARNING, "World '" + name + "' could not be unloaded. Is it a default world?");
             }
         } else if (this.plugin.getServer().getWorld(name) != null) {
-            Logging.warning("Hmm Multiverse does not know about this world but it's loaded in memory.");
-            Logging.warning("To let Multiverse know about it, use:");
-            Logging.warning("/mv import %s %s", name, this.plugin.getServer().getWorld(name).getEnvironment().toString());
-        } else if (this.worldsFromTheConfig.containsKey(name)) {
-            return true; // it's already unloaded
+            this.plugin.log(Level.WARNING, "Hmm Multiverse does not know about this world but it's loaded in memory.");
+            this.plugin.log(Level.WARNING, "To unload it using multiverse, use:");
+            this.plugin.log(Level.WARNING, "/mv import " + name + " " + this.plugin.getServer().getWorld(name).getEnvironment().toString());
         } else {
-            Logging.info("Multiverse does not know about '%s' and it's not loaded by Bukkit.", name);
+            this.plugin.log(Level.INFO, "Multiverse does not know about " + name + " and it's not loaded by Bukkit.");
         }
         return false;
     }
@@ -337,74 +270,41 @@ public class WorldManager implements MVWorldManager {
     public boolean loadWorld(String name) {
         // Check if the World is already loaded
         if (this.worlds.containsKey(name)) {
+            // Ensure it's not unloaded, since it IS loaded.
+            if (this.unloadedWorlds.contains(name)) {
+                this.unloadedWorlds.remove(name);
+            }
             return true;
         }
 
-        // Check that the world is in the config
-        if (worldsFromTheConfig.containsKey(name)) {
-            return doLoad(name);
+        // Grab all the Worlds from the Config.
+        Set<String> worldKeys = this.configWorlds.getConfigurationSection("worlds").getKeys(false);
+
+        // Check that the list is not null and that the config contains the world
+        if ((worldKeys != null) && (worldKeys.contains(name))) {
+            // Grab the initial values from the config file.
+            String environment = this.configWorlds.getString("worlds." + name + ".environment", "NORMAL"); // Grab the Environment as a String.
+            String type = this.configWorlds.getString("worlds." + name + ".type", "NORMAL");
+            String seedString = this.configWorlds.getString("worlds." + name + ".seed", "");
+            String generatorString = this.configWorlds.getString("worlds." + name + ".generator");
+            boolean generateStructures = this.configWorlds.getBoolean("worlds." + name + ".generatestructures", true);
+
+            this.addWorld(name, EnvironmentCommand.getEnvFromString(environment), seedString,
+                    EnvironmentCommand.getWorldTypeFromString(type), generateStructures, generatorString);
+            if (this.unloadedWorlds.contains(name)) {
+                this.unloadedWorlds.remove(name);
+            }
+            return true;
         } else {
             return false;
         }
     }
 
-    private void brokenWorld(String name) {
-        this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because it contains errors!");
-        this.plugin.log(Level.SEVERE, "Try using Chukster to repair your world! '" + name + "'");
-        this.plugin.log(Level.SEVERE, "http://forums.bukkit.org/threads/admin-chunkster.8186/");
-    }
-
-    private boolean doLoad(String name) {
-        return doLoad(name, false);
-    }
-
-    private boolean doLoad(String name, boolean ignoreExists) {
-        if (!worldsFromTheConfig.containsKey(name))
-            throw new IllegalArgumentException("That world doesn't exist!");
-
-        MVWorld world = worldsFromTheConfig.get(name);
-        WorldCreator creator = WorldCreator.name(name);
-
-        creator.environment(world.getEnvironment()).seed(world.getSeed());
-        if ((world.getGenerator() != null) && (!world.getGenerator().equals("null")))
-            creator.generator(world.getGenerator());
-
-        return doLoad(creator, ignoreExists);
-    }
-
-    private boolean doLoad(WorldCreator creator, boolean ignoreExists) {
-        String worldName = creator.name();
-        if (!worldsFromTheConfig.containsKey(worldName))
-            throw new IllegalArgumentException("That world doesn't exist!");
-        if (worlds.containsKey(worldName))
-            throw new IllegalArgumentException("That world is already loaded!");
-
-        if (!ignoreExists && !new File(this.plugin.getServer().getWorldContainer(), worldName).exists()) {
-            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;
-        }
-
-        MVWorld mvworld = worldsFromTheConfig.get(worldName);
-        World cbworld;
-        try {
-            cbworld = creator.createWorld();
-        } catch (Exception e) {
-            e.printStackTrace();
-            brokenWorld(worldName);
-            return false;
-        }
-        mvworld.init(cbworld, plugin);
-        this.worldPurger.purgeWorld(mvworld);
-        this.worlds.put(worldName, mvworld);
-        return true;
-    }
-
     /**
      * {@inheritDoc}
      */
     @Override
-    public boolean deleteWorld(String name, boolean removeFromConfig, boolean deleteWorldFolder) {
+    public boolean deleteWorld(String name, boolean removeFromConfig) {
         World world = this.plugin.getServer().getWorld(name);
         if (world == null) {
             // We can only delete loaded worlds
@@ -432,33 +332,25 @@ public class WorldManager implements MVWorldManager {
         try {
             File worldFile = world.getWorldFolder();
             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;
+            boolean deletedWorld = FileUtils.deleteFolder(worldFile);
+            if (deletedWorld) {
+                this.plugin.log(Level.INFO, "World " + name + " was DELETED.");
             } else {
-                Logging.severe("World '%s' was NOT deleted.", name);
-                Logging.severe("Are you sure the folder %s exists?", name);
-                Logging.severe("Please check your file permissions on '%s'", name);
-                return false;
+                this.plugin.log(Level.SEVERE, "World " + name + " was NOT deleted.");
+                this.plugin.log(Level.SEVERE, "Are you sure the folder " + name + " exists?");
+                this.plugin.log(Level.SEVERE, "Please check your file permissions on " + name);
             }
+            return deletedWorld;
         } catch (Throwable e) {
-            Logging.severe("Hrm, something didn't go as planned. Here's an exception for ya.");
-            Logging.severe("You can go politely explain your situation in #multiverse on esper.net");
-            Logging.severe("But from here, it looks like your folder is oddly named.");
-            Logging.severe("This world has been removed from Multiverse-Core so your best bet is to go delete the folder by hand. Sorry.");
-            Logging.severe(e.getMessage());
+            this.plugin.log(Level.SEVERE, "Hrm, something didn't go as planned. Here's an exception for ya.");
+            this.plugin.log(Level.SEVERE, "You can go politely explain your situation in #multiverse on esper.net");
+            this.plugin.log(Level.SEVERE, "But from here, it looks like your folder is oddly named.");
+            this.plugin.log(Level.SEVERE, "This world has been removed from Multiverse-Core so your best bet is to go delete the folder by hand. Sorry.");
+            this.plugin.log(Level.SEVERE, e.getMessage());
             return false;
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean deleteWorld(String name, boolean removeFromConfig) {
-        return this.deleteWorld(name, removeFromConfig, true);
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -509,12 +401,8 @@ public class WorldManager implements MVWorldManager {
      */
     @Override
     public MultiverseWorld getMVWorld(String name) {
-        if (name == null) {
-            return null;
-        }
-        MultiverseWorld world = this.worlds.get(name);
-        if (world != null) {
-            return world;
+        if (this.worlds.containsKey(name)) {
+            return this.worlds.get(name);
         }
         return this.getMVWorldByAlias(name);
     }
@@ -549,7 +437,7 @@ public class WorldManager implements MVWorldManager {
      * {@inheritDoc}
      */
     @Override
-    public boolean isMVWorld(final String name) {
+    public boolean isMVWorld(String name) {
         return (this.worlds.containsKey(name) || isMVWorldAlias(name));
     }
 
@@ -567,7 +455,7 @@ public class WorldManager implements MVWorldManager {
      * @param alias The alias of the world to check.
      * @return True if the world exists, false if not.
      */
-    private boolean isMVWorldAlias(final String alias) {
+    private boolean isMVWorldAlias(String alias) {
         for (MultiverseWorld w : this.worlds.values()) {
             if (w.getAlias().equalsIgnoreCase(alias)) {
                 return true;
@@ -583,22 +471,30 @@ public class WorldManager implements MVWorldManager {
     public void loadDefaultWorlds() {
         this.ensureConfigIsPrepared();
         List<World> myWorlds = this.plugin.getServer().getWorlds();
+        Set<String> worldStrings = this.configWorlds.getConfigurationSection("worlds").getKeys(false);
         for (World w : myWorlds) {
             String name = w.getName();
-            if (!worldsFromTheConfig.containsKey(name)) {
-                String generator = null;
+            if (!worldStrings.contains(name)) {
                 if (this.defaultGens.containsKey(name)) {
-                    generator = this.defaultGens.get(name);
+                    this.addWorld(name, w.getEnvironment(), w.getSeed() + "", w.getWorldType(),
+                            w.canGenerateStructures(), this.defaultGens.get(name));
+                } else {
+                    this.addWorld(name, w.getEnvironment(), w.getSeed() + "", w.getWorldType(),
+                            w.canGenerateStructures(), null);
                 }
-                this.addWorld(name, w.getEnvironment(), String.valueOf(w.getSeed()), w.getWorldType(), w.canGenerateStructures(), generator);
+
             }
         }
     }
 
     private void ensureConfigIsPrepared() {
-        this.configWorlds.options().pathSeparator(SEPARATOR);
         if (this.configWorlds.getConfigurationSection("worlds") == null) {
             this.configWorlds.createSection("worlds");
+            try {
+                this.configWorlds.save(new File(this.plugin.getDataFolder(), "worlds.yml"));
+            } catch (IOException e) {
+                this.plugin.log(Level.SEVERE, "Failed to save worlds.yml. Please check your file permissions.");
+            }
         }
     }
 
@@ -611,10 +507,13 @@ public class WorldManager implements MVWorldManager {
         int count = 0;
         this.ensureConfigIsPrepared();
         this.ensureSecondNamespaceIsPrepared();
+        // Grab all the Worlds from the Config.
+        Set<String> worldKeys = this.configWorlds.getConfigurationSection("worlds").getKeys(false);
 
         // Force the worlds to be loaded, ie don't just load new worlds.
         if (forceLoad) {
             // Remove all world permissions.
+
             Permission allAccess = this.plugin.getServer().getPluginManager().getPermission("multiverse.access.*");
             Permission allExempt = this.plugin.getServer().getPluginManager().getPermission("multiverse.exempt.*");
             for (MultiverseWorld w : this.worlds.values()) {
@@ -636,20 +535,45 @@ public class WorldManager implements MVWorldManager {
             this.worlds.clear();
         }
 
-        for (Map.Entry<String, MVWorld> entry : worldsFromTheConfig.entrySet()) {
-            if (worlds.containsKey(entry.getKey())) {
-                continue;
-            }
-            if (!entry.getValue().getAutoLoad())
-                continue;
+        // Check that the list is not null.
+        if (worldKeys != null) {
+            for (String worldKey : worldKeys) {
+                // Check if the World is already loaded within the Plugin.
+                if (this.worlds.containsKey(worldKey)) {
+                    continue;
+                }
 
-            if (doLoad(entry.getKey()))
+                // If autoload was set to false, don't load this one.
+                if (!this.configWorlds.getBoolean("worlds." + worldKey + ".autoload", true)) {
+                    if (!this.unloadedWorlds.contains(worldKey)) {
+                        this.unloadedWorlds.add(worldKey);
+                    }
+                    continue;
+                }
+                // Grab the initial values from the config file.
+                String environment = this.configWorlds.getString("worlds." + worldKey + ".environment", "NORMAL");
+                String type = this.configWorlds.getString("worlds." + worldKey + ".type", "NORMAL");
+                String seedString = this.configWorlds.getString("worlds." + worldKey + ".seed", null);
+                boolean generateStructures = this.configWorlds.getBoolean("worlds." + worldKey + ".generatestructures", true);
+                if (seedString == null) {
+                    seedString = this.configWorlds.getLong("worlds." + worldKey + ".seed") + "";
+                }
+
+                String generatorString = this.configWorlds.getString("worlds." + worldKey + ".generator");
+                if (environment.equalsIgnoreCase("skylands")) {
+                    this.plugin.log(Level.WARNING, "Found SKYLANDS world. Not importing automatically, as it won't work atm :(");
+                    continue;
+                }
+                addWorld(worldKey, EnvironmentCommand.getEnvFromString(environment), seedString,
+                        EnvironmentCommand.getWorldTypeFromString(type), generateStructures, generatorString);
+
+                // Increment the world count
                 count++;
+            }
         }
 
         // Simple Output to the Console to show how many Worlds were loaded.
-        Logging.config("%s - World(s) loaded.", count);
-        this.saveWorldsConfig();
+        this.plugin.log(Level.INFO, count + " - World(s) loaded.");
     }
 
     private void ensureSecondNamespaceIsPrepared() {
@@ -678,59 +602,15 @@ public class WorldManager implements MVWorldManager {
         return worldPurger;
     }
 
-    private static final char SEPARATOR = '\uF8FF';
-
     /**
-     * {@inheritDoc}
+     * Load the config from a file.
+     *
+     * @param file The file to load.
+     * @return A loaded configuration.
      */
     @Override
     public FileConfiguration loadWorldConfig(File file) {
         this.configWorlds = YamlConfiguration.loadConfiguration(file);
-        this.ensureConfigIsPrepared();
-        try {
-            this.configWorlds.save(new File(this.plugin.getDataFolder(), "worlds.yml"));
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        // load world-objects
-        Stack<String> worldKeys = new Stack<String>();
-        worldKeys.addAll(this.configWorlds.getConfigurationSection("worlds").getKeys(false));
-        Map<String, MVWorld> newWorldsFromTheConfig = new HashMap<String, MVWorld>();
-        while (!worldKeys.isEmpty()) {
-            String key = worldKeys.pop();
-            String path = "worlds" + SEPARATOR + key;
-            Object obj = this.configWorlds.get(path);
-            if ((obj != null) && (obj instanceof MVWorld)) {
-                String worldName = key.replaceAll(String.valueOf(SEPARATOR), ".");
-                MVWorld mvWorld = null;
-                if (this.worldsFromTheConfig.containsKey(worldName)) {
-                    // Object-Recycling :D
-                    // TODO Why is is checking worldsFromTheConfig and then getting from worlds?  So confused... (DTM)
-                    mvWorld = (MVWorld) this.worlds.get(worldName);
-                    if (mvWorld != null) {
-                        mvWorld.copyValues((MVWorld) obj);
-                    }
-                }
-                if (mvWorld == null) {
-                    // we have to use a new one
-                    World cbworld = this.plugin.getServer().getWorld(worldName);
-                    mvWorld = (MVWorld) obj;
-                    if (cbworld != null) {
-                        mvWorld.init(cbworld, this.plugin);
-                    }
-                }
-                newWorldsFromTheConfig.put(worldName, mvWorld);
-            } else if (this.configWorlds.isConfigurationSection(path)) {
-                ConfigurationSection section = this.configWorlds.getConfigurationSection(path);
-                Set<String> subkeys = section.getKeys(false);
-                for (String subkey : subkeys) {
-                    worldKeys.push(key + SEPARATOR + subkey);
-                }
-            }
-        }
-        this.worldsFromTheConfig = newWorldsFromTheConfig;
-        this.worlds.keySet().retainAll(this.worldsFromTheConfig.keySet());
         return this.configWorlds;
     }
 
@@ -740,11 +620,6 @@ public class WorldManager implements MVWorldManager {
     @Override
     public boolean saveWorldsConfig() {
         try {
-            this.configWorlds.options().pathSeparator(SEPARATOR);
-            this.configWorlds.set("worlds", null);
-            for (Map.Entry<String, ? extends MultiverseWorld> entry : worldsFromTheConfig.entrySet()) {
-                this.configWorlds.set("worlds" + SEPARATOR + entry.getKey(), entry.getValue());
-            }
             this.configWorlds.save(new File(this.plugin.getDataFolder(), "worlds.yml"));
             return true;
         } catch (IOException e) {
@@ -766,49 +641,7 @@ public class WorldManager implements MVWorldManager {
      */
     @Override
     public List<String> getUnloadedWorlds() {
-        List<String> allNames = new ArrayList<String>(this.worldsFromTheConfig.keySet());
-        allNames.removeAll(worlds.keySet());
-        return allNames;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed) {
-        MultiverseWorld world = this.getMVWorld(name);
-        if (world == null)
-            return false;
-
-        List<Player> ps = world.getCBWorld().getPlayers();
-
-        if (useNewSeed) {
-            long theSeed;
-
-            if (randomSeed) {
-                theSeed = new Random().nextLong();
-            } else {
-                try {
-                    theSeed = Long.parseLong(seed);
-                } catch (NumberFormatException e) {
-                    theSeed = seed.hashCode();
-                }
-            }
-
-            world.setSeed(theSeed);
-        }
-
-        if (this.deleteWorld(name, false, false)) {
-            this.doLoad(name, true);
-            SafeTTeleporter teleporter = this.plugin.getSafeTTeleporter();
-            Location newSpawn = world.getSpawnLocation();
-            // Send all players that were in the old world, BACK to it!
-            for (Player p : ps) {
-                teleporter.safelyTeleport(null, p, newSpawn, true);
-            }
-            return true;
-        }
-        return false;
+        return this.unloadedWorlds;
     }
 
     /**

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

@@ -1,34 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.webpaste;
-
-import java.io.IOException;
-
-/**
- * An {@link URLShortener} using {@code bit.ly}.
- */
-public class BitlyURLShortener extends HttpAPIClient implements URLShortener {
-    private static final String GENERIC_BITLY_REQUEST_FORMAT = "https://api-ssl.bitly.com/v3/shorten?format=txt&apiKey=%s&login=%s&longUrl=%s";
-
-    // I think it's no problem that these are public
-    private static final String USERNAME = "multiverse2";
-    private static final String API_KEY = "R_9dbff4862a3bc0c4218a7d78cc10d0e0";
-
-    public BitlyURLShortener() {
-        super(String.format(GENERIC_BITLY_REQUEST_FORMAT, API_KEY, USERNAME, "%s"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String shorten(String longUrl) {
-        try {
-            String result = this.exec(longUrl);
-            if (!result.startsWith("http://j.mp/")) // ... then it's failed :/
-                throw new IOException(result);
-            return result;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return longUrl; // sorry ...
-        }
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.webpaste;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-
-/**
- * HTTP API-client.
- */
-public abstract class HttpAPIClient {
-    /**
-     * The URL for this API-request.
-     */
-    protected final String urlFormat;
-
-    public HttpAPIClient(String urlFormat) {
-        this.urlFormat = urlFormat;
-    }
-
-    /**
-     * Executes this API-Request.
-     * @param args Format-args.
-     * @return The result (as text).
-     * @throws IOException When the I/O-operation failed.
-     */
-    protected final String exec(Object... args) throws IOException {
-
-        URLConnection conn = new URL(String.format(this.urlFormat, args)).openConnection();
-        conn.connect();
-        StringBuilder ret = new StringBuilder();
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            while (!reader.ready()); // wait until reader is ready, may not be necessary, SUPPRESS CHECKSTYLE: EmptyStatement
-
-            while (reader.ready()) {
-                ret.append(reader.readLine()).append('\n');
-            }
-        } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (IOException ignore) { }
-            }
-        }
-        return ret.toString();
-    }
-}

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

@@ -1,7 +1,6 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;
 
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
@@ -9,6 +8,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
+import java.util.regex.Pattern;
 
 /**
  * Pastes to {@code pastebin.com}.
@@ -55,35 +55,38 @@ public class PastebinPasteService implements PasteService {
      */
     @Override
     public String postData(String encodedData, URL url) throws PasteFailedException {
-        OutputStreamWriter wr = null;
-        BufferedReader rd = null;
         try {
             URLConnection conn = url.openConnection();
             conn.setDoOutput(true);
-            wr = new OutputStreamWriter(conn.getOutputStream());
+            OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
             wr.write(encodedData);
             wr.flush();
 
-            rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
             String line;
             String pastebinUrl = "";
             while ((line = rd.readLine()) != null) {
                 pastebinUrl = line;
             }
+            wr.close();
+            rd.close();
             return pastebinUrl;
         } catch (Exception e) {
             throw new PasteFailedException(e);
-        } finally {
-            if (wr != null) {
-                try {
-                    wr.close();
-                } catch (IOException ignore) { }
-            }
-            if (rd != null) {
-                try {
-                    rd.close();
-                } catch (IOException ignore) { }
-            }
         }
     }
+
+    // TODO maybe remove this?
+    private Pattern getURLMatchingPattern() {
+        if (this.isPrivate) {
+            return Pattern.compile(".*http://pastie.org/.*key=([0-9a-z]+).*");
+        } else {
+            return Pattern.compile(".*http://pastie.org/([0-9]+).*");
+        }
+    }
+
+    // TODO maybe remove this?
+    private String formatURL(String pastieID) {
+        return "http://pastie.org/" + (this.isPrivate ? "private/" : "") + pastieID;
+    }
 }

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

@@ -1,7 +1,6 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;
 
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
@@ -56,16 +55,14 @@ public class PastiePasteService implements PasteService {
      */
     @Override
     public String postData(String encodedData, URL url) throws PasteFailedException {
-        OutputStreamWriter wr = null;
-        BufferedReader rd = null;
         try {
             URLConnection conn = url.openConnection();
             conn.setDoOutput(true);
-            wr = new OutputStreamWriter(conn.getOutputStream());
+            OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
             wr.write(encodedData);
             wr.flush();
 
-            rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
             String line;
             String pastieUrl = "";
             Pattern pastiePattern = this.getURLMatchingPattern();
@@ -76,20 +73,11 @@ public class PastiePasteService implements PasteService {
                     pastieUrl = this.formatURL(pastieID);
                 }
             }
+            wr.close();
+            rd.close();
             return pastieUrl;
         } catch (Exception e) {
             throw new PasteFailedException(e);
-        } finally {
-            if (wr != null) {
-                try {
-                    wr.close();
-                } catch (IOException ignore) { }
-            }
-            if (rd != null) {
-                try {
-                    rd.close();
-                } catch (IOException ignore) { }
-            }
         }
     }
 

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

@@ -1,13 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.webpaste;
-
-/**
- * URL-Shortener.
- */
-public interface URLShortener {
-    /**
-     * Shorten an URL.
-     * @param longUrl The long form.
-     * @return The shortened URL.
-     */
-    String shorten(String longUrl);
-}