Version 4.1.1-1.8.8-SNAPSHOT!

Bumped version to 4.1.1-SNAPSHOT for continued development.
(cherry picked from commit 1ba693ffd5)
2019-08-25 00:14:43 -04:00 · 2019-08-25 00:09:58 -04:00 · 2019-08-25 00:09:09 -04:00 · 2019-08-25 00:09:03 -04:00 · 2019-08-25 00:08:55 -04:00 · 2019-08-25 00:08:45 -04:00
193 changed files with 16796 additions and 3864 deletions
@@ -2,6 +2,7 @@
 /.classpath
 /.project
 /.settings
+/.checkstyle

 # netbeans
 /nbproject
@@ -11,6 +12,7 @@

 # maven
 /target
+dependency-reduced-pom.xml

 # vim
 .*.sw[a-p]
@@ -33,4 +35,11 @@
 .idea/

 # Fern's utils
-uploadtoserver.sh
+uploadtoserver.sh
+
+# Testing files:
+debug.log
+
+# Doxygen
+/docs/html
+debug.txt
@@ -1,7 +0,0 @@
-[submodule "lib/allpay"]
-	path = lib/allpay
-	url = git://github.com/FernFerret/AllPay.git
-[submodule "lib/commandhandler"]
-	path = lib/commandhandler
-	url = git://github.com/PneumatiCraft/CommandHandler.git
-        branch = notrie
@@ -0,0 +1,7 @@
+language: java
+jdk:
+  - oraclejdk8
+notifications:
+  email: false
+before_install:
+  - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
@@ -1,5 +1,16 @@
+Building
+========
+Simply build the source with maven:
+
+    $ mvn install
+
+More details are available on the [build instructions wiki page](https://github.com/Multiverse/Multiverse-Core/wiki/Building).
+
+License
+=======
 Copyright (c) 2011, The Multiverse Team All rights reserved.

 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the The Multiverse Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the The Multiverse Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
@@ -0,0 +1,3 @@
+machine:
+  java:
+    version: oraclejdk8
@@ -0,0 +1,141 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ 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.                                                        ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<!-- Future reference: valid severity values are 'ignore', 'info', 'warning', 'error' -->
+<module name="Checker">
+    <module name="JavadocPackage">
+        <property name="allowLegacy" value="true"/>
+    </module>
+    <module name="NewlineAtEndOfFile" />
+    <module name="Translation"/>
+    <module name="FileLength"/>
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+    </module>
+    <module name="RegexpSingleline">
+        <property name="message" value="Line has trailing spaces."/>
+        <property name="format" value="\s+$"/>
+    </module>
+    <module name="SuppressWithNearbyCommentFilter">
+        <property name="commentFormat" value="SUPPRESS CHECKSTYLE: (\w+)"/>
+        <property name="checkFormat" value="$1"/>
+    </module>
+    <module name="SuppressionCommentFilter">
+           <property name="offCommentFormat" value="BEGIN CHECKSTYLE-SUPPRESSION\: (\w+)"/>
+           <property name="onCommentFormat" value="END CHECKSTYLE-SUPPRESSION\: (\w+)"/>
+           <property name="checkFormat" value="$1"/>
+    </module>
+    <module name="SuppressionCommentFilter">
+           <property name="offCommentFormat" value="BEGIN CHECKSTYLE-SUPPRESSION\: ALL"/>
+           <property name="onCommentFormat" value="END CHECKSTYLE-SUPPRESSION\: ALL"/>
+    </module>
+    <module name="TreeWalker">
+        <!-- Make suppression possible -->
+        <module name="FileContentsHolder"/>
+        <!-- Actual checks -->
+        <module name="LineLength">
+            <property name="max" value="160"/>
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="JavadocMethod">
+            <property name="scope" value="package"/><!-- We don't need javadoc for private methods -->
+            <property name="tokens" value="METHOD_DEF"/><!-- We don't need javadoc for constructors -->
+        </module>
+        <module name="JavadocType"/>
+        <module name="JavadocVariable">
+            <property name="scope" value="package"/><!-- We don't need javadoc for private variables -->
+        </module>
+        <module name="JavadocStyle"/>
+        <module name="WriteTag">
+            <property name="tag" value="@author"/>
+            <property name="tagFormat" value="\S"/>
+            <property name="severity" value="ignore"/>
+            <property name="tagSeverity" value="warning"/>
+        </module>
+        <module name="ConstantName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+        <module name="AvoidStarImport">
+            <property name="severity" value="warning"/>
+            <property name="excludes" value="com.onarandombox.MultiverseCore.utils,com.onarandombox.MultiverseCore.configuration,com.onarandombox.MultiverseCore.commands,com.onarandombox.MultiverseCore.destination"/>
+        </module>
+        <module name="IllegalImport"/>
+        <module name="RedundantImport"/>
+        <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="ParameterNumber"/>
+        <module name="EmptyForIteratorPad"/>
+        <module name="MethodParamPad"/>
+        <module name="NoWhitespaceAfter">
+            <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
+        </module>
+        <module name="NoWhitespaceBefore"/>
+        <module name="OperatorWrap"/>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="WhitespaceAfter">
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="WhitespaceAround">
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+        <module name="AvoidNestedBlocks"/>
+        <module name="EmptyBlock">
+            <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_FOR,LITERAL_TRY,LITERAL_WHILE,INSTANCE_INIT,STATIC_INIT"/>
+        </module>
+        <module name="LeftCurly"/>
+        <module name="RightCurly"/>
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="HiddenField">
+            <property name="tokens" value="VARIABLE_DEF"/><!-- We don't care if parameters hide fields. -->
+        </module>
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+        <module name="MagicNumber">
+            <property name="ignoreNumbers" value="-1, 0, 0.5, 1, 2, 3"/>
+        </module>
+        <module name="MissingSwitchDefault"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <!-- Don't like errors for `final` missing
+        <module name="DesignForExtension"/>
+        <module name="FinalClass"/>
+        -->
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <module name="VisibilityModifier">
+            <property name="protectedAllowed" value="true"/>
+        </module>
+        <module name="ArrayTypeStyle"/>
+        <!-- Don't like errors for `final` missing
+        <module name="FinalParameters"/>
+        -->
+        <module name="TodoComment">
+            <property name="severity" value="info"/>
+        </module>
+        <module name="UpperEll"/>
+        <module name="Indentation"/>
+        <module name="MissingDeprecated"/>
+        <module name="MissingOverride"/>
+    </module>
+</module>
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.onarandombox.multiversecore</groupId>
    <artifactId>Multiverse-Core</artifactId>
-    <version>2.1</version>
+    <version>4.1.1-1.8.8-SNAPSHOT</version>
    <name>Multiverse-Core</name>
    <description>World Management Plugin</description>
    <properties>
@@ -12,9 +12,31 @@
    </properties>

    <repositories>
+      <!-- Spigot -->
        <repository>
-            <id>OnARandomBox</id>
-            <url>http://repo.onarandombox.com/artifactory/repo</url>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+            <id>onarandombox</id>
+            <url>http://repo.onarandombox.com/content/groups/public</url>
+        </repository>
+        <repository>
+            <id>spigot</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>vault-repo</id>
+            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+        </repository>
+        <repository>
+            <id>minebench-repo</id>
+            <url>https://repo.minebench.de/</url>
+        </repository>
+        <!-- Has a copy of metrics R8-SNAPSHOT !-->
+        <repository>
+            <id>elmakers-repo</id>
+            <url>http://maven.elmakers.com/repository/</url>
        </repository>
    </repositories>

@@ -34,6 +56,22 @@
        <url>http://ci.onarandombox.com</url>
    </ciManagement>

+    <!-- Profiles are used to detect whether this is a local or Jenkins build
+         and adjust the build number accordingly -->
+    <profiles>
+        <profile>
+            <id>jenkins</id>
+            <activation>
+                <property>
+                    <name>env.BUILD_NUMBER</name>
+                </property>
+            </activation>
+            <properties>
+                <project.build.number>${env.BUILD_NUMBER}</project.build.number>
+            </properties>
+        </profile>
+    </profiles>
+
    <build>
        <defaultGoal>clean package</defaultGoal>
        <plugins>
@@ -41,38 +79,16 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.7.0</version>
                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                </configuration>
            </plugin>
-            <!-- Build Helper - Additional Source Folders -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <id>add-wsdl-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.basedir}/lib/allpay/src</source>
-                                <source>${project.basedir}/lib/commandhandler/src</source>
-                                <source>${project.basedir}/lib/commandhandler/lib/ShellParser/src</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
            <plugin>
                <groupId>com.google.code.maven-replacer-plugin</groupId>
                <artifactId>maven-replacer-plugin</artifactId>
-                <version>1.3.8</version>
+                <version>1.4.1</version>
                <executions>
                    <execution>
                        <phase>prepare-package</phase>
@@ -86,7 +102,7 @@
                    <replacements>
                        <replacement>
                            <token>maven-version-number</token>
-                            <value>${project.version}-${project.build.number}</value>
+                            <value>${project.version}-b${project.build.number}</value>
                        </replacement>
                    </replacements>
                </configuration>
@@ -95,7 +111,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>3.0.2</version>
                <configuration>
                    <archive>
                        <manifestEntries>
@@ -103,94 +119,245 @@
                    </archive>
                </configuration>
            </plugin>
-            <!-- Maven Source Plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M3</version>
+                <configuration>
+                    <parallel>methods</parallel>
+                    <threadCount>10</threadCount>
+                    <excludes>
+                        <exclude>**/TestCommandSender.java</exclude>
+                        <exclude>**/TestInstanceCreator.java</exclude>
+                    </excludes>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>3.0.0-M3</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.17</version>
+                <configuration>
+                    <enableRulesSummary>true</enableRulesSummary>
+                    <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>
+                <version>3.0.1</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.10.4</version>
+                <executions>
+                    <execution>
+                        <id>javadoc-jar</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <failOnError>false</failOnError>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>me.main__.util</pattern>
+                                    <shadedPattern>com.onarandombox.serializationconfig</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.pneumaticraft.commandhandler</pattern>
+                                    <shadedPattern>com.onarandombox.commandhandler</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>buscript</pattern>
+                                    <shadedPattern>com.onarandombox.buscript</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.mcstats</pattern>
+                                    <shadedPattern>com.onarandombox.mcstats</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>
+                                <relocation>
+                                    <pattern>org.codehaus.jettison</pattern>
+                                    <shadedPattern>com.onarandombox.jettison</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>de.themoep.idconverter</pattern>
+                                    <shadedPattern>com.onarandombox.idconverter</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>se.eris</groupId>
+                <artifactId>notnull-instrumenter-maven-plugin</artifactId>
+                <version>0.6.8</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>instrument</goal>
+                            <goal>tests-instrument</goal>
+                        </goals>
+                    </execution>
+                </executions>
            </plugin>
        </plugins>
    </build>

    <dependencies>
-        <!-- Bukkit Dependency -->
        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
+           <groupId>org.bukkit</groupId>
+           <artifactId>bukkit</artifactId>
+           <version>1.8.8-R0.1-SNAPSHOT</version>
+           <scope>provided</scope>
        </dependency>
-        <!-- Bukkit Dependency -->
-        <!-- Start of Spout -->
+        <!-- SerializationConfig Dependency -->
        <dependency>
-            <groupId>org.getspout</groupId>
-            <artifactId>spoutapi</artifactId>
-            <version>dev-SNAPSHOT</version>
+            <groupId>me.main__.util</groupId>
+            <artifactId>SerializationConfig</artifactId>
+            <version>1.7</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>
-        <!-- End of Spout -->
-        <!-- Start of Economy Dependencies -->
+        <!-- End of SerializationConfig Dependency -->
+        <!-- Start of Economy Dependency -->
        <dependency>
-            <groupId>cosine.boseconomy</groupId>
-            <artifactId>BOSEconomy</artifactId>
-            <version>0.6.2</version>
-            <type>jar</type>
-            <scope>compile</scope>
+            <groupId>net.milkbowl.vault</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- End of Economy Dependency -->
+        <!-- Start of CommandHandler Dependency -->
+        <dependency>
+            <groupId>com.pneumaticraft.commandhandler</groupId>
+            <artifactId>CommandHandler</artifactId>
+            <version>11</version>
+        </dependency>
+        <dependency>
+            <groupId>com.dumptruckman.minecraft</groupId>
+            <artifactId>buscript</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mcstats.bukkit</groupId>
+            <artifactId>metrics</artifactId>
+            <version>R6</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.dumptruckman.minecraft</groupId>
+            <artifactId>Logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>16.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>de.themoep.idconverter</groupId>
+            <artifactId>mappings</artifactId>
+            <version>1.2-SNAPSHOT</version>
        </dependency>

+        <!-- Start of Test Dependencies -->
        <dependency>
-            <groupId>fr.crafter.tickleman.RealShop</groupId>
-            <artifactId>RealShop</artifactId>
-            <version>0.63</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.iCo6</groupId>
-            <artifactId>iConomy</artifactId>
-            <version>6.0</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.iConomy</groupId>
-            <artifactId>iConomy</artifactId>
-            <version>5.0</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.nijiko.coelho.iConomy</groupId>
-            <artifactId>iConomy</artifactId>
-            <version>4.65</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.earth2me.essentials</groupId>
-            <artifactId>Essentials</artifactId>
-            <version>2.4.2</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.ashtheking.currency</groupId>
-            <artifactId>MultiCurrency</artifactId>
-            <version>0.09</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of Economy Dependencies -->
-        <!-- Start of JUnit Dependencies -->
-        <dependency>
-            <groupId>org.junit</groupId>
+            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>2.0.0</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-easymock</artifactId>
+            <version>2.0.0</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>2.0.0</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>4.0.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+            <scope>test</scope>
        </dependency>
-        <!-- End of JUnit Dependencies -->
    </dependencies>
+    <distributionManagement>
+        <repository>
+            <id>OnARandomBox</id>
+            <url>http://repo.onarandombox.com/content/repositories/multiverse</url>
+        </repository>
+        <snapshotRepository>
+            <id>OnARandomBox</id>
+            <url>http://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
 </project>
@@ -1,17 +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;
-
-/**
- * Dummy class to make old MV Plugins not explode.
- * If this loads, the user WILL get a severe telling them to update said plugin!
- * WILL BE DELETED ON 11/1/11
- */
-@Deprecated
-public interface LoggablePlugin extends com.onarandombox.MultiverseCore.api.LoggablePlugin {
-}
@@ -1,20 +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;
-
-/**
- * Dummy class to make old MV Plugins not explode.
- * If this loads, the user WILL get a severe telling them to update said plugin!
- * WILL BE DELETED ON 11/1/11
- */
-@Deprecated
-public class MVPermissions extends com.onarandombox.MultiverseCore.utils.MVPermissions {
-    public MVPermissions(MultiverseCore plugin) {
-        super(plugin);
-    }
-}
@@ -1,17 +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;
-
-/**
- * Dummy class to make old MV Plugins not explode.
- * If this loads, the user WILL get a severe telling them to update said plugin!
- * WILL BE DELETED ON 11/1/11
- */
-@Deprecated
-public interface MVPlugin extends com.onarandombox.MultiverseCore.api.MVPlugin {
-}
@@ -0,0 +1,351 @@
+package com.onarandombox.MultiverseCore;
+
+import com.dumptruckman.minecraft.util.*;
+import com.onarandombox.MultiverseCore.api.*;
+import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
+import me.main__.util.SerializationConfig.*;
+import org.bukkit.Bukkit;
+
+import java.util.*;
+
+/**
+ * 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;
+    @Property
+    private volatile boolean prefixchat;
+    @Property
+    private volatile String prefixchatformat;
+    @Property
+    private volatile boolean useasyncchat;
+    @Property
+    private volatile boolean teleportintercept;
+    @Property
+    private volatile boolean firstspawnoverride;
+    @Property
+    private volatile boolean displaypermerrors;
+    @Property
+    private volatile int globaldebug;
+    @Property
+    private volatile boolean silentstart;
+    @Property
+    private volatile int messagecooldown;
+    @Property
+    private volatile double version;
+    @Property
+    private volatile String firstspawnworld;
+    @Property
+    private volatile int teleportcooldown;
+    @Property
+    private volatile boolean defaultportalsearch;
+    @Property
+    private volatile int portalsearchradius;
+    @Property
+    private volatile boolean autopurge;
+
+    public MultiverseCoreConfiguration() {
+        super();
+        MultiverseCoreConfiguration.setInstance(this);
+    }
+
+    public MultiverseCoreConfiguration(Map<String, Object> values) {
+        super(values);
+        MultiverseCoreConfiguration.setInstance(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void setDefaults() {
+        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+        enforceaccess = false;
+        useasyncchat = true;
+        prefixchat = true;
+        prefixchatformat = "[%world%]%chat%";
+        teleportintercept = true;
+        firstspawnoverride = true;
+        displaypermerrors = true;
+        globaldebug = 0;
+        messagecooldown = 5000;
+        teleportcooldown = 1000;
+        this.version = 2.9;
+        silentstart = false;
+        defaultportalsearch = false;
+        portalsearchradius = 128;
+        autopurge = true;
+        // 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:
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getEnforceAccess() {
+        return this.enforceaccess;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setEnforceAccess(boolean enforceAccess) {
+        this.enforceaccess = enforceAccess;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getPrefixChat() {
+        return this.prefixchat;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setPrefixChat(boolean prefixChat) {
+        this.prefixchat = prefixChat;
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getPrefixChatFormat() {
+        return this.prefixchatformat;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setPrefixChatFormat(String prefixChatFormat) {
+        this.prefixchatformat = prefixChatFormat;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getTeleportIntercept() {
+        return this.teleportintercept;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setTeleportIntercept(boolean teleportIntercept) {
+        this.teleportintercept = teleportIntercept;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getFirstSpawnOverride() {
+        return this.firstspawnoverride;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setFirstSpawnOverride(boolean firstSpawnOverride) {
+        this.firstspawnoverride = firstSpawnOverride;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getDisplayPermErrors() {
+        return this.displaypermerrors;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDisplayPermErrors(boolean displayPermErrors) {
+        this.displaypermerrors = displayPermErrors;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getGlobalDebug() {
+        return this.globaldebug;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setGlobalDebug(int globalDebug) {
+        this.globaldebug = globalDebug;
+        Logging.setDebugLevel(globalDebug);
+        Bukkit.getPluginManager().callEvent(new MVDebugModeEvent(globalDebug));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getMessageCooldown() {
+        return this.messagecooldown;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setMessageCooldown(int messageCooldown) {
+        this.messagecooldown = messageCooldown;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public double getVersion() {
+        return this.version;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setVersion(int version) {
+        this.version = version;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getFirstSpawnWorld() {
+        return this.firstspawnworld;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setFirstSpawnWorld(String firstSpawnWorld) {
+        this.firstspawnworld = firstSpawnWorld;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getTeleportCooldown() {
+        return this.teleportcooldown;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    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 void setSilentStart(boolean silentStart) {
+        Logging.setShowingConfig(!silentStart);
+        this.silentstart = silentStart;
+    }
+
+    @Override
+    public boolean getSilentStart() {
+        return silentstart;
+    }
+
+    @Override
+    public void setUseDefaultPortalSearch(boolean useDefaultPortalSearch) {
+        defaultportalsearch = useDefaultPortalSearch;
+    }
+
+    @Override
+    public boolean isUsingDefaultPortalSearch() {
+        return defaultportalsearch;
+    }
+
+    @Override
+    public void setPortalSearchRadius(int searchRadius) {
+        this.portalsearchradius = searchRadius;
+    }
+
+    @Override
+    public int getPortalSearchRadius() {
+        return portalsearchradius;
+    }
+
+    @Override
+    public boolean isAutoPurgeEnabled() {
+        return autopurge;
+    }
+
+    @Override
+    public void setAutoPurgeEnabled(boolean autopurge) {
+        this.autopurge = autopurge;
+    }
+}
@@ -0,0 +1,655 @@
+package com.onarandombox.MultiverseCore;
+
+import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
+import com.onarandombox.MultiverseCore.configuration.EntryFee;
+import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
+import com.onarandombox.MultiverseCore.configuration.SpawnSettings;
+import com.onarandombox.MultiverseCore.configuration.WorldPropertyValidator;
+import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
+import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
+import com.onarandombox.MultiverseCore.enums.EnglishChatStyle;
+import me.main__.util.SerializationConfig.IllegalPropertyValueException;
+import me.main__.util.SerializationConfig.Property;
+import me.main__.util.SerializationConfig.SerializationConfig;
+import me.main__.util.SerializationConfig.Serializor;
+import me.main__.util.SerializationConfig.Validator;
+import me.main__.util.SerializationConfig.VirtualProperty;
+import org.bukkit.ChatColor;
+import org.bukkit.Difficulty;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World.Environment;
+import org.bukkit.configuration.serialization.SerializableAs;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/*
+ * This is a property class, I think we don't need that much javadoc.
+ * BEGIN CHECKSTYLE-SUPPRESSION: Javadoc
+ */
+
+@SerializableAs("MVWorld")
+public class WorldProperties extends SerializationConfig {
+
+    private static final Map<String, String> PROPERTY_ALIASES;
+
+    static {
+        PROPERTY_ALIASES = new HashMap<String, String>();
+        PROPERTY_ALIASES.put("curr", "entryfee.currency");
+        PROPERTY_ALIASES.put("currency", "entryfee.currency");
+        PROPERTY_ALIASES.put("price", "entryfee.amount");
+        PROPERTY_ALIASES.put("scaling", "scale");
+        PROPERTY_ALIASES.put("aliascolor", "color");
+        PROPERTY_ALIASES.put("heal", "autoHeal");
+        PROPERTY_ALIASES.put("storm", "allowWeather");
+        PROPERTY_ALIASES.put("weather", "allowWeather");
+        PROPERTY_ALIASES.put("spawnmemory", "keepSpawnInMemory");
+        PROPERTY_ALIASES.put("memory", "keepSpawnInMemory");
+        PROPERTY_ALIASES.put("mode", "gameMode");
+        PROPERTY_ALIASES.put("diff", "difficulty");
+        PROPERTY_ALIASES.put("spawnlocation", "spawn");
+        PROPERTY_ALIASES.put("limit", "playerLimit");
+        PROPERTY_ALIASES.put("animals", "spawning.animals.spawn");
+        PROPERTY_ALIASES.put("monsters", "spawning.monsters.spawn");
+        PROPERTY_ALIASES.put("animalsrate", "spawning.animals.spawnrate");
+        PROPERTY_ALIASES.put("monstersrate", "spawning.monsters.spawnrate");
+        PROPERTY_ALIASES.put("flight", "allowFlight");
+        PROPERTY_ALIASES.put("fly", "allowFlight");
+        PROPERTY_ALIASES.put("allowfly", "allowFlight");
+    }
+
+    private final boolean keepSpawnFallback;
+
+    public WorldProperties(Map<String, Object> values) {
+        super(values);
+        Object keepSpawnObject = values.get("keepSpawnInMemory");
+        keepSpawnFallback = keepSpawnObject == null || Boolean.parseBoolean(keepSpawnObject.toString());
+    }
+
+    public WorldProperties() {
+        super();
+        keepSpawnFallback = true;
+    }
+
+    public WorldProperties(final boolean fixSpawn, final Environment environment) {
+        super();
+        if (!fixSpawn) {
+            this.adjustSpawn = false;
+        }
+        setScaling(getDefaultScale(environment));
+        keepSpawnFallback = true;
+    }
+
+    void setMVWorld(MVWorld world) {
+        registerObjectUsing(world);
+        registerGlobalValidator(new WorldPropertyValidator());
+    }
+
+    /**
+     * Serializor for the color-property.
+     */
+    private static final class EnumPropertySerializor<T extends Enum<T>> implements Serializor<T, String> {
+        @Override
+        public String serialize(T from) {
+            return from.toString();
+        }
+
+        @Override
+        public T deserialize(String serialized, Class<T> wanted) throws IllegalPropertyValueException {
+            try {
+                return Enum.valueOf(wanted, serialized.toUpperCase());
+            } catch (IllegalArgumentException e) {
+                throw new IllegalPropertyValueException(e);
+            }
+        }
+    }
+
+    /**
+     * Serializor for the difficulty-property.
+     */
+    private static final class DifficultyPropertySerializor implements Serializor<Difficulty, String> {
+        @Override
+        public String serialize(Difficulty from) {
+            return from.toString();
+        }
+
+        @Override
+        public Difficulty deserialize(String serialized, Class<Difficulty> wanted) throws IllegalPropertyValueException {
+            try {
+                return Difficulty.getByValue(Integer.parseInt(serialized));
+            } catch (Exception e) {
+            }
+            try {
+                return Difficulty.valueOf(serialized.toUpperCase());
+            } catch (Exception e) {
+            }
+            throw new IllegalPropertyValueException();
+        }
+    }
+
+    /**
+     * Serializor for the gameMode-property.
+     */
+    private static final class GameModePropertySerializor implements Serializor<GameMode, String> {
+        @Override
+        public String serialize(GameMode from) {
+            return from.toString();
+        }
+
+        @Override
+        public GameMode deserialize(String serialized, Class<GameMode> wanted) throws IllegalPropertyValueException {
+            try {
+                return GameMode.getByValue(Integer.parseInt(serialized));
+            } catch (NumberFormatException nfe) {
+            }
+            try {
+                return GameMode.valueOf(serialized.toUpperCase());
+            } catch (Exception e) {
+            }
+            throw new IllegalPropertyValueException();
+        }
+    }
+
+    /**
+     * Serializor for the time-property.
+     */
+    private static final class TimePropertySerializor implements Serializor<Long, String> {
+        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+        private static final String TIME_REGEX = "(\\d\\d?):?(\\d\\d)(a|p)?m?";
+        private static final  Map<String, String> TIME_ALIASES;
+        static {
+            Map<String, String> staticTimes = new HashMap<String, String>();
+            staticTimes.put("morning", "8:00");
+            staticTimes.put("day", "12:00");
+            staticTimes.put("noon", "12:00");
+            staticTimes.put("midnight", "0:00");
+            staticTimes.put("night", "20:00");
+
+            // now set TIME_ALIASES to a "frozen" map
+            TIME_ALIASES = Collections.unmodifiableMap(staticTimes);
+        }
+
+        @Override
+        public String serialize(Long from) {
+            // I'm tired, so they get time in 24 hour for now.
+            // Someone else can add 12 hr format if they want :P
+
+            int hours = (int) ((from / 1000 + 8) % 24);
+            int minutes = (int) (60 * (from % 1000) / 1000);
+
+            return String.format("%d:%02d", hours, minutes);
+        }
+
+        @Override
+        public Long deserialize(String serialized, Class<Long> wanted) throws IllegalPropertyValueException {
+            if (TIME_ALIASES.containsKey(serialized.toLowerCase())) {
+                serialized = TIME_ALIASES.get(serialized.toLowerCase());
+            }
+            // Regex that extracts a time in the following formats:
+            // 11:11pm, 11:11, 23:11, 1111, 1111p, and the aliases at the top of this file.
+            Pattern pattern = Pattern.compile(TIME_REGEX, Pattern.CASE_INSENSITIVE);
+            Matcher matcher = pattern.matcher(serialized);
+            matcher.find();
+            int hour = 0;
+            double minute = 0;
+            int count = matcher.groupCount();
+            if (count >= 2) {
+                hour = Integer.parseInt(matcher.group(1));
+                minute = Integer.parseInt(matcher.group(2));
+            }
+            // If there were 4 matches (all, hour, min, am/pm)
+            if (count == 4) {
+                // We want 24 hour time for calcs, but if they
+                // added a p[m], turn it into a 24 hr one.
+                if (matcher.group(3).equals("p")) {
+                    hour += 12;
+                }
+            }
+            // Translate 24th hour to 0th hour.
+            if (hour == 24) {
+                hour = 0;
+            }
+            // Clamp the hour
+            if (hour > 23 || hour < 0) {
+                throw new IllegalPropertyValueException("Illegal hour!");
+            }
+            // Clamp the minute
+            if (minute > 59 || minute < 0) {
+                throw new IllegalPropertyValueException("Illegal minute!");
+            }
+            // 60 seconds in a minute, time needs to be in hrs * 1000, per
+            // the bukkit docs.
+            double totaltime = (hour + (minute / 60.0)) * 1000;
+            // Somehow there's an 8 hour offset...
+            totaltime -= 8000;
+            if (totaltime < 0) {
+                totaltime = 24000 + totaltime;
+            }
+
+            return (long) totaltime;
+        }
+        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+    }
+
+    // --------------------------------------------------------------
+    // Begin properties
+    @Property(description = "Sorry, 'hidden' must either be: true or false.")
+    private volatile boolean hidden;
+    @Property(description = "Alias must be a valid string.")
+    private volatile String alias;
+    @Property(serializor = EnumPropertySerializor.class, description = "Sorry, 'color' must be a valid color-name.")
+    private volatile EnglishChatColor color;
+    @Property(serializor = EnumPropertySerializor.class, description = "Sorry, 'style' must be a valid style-name.")
+    private volatile EnglishChatStyle style;
+    @Property(description = "Sorry, 'pvp' must either be: true or false.", virtualType = Boolean.class, persistVirtual = true)
+    volatile VirtualProperty<Boolean> pvp; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property(description = "Scale must be a positive double value. ex: 2.3")
+    private volatile double scale;
+    @Property(description = "You must set this to the NAME not alias of a world.")
+    private volatile String respawnWorld;
+    @Property(description = "Sorry, this must either be: true or false.")
+    private volatile boolean allowWeather;
+    @Property(serializor = DifficultyPropertySerializor.class, virtualType = Difficulty.class, persistVirtual = true,
+            description = "Difficulty must be set as one of the following: peaceful easy normal hard")
+    volatile VirtualProperty<Difficulty> difficulty; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property(description = "Sorry, 'animals' must either be: true or false.")
+    private volatile SpawnSettings spawning;
+    @Property
+    volatile EntryFee entryfee;
+    @Property(description = "Sorry, 'hunger' must either be: true or false.")
+    private volatile boolean hunger;
+    @Property(description = "Sorry, 'autoheal' must either be: true or false.")
+    private volatile boolean autoHeal;
+    @Property(description = "Sorry, 'adjustspawn' must either be: true or false.")
+    private volatile boolean adjustSpawn;
+    @Property(serializor = EnumPropertySerializor.class, description = "Allow portal forming must be NONE, ALL, NETHER or END.")
+    private volatile AllowedPortalType portalForm;
+    @Property(serializor = GameModePropertySerializor.class, description = "GameMode must be set as one of the following: survival creative")
+    private volatile GameMode gameMode;
+    @Property(description = "Sorry, this must either be: true or false.", virtualType = Boolean.class, persistVirtual = true)
+    volatile VirtualProperty<Boolean> keepSpawnInMemory; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property
+    volatile SpawnLocation spawnLocation; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property(virtualType = Location.class,
+            description = "There is no help available for this variable. Go bug Rigby90 about it.")
+    volatile VirtualProperty<Location> spawn; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property(description = "Set this to false ONLY if you don't want this world to load itself on server restart.")
+    private volatile boolean autoLoad;
+    @Property(description = "If a player dies in this world, shoudld they go to their bed?")
+    private volatile boolean bedRespawn;
+    @Property
+    private volatile List<String> worldBlacklist;
+    @Property(serializor = TimePropertySerializor.class, virtualType = Long.class,
+            description = "Set the time to whatever you want! (Will NOT freeze time)")
+    volatile VirtualProperty<Long> time; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property
+    volatile Environment environment; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property
+    volatile long seed; // SUPPRESS CHECKSTYLE: VisibilityModifier
+    @Property
+    private volatile String generator;
+    @Property
+    private volatile int playerLimit;
+    @Property
+    private volatile boolean allowFlight;
+    // End of properties
+    // --------------------------------------------------------------
+
+    void setValidator(String fieldName, Validator validator) {
+        registerValidator(fieldName, validator);    //To change body of overridden methods use File | Settings | File Templates.
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void copyValues(SerializationConfig other) {
+        super.copyValues(other);
+    }
+
+    /**
+     * This prepares the MVWorld for unloading.
+     */
+    public void cacheVirtualProperties() {
+        try {
+            this.buildVPropChanges();
+        } catch (IllegalStateException e) {
+            // do nothing
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void setDefaults() {
+        this.hidden = false;
+        this.alias = new String();
+        this.color = EnglishChatColor.WHITE;
+        this.style = EnglishChatStyle.NORMAL;
+        this.scale = 1D;
+        this.respawnWorld = new String();
+        this.allowWeather = true;
+        this.spawning = new SpawnSettings();
+        this.entryfee = new EntryFee();
+        this.hunger = true;
+        this.autoHeal = true;
+        this.adjustSpawn = true;
+        this.portalForm = AllowedPortalType.ALL;
+        this.gameMode = GameMode.SURVIVAL;
+        this.spawnLocation = new NullLocation();
+        this.autoLoad = true;
+        this.bedRespawn = true;
+        this.worldBlacklist = new ArrayList<String>();
+        this.generator = null;
+        this.playerLimit = -1;
+        this.allowFlight = true;
+    }
+
+    private static double getDefaultScale(Environment environment) {
+        if (environment == Environment.NETHER) {
+            return 8.0; // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        } else if (environment == Environment.THE_END) {
+            return 16.0; // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        }
+        return 1.0;
+    }
+
+    /**
+     * getAliases().
+     * @return The alias-map.
+     * @see SerializationConfig
+     */
+    protected static Map<String, String> getAliases() {
+        return PROPERTY_ALIASES;
+    }
+
+    void flushChanges() {
+        this.flushPendingVPropChanges();
+    }
+
+    public String getAlias() {
+        return this.alias;
+    }
+
+    public void setAlias(String alias) {
+        this.setPropertyValueUnchecked("alias", alias);
+    }
+
+    public Environment getEnvironment() {
+        return this.environment;
+    }
+
+    public void setEnvironment(Environment environment) {
+        this.setPropertyValueUnchecked("environment", environment);
+    }
+
+    public long getSeed() {
+        return this.seed;
+    }
+
+    public void setSeed(long seed) {
+        this.setPropertyValueUnchecked("seed", seed);
+    }
+
+    public String getGenerator() {
+        return this.generator;
+    }
+
+    public void setGenerator(String generator) {
+        this.setPropertyValueUnchecked("generator", generator);
+    }
+
+    public int getPlayerLimit() {
+        return this.playerLimit;
+    }
+
+    public void setPlayerLimit(int limit) {
+        this.setPropertyValueUnchecked("playerLimit", limit);
+    }
+
+    public boolean canAnimalsSpawn() {
+        return this.spawning.getAnimalSettings().doSpawn();
+    }
+
+    public void setAllowAnimalSpawn(boolean animals) {
+        this.setPropertyValueUnchecked("spawning.animals.spawn", animals);
+    }
+
+    public List<String> getAnimalList() {
+        // These don't fire events at the moment. Should they?
+        return this.spawning.getAnimalSettings().getExceptions();
+    }
+
+    public boolean canMonstersSpawn() {
+        return this.spawning.getMonsterSettings().doSpawn();
+    }
+
+    public void setAllowMonsterSpawn(boolean monsters) {
+        this.setPropertyValueUnchecked("spawning.monsters.spawn", monsters);
+    }
+
+    public int getAnimalSpawnRate() {
+        return this.spawning.getAnimalSettings().getSpawnRate();
+    }
+
+    public int getMonsterSpawnRate() {
+        return this.spawning.getMonsterSettings().getSpawnRate();
+    }
+
+    public List<String> getMonsterList() {
+        // These don't fire events at the moment. Should they?
+        return this.spawning.getMonsterSettings().getExceptions();
+    }
+
+    public boolean isPVPEnabled() {
+        return this.pvp.get();
+    }
+
+    public void setPVPMode(boolean pvp) {
+        this.setPropertyValueUnchecked("pvp", pvp);
+    }
+
+    public boolean isHidden() {
+        return this.hidden;
+    }
+
+    public void setHidden(boolean hidden) {
+        this.setPropertyValueUnchecked("hidden", hidden);
+    }
+
+    public List<String> getWorldBlacklist() {
+        return this.worldBlacklist;
+    }
+
+    public double getScaling() {
+        return this.scale;
+    }
+
+    public boolean setScaling(double scaling) {
+        return this.setPropertyValueUnchecked("scale", scaling);
+    }
+
+    public boolean setColor(String aliasColor) {
+        return this.setPropertyUnchecked("color", aliasColor);
+    }
+
+    public boolean setColor(EnglishChatColor color) {
+        return this.setPropertyValueUnchecked("color", color);
+    }
+
+    public EnglishChatColor getColor() {
+        return this.color;
+    }
+
+    public String getRespawnToWorld() {
+        return this.respawnWorld;
+    }
+
+    public boolean setRespawnToWorld(String respawnToWorld) {
+        return this.setPropertyValueUnchecked("respawnWorld", respawnToWorld);
+    }
+
+    public Material getCurrency() {
+        return this.entryfee.getCurrency();
+    }
+
+    public void setCurrency(@Nullable Material currency) {
+        this.setPropertyValueUnchecked("entryfee.currency", currency);
+    }
+
+    public double getPrice() {
+        return this.entryfee.getAmount();
+    }
+
+    public void setPrice(double price) {
+        this.setPropertyValueUnchecked("entryfee.amount", price);
+    }
+
+    public boolean setGameMode(String mode) {
+        return this.setPropertyUnchecked("gameMode", mode);
+    }
+
+    public boolean setGameMode(GameMode mode) {
+        return this.setPropertyValueUnchecked("gameMode", mode);
+    }
+
+    public GameMode getGameMode() {
+        return this.gameMode;
+    }
+
+    public void setEnableWeather(boolean weather) {
+        this.setPropertyValueUnchecked("allowWeather", weather);
+    }
+
+    public boolean isWeatherEnabled() {
+        return this.allowWeather;
+    }
+
+    public boolean isKeepingSpawnInMemory() {
+        if (keepSpawnInMemory == null) {
+            return keepSpawnFallback;
+        }
+        try {
+            return this.keepSpawnInMemory.get();
+        } catch (IllegalStateException e) {
+            return keepSpawnFallback;
+        }
+    }
+
+    public void setKeepSpawnInMemory(boolean value) {
+        this.setPropertyValueUnchecked("keepSpawnInMemory", value);
+    }
+
+    public boolean getHunger() {
+        return this.hunger;
+    }
+
+    public void setHunger(boolean hunger) {
+        this.setPropertyValueUnchecked("hunger", hunger);
+    }
+
+    public Location getSpawnLocation() {
+        return this.spawn.get();
+    }
+
+    public void setSpawnLocation(Location l) {
+        this.setPropertyValueUnchecked("spawn", l);
+    }
+
+    public Difficulty getDifficulty() {
+        return this.difficulty.get();
+    }
+
+    @Deprecated // SUPPRESS CHECKSTYLE: Deprecated
+    public boolean setDifficulty(String difficulty) {
+        return this.setPropertyUnchecked("difficulty", difficulty);
+    }
+
+    public boolean setDifficulty(Difficulty difficulty) {
+        return this.setPropertyValueUnchecked("difficulty", difficulty);
+    }
+
+    public boolean getAutoHeal() {
+        return this.autoHeal;
+    }
+
+    public void setAutoHeal(boolean heal) {
+        this.setPropertyValueUnchecked("autoHeal", heal);
+    }
+
+    public void setAdjustSpawn(boolean adjust) {
+        this.setPropertyValueUnchecked("adjustSpawn", adjust);
+    }
+
+    public boolean getAdjustSpawn() {
+        return this.adjustSpawn;
+    }
+
+    public void setAutoLoad(boolean load) {
+        this.setPropertyValueUnchecked("autoLoad", load);
+    }
+
+    public boolean getAutoLoad() {
+        return this.autoLoad;
+    }
+
+    public void setBedRespawn(boolean respawn) {
+        this.setPropertyValueUnchecked("bedRespawn", respawn);
+    }
+
+    public boolean getBedRespawn() {
+        return this.bedRespawn;
+    }
+
+    public String getAllPropertyNames() {
+        ChatColor myColor = ChatColor.AQUA;
+        StringBuilder result = new StringBuilder();
+        Map<String, Object> serialized = this.serialize();
+        for (String key : serialized.keySet()) {
+            result.append(myColor).append(key).append(' ');
+            myColor = (myColor == ChatColor.AQUA) ? ChatColor.GOLD : ChatColor.AQUA;
+        }
+        return result.toString();
+    }
+
+    public String getTime() {
+        return this.getPropertyUnchecked("time");
+    }
+
+    public boolean setTime(String timeAsString) {
+        return this.setPropertyUnchecked("time", timeAsString);
+    }
+
+    public AllowedPortalType getAllowedPortals() {
+        return portalForm;
+    }
+
+    public void allowPortalMaking(AllowedPortalType portalType) {
+        this.setPropertyValueUnchecked("portalForm", portalType);
+    }
+
+    public EnglishChatStyle getStyle() {
+        return style;
+    }
+
+    public boolean setStyle(String style) {
+        return this.setPropertyUnchecked("style", style);
+    }
+
+    public boolean getAllowFlight() {
+        return this.allowFlight;
+    }
+
+    public void setAllowFlight(final boolean allowFlight) {
+        this.setPropertyValueUnchecked("allowFlight", allowFlight);
+    }
+}
@@ -0,0 +1,79 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Minecart;
+import org.bukkit.entity.Vehicle;
+
+/**
+ * Used to get block/location-related information.
+ */
+public interface BlockSafety {
+    /**
+     * This function checks whether the block at the given coordinates are above air or not.
+     * @param l The {@link Location} of the block.
+     * @return True if the block at that {@link Location} is above air.
+     */
+    boolean isBlockAboveAir(Location l);
+
+    /**
+     * Checks if a player can spawn safely at the given coordinates.
+     * @param world The {@link World}.
+     * @param x The x-coordinate.
+     * @param y The y-coordinate.
+     * @param z The z-coordinate.
+     * @return True if a player can spawn safely at the given coordinates.
+     */
+    boolean playerCanSpawnHereSafely(World world, double x, double y, double z);
+
+    /**
+     * This function checks whether the block at the coordinates given is safe or not by checking for Lava/Fire/Air
+     * etc. This also ensures there is enough space for a player to spawn!
+     *
+     * @param l The {@link Location}
+     * @return Whether the player can spawn safely at the given {@link Location}
+     */
+    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}.
+     * @return The {@link Location} of the top-block.
+     */
+    Location getTopBlock(Location l);
+
+    /**
+     * Gets the location of the top block at the specified {@link Location}.
+     * @param l Any {@link Location}.
+     * @return The {@link Location} of the top-block.
+     */
+    Location getBottomBlock(Location l);
+
+    /**
+     * Checks if an entity would be on track at the specified {@link Location}.
+     * @param l The {@link Location}.
+     * @return True if an entity would be on tracks at the specified {@link Location}.
+     */
+    boolean isEntitiyOnTrack(Location l);
+
+    /**
+     * Checks if the specified {@link Minecart} can spawn safely.
+     * @param cart The {@link Minecart}.
+     * @return True if the minecart can spawn safely.
+     */
+    boolean canSpawnCartSafely(Minecart cart);
+
+    /**
+     * Checks if the specified {@link Vehicle} can spawn safely.
+     * @param vehicle The {@link Vehicle}.
+     * @return True if the vehicle can spawn safely.
+     */
+    boolean canSpawnVehicleSafely(Vehicle vehicle);
+}
@@ -7,47 +7,57 @@

 package com.onarandombox.MultiverseCore.api;

-import com.fernferret.allpay.GenericBank;
+import buscript.Buscript;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
-import com.onarandombox.MultiverseCore.utils.*;
+import com.onarandombox.MultiverseCore.utils.AnchorManager;
+import com.onarandombox.MultiverseCore.utils.MVEconomist;
+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.pneumaticraft.commandhandler.CommandHandler;
-import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;

 /**
 * Multiverse 2 Core API
- * <p/>
+ * <p>
 * This API contains a bunch of useful things you can get out of Multiverse in general!
 */
 public interface Core {

    /**
-     * Gets the Multiverse config file.
+     * Returns the Vault handler used by Multiverse.  The returned object will have all methods necessary for
+     * interfacing with Vault.
     *
-     * @return The Multiverse config file.
+     * @return the Vault handler for Multiverse.
+     * @deprecated we are now using {@link #getEconomist()} for all economy needs.
     */
-    public FileConfiguration getMVConfiguration();
+    @Deprecated
+    VaultHandler getVaultHandler();

    /**
-     * Gets the Banking system that Multiverse-Core has hooked into.
+     * Retrieves Multiverse's friendly economist. The economist can be used for dealing with economies without
+     * worrying about any of the messy details.
     *
-     * @return A {@link GenericBank} that can be used for payments.
+     * @return the economy manager for Multiverse.
     */
-    public GenericBank getBank();
+    MVEconomist getEconomist();

    /**
     * Reloads the Multiverse Configuration files:
     * worlds.yml and config.yml.
     */
-    public void loadConfigs();
+    void loadConfigs();

    /**
     * Gets the Multiverse message system. This allows you to send messages
     * to users at specified intervals.
     *
-     * @return The loaded {@link MVMessaging}.
+     * @return The loaded {@link MultiverseMessaging}.
     */
-    public MVMessaging getMessaging();
+    MultiverseMessaging getMessaging();

    /**
     * Gets the {@link MVPlayerSession} for the given player.
@@ -58,15 +68,7 @@ public interface Core {
     *
     * @return The corresponding {@link MVPlayerSession}.
     */
-    public MVPlayerSession getPlayerSession(Player player);
-
-    /**
-     * Gets the instantiated Safe-T-Teleporter for performing
-     * safe teleports.
-     *
-     * @return A non-null {@link SafeTTeleporter}.
-     */
-    public SafeTTeleporter getTeleporter();
+    MVPlayerSession getPlayerSession(Player player);

    /**
     * Multiverse uses an advanced permissions setup, this object
@@ -74,7 +76,7 @@ public interface Core {
     *
     * @return A non-null {@link MVPermissions}.
     */
-    public MVPermissions getMVPerms();
+    MVPermissions getMVPerms();

    /**
     * Multiverse uses {@link CommandHandler} to make adding and using commands
@@ -82,7 +84,7 @@ public interface Core {
     *
     * @return A non-null {@link CommandHandler}.
     */
-    public CommandHandler getCommandHandler();
+    CommandHandler getCommandHandler();

    /**
     * Gets the factory class responsible for loading many different destinations
@@ -90,12 +92,126 @@ public interface Core {
     *
     * @return A valid {@link DestinationFactory}.
     */
-    public DestinationFactory getDestFactory();
+    DestinationFactory getDestFactory();

    /**
     * Gets the primary class responsible for managing Multiverse Worlds.
     *
-     * @return {@link WorldManager}.
+     * @return {@link MVWorldManager}.
     */
-    public WorldManager getMVWorldManager();
+    MVWorldManager getMVWorldManager();
+
+    /**
+     * Saves all configs.
+     *
+     * @return Whether the config was successfully saved
+     */
+    boolean saveMVConfigs();
+
+    /**
+     * Gets the {@link AnchorManager}.
+     *
+     * @return The {@link AnchorManager}
+     */
+    AnchorManager getAnchorManager();
+
+    /**
+     * Used by queued commands to regenerate a world on a delay.
+     *
+     * @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.
+     *
+     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String)} instead.
+     */
+    @Deprecated
+    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed);
+
+    /**
+     * Decrements the number of plugins that have specifically hooked into core.
+     */
+    void decrementPluginCount();
+
+    /**
+     * Increments the number of plugins that have specifically hooked into core.
+     */
+    void incrementPluginCount();
+
+    /**
+     * Returns the number of plugins that have specifically hooked into core.
+     *
+     * @return The number if plugins that have hooked into core.
+     */
+    int getPluginCount();
+
+    /**
+     * Parse the Authors Array into a readable String with ',' and 'and'.
+     *
+     * @return The readable authors-{@link String}
+     */
+    String getAuthors();
+
+    /**
+     * Gets the {@link BlockSafety} this {@link Core} is using.
+     * @return The {@link BlockSafety} this {@link Core} is using.
+     * @see BlockSafety
+     * @see SimpleBlockSafety
+     */
+    BlockSafety getBlockSafety();
+
+    /**
+     * Sets the {@link BlockSafety} this {@link Core} is using.
+     * @param blockSafety The new {@link BlockSafety}.
+     * @see BlockSafety
+     * @see SimpleBlockSafety
+     */
+    void setBlockSafety(BlockSafety blockSafety);
+
+    /**
+     * Gets the {@link LocationManipulation} this {@link Core} is using.
+     * @return The {@link LocationManipulation} this {@link Core} is using.
+     * @see LocationManipulation
+     * @see SimpleLocationManipulation
+     */
+    LocationManipulation getLocationManipulation();
+
+    /**
+     * Sets the {@link LocationManipulation} this {@link Core} is using.
+     * @param locationManipulation The new {@link LocationManipulation}.
+     * @see LocationManipulation
+     * @see SimpleLocationManipulation
+     */
+    void setLocationManipulation(LocationManipulation locationManipulation);
+
+    /**
+     * Gets the {@link SafeTTeleporter} this {@link Core} is using.
+     * @return The {@link SafeTTeleporter} this {@link Core} is using.
+     * @see SafeTTeleporter
+     * @see SimpleSafeTTeleporter
+     */
+    SafeTTeleporter getSafeTTeleporter();
+
+    /**
+     * Sets the {@link SafeTTeleporter} this {@link Core} is using.
+     * @param safeTTeleporter The new {@link SafeTTeleporter}.
+     * @see SafeTTeleporter
+     * @see SimpleSafeTTeleporter
+     */
+    void setSafeTTeleporter(SafeTTeleporter safeTTeleporter);
+
+    /**
+     * Gets the {@link MultiverseCoreConfig}.
+     * @return The configuration.
+     */
+    MultiverseCoreConfig getMVConfig();
+
+    /**
+     * Gets the buscript object for Multiverse.  This is what handles Javascript processing.
+     *
+     * @return The Multiverse buscript object.
+     */
+    Buscript getScriptAPI();
 }
@@ -7,11 +7,14 @@

 package com.onarandombox.MultiverseCore.api;

+/**
+ * A fancy text.
+ */
 public interface FancyText {
    /**
-     * TODO: Write something useful here.
+     * Gets the {@link String}-representation of this {@link FancyText}.
     *
-     * @return And Here.
+     * @return The {@link String}-representation of this {@link FancyText}.
     */
-    public String getFancyText();
+    String getFancyText();
 }
@@ -0,0 +1,99 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Vehicle;
+import org.bukkit.util.Vector;
+
+/**
+ * Used to manipulate locations.
+ */
+public interface LocationManipulation {
+    /**
+     * Convert a Location into a Colon separated string to allow us to store it in text.
+     * <p>
+     * WORLD:X,Y,Z:yaw:pitch
+     * <p>
+     * The corresponding String2Loc function is {@link #stringToLocation}
+     *
+     * @param location The Location to save.
+     * @return The location as a string in this format: WORLD:x,y,z:yaw:pitch
+     */
+    String locationToString(Location location);
+
+    /**
+     * This method simply does some rounding, rather than forcing a call to the server to get the blockdata.
+     *
+     * @param l The location to round to the block location
+     * @return A rounded location.
+     */
+    Location getBlockLocation(Location l);
+
+    /**
+     * Returns a new location from a given string. The format is as follows:
+     * <p>
+     * WORLD:X,Y,Z:yaw:pitch
+     * <p>
+     * The corresponding Location2String function is {@link #stringToLocation}
+     *
+     * @param locationString The location represented as a string (WORLD:X,Y,Z:yaw:pitch)
+     * @return A new location defined by the string or null if the string was invalid.
+     */
+    Location stringToLocation(String locationString);
+
+    /**
+     * Returns a colored string with the coords.
+     *
+     * @param l The {@link Location}
+     * @return The {@link String}
+     */
+    String strCoords(Location l);
+
+    /**
+     * Converts a location to a printable readable formatted string including pitch/yaw.
+     *
+     * @param l The {@link Location}
+     * @return The {@link String}
+     */
+    String strCoordsRaw(Location l);
+
+    /**
+     * Return the NESW Direction a Location is facing.
+     *
+     * @param location The {@link Location}
+     * @return The NESW Direction
+     */
+    String getDirection(Location location);
+
+    /**
+     * Returns the float yaw position for the given cardinal direction.
+     *
+     * @param orientation The cardinal direction
+     * @return The yaw
+     */
+    float getYaw(String orientation);
+
+    /**
+     * Returns a speed float from a given vector.
+     *
+     * @param v The {@link Vector}
+     * @return The speed
+     */
+    float getSpeed(Vector v);
+
+    /**
+     * Returns a translated vector from the given direction.
+     *
+     * @param v The old {@link Vector}
+     * @param direction The new direction
+     * @return The translated {@link Vector}
+     */
+    Vector getTranslatedVector(Vector v, String direction);
+
+    /**
+     * Returns the next Location that a {@link Vehicle} is traveling at.
+     *
+     * @param v The {@link Vehicle}
+     * @return The {@link Location}
+     */
+    Location getNextBlock(Vehicle v);
+}
@@ -16,15 +16,15 @@ public interface LoggablePlugin {
    /**
     * Logs a message at the specified level.
     *
-     * @param level The severity of the log.
+     * @param level The Log-{@link Level}.
     * @param msg   The message to log.
     */
-    public void log(Level level, String msg);
+    void log(Level level, String msg);

    /**
     * Gets the server instance that this plugin is attached to.
     *
     * @return A {@link Server} instance.
     */
-    public Server getServer();
+    Server getServer();
 }
@@ -15,24 +15,22 @@ import org.bukkit.util.Vector;
 /**
 * A destination API for Multiverse
 * Any plugin can add these to MV and when they are, any action that uses them (portals, MVTP, etc.) can use them!
- *
- * @author fernferret
 */
 public interface MVDestination {
    /**
     * Returns the identifier or prefix that is required for this destination.
-     * <p/>
+     * <p>
     * Portals have a prefix of "p" for example and OpenWarp (third party plugin) uses "ow". This is derived from a
     * hash and cannot have duplicate values. Read that as your plugin cannot use 'p' because it's already used.
     * Please check the wiki when adding a custom destination!
     *
     * @return The identifier or prefix that is required for this destination.
     */
-    public String getIdentifier();
+    String getIdentifier();

    /**
     * Allows you to determine if a Destination is valid for the type it thinks it is.
-     * <p/>
+     * <p>
     * An example of this would be the exact destination. A valid string would be: e:0,0,0 where an invalid one would
     * be e:1:2:3. The first string would return true the second would return false. This is simply a convenience
     * method
@@ -44,35 +42,35 @@ public interface MVDestination {
     *
     * @return True if the destination is valid, false if not.
     */
-    public boolean isThisType(JavaPlugin plugin, String destination);
+    boolean isThisType(JavaPlugin plugin, String destination);

    /**
-     * Returns the location a specific entity will spawn at.
-     * <p/>
+     * Returns the location a specific entity will spawn at when being teleported to this Destination.
+     * <p>
     * To just retrieve the location as it is stored you can just pass null, but be warned some destinations may return
     * null back to you if you do this. It is always safer to pass an actual entity. This is used so things like
     * minecarts can be teleported.
-     * <p/>
+     * <p>
     * Do not forget to use {@link #getVelocity()} as destinations can use this too!
     *
     * @param entity The entity to be teleported.
     *
     * @return The location of the entity.
     */
-    public Location getLocation(Entity entity);
+    Location getLocation(Entity entity);

    /**
     * Returns the velocity vector for this destination.
-     * <p/>
+     * <p>
     * Plugins wishing to fully support MVDestinations MUST implement this.
     *
     * @return A vector representing the speed/direction the player should travel when arriving
     */
-    public Vector getVelocity();
+    Vector getVelocity();

    /**
     * Sets the destination string.
-     * <p/>
+     * <p>
     * This should be used when you want to tell this destination object about a change in where it should take people.
     * The destination param should be match the result from {@link #getIdentifier()}. A valid example would be that if
     * {@link #getIdentifier()} returned "ow" our destination string could be "ow:TownCenter" but could not be
@@ -81,63 +79,63 @@ public interface MVDestination {
     * @param plugin      The plugin who the type belongs to.
     * @param destination The destination string. ex: p:MyPortal:nw
     */
-    public void setDestination(JavaPlugin plugin, String destination);
+    void setDestination(JavaPlugin plugin, String destination);

    /**
     * Returns true if the destination is valid and players will be taken to it.
-     * <p/>
+     * <p>
     * Even if destinations are in the correct format (p:MyPortal) MyPortal may not exist, and therefore this would
     * return false.
     *
     * @return True if the destination is valid; false if not.
     */
-    public boolean isValid();
+    boolean isValid();

    /**
     * Gives you a general friendly description of the type of destination.
-     * <p/>
+     * <p>
     * For example, the PlayerDestination sets this to "Player". You can use this to show where a player will be taken.
     *
     * @return A friendly string description of the type of destination.
     */
-    public String getType();
+    String getType();

    /**
     * Gives you a specific name of the destination.
-     * <p/>
+     * <p>
     * For example, the PlayerDestination sets this to The Player's Name.
     *
     * @return A friendly string stating the name of the destination.
     */
-    public String getName();
+    String getName();

    /**
     * Returns a string that can easily be saved in the config that contains all the details needed to rebuild this
     * destination.
-     * <p/>
+     * <p>
     * ex: e:0,0,0:50:50
     *
     * @return The savable config string.
     */
-    public String toString();
+    String toString();

    /**
     * Returns the permissions string required to go here.
-     * <p/>
+     * <p>
     * ex: multiverse.access.world
-     * <p/>
+     * <p>
     * NOTE: This is NOT the permission to use the teleport command.
     *
     * @return the permissions string required to go here.
     */
-    public String getRequiredPermission();
+    String getRequiredPermission();

    /**
     * Should the Multiverse SafeTeleporter be used?
-     * <p/>
+     * <p>
     * If not, MV will blindly take people to the location specified.
     *
     * @return True if the SafeTeleporter will be used, false if not.
     */
-    public boolean useSafeTeleporter();
+    boolean useSafeTeleporter();
 }
@@ -8,7 +8,11 @@
 package com.onarandombox.MultiverseCore.api;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.event.MVVersionEvent;

+/**
+ * This interface is implemented by every official Multiverse-plugin.
+ */
 public interface MVPlugin extends LoggablePlugin {
    /**
     * Adds This plugin's version information to the buffer and returns the new string.
@@ -16,22 +20,26 @@ public interface MVPlugin extends LoggablePlugin {
     * @param buffer The string that contains Core and all other MV plugins' versions.
     *
     * @return A modified buffer that contains this MVPlugin's version information.
+     *
+     * @deprecated This is now deprecated, nobody needs it any longer.
+     * All version info-dumping is now done with {@link MVVersionEvent}.
     */
-    public String dumpVersionInfo(String buffer);
+    @Deprecated
+    String dumpVersionInfo(String buffer);

    /**
     * Gets the reference to MultiverseCore.
     *
-     * @return A valid {@link MultiverseCore}.
+     * @return A valid {@link com.onarandombox.MultiverseCore}.
     */
-    public MultiverseCore getCore();
+    MultiverseCore getCore();

    /**
     * Sets the reference to MultiverseCore.
     *
-     * @param core A valid {@link MultiverseCore}.
+     * @param core A valid {@link com.onarandombox.MultiverseCore}.
     */
-    public void setCore(MultiverseCore core);
+    void setCore(MultiverseCore core);

    /**
     * Allows Multiverse or a plugin to query another Multiverse plugin to see what version its protocol is. This
@@ -40,5 +48,5 @@ public interface MVPlugin extends LoggablePlugin {
     *
     * @return The Integer protocol version.
     */
-    public int getProtocolVersion();
+    int getProtocolVersion();
 }
@@ -8,15 +8,20 @@
 package com.onarandombox.MultiverseCore.api;

 import com.onarandombox.MultiverseCore.utils.PurgeWorlds;
+import com.onarandombox.MultiverseCore.utils.SimpleWorldPurger;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
+import org.bukkit.WorldType;
+import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.generator.ChunkGenerator;

+import java.io.File;
 import java.util.Collection;
+import java.util.List;

 /**
 * Multiverse 2 World Manager API
- * <p/>
+ * <p>
 * This API contains all of the world managing
 * functions that your heart desires!
 */
@@ -24,52 +29,123 @@ public interface MVWorldManager {
    /**
     * Add a new World to the Multiverse Setup.
     *
-     * @param name       World Name
-     * @param env        Environment Type
-     * @param seedString The seed in the form of a string.
-     *                   If the seed is a Long,
-     *                   it will be interpreted as such.
-     * @param generator  The Custom generator plugin to use.
-     *
+     * @param name               World Name
+     * @param env                Environment Type
+     * @param seedString         The seed in the form of a string.
+     *                             If the seed is a Long,
+     *                             it will be interpreted as such.
+     * @param type               The Type of the world to be made.
+     * @param generateStructures If true, this world will get NPC villages.
+     * @param generator          The Custom generator plugin to use.
     * @return True if the world is added, false if not.
     */
-    public boolean addWorld(String name, Environment env, String seedString, String generator);
+    boolean addWorld(String name, Environment env, String seedString, WorldType type, Boolean generateStructures,
+                     String generator);
+
+    /**
+     * Add a new World to the Multiverse Setup.
+     *
+     * @param name               World Name
+     * @param env                Environment Type
+     * @param seedString         The seed in the form of a string.
+     *                             If the seed is a Long,
+     *                             it will be interpreted as such.
+     * @param type               The Type of the world to be made.
+     * @param generateStructures If true, this world will get NPC villages.
+     * @param generator          The Custom generator plugin to use.
+     * @param useSpawnAdjust If true, multiverse will search for a safe spawn. If not, It will not modify the level.dat.
+     * @return True if the world is added, false if not.
+     */
+    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. Ignored.
+     * @return True if the world is copied successfully, false if not.
+     * @deprecated Use {@link #cloneWorld(String, String)} instead.
+     */
+    @Deprecated
+    boolean cloneWorld(String oldName, String newName, String generator);
+
+    /**
+     * Make a copy of a world.
+     *
+     * @param oldName
+     *            Name of world to be copied
+     * @param newName
+     *            Name of world to be created
+     * @return True if the world is copied successfully, false if not.
+     */
+    boolean cloneWorld(String oldName, String newName);
+
+    /**
+     * Remove the world from the Multiverse list, from the config and deletes
+     * the folder.
+     *
+     * @param name
+     *            The name of the world to remove
+     * @return True if success, false if failure.
+     */
+    boolean deleteWorld(String name);

    /**
     * Remove the world from the Multiverse list, from the
-     * config and deletes the folder
-     *
-     * @param name The name of the world to remove
+     * config if wanted, and deletes the folder.
     *
+     * @param name         The name of the world to remove
+     * @param removeConfig If true(default), we'll remove the entries from the
+     *                     config. If false, they'll stay and the world may come back.
     * @return True if success, false if failure.
     */
-    public Boolean deleteWorld(String name);
+    boolean deleteWorld(String name, boolean removeConfig);

    /**
-     * Unload a world from Multiverse
+     *
+     * @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.
     *
     * @param name Name of the world to unload
-     *
     * @return True if the world was unloaded, false if not.
     */
-    public boolean unloadWorld(String name);
+    boolean unloadWorld(String name);
+
+    /**
+     * Unload a world from Multiverse with option to prevent calling unloadWorld in Bukkit.
+     *
+     * @param name Name of the world to unload
+     * @param unloadBukkit True if Bukkit world should be unloaded
+     * @return True if the world was unloaded, false if not.
+     */
+    boolean unloadWorld(String name, boolean unloadBukkit);

    /**
     * Loads the world. Only use this if the world has been
     * unloaded with {@link #unloadWorld(String)}.
     *
     * @param name The name of the world to load
-     *
     * @return True if success, false if failure.
     */
-    public boolean loadWorld(String name);
+    boolean loadWorld(String name);

    /**
     * Removes all players from the specified world.
     *
     * @param name World to remove players from.
     */
-    public void removePlayersFromWorld(String name);
+    void removePlayersFromWorld(String name);

    /**
     * Test if a given chunk generator is valid.
@@ -77,17 +153,16 @@ public interface MVWorldManager {
     * @param generator   The generator name.
     * @param generatorID The generator id.
     * @param worldName   The worldName to use as the default.
-     *
     * @return A {@link ChunkGenerator} or null
     */
-    public ChunkGenerator getChunkGenerator(String generator, String generatorID, String worldName);
+    ChunkGenerator getChunkGenerator(String generator, String generatorID, String worldName);

    /**
     * Returns a list of all the worlds Multiverse knows about.
     *
     * @return A list of {@link MultiverseWorld}.
     */
-    public Collection<MultiverseWorld> getMVWorlds();
+    Collection<MultiverseWorld> getMVWorlds();


    /**
@@ -95,50 +170,148 @@ public interface MVWorldManager {
     * This will search name AND alias.
     *
     * @param name The name or alias of the world to get.
-     *
     * @return A {@link MultiverseWorld} or null.
     */
-    public MultiverseWorld getMVWorld(String name);
+    MultiverseWorld getMVWorld(String name);

    /**
     * Returns a {@link MultiverseWorld} if it exists, and null if it does not.
     *
     * @param world The Bukkit world to check.
-     *
     * @return A {@link MultiverseWorld} or null.
     */
-    public MultiverseWorld getMVWorld(World world);
+    MultiverseWorld getMVWorld(World world);

    /**
-     * Checks to see if the given name is a valid {@link MultiverseWorld}
+     * Checks to see if the given name is a valid {@link MultiverseWorld}.
     *
     * @param name The name or alias of the world to check.
-     *
     * @return True if the world exists, false if not.
     */
-    public boolean isMVWorld(String name);
+    boolean isMVWorld(String name);

    /**
-     * Checks to see if the given world is a valid {@link MultiverseWorld}
+     * Checks to see if the given world is a valid {@link MultiverseWorld}.
     *
     * @param world The Bukkit world to check.
-     *
     * @return True if the world has been loaded into MV2, false if not.
     */
-    public boolean isMVWorld(World world);
+    boolean isMVWorld(World world);

    /**
-     * Load the Worlds & Settings from the configuration file.
+     * Load the Worlds &amp; Settings from the configuration file.
     *
     * @param forceLoad If set to true, this will perform a total
     *                  reset and not just load new worlds.
     */
-    public void loadWorlds(boolean forceLoad);
+    void loadWorlds(boolean forceLoad);
+
+    /**
+     * Loads the Worlds &amp; Settings for any worlds that bukkit loaded before us.
+     * <p>
+     * This way people will _always_ have some worlds in the list.
+     */
+    void loadDefaultWorlds();

    /**
     * Return the World Purger.
     *
     * @return A valid {@link PurgeWorlds}.
+     * @deprecated {@link PurgeWorlds} is deprecated!
     */
-    public PurgeWorlds getWorldPurger();
+    @Deprecated
+    PurgeWorlds getWorldPurger();
+
+    /**
+     * Gets the {@link WorldPurger}.
+     * <p>
+     * TODO: Remove {@link #getWorldPurger()} and replace it with this method.
+     * @return The {@link WorldPurger} this {@link MVWorldManager} is using.
+     * @see WorldPurger
+     * @see SimpleWorldPurger
+     */
+    WorldPurger getTheWorldPurger();
+
+    /**
+     * Gets the world players will spawn in on first join.
+     * Currently this always returns worlds.get(0) from Bukkit.
+     *
+     * @return A Multiverse world that players will spawn in or null if no MV world has been set.
+     */
+    MultiverseWorld getSpawnWorld();
+
+    /**
+     * Gets the list of worlds in the config, but unloaded.
+     *
+     * @return A List of worlds as strings.
+     */
+    List<String> getUnloadedWorlds();
+
+    /**
+     * This method populates an internal list and needs to be called after multiverse initialization.
+     */
+    void getDefaultWorldGenerators();
+
+    /**
+     * Load the config from a file.
+     *
+     * @param file The file to load.
+     * @return A loaded configuration.
+     */
+    FileConfiguration loadWorldConfig(File file);
+
+    /**
+     * Saves the world config to disk.
+     *
+     * @return True if success, false if fail.
+     */
+    boolean saveWorldsConfig();
+
+    /**
+     * Remove the world from the Multiverse list and from the config.
+     *
+     * @param name The name of the world to remove
+     * @return True if success, false if failure.
+     */
+    boolean removeWorldFromConfig(String name);
+
+    /**
+     * Sets the initial spawn world for new players.
+     *
+     * @param world The World new players should spawn in.
+     */
+    void setFirstSpawnWorld(String world);
+
+    /**
+     * Gets the world players should spawn in first.
+     *
+     * @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);
+
+    boolean isKeepingSpawnInMemory(World world);
+    
+    /**
+     * Checks whether Multiverse knows about a provided unloaded world. This
+     * method will check the parameter against the alias mappings.
+     *
+     * @param name The name of the unloaded world
+     * @param includeLoaded The value to return if the world is loaded
+     *
+     * @return True if the world exists and is unloaded. False if the world
+     * does not exist. {@code includeLoaded} if the world exists and is loaded.
+     */
+    boolean hasUnloadedWorld(String name, boolean includeLoaded);
 }
@@ -0,0 +1,216 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
+
+/**
+ * The configuration of MultiverseCore.
+ */
+public interface MultiverseCoreConfig extends ConfigurationSerializable {
+    /**
+     * Sets a property using a {@link String}.
+     * @param property The name of the property.
+     * @param value The value.
+     * @return True on success, false if the operation failed.
+     */
+    boolean setConfigProperty(String property, String value);
+
+    /**
+     * Sets portalCooldown.
+     * @param portalCooldown The new value.
+     */
+    void setTeleportCooldown(int portalCooldown);
+
+    /**
+     * Gets portalCooldown.
+     * @return portalCooldown.
+     */
+    int getTeleportCooldown();
+
+    /**
+     * Sets firstSpawnWorld.
+     * @param firstSpawnWorld The new value.
+     */
+    void setFirstSpawnWorld(String firstSpawnWorld);
+
+    /**
+     * Gets firstSpawnWorld.
+     * @return firstSpawnWorld.
+     */
+    String getFirstSpawnWorld();
+
+    /**
+     * Sets version.
+     * @param version The new value.
+     */
+    void setVersion(int version);
+
+    /**
+     * Gets version.
+     * @return version.
+     */
+    double getVersion();
+
+    /**
+     * Sets messageCooldown.
+     * @param messageCooldown The new value.
+     */
+    void setMessageCooldown(int messageCooldown);
+
+    /**
+     * Gets messageCooldown.
+     * @return messageCooldown.
+     */
+    int getMessageCooldown();
+
+    /**
+     * Sets globalDebug.
+     * @param globalDebug The new value.
+     */
+    void setGlobalDebug(int globalDebug);
+
+    /**
+     * Gets globalDebug.
+     * @return globalDebug.
+     */
+    int getGlobalDebug();
+
+    /**
+     * Sets displayPermErrors.
+     * @param displayPermErrors The new value.
+     */
+    void setDisplayPermErrors(boolean displayPermErrors);
+
+    /**
+     * Gets displayPermErrors.
+     * @return displayPermErrors.
+     */
+    boolean getDisplayPermErrors();
+
+    /**
+     * Sets firstSpawnOverride.
+     * @param firstSpawnOverride The new value.
+     */
+    void setFirstSpawnOverride(boolean firstSpawnOverride);
+
+    /**
+     * Gets firstSpawnOverride.
+     * @return firstSpawnOverride.
+     */
+    boolean getFirstSpawnOverride();
+
+    /**
+     * Sets teleportIntercept.
+     * @param teleportIntercept The new value.
+     */
+    void setTeleportIntercept(boolean teleportIntercept);
+
+    /**
+     * Gets teleportIntercept.
+     * @return teleportIntercept.
+     */
+    boolean getTeleportIntercept();
+
+    /**
+     * Sets prefixChat.
+     * @param prefixChat The new value.
+     */
+    void setPrefixChat(boolean prefixChat);
+
+    /**
+     * Gets prefixChat.
+     * @return prefixChat.
+     */
+    boolean getPrefixChat();
+    
+    /**
+     * Sets prefixChatFormat.
+     * @param prefixChatFormat The new value.
+     */
+    void setPrefixChatFormat(String prefixChatFormat);
+
+    /**
+     * Gets prefixChatFormat.
+     * @return prefixChatFormat.
+     */
+    String getPrefixChatFormat();
+
+    /**
+     * Sets enforceAccess.
+     * @param enforceAccess The new value.
+     */
+    void setEnforceAccess(boolean enforceAccess);
+
+    /**
+     * Gets enforceAccess.
+     * @return enforceAccess.
+     */
+    boolean getEnforceAccess();
+
+    /**
+     * Sets useasyncchat.
+     * @param useAsyncChat The new value.
+     */
+    void setUseAsyncChat(boolean useAsyncChat);
+
+    /**
+     * Gets useasyncchat.
+     * @return useasyncchat.
+     */
+    boolean getUseAsyncChat();
+
+    /**
+     * 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();
+
+    /**
+     * Sets whether or not to let Bukkit determine portal search radius on its own or if Multiverse should give input.
+     *
+     * @param useDefaultPortalSearch True to let Bukkit determine portal search radius on its own.
+     */
+    void setUseDefaultPortalSearch(boolean useDefaultPortalSearch);
+
+    /**
+     * Gets whether or not Bukkit will be determining portal search radius on its own or if Multiverse should help.
+     *
+     * @return True means Bukkit will use its own default values.
+     */
+    boolean isUsingDefaultPortalSearch();
+
+    /**
+     * Sets the radius at which vanilla style portals will be searched for to connect to worlds together.
+     *
+     * @param searchRadius The portal search radius.
+     */
+    void setPortalSearchRadius(int searchRadius);
+
+    /**
+     * Gets the radius at which vanilla style portals will be searched for to connect to worlds together.
+     *
+     * @return The portal search radius.
+     */
+    int getPortalSearchRadius();
+
+    /**
+     * Gets whether or not the automatic purge of entities is enabled.
+     *
+     * @return True if automatic purge is enabled.
+     */
+    boolean isAutoPurgeEnabled();
+
+    /**
+     * Sets whether or not the automatic purge of entities is enabled.
+     *
+     * @param autopurge True if automatic purge should be enabled.
+     */
+    void setAutoPurgeEnabled(boolean autopurge);
+}
@@ -0,0 +1,56 @@
+package com.onarandombox.MultiverseCore.api;
+
+import java.util.Collection;
+
+import org.bukkit.command.CommandSender;
+
+/**
+ * Multiverse-messaging.
+ */
+public interface MultiverseMessaging {
+    /**
+     * Sets the message-cooldown.
+     * @param milliseconds The new message-cooldown in milliseconds.
+     */
+    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 ignoreCooldown If true this message will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
+    boolean sendMessage(CommandSender sender, String message, boolean ignoreCooldown);
+
+    /**
+     * Sends a group of messages to the specified sender if the cooldown has passed.
+     * This method is needed, since sending many messages in quick succession would violate
+     * the cooldown.
+     *
+     * @param sender         The person/console to send the message to.
+     * @param messages       The messages to send.
+     * @param ignoreCooldown If true these messages will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
+    boolean sendMessages(CommandSender sender, String[] messages, boolean ignoreCooldown);
+
+    /**
+     * Sends a group of messages to the specified sender if the cooldown has passed.
+     * This method is needed, since sending many messages in quick succession would violate
+     * the cooldown.
+     *
+     * @param sender         The person/console to send the message to.
+     * @param messages       The messages to send.
+     * @param ignoreCooldown If true these messages will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
+    boolean sendMessages(CommandSender sender, Collection<String> messages, boolean ignoreCooldown);
+
+    /**
+     * Gets the message-cooldown.
+     * @return The message-cooldown.
+     */
+    int getCooldown();
+}
@@ -0,0 +1,161 @@
+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.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()) {
+            sender.sendMessage("This plugin is 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;
+    }
+}
@@ -7,53 +7,164 @@

 package com.onarandombox.MultiverseCore.api;

-import org.bukkit.*;
+import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
+import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
+import org.bukkit.ChatColor;
+import org.bukkit.Difficulty;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.WorldType;
+import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
+import org.jetbrains.annotations.Nullable;

 import java.util.List;

 /**
 * The API for a Multiverse Handled World.
- * <p/>
- * Currently INCOMPLETE
 */
 public interface MultiverseWorld {
-
    /**
     * Returns the Bukkit world object that this world describes.
     *
     * @return A {@link World}
     */
-    public World getCBWorld();
+    World getCBWorld();

    /**
-     * Adds the property to the given value. The property must be a {@link com.onarandombox.MultiverseCore.enums.SetProperties}.
+     * 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.
     *
-     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.SetProperties} to set.
+     * @return The name of the world as a String.
+     */
+    String getName();
+
+    /**
+     * 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.
+     *
+     * @return The Type of this world.
+     */
+    WorldType getWorldType();
+
+    /**
+     * Gets the environment of this world.
+     *
+     * @return A {@link org.bukkit.World.Environment}.
+     */
+    World.Environment getEnvironment();
+
+    /**
+     * Sets the environment of a world.
+     * <p>
+     * Note: This will ONLY take effect once the world is unloaded/reloaded.
+     *
+     * @param environment A {@link org.bukkit.World.Environment}.
+     */
+    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();
+
+    /**
+     * Sets the seed of this world.
+     *
+     * @param seed A Long that is the seed.
+     */
+    void setSeed(long seed);
+
+    /**
+     * Gets the generator of this world.
+     *
+     * @return The name of the generator.
+     */
+    String getGenerator();
+
+    /**
+     * 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.
     */
-    public boolean setVariable(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.
-     */
-    public boolean clearVariable(String property);
+    boolean setPropertyValue(String property, String value) 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.
     */
-    public boolean addToVariable(String property, String value);
+    @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}.
@@ -61,335 +172,132 @@ public interface MultiverseWorld {
     * @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.
     */
-    public boolean removeFromVariable(String property, String value);
+    @Deprecated
+    boolean removeFromVariable(String property, String value);

    /**
-     * Gets the environment of this world.
+     * Removes all values from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
     *
-     * @return A {@link org.bukkit.World.Environment}.
+     * @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.
     */
-    public World.Environment getEnvironment();
+    @Deprecated
+    boolean clearVariable(String property);

    /**
-     * Sets the environment of a world.
-     * <p/>
-     * Note: This will ONLY take effect once the world is unloaded/reloaded.
+     * Clears a list property (sets it to []).
     *
-     * @param environment A {@link org.bukkit.World.Environment}.
+     * @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.
     */
-    public void setEnvironment(World.Environment environment);
+    @Deprecated
+    boolean clearList(String property);
+    // end of old config stuff

+    // permission stuff
    /**
-     * Gets the world seed of this world.
+     * Gets the lowercased name of the world. This method is required, since the permissables
+     * lowercase all permissions when recalculating.
+     * <p>
+     * Note: This also means if a user has worlds named: world and WORLD, that they can both
+     * exist, and both be teleported to independently, but their permissions **cannot** be
+     * uniqueified at this time. See bug report #.
     *
-     * @return The Long version of the seed.
+     * @return The lowercased name of the world.
     */
-    public Long getSeed();
-
-    /**
-     * Sets the seed of this world.
-     *
-     * @param seed A Long that is the seed.
-     */
-    public void setSeed(Long seed);
-
-    /**
-     * Gets the name of this world. This cannot be changed.
-     *
-     * @return The name of the world as a String.
-     */
-    public String getName();
-
-    /**
-     * Gets the alias of this world.
-     * <p/>
-     * This alias allows users to have a world named "world" but show up in the list as "FernIsland"
-     *
-     * @return The alias of the world as a String.
-     */
-    public String getAlias();
-
-    /**
-     * Sets the alias of the world.
-     *
-     * @param alias A string that is the new alias.
-     */
-    public void setAlias(String alias);
-
-    /**
-     * Sets the color that this world's name/alias will display as.
-     *
-     * @param color A valid color name.
-     *
-     * @return True if the color was set, false if not.
-     */
-    public boolean setColor(String color);
-
-    /**
-     * Gets the color that this world's name/alias will display as.
-     *
-     * @return The color of this world.
-     */
-    public 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.
-     */
-    public boolean isValidAliasColor(String color);
-
-    /**
-     * Returns a very nicely colored string (using Alias and Color if they are set).
-     *
-     * @return A nicely colored string.
-     */
-    public String getColoredWorldString();
-
-    /**
-     * Gets whether or not animals are allowed to spawn in this world.
-     *
-     * @return True if ANY animal can, false if no animals can spawn.
-     */
-    public boolean canAnimalsSpawn();
-
-    /**
-     * Gets whether or not monsters are allowed to spawn in this world.
-     *
-     * @return True if ANY monster can, false if no monsters can spawn.
-     */
-    public boolean canMonstersSpawn();
-
-    /**
-     * 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.
-     */
-    public void setPVPMode(boolean pvpMode);
-
-    /**
-     * Turn pvp on or off. This setting is used to set the world's PVP mode, and thus relies on fakePVP
-     *
-     * @return True if this world has fakepvp on
-     */
-    public 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.
-     */
-    public 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.
-     *
-     * @return True if the world will be hidden, false if not.
-     */
-    public boolean isHidden();
-
-    /**
-     * Sets 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.
-     *
-     * @param hidden Set
-     */
-    public void setHidden(boolean hidden);
-
-    /**
-     * 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.
-     *
-     * @param enableWeather True if weather events should occur in a world, false if not.
-     */
-    public void setEnableWeather(boolean enableWeather);
-
-    /**
-     * Gets whether weather is enabled in this world.
-     *
-     * @return True if weather events will occur, false if not.
-     */
-    public boolean isWeatherEnabled();
-
-    /**
-     * If true, tells Craftbukkit to keep a worlds spawn chunks loaded in memory (default: true)
-     * If not, CraftBukkit will attempt to free memory when players have not used that world.
-     * This will not happen immediately.
-     *
-     * @param keepSpawnInMemory If true, CraftBukkit will keep the spawn chunks loaded in memory.
-     */
-    public void setKeepSpawnInMemory(boolean keepSpawnInMemory);
-
-    /**
-     * Gets whether or not CraftBukkit is keeping the chunks for this world in memory.
-     *
-     * @return True if CraftBukkit is keeping spawn chunks in memory.
-     */
-    public 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.
-     */
-    public boolean setDifficulty(String difficulty);
-
-    /**
-     * Gets the difficulty of this world.
-     *
-     * @return The difficulty of this world.
-     */
-    public Difficulty getDifficulty();
-
-    /**
-     * Sets the spawn location for a world.
-     *
-     * @param spawnLocation The spawn location for a world.
-     */
-    public void setSpawnLocation(Location spawnLocation);
-
-    /**
-     * Gets the spawn location of this world.
-     *
-     * @return The spawn location of this world.
-     */
-    public Location getSpawnLocation();
-
-    /**
-     * Sets whether or not the hunger level of players will go down in a world.
-     *
-     * @param hungerEnabled True if hunger will go down, false to keep it at
-     *                      the level they entered a world with.
-     */
-    public void setHunger(boolean hungerEnabled);
-
-    /**
-     * Gets whether or not the hunger level of players will go down in a world.
-     *
-     * @return True if it will go down, false if it will remain steady.
-     */
-    public boolean getHunger();
-
-    /**
-     * Sets the game mode of this world
-     *
-     * @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.
-     */
-    public boolean setGameMode(String gameMode);
-
-    /**
-     * Gets the GameMode of this world.
-     *
-     * @return The GameMode of this world.
-     */
-    public GameMode getGameMode();
+    String getPermissibleName();

    /**
     * Gets the permission required to enter this world.
     *
     * @return The permission required to be exempt from charges to/from this world.
     */
-    public Permission getAccessPermission();
+    Permission getAccessPermission();

    /**
     * Gets the permission required to be exempt when entering.
     *
     * @return The permission required to be exempt when entering.
     */
-    public Permission getExemptPermission();
+    Permission getExemptPermission();
+    // end of permission stuff

    /**
-     * Sets the price for entry to this world.
-     * You can think of this like an amount.
-     * The type can be set with {@link #setCurrency(int)}
+     * Gets the alias of this world.
+     * <p>
+     * This alias allows users to have a world named "world" but show up in the list as "FernIsland"
     *
-     * @param price The Amount of money/item to enter the world.
+     * @return The alias of the world as a String.
     */
-    public void setPrice(double price);
+    String getAlias();

    /**
-     * Gets the amount of currency it requires to enter this world.
+     * Sets the alias of the world.
     *
-     * @return The amount it costs to enter this world.
+     * @param alias A string that is the new alias.
     */
-    public double getPrice();
+    void setAlias(String alias);

    /**
-     * Sets the type of item that will be required given the price is not 0.
-     * Use -1 to use an AllPay economy, or any valid itemid
+     * Gets the color that this world's name/alias will display as.
     *
-     * @param item The Type of currency that will be used when users enter this world.
+     * @return The color of this world.
     */
-    public void setCurrency(int item);
+    ChatColor getColor();

    /**
-     * Gets the Type of currency that will be used when users enter this world.
+     * Sets the color that this world's name/alias will display as.
     *
-     * @return The Type of currency that will be used when users enter this world.
+     * @param color A valid color name.
+     * @return True if the color was set, false if not.
     */
-    public int getCurrency();
+    boolean setColor(String color);

    /**
-     * Sets the world players will respawn in if they die in this one.
-     * Returns true upon success, false upon failure.
+     * Gets the style that this world's name/alias will display as.
     *
-     * @param respawnWorld The name of a world that exists on the server.
-     *
-     * @return True if respawnWorld existed, false if not.
+     * @return The style of this world. {@code null} for "normal" style.
     */
-    public boolean setRespawnToWorld(String respawnWorld);
+    ChatColor getStyle();

    /**
-     * Gets the world players will respawn in if they die in this one.
+     * Sets the style that this world's name/alias will display as.
     *
-     * @return A world that exists on the server.
+     * @param style A valid style name.
+     * @return True if the style was set, false if not.
     */
-    public World getRespawnToWorld();
+    boolean setStyle(String style);

    /**
-     * Sets the scale of this world. Really only has an effect if you use
-     * Multiverse-NetherPortals.
+     * Tells you if someone entered a valid color.
     *
-     * @param scaling A scaling value, cannot be negative or 0.
+     * @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)}
     */
-    public boolean setScaling(double scaling);
+    @Deprecated
+    boolean isValidAliasColor(String color);

    /**
-     * Gets the scaling value of this world.Really only has an effect if you use
-     * Multiverse-NetherPortals.
+     * Returns a very nicely colored string (using Alias and Color if they are set).
     *
-     * @return This world's non-negative, non-zero scale.
+     * @return A nicely colored string.
     */
-    public double getScaling();
+    String getColoredWorldString();

+    // animals&monster stuff
    /**
-     * Gets a list of all the worlds that players CANNOT travel to from this world,
-     * regardless of their access permissions.
+     * Gets whether or not animals are allowed to spawn in this world.
     *
-     * @return A List of world names.
+     * @return True if ANY animal can, false if no animals can spawn.
     */
-    public 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.
-     */
-    public List<String> getAnimalList();
+    boolean canAnimalsSpawn();

    /**
     * Sets whether or not animals can spawn.
@@ -398,14 +306,21 @@ public interface MultiverseWorld {
     *
     * @param allowAnimalSpawn True to allow spawning of monsters, false to prevent.
     */
-    public void setAllowAnimalSpawn(boolean allowAnimalSpawn);
+    void setAllowAnimalSpawn(boolean allowAnimalSpawn);

    /**
-     * Returns a list of monsters. This list always negates the {@link #canMonstersSpawn()} ()} result.
+     * Returns a list of animals. This list always negates the {@link #canAnimalsSpawn()} result.
     *
-     * @return A list of monsters that will spawn if {@link #canMonstersSpawn()} is false.
+     * @return A list of animals that will spawn if {@link #canAnimalsSpawn()} is false.
     */
-    public List<String> getMonsterList();
+    List<String> getAnimalList();
+
+    /**
+     * Gets whether or not monsters are allowed to spawn in this world.
+     *
+     * @return True if ANY monster can, false if no monsters can spawn.
+     */
+    boolean canMonstersSpawn();

    /**
     * Sets whether or not monsters can spawn.
@@ -414,28 +329,346 @@ public interface MultiverseWorld {
     *
     * @param allowMonsterSpawn True to allow spawning of monsters, false to prevent.
     */
-    public void setAllowMonsterSpawn(boolean allowMonsterSpawn);
+    void setAllowMonsterSpawn(boolean allowMonsterSpawn);

    /**
-     * TODO: Write these docs.
+     * Returns a list of monsters. This list always negates the {@link #canMonstersSpawn()} result.
     *
-     * @param property
-     *
-     * @return
+     * @return A list of monsters that will spawn if {@link #canMonstersSpawn()} is false.
     */
-    public boolean clearList(String property);
+    List<String> getMonsterList();
+    // end of animal&monster stuff

    /**
-     * Sets whether or not a world will autoheal players if the difficulty is on peaceful.
+     * Gets whether or not PVP is enabled in this world in some form (fake or not).
     *
-     * @param heal True if the world will heal.
+     * @return True if players can take damage from other players.
     */
-    public void setAutoHeal(boolean heal);
+    boolean isPVPEnabled();

    /**
-     * Gets whether or not a world will autoheal players if the difficulty is on peaceful.
+     * Turn pvp on or off. This setting is used to set the world's PVP mode.
+     *
+     * @param pvpMode True to enable PVP damage, false to disable it.
+     */
+    void setPVPMode(boolean pvpMode);
+
+    /**
+     * Turn pvp on or off. This setting is used to set the world's PVP mode, and thus relies on fakePVP
+     *
+     * @return True if this world has fakepvp on
+     * @deprecated This is deprecated.
+     */
+    @Deprecated
+    boolean getFakePVP();
+
+    /**
+     * 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.
+     *
+     * @return True if the world will be hidden, false if not.
+     */
+    boolean isHidden();
+
+    /**
+     * Sets 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.
+     *
+     * @param hidden Set
+     */
+    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.
+     *
+     * @param enableWeather True if weather events should occur in a world, false if not.
+     */
+    void setEnableWeather(boolean enableWeather);
+
+    /**
+     * Gets whether or not CraftBukkit is keeping the chunks for this world in memory.
+     *
+     * @return True if CraftBukkit is keeping spawn chunks in memory.
+     */
+    boolean isKeepingSpawnInMemory();
+
+    /**
+     * If true, tells Craftbukkit to keep a worlds spawn chunks loaded in memory (default: true)
+     * If not, CraftBukkit will attempt to free memory when players have not used that world.
+     * This will not happen immediately.
+     *
+     * @param keepSpawnInMemory If true, CraftBukkit will keep the spawn chunks loaded in memory.
+     */
+    void setKeepSpawnInMemory(boolean keepSpawnInMemory);
+
+    /**
+     * Gets the spawn location of this world.
+     *
+     * @return The spawn location of this world.
+     */
+    Location getSpawnLocation();
+
+    /**
+     * Sets the spawn location for a world.
+     *
+     * @param spawnLocation The spawn location for a world.
+     */
+    void setSpawnLocation(Location spawnLocation);
+
+    /**
+     * Gets whether or not the hunger level of players will go down in a world.
+     *
+     * @return True if it will go down, false if it will remain steady.
+     */
+    boolean getHunger();
+
+    /**
+     * Sets whether or not the hunger level of players will go down in a world.
+     *
+     * @param hungerEnabled True if hunger will go down, false to keep it at
+     *                      the level they entered a world with.
+     */
+    void setHunger(boolean hungerEnabled);
+
+    /**
+     * Gets the GameMode of this world.
+     *
+     * @return The GameMode of this world.
+     */
+    GameMode getGameMode();
+
+    /**
+     * Sets the game mode of this world.
+     *
+     * @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.
+     *
+     * @param gameMode The new {@link GameMode}.
+     * @return True if the game mode was successfully changed, false if not.
+     */
+    boolean setGameMode(GameMode gameMode);
+
+    /**
+     * Gets the amount of currency it requires to enter this world.
+     *
+     * @return The amount it costs to enter this world.
+     */
+    double getPrice();
+
+    /**
+     * Sets the price for entry to this world.
+     * You can think of this like an amount.
+     * The type can be set with {@link #setCurrency(Material)}
+     *
+     * @param price The Amount of money/item to enter the world.
+     */
+    void setPrice(double price);
+
+    /**
+     * Gets the type of currency that will be used when users enter this world. A value of null indicates a non-item
+     * based currency is used.
+     *
+     * @return The type of currency that will be used when users enter this world.
+     */
+    @Nullable
+    Material getCurrency();
+
+    /**
+     * Sets the type of item that will be required given the price is not 0.
+     * Use a value of null to specify a non-item based currency.
+     *
+     * @param item The Type of currency that will be used when users enter this world.
+     */
+    void setCurrency(@Nullable Material item);
+
+    /**
+     * Gets the world players will respawn in if they die in this one.
+     *
+     * @return A world that exists on the server.
+     */
+    World getRespawnToWorld();
+
+    /**
+     * Sets the world players will respawn in if they die in this one.
+     * Returns true upon success, false upon failure.
+     *
+     * @param respawnWorld The name of a world that exists on the server.
+     * @return True if respawnWorld existed, false if not.
+     */
+    boolean setRespawnToWorld(String respawnWorld);
+
+    /**
+     * Gets the scaling value of this world.Really only has an effect if you use
+     * Multiverse-NetherPortals.
+     *
+     * @return This world's non-negative, non-zero scale.
+     */
+    double getScaling();
+
+    /**
+     * Sets the scale of this world. Really only has an effect if you use
+     * Multiverse-NetherPortals.
+     *
+     * @param scaling A scaling value, cannot be negative or 0.
+     * @return Whether the scale was set successfully.
+     */
+    boolean setScaling(double scaling);
+
+    /**
+     * Gets whether or not a world will auto-heal players if the difficulty is on peaceful.
     *
     * @return True if the world should heal (default), false if not.
     */
-    public boolean getAutoHeal();
+    boolean getAutoHeal();
+
+    /**
+     * Sets whether or not a world will auto-heal players if the difficulty is on peaceful.
+     *
+     * @param heal True if the world will heal.
+     */
+    void setAutoHeal(boolean heal);
+
+    /**
+     * Gets whether or not Multiverse should auto-adjust the spawn for this world.
+     *
+     * @return True if Multiverse should adjust the spawn, false if not.
+     */
+    boolean getAdjustSpawn();
+
+    /**
+     * Sets whether or not Multiverse should auto-adjust the spawn for this world.
+     *
+     * @param adjust True if multiverse should adjust the spawn, false if not.
+     */
+    void setAdjustSpawn(boolean adjust);
+
+    /**
+     * Gets whether or not Multiverse should auto-load this world.
+     *
+     * @return True if Multiverse should auto-load this world.
+     */
+    boolean getAutoLoad();
+
+    /**
+     * Sets whether or not Multiverse should auto-load this world.
+     * <p>
+     * True is default.
+     *
+     * @param autoLoad True if multiverse should autoload this world the spawn, false if not.
+     */
+    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.
+     *
+     * @return True if players dying in this world should respawn at their bed.
+     */
+    boolean getBedRespawn();
+
+    /**
+     * Sets whether or not a player who dies in this world will respawn in their
+     * bed or follow the normal respawn pattern.
+     * <p>
+     * True is default.
+     *
+     * @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
+     */
+    int getPlayerLimit();
+
+    /**
+     * Same as {@link #getTime()}, but returns a string.
+     * @return The time as a short string: 12:34pm
+     */
+    String getTime();
+
+    /**
+     * Sets the current time in a world.
+     * <p>
+     * This method will take the following formats:
+     * 11:37am
+     *  4:30p
+     *  day(morning), night, noon, midnight
+     *
+     * @param timeAsString The formatted time to set the world to.
+     * @return True if the time was set, false if not.
+     */
+    boolean setTime(String timeAsString);
+
+    /**
+     * Sets The types of portals that are allowed in this world.
+     *
+     * @param type The type of portals allowed in this world.
+     */
+    void allowPortalMaking(AllowedPortalType type);
+
+    /**
+     * Gets which type(s) of portals are allowed to be constructed in this world.
+     *
+     * @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();
+
+    /**
+     * Whether or not players are allowed to fly in this world.
+     *
+     * @return True if players allowed to fly in this world.
+     */
+    boolean getAllowFlight();
+
+    /**
+     * Sets whether or not players are allowed to fly in this world.
+     *
+     * @param allowFlight True to allow flight in this world.
+     */
+    void setAllowFlight(final boolean allowFlight);
 }
@@ -0,0 +1,71 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+
+import com.onarandombox.MultiverseCore.enums.TeleportResult;
+
+/**
+ * Used to safely teleport people.
+ */
+public interface SafeTTeleporter extends Teleporter {
+
+    /**
+     * Gets the next safe location around the given location.
+     * @param l A {@link Location}.
+     * @return A safe {@link Location}.
+     */
+    Location getSafeLocation(Location l);
+
+    /**
+     * Gets the next safe location around the given location.
+     * @param l A {@link Location}.
+     * @param tolerance The tolerance.
+     * @param radius The radius.
+     * @return A safe {@link Location}.
+     */
+    Location getSafeLocation(Location l, int tolerance, int radius);
+
+    /**
+     * Safely teleport the entity to the MVDestination. This will perform checks to see if the place is safe, and if
+     * it's not, will adjust the final destination accordingly.
+     *
+     * @param teleporter Person who performed the teleport command.
+     * @param teleportee Entity to teleport
+     * @param d          Destination to teleport them to
+     * @return true for success, false for failure
+     */
+    TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, MVDestination d);
+
+    /**
+     * Safely teleport the entity to the Location. This may perform checks to
+     * see if the place is safe, and if
+     * it's not, will adjust the final destination accordingly.
+     *
+     * @param teleporter Person who issued the teleport command.
+     * @param teleportee Entity to teleport.
+     * @param location   Location to teleport them to.
+     * @param safely     Should the destination be checked for safety before teleport?
+     * @return true for success, false for failure.
+     */
+    TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, Location location,
+            boolean safely);
+
+    /**
+     * Returns a safe location for the entity to spawn at.
+     *
+     * @param e The entity to spawn
+     * @param d The MVDestination to take the entity to.
+     * @return A new location to spawn the entity at.
+     */
+    Location getSafeLocation(Entity e, MVDestination d);
+
+    /**
+     * Finds a portal-block next to the specified {@link Location}.
+     * @param l The {@link Location}
+     * @return The next portal-block's {@link Location}.
+     */
+    Location findPortalBlockNextTo(Location l);
+
+}
@@ -0,0 +1,10 @@
+package com.onarandombox.MultiverseCore.api;
+
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.enums.TeleportResult;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public interface Teleporter {
+    TeleportResult teleport(CommandSender teleporter, Player teleportee, MVDestination destination);
+}
@@ -0,0 +1,68 @@
+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.
+     *
+     * @param worlds A list of {@link MultiverseWorld}
+     */
+    void purgeWorlds(List<MultiverseWorld> worlds);
+
+    /**
+     * Convenience method for {@link #purgeWorld(MultiverseWorld, java.util.List, boolean, boolean)} that takes the settings from the world-config.
+     *
+     * @param world The {@link MultiverseWorld}.
+     */
+    void purgeWorld(MultiverseWorld world);
+
+    /**
+     * Clear all animals/monsters that do not belong to a world according to the config.
+     *
+     * @param mvworld The {@link MultiverseWorld}.
+     * @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.
+     */
+    void purgeWorld(MultiverseWorld mvworld, List<String> thingsToKill, boolean negateAnimals,
+            boolean negateMonsters);
+
+    /**
+     * Clear all animals/monsters that do not belong to a world according to the config.
+     *
+     * @param mvworld The {@link MultiverseWorld}.
+     * @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.
+     * @param sender The {@link CommandSender} that initiated the action. He will/should be notified.
+     */
+    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);
+}
@@ -0,0 +1,5 @@
+/**
+ * The Multiverse-API, containing lots of interfaces that can be quite useful for other
+ * plugins when interacting with Multiverse.
+ */
+package com.onarandombox.MultiverseCore.api;
@@ -0,0 +1,162 @@
+/******************************************************************************
+ * 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.Permission;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class AnchorCommand extends PaginatedCoreCommand<String> {
+
+    public AnchorCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Create, Delete and Manage Anchor Destinations.");
+        this.setCommandUsage("/mv anchor " + ChatColor.GREEN + "{name}" + ChatColor.GOLD + " [-d]");
+        this.setArgRange(0, 2);
+        this.addKey("mv anchor");
+        this.addKey("mv anchors");
+        this.addKey("mvanchor");
+        this.addKey("mvanchors");
+        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "awesomething");
+        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.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+    }
+
+    private List<String> getFancyAnchorList(Player p) {
+        List<String> anchorList = new ArrayList<String>();
+        ChatColor color = ChatColor.GREEN;
+        for (String anchor : this.plugin.getAnchorManager().getAnchors(p)) {
+            anchorList.add(color + anchor);
+            color = (color == ChatColor.GREEN) ? ChatColor.GOLD : ChatColor.GREEN;
+        }
+        return anchorList;
+    }
+
+    private void showList(CommandSender sender, List<String> args) {
+        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.list", true)) {
+            sender.sendMessage(ChatColor.RED + "You don't have the permission to list anchors!");
+            return;
+        }
+
+        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse Anchor List ]====");
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+
+
+        FilterObject filterObject = this.getPageAndFilter(args);
+
+        List<String> availableAnchors = new ArrayList<String>(this.getFancyAnchorList(p));
+        if (filterObject.getFilter().length() > 0) {
+            availableAnchors = this.getFilteredItems(availableAnchors, filterObject.getFilter());
+            if (availableAnchors.size() == 0) {
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
+                        + "No anchors matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
+                return;
+            }
+        } else {
+            if (availableAnchors.size() == 0) {
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE + "No anchors were defined.");
+                return;
+            }
+        }
+
+
+        if (!(sender instanceof Player)) {
+            for (String c : availableAnchors) {
+                sender.sendMessage(c);
+            }
+            return;
+        }
+
+        int totalPages = (int) Math.ceil(availableAnchors.size() / (this.itemsPerPage + 0.0));
+
+        if (filterObject.getPage() > totalPages) {
+            filterObject.setPage(totalPages);
+        } else if (filterObject.getPage() < 1) {
+            filterObject.setPage(1);
+        }
+
+        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
+
+        this.showPage(filterObject.getPage(), sender, availableAnchors);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() == 0) {
+            this.showList(sender, args);
+            return;
+        }
+        if (args.size() == 1 && (this.getPageAndFilter(args).getPage() != 1 || args.get(0).equals("1"))) {
+            this.showList(sender, args);
+            return;
+        }
+        if (args.size() == 2 && args.get(1).equalsIgnoreCase("-d")) {
+            if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.delete", true)) {
+                sender.sendMessage(ChatColor.RED + "You don't have the permission to delete anchors!");
+            } else {
+                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)) {
+            sender.sendMessage("You must be a player to create Anchors.");
+            return;
+        }
+
+        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.create", true)) {
+            sender.sendMessage(ChatColor.RED + "You don't have the permission to create anchors!");
+        } else {
+            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
+    protected List<String> getFilteredItems(List<String> availableItems, String filter) {
+        List<String> filtered = new ArrayList<String>();
+        for (String s : availableItems) {
+            if (s.matches("(?i).*" + filter + ".*")) {
+                filtered.add(s);
+            }
+        }
+        return filtered;
+    }
+
+    @Override
+    protected String getItemText(String item) {
+        return item;
+    }
+}
@@ -11,16 +11,16 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
 import com.onarandombox.MultiverseCore.utils.MVPermissions;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

 import java.util.List;
-
+/**
+ * Checks to see if a player can go to a destination.
+ */
 public class CheckCommand extends MultiverseCommand {
-    private WorldManager worldManager;

    public CheckCommand(MultiverseCore plugin) {
        super(plugin);
@@ -33,7 +33,6 @@ public class CheckCommand extends MultiverseCommand {
        this.addCommandExample("/mv check " + ChatColor.GREEN + "Rigby90 " + ChatColor.LIGHT_PURPLE + "p:MyPortal");
        this.addCommandExample("/mv check " + ChatColor.GREEN + "lithium3141 " + ChatColor.LIGHT_PURPLE + "ow:WarpName");
        this.setPermission("multiverse.core.debug", "Checks to see if a player can go to a destination. Prints debug if false.", PermissionDefault.OP);
-        this.worldManager = this.plugin.getMVWorldManager();
    }

    @Override
@@ -46,18 +45,13 @@ public class CheckCommand extends MultiverseCommand {
        }
        MVDestination dest = this.plugin.getDestFactory().getDestination(args.get(1));
        if (dest instanceof InvalidDestination) {
-            sender.sendMessage("You asked if '" + args.get(0) + "' could go to " + ChatColor.GREEN + args.get(0) + ChatColor.WHITE + ",");
+            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;
        }

        MVPermissions perms = this.plugin.getMVPerms();
-        if (perms.canEnterDestination(p, dest)) {
-            sender.sendMessage(ChatColor.GREEN + args.get(0) + ChatColor.WHITE + " can travel to " + ChatColor.GREEN + args.get(1));
-        } else {
-            sender.sendMessage(ChatColor.AQUA + args.get(0) + ChatColor.RED + " CANNOT travel to " + ChatColor.AQUA + args.get(1));
-            sender.sendMessage("Please turn debug mode to 3 then watch the console to find out why!");
-            sender.sendMessage("Use: " + ChatColor.GREEN + "/mv debug 3");
-        }
+        perms.tellMeWhyICantDoThis(sender, p, dest);
    }
 }
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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 java.util.List;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+
+/**
+ * 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.setPermission("multiverse.core.clone", "Clones a world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        String oldName = args.get(0);
+	    if (!this.worldManager.hasUnloadedWorld(oldName, true)) {
+            // If no world was found, we can't clone.
+            sender.sendMessage("Sorry, Multiverse doesn't know about world " + oldName + ", so we can't clone it!");
+            sender.sendMessage("Check the " + ChatColor.GREEN + "/mv list" + ChatColor.WHITE + " command to verify it is listed.");
+            return;
+        }
+        if (this.plugin.getMVWorldManager().cloneWorld(oldName, args.get(1))) {
+            sender.sendMessage(ChatColor.GREEN + "World cloned!");
+        } else {
+            sender.sendMessage(ChatColor.RED + "World could NOT be cloned!");
+        }
+    }
+}
@@ -8,17 +8,17 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.enums.ConfigProperty;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

 import java.util.List;
+import java.util.Map;

+/**
+ * Allows you to set Global MV Variables.
+ */
 public class ConfigCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
-
    public ConfigCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Configuration");
@@ -28,61 +28,40 @@ public class ConfigCommand extends MultiverseCommand {
        this.addKey("mvconfig");
        this.addKey("mv conf");
        this.addKey("mvconf");
-        this.addCommandExample("All values: " + ConfigProperty.getAllValues());
        this.addCommandExample("/mv config show");
        this.addCommandExample("/mv config " + ChatColor.GREEN + "debug" + ChatColor.AQUA + " 3");
        this.addCommandExample("/mv config " + ChatColor.GREEN + "enforceaccess" + ChatColor.AQUA + " false");
-        this.addCommandExample("/mv config " + ChatColor.GREEN + "bedrespawn" + ChatColor.AQUA + " true");
        this.setPermission("multiverse.core.config", "Allows you to set Global MV Variables.", PermissionDefault.OP);
-        this.worldManager = this.plugin.getMVWorldManager();
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
        if (args.size() <= 1) {
-            String[] allProps = ConfigProperty.getAllValues().split(" ");
-            String currentvals = "";
-            for (String prop : allProps) {
-                currentvals += ChatColor.GREEN;
-                currentvals += prop;
-                currentvals += ChatColor.WHITE;
-                currentvals += " = ";
-                currentvals += ChatColor.GOLD;
-                currentvals += this.plugin.getMVConfiguration().get(prop, "NOT SET");
-                currentvals += ChatColor.WHITE;
-                currentvals += ", ";
+            StringBuilder builder = new StringBuilder();
+            Map<String, Object> serializedConfig = this.plugin.getMVConfig().serialize();
+            for (Map.Entry<String, Object> entry : serializedConfig.entrySet()) {
+                builder.append(ChatColor.GREEN);
+                builder.append(entry.getKey());
+                builder.append(ChatColor.WHITE).append(" = ").append(ChatColor.GOLD);
+                builder.append(entry.getValue().toString());
+                builder.append(ChatColor.WHITE).append(", ");
            }
-            sender.sendMessage(currentvals.substring(0, currentvals.length() - 2));
+            String message = builder.toString();
+            message = message.substring(0, message.length() - 2);
+            sender.sendMessage(message);
            return;
        }
-        if (args.get(0).equalsIgnoreCase("messagecooldown") || args.get(0).equalsIgnoreCase("teleportcooldown") || args.get(0).equalsIgnoreCase("debug")) {
-            try {
-                this.plugin.getMVConfiguration().set(args.get(0).toLowerCase(), Integer.parseInt(args.get(1)));
-            } catch (NumberFormatException e) {
-                sender.sendMessage(ChatColor.RED + "Sorry, " + ChatColor.AQUA + args.get(0) + ChatColor.WHITE + " must be an integer!");
-                return;
-            }
-        } else {
-            ConfigProperty property = null;
-            try {
-                property = ConfigProperty.valueOf(args.get(0).toLowerCase());
-            } catch (IllegalArgumentException e) {
-                sender.sendMessage(ChatColor.RED + "Sorry, " + ChatColor.AQUA + args.get(0) + ChatColor.WHITE + " you can't set " + ChatColor.AQUA + args.get(0));
-                sender.sendMessage(ChatColor.GREEN + "Valid values are:");
-                sender.sendMessage(ConfigProperty.getAllValues());
-                return;
-            }
-
-            if (property != null) {
-                try {
-                    this.plugin.getMVConfiguration().set(args.get(0).toLowerCase(), Boolean.parseBoolean(args.get(1)));
-                } catch (Exception e) {
-                    sender.sendMessage(ChatColor.RED + "Sorry, " + ChatColor.AQUA + args.get(0) + ChatColor.WHITE + " must be true or false!");
-                    return;
-                }
-
-            }
+        if (!this.plugin.getMVConfig().setConfigProperty(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;
        }
+
+        // special rule
+        if (args.get(0).equalsIgnoreCase("firstspawnworld")) {
+            // Don't forget to set the world!
+            this.plugin.getMVWorldManager().setFirstSpawnWorld(args.get(1));
+        }
+
        if (this.plugin.saveMVConfigs()) {
            sender.sendMessage(ChatColor.GREEN + "SUCCESS!" + ChatColor.WHITE + " Values were updated successfully!");
            this.plugin.loadConfigs();
@@ -13,6 +13,9 @@ import org.bukkit.permissions.PermissionDefault;

 import java.util.List;

+/**
+ * Confirms actions.
+ */
 public class ConfirmCommand extends MultiverseCommand {

    public ConfirmCommand(MultiverseCore plugin) {
@@ -8,9 +8,8 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -21,8 +20,11 @@ import org.bukkit.permissions.PermissionDefault;
 import java.text.DecimalFormat;
 import java.util.List;

+/**
+ * Returns detailed information on the Players where abouts.
+ */
 public class CoordCommand extends MultiverseCommand {
-    private WorldManager worldManager;
+    private MVWorldManager worldManager;

    public CoordCommand(MultiverseCore plugin) {
        super(plugin);
@@ -58,9 +60,9 @@ public class CoordCommand extends MultiverseCommand {
            DecimalFormat df = new DecimalFormat();
            df.setMinimumFractionDigits(0);
            df.setMaximumFractionDigits(2);
-            p.sendMessage(ChatColor.AQUA + "Coordinates: " + ChatColor.WHITE + LocationManipulation.strCoords(p.getLocation()));
-            p.sendMessage(ChatColor.AQUA + "Direction: " + ChatColor.WHITE + LocationManipulation.getDirection(p.getLocation()));
-            p.sendMessage(ChatColor.AQUA + "Block: " + ChatColor.WHITE + Material.getMaterial(world.getBlockTypeIdAt(p.getLocation())));
+            p.sendMessage(ChatColor.AQUA + "Coordinates: " + ChatColor.WHITE + plugin.getLocationManipulation().strCoords(p.getLocation()));
+            p.sendMessage(ChatColor.AQUA + "Direction: " + ChatColor.WHITE + plugin.getLocationManipulation().getDirection(p.getLocation()));
+            p.sendMessage(ChatColor.AQUA + "Block: " + ChatColor.WHITE + world.getBlockAt(p.getLocation()).getType());
        } else {
            sender.sendMessage("This command needs to be used from a Player.");
        }
@@ -8,31 +8,40 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
+import org.bukkit.WorldType;
+import org.bukkit.command.Command;
 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;

+/**
+ * Creates a new world and loads it.
+ */
 public class CreateCommand extends MultiverseCommand {
-    private WorldManager worldManager;
+    private MVWorldManager worldManager;

    public CreateCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Create World");
-        this.setCommandUsage("/mv create" + ChatColor.GREEN + " {NAME} {ENV}" + ChatColor.GOLD + " -s [SEED] -g [GENERATOR[:ID]]");
-        this.setArgRange(2, 6);
+        this.setCommandUsage(String.format("/mv create %s{NAME} {ENV} %s-s [SEED] -g [GENERATOR[:ID]] -t [WORLDTYPE] [-n] -a [true|false]",
+                ChatColor.GREEN, ChatColor.GOLD));
+        this.setArgRange(2, 11); // SUPPRESS CHECKSTYLE: MagicNumberCheck
        this.addKey("mvcreate");
        this.addKey("mvc");
        this.addKey("mv create");
        this.setPermission("multiverse.core.create", "Creates a new world and loads it.", PermissionDefault.OP);
        this.addCommandExample("/mv create " + ChatColor.GOLD + "world" + ChatColor.GREEN + " normal");
        this.addCommandExample("/mv create " + ChatColor.GOLD + "lavaland" + ChatColor.RED + " nether");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "starwars" + ChatColor.AQUA + " skylands");
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "starwars" + ChatColor.AQUA + " end");
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "flatroom" + ChatColor.GREEN + " normal" + ChatColor.AQUA + " -t flat");
        this.addCommandExample("/mv create " + ChatColor.GOLD + "gargamel" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -s gargamel");
        this.addCommandExample("/mv create " + ChatColor.GOLD + "moonworld" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -g BukkitFullOfMoon");
        this.worldManager = this.plugin.getMVWorldManager();
@@ -40,32 +49,72 @@ public class CreateCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        if (args.size() % 2 != 0) {
-            sender.sendMessage("You must preface your SEED with -s OR your GENERATOR with -g. Type /mv for help");
-            return;
-        }
        String worldName = args.get(0);
+        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
        String env = args.get(1);
        String seed = CommandHandler.getFlag("-s", args);
        String generator = CommandHandler.getFlag("-g", args);
+        boolean allowStructures = true;
+        String structureString = CommandHandler.getFlag("-a", args);
+        if (structureString != null) {
+            allowStructures = Boolean.parseBoolean(structureString);
+        }
+        String typeString = CommandHandler.getFlag("-t", args);
+        boolean useSpawnAdjust = true;
+        for (String s : args) {
+            if (s.equalsIgnoreCase("-n")) {
+                useSpawnAdjust = false;
+            }
+        }

-        if (new File(worldName).exists() || this.worldManager.isMVWorld(worldName)) {
+        if (this.worldManager.isMVWorld(worldName)) {
+            sender.sendMessage(ChatColor.RED + "Multiverse cannot create " + ChatColor.GOLD + ChatColor.UNDERLINE
+                    + "another" + ChatColor.RESET + ChatColor.RED + " world named " + worldName);
+            return;
+        }
+
+        if (worldFile.exists()) {
            sender.sendMessage(ChatColor.RED + "A Folder/World already exists with this name!");
            sender.sendMessage(ChatColor.RED + "If you are confident it is a world you can import with /mvimport");
            return;
        }

-        Environment environment = this.plugin.getEnvFromString(env);
+        Environment environment = EnvironmentCommand.getEnvFromString(env);
        if (environment == null) {
            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
            EnvironmentCommand.showEnvironments(sender);
            return;
        }
-        sender.sendMessage(ChatColor.AQUA + "Starting world creation...");
-        if (this.worldManager.addWorld(worldName, environment, seed, generator)) {
-            sender.sendMessage(ChatColor.GREEN + "Complete!");
+
+        // If they didn't specify a type, default to NORMAL
+        if (typeString == null) {
+            typeString = "NORMAL";
+        }
+        WorldType type = EnvironmentCommand.getWorldTypeFromString(typeString);
+        if (type == null) {
+            sender.sendMessage(ChatColor.RED + "That is not a valid World Type.");
+            EnvironmentCommand.showWorldTypes(sender);
+            return;
+        }
+        // Determine if the generator is valid. #918
+        if (generator != null) {
+            List<String> genarray = new ArrayList<String>(Arrays.asList(generator.split(":")));
+            if (genarray.size() < 2) {
+                // If there was only one arg specified, pad with another empty one.
+                genarray.add("");
+            }
+            if (this.worldManager.getChunkGenerator(genarray.get(0), genarray.get(1), "test") == null) {
+                // We have an invalid generator.
+                sender.sendMessage("Invalid generator! '" + generator + "'. " + ChatColor.RED + "Aborting world creation.");
+                return;
+            }
+        }
+        Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'...");
+
+        if (this.worldManager.addWorld(worldName, environment, seed, type, allowStructures, generator, useSpawnAdjust)) {
+            Command.broadcastCommandMessage(sender, "Complete!");
        } else {
-            sender.sendMessage(ChatColor.RED + "FAILED.");
+            Command.broadcastCommandMessage(sender, "FAILED.");
        }
    }
 }
@@ -15,12 +15,15 @@ import org.bukkit.permissions.PermissionDefault;
 import java.util.List;
 import java.util.logging.Level;

+/**
+ * Enables debug-information.
+ */
 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]");
+        this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off|silent]");
        this.setArgRange(0, 1);
        this.addKey("mv debug");
        this.addKey("mv d");
@@ -33,28 +36,30 @@ public class DebugCommand extends MultiverseCommand {
    public void runCommand(CommandSender sender, List<String> args) {
        if (args.size() == 1) {
            if (args.get(0).equalsIgnoreCase("off")) {
-                MultiverseCore.GlobalDebug = 0;
+                plugin.getMVConfig().setGlobalDebug(0);
            } else {
                try {
                    int debugLevel = Integer.parseInt(args.get(0));
                    if (debugLevel > 3 || debugLevel < 0) {
                        throw new NumberFormatException();
                    }
-                    MultiverseCore.GlobalDebug = debugLevel;
+                    plugin.getMVConfig().setGlobalDebug(debugLevel);
                } catch (NumberFormatException e) {
-                    sender.sendMessage(ChatColor.RED + "Error" + ChatColor.WHITE + " setting debug level. Please use a number 0-3 " + ChatColor.AQUA + "(3 being many many messages!)");
+                    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) {
-        if (MultiverseCore.GlobalDebug == 0) {
+        final int debugLevel = plugin.getMVConfig().getGlobalDebug();
+        if (debugLevel == 0) {
            sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
        } else {
-            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + MultiverseCore.GlobalDebug);
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel);
            this.plugin.log(Level.FINE, "Multiverse Debug ENABLED");
        }
    }
@@ -15,6 +15,9 @@ import org.bukkit.permissions.PermissionDefault;
 import java.util.ArrayList;
 import java.util.List;

+/**
+ * Deletes worlds.
+ */
 public class DeleteCommand extends MultiverseCommand {

    public DeleteCommand(MultiverseCore plugin) {
@@ -24,14 +27,19 @@ public class DeleteCommand extends MultiverseCommand {
        this.setArgRange(1, 1);
        this.addKey("mvdelete");
        this.addKey("mv delete");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "MyWorld");
+        this.addCommandExample("/mv delete " + ChatColor.GOLD + "MyWorld");
        this.setPermission("multiverse.core.delete", "Deletes a world on your server. " + ChatColor.RED + "PERMANENTLY.", PermissionDefault.OP);
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        Class<?> paramTypes[] = {String.class};
+        String worldName = args.get(0);
+
+        Class<?>[] paramTypes = {String.class};
        List<Object> objectArgs = new ArrayList<Object>(args);
-        this.plugin.getCommandHandler().queueCommand(sender, "mvdelete", "deleteWorld", objectArgs, paramTypes, ChatColor.GREEN + "World Deleted!", ChatColor.RED + "World could NOT be deleted!");
+        this.plugin.getCommandHandler()
+                   .queueCommand(sender, "mvdelete", "deleteWorld", objectArgs,
+                                 paramTypes, ChatColor.GREEN + "World '" + worldName + "' Deleted!",
+                                 ChatColor.RED + "World '" + worldName + "' could NOT be deleted!");
    }
 }
@@ -9,11 +9,16 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.WorldType;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

 import java.util.List;

+/**
+ * Lists valid known environments.
+ */
 public class EnvironmentCommand extends MultiverseCommand {

    public EnvironmentCommand(MultiverseCore plugin) {
@@ -23,21 +28,91 @@ public class EnvironmentCommand extends MultiverseCommand {
        this.setArgRange(0, 0);
        this.addKey("mvenv");
        this.addKey("mv env");
+        this.addKey("mv type");
        this.addKey("mv environment");
        this.addKey("mv environments");
        this.addCommandExample("/mv env");
-        this.setPermission("multiverse.core.list.environments", "Lists valid known environments.", PermissionDefault.OP);
+        this.setPermission("multiverse.core.list.environments", "Lists valid known environments/world types.", PermissionDefault.OP);
    }

+    /**
+     * Shows all valid known environments to a {@link CommandSender}.
+     *
+     * @param sender The {@link CommandSender}.
+     */
    public static void showEnvironments(CommandSender sender) {
        sender.sendMessage(ChatColor.YELLOW + "Valid Environments are:");
        sender.sendMessage(ChatColor.GREEN + "NORMAL");
        sender.sendMessage(ChatColor.RED + "NETHER");
-        sender.sendMessage(ChatColor.AQUA + "SKYLANDS");
+        sender.sendMessage(ChatColor.AQUA + "END");
+    }
+    /**
+     * Shows all valid known world types to a {@link CommandSender}.
+     *
+     * @param sender The {@link CommandSender}.
+     */
+    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));
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
        EnvironmentCommand.showEnvironments(sender);
+        EnvironmentCommand.showWorldTypes(sender);
+    }
+
+    /**
+     * Converts a {@link String} into a {@link WorldType}.
+     *
+     * @param type The WorldType as a {@link String}
+     * @return The WorldType as a {@link WorldType}
+     */
+    public static WorldType getWorldTypeFromString(String type) {
+        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
+        if (type.equalsIgnoreCase("normal")) {
+            type = "NORMAL";
+        } else if (type.equalsIgnoreCase("flat")) {
+            type = "FLAT";
+        } else if (type.equalsIgnoreCase("largebiomes")) {
+            type = "LARGE_BIOMES";
+        } else if (type.equalsIgnoreCase("amplified")) {
+            type = "AMPLIFIED";
+        }
+        try {
+            // Now that we've converted a potentially unfriendly value
+            // to a friendly one, get it from the ENUM!
+            return WorldType.valueOf(type);
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Converts a {@link String} into an {@link org.bukkit.World.Environment}.
+     *
+     * @param env The environment as {@link String}
+     * @return The environment as {@link org.bukkit.World.Environment}
+     */
+    public static World.Environment getEnvFromString(String env) {
+        env = env.toUpperCase();
+        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
+        if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER"))
+            env = "NETHER";
+
+        if (env.equalsIgnoreCase("END") || env.equalsIgnoreCase("THEEND") || env.equalsIgnoreCase("STARWARS"))
+            env = "THE_END";
+
+        if (env.equalsIgnoreCase("NORMAL") || env.equalsIgnoreCase("WORLD"))
+            env = "NORMAL";
+
+        try {
+            // Now that we've converted a potentially unfriendly value
+            // to a friendly one, get it from the ENUM!
+            return World.Environment.valueOf(env);
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
    }
 }
@@ -0,0 +1,75 @@
+/******************************************************************************
+ * 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.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class GameruleCommand extends MultiverseCommand {
+
+    public GameruleCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Set a Minecraft Game Rule for a World.");
+        this.setCommandUsage("/mv gamerule " + ChatColor.GREEN + "{RULE} {VALUE}" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(2, 3);
+        this.addKey("mv gamerule");
+        this.addKey("mv rule");
+        this.addKey("mvgamerule");
+        this.addKey("mvrule");
+        this.addCommandExample("/mv gamerule " + ChatColor.GREEN + "doMobLoot false");
+        this.addCommandExample("/mvrule " + ChatColor.GREEN + "keepInventory true " + ChatColor.RED + "world_nether");
+        this.setPermission("multiverse.core.gamerule.set", "Allows a player to set a gamerule.", PermissionDefault.OP);
+    }
+
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        final Player p;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        } else {
+            p = null;
+        }
+
+        if (args.size() == 2 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        final String gameRule = args.get(0);
+        final String value = args.get(1);
+        final World world;
+        if (args.size() == 2) {
+            world = p.getWorld();
+        } else {
+            world = Bukkit.getWorld(args.get(2));
+        }
+
+        if (world.setGameRuleValue(gameRule, value)) {
+            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                    + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
+        } else {
+            sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                    + ChatColor.WHITE + " cannot be set to " + ChatColor.RED + value);
+        }
+    }
+}
@@ -0,0 +1,76 @@
+/******************************************************************************
+ * 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.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class GamerulesCommand extends MultiverseCommand {
+
+    public GamerulesCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("List the Minecraft Game Rules for a World.");
+        this.setCommandUsage("/mv gamerules" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(0, 1);
+        this.addKey("mv gamerules");
+        this.addKey("mv rules");
+        this.addKey("mvgamerules");
+        this.addKey("mvrules");
+        this.addCommandExample("/mv gamerules");
+        this.addCommandExample("/mvrules " + ChatColor.RED + "world_nether");
+        this.setPermission("multiverse.core.gamerule.list", "Allows a player to list gamerules.", PermissionDefault.OP);
+    }
+
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        final Player p;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        } else {
+            p = null;
+        }
+
+        if (args.size() == 0 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        final World world;
+        if (args.size() == 0) {
+            world = p.getWorld();
+        } else {
+            world = Bukkit.getWorld(args.get(0));
+        }
+
+        final StringBuilder gameRules = new StringBuilder();
+        for (final String gameRule : world.getGameRules()) {
+            if (gameRules.length() != 0) {
+                gameRules.append(ChatColor.WHITE).append(", ");
+            }
+            gameRules.append(ChatColor.AQUA).append(gameRule).append(ChatColor.WHITE).append(": ");
+            gameRules.append(ChatColor.GREEN).append(world.getGameRuleValue(gameRule));
+        }
+        sender.sendMessage("=== Gamerules for " + ChatColor.AQUA + world.getName() + ChatColor.WHITE + " ===");
+        sender.sendMessage(gameRules.toString());
+    }
+}
@@ -7,6 +7,7 @@

 package com.onarandombox.MultiverseCore.commands;

+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -15,8 +16,10 @@ 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.
+ */
 public class GeneratorCommand extends MultiverseCommand {

    public GeneratorCommand(MultiverseCore plugin) {
@@ -34,7 +37,7 @@ public class GeneratorCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        this.plugin.log(Level.INFO, "PLEASE IGNORE the 'Plugin X does not contain any generators' message below!");
+        Logging.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) {
@@ -46,13 +49,8 @@ public class GeneratorCommand extends MultiverseCommand {
        String loadedGens = "";
        boolean altColor = false;
        for (String s : generators) {
-            if (altColor) {
-                altColor = false;
-                loadedGens += ChatColor.YELLOW + s + "";
-            } else {
-                altColor = true;
-                loadedGens += ChatColor.WHITE + s + "";
-            }
+            loadedGens += (altColor ? ChatColor.YELLOW : ChatColor.WHITE) + s + " ";
+            altColor = !altColor;
        }
        if (loadedGens.length() == 0) {
            loadedGens = ChatColor.RED + "No Generator Plugins found.";
@@ -5,7 +5,6 @@
 * with this project.                                                         *
 ******************************************************************************/

-// This file is no longer licensed under that silly CC license. I have blanked it out and will start implementaiton of my own in a few days. For now there is no help.
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
@@ -18,8 +17,10 @@ import org.bukkit.permissions.PermissionDefault;
 import java.util.ArrayList;
 import java.util.List;

-public class HelpCommand extends MultiverseCommand {
-    private static final int CMDS_PER_PAGE = 7;
+/**
+ * Displays a nice help menu.
+ */
+public class HelpCommand extends PaginatedCoreCommand<Command> {

    public HelpCommand(MultiverseCore plugin) {
        super(plugin);
@@ -34,40 +35,51 @@ public class HelpCommand extends MultiverseCommand {
        this.addKey("mv search");
        this.addCommandExample("/mv help ?");
        this.setPermission("multiverse.help", "Displays a nice help menu.", PermissionDefault.TRUE);
+        this.setItemsPerPage(7); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+    }
+
+    @Override
+    protected List<Command> getFilteredItems(List<Command> availableItems, String filter) {
+        List<Command> filtered = new ArrayList<Command>();
+
+        for (Command c : availableItems) {
+            if (stitchThisString(c.getKeyStrings()).matches("(?i).*" + filter + ".*")) {
+                filtered.add(c);
+            } else if (c.getCommandName().matches("(?i).*" + filter + ".*")) {
+                filtered.add(c);
+            } else if (c.getCommandDesc().matches("(?i).*" + filter + ".*")) {
+                filtered.add(c);
+            } else if (c.getCommandUsage().matches("(?i).*" + filter + ".*")) {
+                filtered.add(c);
+            } else {
+                for (String example : c.getCommandExamples()) {
+                    if (example.matches("(?i).*" + filter + ".*")) {
+                        filtered.add(c);
+                        break;
+                    }
+                }
+            }
+        }
+        return filtered;
+    }
+
+    @Override
+    protected String getItemText(Command item) {
+        return ChatColor.AQUA + item.getCommandUsage();
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
        sender.sendMessage(ChatColor.AQUA + "====[ Multiverse Help ]====");

-        int page = 1;
-
-        String filter = "";
-
-        if (args.size() == 0) {
-            filter = "";
-            page = 1;
-        } else if (args.size() == 1) {
-            try {
-                page = Integer.parseInt(args.get(0));
-            } catch (NumberFormatException ex) {
-                filter = args.get(0);
-                page = 1;
-            }
-        } else if (args.size() == 2) {
-            filter = args.get(0);
-            try {
-                page = Integer.parseInt(args.get(1));
-            } catch (NumberFormatException ex) {
-                page = 1;
-            }
-        }
+        FilterObject filterObject = this.getPageAndFilter(args);

        List<Command> availableCommands = new ArrayList<Command>(this.plugin.getCommandHandler().getCommands(sender));
-        if (filter.length() > 0) {
-            availableCommands = this.getFilteredCommands(availableCommands, filter);
+        if (filterObject.getFilter().length() > 0) {
+            availableCommands = this.getFilteredItems(availableCommands, filterObject.getFilter());
            if (availableCommands.size() == 0) {
-                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE + "No commands matched your filter: " + ChatColor.AQUA + filter);
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
+                        + "No commands matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
                return;
            }
        }
@@ -80,55 +92,15 @@ public class HelpCommand extends MultiverseCommand {
            return;
        }

-        int totalPages = (int) Math.ceil(availableCommands.size() / (CMDS_PER_PAGE + 0.0));
+        int totalPages = (int) Math.ceil(availableCommands.size() / (this.itemsPerPage + 0.0));

-        if (page > totalPages) {
-            page = totalPages;
+        if (filterObject.getPage() > totalPages) {
+            filterObject.setPage(totalPages);
        }

-        sender.sendMessage(ChatColor.AQUA + " Page " + page + " of " + totalPages);
+        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
        sender.sendMessage(ChatColor.AQUA + " Add a '" + ChatColor.DARK_PURPLE + "?" + ChatColor.AQUA + "' after a command to see more about it.");

-        this.showPage(page, sender, availableCommands);
-
+        this.showPage(filterObject.getPage(), sender, availableCommands);
    }
-
-    private List<Command> getFilteredCommands(List<Command> availableCommands, String filter) {
-        List<Command> filtered = new ArrayList<Command>();
-
-        for (Command c : availableCommands) {
-            if (stitchThisString(c.getKeyStrings()).matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else if (c.getCommandName().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else if (c.getCommandDesc().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else if (c.getCommandUsage().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            }
-        }
-        return filtered;
-    }
-
-    private String stitchThisString(List<String> list) {
-        String returnstr = "";
-        for (String s : list) {
-            returnstr += s + " ";
-        }
-        return returnstr;
-    }
-
-    private void showPage(int page, CommandSender sender, List<Command> cmds) {
-        int start = (page - 1) * CMDS_PER_PAGE;
-        int end = start + CMDS_PER_PAGE;
-        for (int i = start; i < end; i++) {
-            // For consistancy, print some extra lines if it's a player:
-            if (i < cmds.size()) {
-                sender.sendMessage(ChatColor.AQUA + cmds.get(i).getCommandUsage());
-            } else if (sender instanceof Player) {
-                sender.sendMessage(" ");
-            }
-        }
-    }
-
 }
@@ -8,66 +8,164 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
+import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

 import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;

+/**
+ * Imports a new world of the specified type.
+ */
 public class ImportCommand extends MultiverseCommand {
-    private WorldManager worldManager;
+    private MVWorldManager worldManager;

    public ImportCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Import World");
-        this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV} " + ChatColor.GOLD + "[GENERATOR[:ID]]");
-        this.setArgRange(2, 3);
+        this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV}" + ChatColor.GOLD + " -g [GENERATOR[:ID]] [-n]");
+        this.setArgRange(1, 5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
        this.addKey("mvimport");
        this.addKey("mvim");
        this.addKey("mv import");
        this.addCommandExample("/mv import " + ChatColor.GOLD + "gargamel" + ChatColor.GREEN + " normal");
        this.addCommandExample("/mv import " + ChatColor.GOLD + "hell_world" + ChatColor.GREEN + " nether");
+        this.addCommandExample("To import a world that uses a generator, you'll need the generator:");
        this.addCommandExample("/mv import " + ChatColor.GOLD + "CleanRoom" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " CleanRoomGenerator");
        this.setPermission("multiverse.core.import", "Imports a new world of the specified type.", PermissionDefault.OP);
        this.worldManager = this.plugin.getMVWorldManager();
    }

+    /**
+     * A very basic check to see if a folder has a level.dat file.
+     * If it does, we can safely assume it's a world folder.
+     *
+     * @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) {
+        if (worldFolder.isDirectory()) {
+            File[] files = worldFolder.listFiles(new FilenameFilter() {
+                @Override
+                public boolean accept(File file, String name) {
+                    return name.toLowerCase().endsWith(".dat");
+                }
+            });
+            if (files != null && files.length > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private String getPotentialWorlds() {
+        File worldFolder = this.plugin.getServer().getWorldContainer();
+        if (worldFolder == null) {
+            return "";
+        }
+        File[] files = worldFolder.listFiles();
+        String worldList = "";
+        Collection<MultiverseWorld> worlds = this.worldManager.getMVWorlds();
+        List<String> worldStrings = new ArrayList<String>();
+        for (MultiverseWorld world : worlds) {
+            worldStrings.add(world.getName());
+        }
+        for (String world : this.worldManager.getUnloadedWorlds()) {
+            worldStrings.add(world);
+        }
+        ChatColor currColor = ChatColor.WHITE;
+        for (File file : files) {
+            if (file.isDirectory() && checkIfIsWorld(file) && !worldStrings.contains(file.getName())) {
+                worldList += currColor + file.getName() + " ";
+                if (currColor == ChatColor.WHITE) {
+                    currColor = ChatColor.YELLOW;
+                } else {
+                    currColor = ChatColor.WHITE;
+                }
+            }
+        }
+        return worldList;
+    }
+    
+    private String trimWorldName(String userInput) {
+        // Removes relative paths.
+        return userInput.replaceAll("^[./\\\\]+", "");
+    }
+
    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        String worldName = args.get(0);
-        if (this.worldManager.isMVWorld(worldName) && new File(worldName).exists()) {
-            sender.sendMessage(ChatColor.RED + "Multiverse already knows about this world!");
+        String worldName = trimWorldName(args.get(0));
+
+        if (worldName.toLowerCase().equals("--list") || worldName.toLowerCase().equals("-l")) {
+            String worldList = this.getPotentialWorlds();
+            if (worldList.length() > 2) {
+                sender.sendMessage(ChatColor.AQUA + "====[ These look like worlds ]====");
+                sender.sendMessage(worldList);
+            } else {
+                sender.sendMessage(ChatColor.RED + "No potential worlds found. Sorry!");
+            }
+            return;
+        }
+        // Since we made an exception for the list, we have to make sure they have at least 2 params:
+        // Note the exception is --list, which is covered above.
+        if (args.size() == 1 || worldName.length() < 1) {
+            this.showHelp(sender);
            return;
        }

-        String generator = null;
-        if (args.size() == 3) {
-            generator = args.get(2);
+        // Make sure we don't already know about this world.
+        if (this.worldManager.isMVWorld(worldName)) {
+            sender.sendMessage(ChatColor.GREEN + "Multiverse" + ChatColor.WHITE
+                    + " already knows about '" + ChatColor.AQUA + worldName + ChatColor.WHITE + "'!");
+            return;
+        }
+
+        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
+
+        String generator = CommandHandler.getFlag("-g", args);
+        boolean useSpawnAdjust = true;
+        for (String s : args) {
+            if (s.equalsIgnoreCase("-n")) {
+                useSpawnAdjust = false;
+            }
        }

        String env = args.get(1);
-        Environment environment = this.plugin.getEnvFromString(env);
+        Environment environment = EnvironmentCommand.getEnvFromString(env);
        if (environment == null) {
            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
            EnvironmentCommand.showEnvironments(sender);
            return;
        }

-        if (new File(worldName).exists() && env != null) {
-            sender.sendMessage(ChatColor.AQUA + "Starting world import...");
-            this.worldManager.addWorld(worldName, environment, null, generator);
-            sender.sendMessage(ChatColor.GREEN + "Complete!");
-            return;
+        if (!worldFile.exists()) {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            String worldList = this.getPotentialWorlds();
+            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
+            sender.sendMessage(worldList);
+        } else if (!checkIfIsWorld(worldFile)) {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            sender.sendMessage(String.format("'%s' does not appear to be a world. It is lacking a .dat file.",
+                                             worldName));
        } else if (env == null) {
            sender.sendMessage(ChatColor.RED + "FAILED.");
-            sender.sendMessage("That world type did not exist.");
-            sender.sendMessage("For a list of available world types, type: /mvenv");
+            sender.sendMessage("That world environment did not exist.");
+            sender.sendMessage("For a list of available world types, type: " + ChatColor.AQUA + "/mvenv");
        } else {
-            sender.sendMessage(ChatColor.RED + "FAILED.");
-            sender.sendMessage("That world folder does not exist...");
+            Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
+            if (this.worldManager.addWorld(worldName, environment, null, null, null, generator, useSpawnAdjust))
+                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
+            else
+                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
        }
    }
 }
@@ -9,8 +9,11 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.FancyText;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.*;
+import com.onarandombox.MultiverseCore.utils.FancyColorScheme;
+import com.onarandombox.MultiverseCore.utils.FancyHeader;
+import com.onarandombox.MultiverseCore.utils.FancyMessage;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
@@ -23,8 +26,11 @@ import java.util.List;
 // Will use when we can compile with JDK 6
 //import com.sun.xml.internal.ws.util.StringUtils;

+/**
+ * Returns detailed information about a world.
+ */
 public class InfoCommand extends MultiverseCommand {
-    private WorldManager worldManager;
+    private MVWorldManager worldManager;

    public InfoCommand(MultiverseCore plugin) {
        super(plugin);
@@ -55,9 +61,13 @@ public class InfoCommand extends MultiverseCommand {
                return;
            }
        } else if (args.size() == 1) {
-            if (this.worldManager.getMVWorld(args.get(0)) != null) {
+            if (this.worldManager.isMVWorld(args.get(0))) {
                // then we have a world!
                worldName = args.get(0);
+            } else if (this.worldManager.getUnloadedWorlds().contains(args.get(0))) {
+                sender.sendMessage("That world exists, but it is unloaded!");
+                sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, args.get(0)));
+                return;
            } else {
                if (sender instanceof Player) {
                    Player p = (Player) sender;
@@ -65,7 +75,8 @@ public class InfoCommand extends MultiverseCommand {
                    try {
                        pageNum = Integer.parseInt(args.get(0)) - 1;
                    } catch (NumberFormatException e) {
-                        pageNum = 0;
+                        sender.sendMessage("That world does not exist.");
+                        return;
                    }
                } else {
                    sender.sendMessage("You must enter a" + ChatColor.LIGHT_PURPLE + " world" + ChatColor.WHITE + " from the console!");
@@ -87,8 +98,11 @@ public class InfoCommand extends MultiverseCommand {
                p = (Player) sender;
            }
            showPage(pageNum, sender, this.buildEntireCommand(this.worldManager.getMVWorld(worldName), p));
+        } else if (this.worldManager.getUnloadedWorlds().contains(worldName)) {
+            sender.sendMessage("That world exists, but it is unloaded!");
+            sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, worldName));
        } else if (this.plugin.getServer().getWorld(worldName) != null) {
-            sender.sendMessage("That world exists, but multiverse does not know about it!");
+            sender.sendMessage("That world exists, but Multiverse does not know about it!");
            sender.sendMessage("You can import it with" + ChatColor.AQUA + "/mv import " + ChatColor.GREEN + worldName + ChatColor.LIGHT_PURPLE + "{ENV}");
            sender.sendMessage("For available environments type " + ChatColor.GREEN + "/mv env");
        }
@@ -102,17 +116,22 @@ public class InfoCommand extends MultiverseCommand {
        message.add(new FancyHeader("General Info", colors));
        message.add(new FancyMessage("World Name: ", world.getName(), colors));
        message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
-        String enforced = "";
-        if (!MultiverseCore.EnforceGameModes) {
-            enforced = ChatColor.RED + " Not Enforced!";
-        }
-        message.add(new FancyMessage("Game Mode: ", world.getGameMode() + enforced, colors));
+        message.add(new FancyMessage("Game Mode: ", world.getGameMode().toString(), colors));
+        message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
+
        //message.add(new FancyMessage("Game Mode: ", StringUtils.capitalize(world.getGameMode().toString()), colors));
        Location spawn = world.getSpawnLocation();
-        message.add(new FancyMessage("Spawn Location: ", LocationManipulation.strCoords(spawn), colors));
-        message.add(new FancyMessage("World Scale: ", world.getScaling() + "", colors));
+        message.add(new FancyMessage("Spawn Location: ", plugin.getLocationManipulation().strCoords(spawn), colors));
+        message.add(new FancyMessage("World Scale: ", String.valueOf(world.getScaling()), colors));
+        message.add(new FancyMessage("World Seed: ", String.valueOf(world.getSeed()), colors));
        if (world.getPrice() > 0) {
-            message.add(new FancyMessage("Price to enter this world: ", this.plugin.getBank().getFormattedAmount(p, world.getPrice(), world.getCurrency()), colors));
+            message.add(new FancyMessage("Price to enter this world: ",
+                    plugin.getEconomist().formatPrice(world.getPrice(), world.getCurrency()),
+                    colors));
+        } else if (world.getPrice() < 0) {
+            message.add(new FancyMessage("Reward for entering this world: ",
+                    plugin.getEconomist().formatPrice(-world.getPrice(), world.getCurrency()),
+                    colors));
        } else {
            message.add(new FancyMessage("Price to enter this world: ", ChatColor.GREEN + "FREE!", colors));
        }
@@ -131,27 +150,24 @@ public class InfoCommand extends MultiverseCommand {
        // Page 2
        message = new ArrayList<FancyText>();
        message.add(new FancyHeader("More World Settings", colors));
-        message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
+        message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
+        message.add(new FancyMessage("Structures: ", world.getCBWorld().canGenerateStructures() + "", colors));
        message.add(new FancyMessage("Weather: ", world.isWeatherEnabled() + "", colors));
        message.add(new FancyMessage("Players will get hungry: ", world.getHunger() + "", colors));
        message.add(new FancyMessage("Keep spawn in memory: ", world.isKeepingSpawnInMemory() + "", colors));
        message.add(new FancyHeader("PVP Settings", colors));
        message.add(new FancyMessage("Multiverse Setting: ", world.isPVPEnabled() + "", colors));
        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getPVP() + "", colors));
-        message.add(new FancyMessage("Fake PVP Enabled: ", world.getFakePVP() + "", colors));
        worldInfo.add(message);
        // Page 3
        message = new ArrayList<FancyText>();
        message.add(new FancyHeader("Monster Settings", colors));
        message.add(new FancyMessage("Multiverse Setting: ", world.canMonstersSpawn() + "", colors));
        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getAllowMonsters() + "", colors));
-        if (MultiverseCore.MobsDisabledInDefaultWorld) {
-            message.add(new FancyMessage(ChatColor.RED + "WARNING: ", "Monsters WILL NOT SPAWN IN THIS WORLD.", colors));
-            message.add(new FancyMessage(ChatColor.RED + "WARNING: ", "Check your server log for more details.", colors));
-        }
        if (world.getMonsterList().size() > 0) {
            if (world.canMonstersSpawn()) {
-                message.add(new FancyMessage("Monsters that" + ChatColor.RED + " CAN NOT " + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getMonsterList()), colors));
+                message.add(new FancyMessage("Monsters that" + ChatColor.RED + " CAN NOT "
+                        + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getMonsterList()), colors));
            } else {
                message.add(new FancyMessage("Monsters that" + ChatColor.GREEN + " CAN SPAWN: ", toCommaSeperated(world.getMonsterList()), colors));
            }
@@ -165,9 +181,10 @@ public class InfoCommand extends MultiverseCommand {
        message.add(new FancyHeader("Animal Settings", colors));
        message.add(new FancyMessage("Multiverse Setting: ", world.canAnimalsSpawn() + "", colors));
        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getAllowAnimals() + "", colors));
-        if (world.getMonsterList().size() > 0) {
-            if (world.canMonstersSpawn()) {
-                message.add(new FancyMessage("Animals that" + ChatColor.RED + " CAN NOT " + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getAnimalList()), colors));
+        if (world.getAnimalList().size() > 0) {
+            if (world.canAnimalsSpawn()) {
+                message.add(new FancyMessage("Animals that" + ChatColor.RED + " CAN NOT "
+                        + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getAnimalList()), colors));
            } else {
                message.add(new FancyMessage("Animals that" + ChatColor.GREEN + " CAN SPAWN: ", toCommaSeperated(world.getAnimalList()), colors));
            }
@@ -179,7 +196,7 @@ public class InfoCommand extends MultiverseCommand {
        return worldInfo;
    }

-    private String toCommaSeperated(List<String> list) {
+    private static String toCommaSeperated(List<String> list) {
        if (list == null || list.size() == 0) {
            return "";
        }
@@ -195,11 +212,17 @@ public class InfoCommand extends MultiverseCommand {
        return result;
    }

+    /**
+     * Gets a "positive" or "negative" {@link ChatColor}.
+     *
+     * @param positive Whether this {@link ChatColor} should be "positive".
+     * @return The {@link ChatColor}.
+     */
    protected ChatColor getChatColor(boolean positive) {
        return positive ? ChatColor.GREEN : ChatColor.RED;
    }

-    private void showPage(int page, CommandSender sender, List<List<FancyText>> doc) {
+    private static 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;
@@ -15,29 +15,28 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

+import java.util.ArrayList;
 import java.util.List;

-public class ListCommand extends MultiverseCommand {
+/**
+ * Displays a listing of all worlds that a player can enter.
+ */
+public class ListCommand extends PaginatedCoreCommand<String> {

    public ListCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("World Listing");
        this.setCommandUsage("/mv list");
-        this.setArgRange(0, 0);
+        this.setArgRange(0, 2);
        this.addKey("mvlist");
        this.addKey("mvl");
        this.addKey("mv list");
        this.setPermission("multiverse.core.list.worlds", "Displays a listing of all worlds that you can enter.", PermissionDefault.OP);
+        this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
    }

-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-
-        String output = ChatColor.LIGHT_PURPLE + "Worlds which you can view:\n";
+    private List<String> getFancyWorldList(Player p) {
+        List<String> worldList = new ArrayList<String>();
        for (MultiverseWorld world : this.plugin.getMVWorldManager().getMVWorlds()) {

            if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
@@ -50,24 +49,82 @@ public class ListCommand extends MultiverseCommand {
                color = ChatColor.RED;
            } else if (env == Environment.NORMAL) {
                color = ChatColor.GREEN;
-            } else if (env == Environment.SKYLANDS) {
+            } else if (env == Environment.THE_END) {
                color = ChatColor.AQUA;
            }
-            String outputCache = world.getColoredWorldString() + ChatColor.WHITE + " - " + color + world.getEnvironment() + " \n";
+            StringBuilder builder = new StringBuilder();
+            builder.append(world.getColoredWorldString()).append(ChatColor.WHITE);
+            builder.append(" - ").append(color).append(world.getEnvironment());
            if (world.isHidden()) {
-                // TODO: Add an actual permission for this.
-                if (p == null || p.isOp()) {
+                if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.core.modify", true)) {
                    // Prefix hidden worlds with an "[H]"
-                    outputCache = ChatColor.GRAY + "[H]" + outputCache;
-                    output += outputCache;
+                    worldList.add(ChatColor.GRAY + "[H]" + builder.toString());
                }
            } else {
-                output += outputCache;
+                worldList.add(builder.toString());
            }
        }
-        String[] response = output.split("\n");
-        for (String msg : response) {
-            sender.sendMessage(msg);
+        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");
+            }
        }
+        return worldList;
+    }
+
+    @Override
+    protected List<String> getFilteredItems(List<String> availableItems, String filter) {
+        List<String> filtered = new ArrayList<String>();
+
+        for (String s : availableItems) {
+            if (s.matches("(?i).*" + filter + ".*")) {
+                filtered.add(s);
+            }
+        }
+        return filtered;
+    }
+
+    @Override
+    protected String getItemText(String item) {
+        return item;
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse World List ]====");
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+
+
+        FilterObject filterObject = this.getPageAndFilter(args);
+
+        List<String> availableWorlds = new ArrayList<String>(this.getFancyWorldList(p));
+        if (filterObject.getFilter().length() > 0) {
+            availableWorlds = this.getFilteredItems(availableWorlds, filterObject.getFilter());
+            if (availableWorlds.size() == 0) {
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
+                        + "No worlds matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
+                return;
+            }
+        }
+
+        if (!(sender instanceof Player)) {
+            for (String c : availableWorlds) {
+                sender.sendMessage(c);
+            }
+            return;
+        }
+
+        int totalPages = (int) Math.ceil(availableWorlds.size() / (this.itemsPerPage + 0.0));
+
+        if (filterObject.getPage() > totalPages) {
+            filterObject.setPage(totalPages);
+        }
+
+        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
+
+        this.showPage(filterObject.getPage(), sender, availableWorlds);
    }
 }
@@ -9,11 +9,15 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

 import java.util.List;

+/**
+ * Loads a world into Multiverse.
+ */
 public class LoadCommand extends MultiverseCommand {

    public LoadCommand(MultiverseCore plugin) {
@@ -30,9 +34,9 @@ public class LoadCommand extends MultiverseCommand {
    @Override
    public void runCommand(CommandSender sender, List<String> args) {
        if (this.plugin.getMVWorldManager().loadWorld(args.get(0))) {
-            sender.sendMessage("World Loaded!");
+            Command.broadcastCommandMessage(sender, "Loaded world '" + args.get(0) + "'!");
        } else {
-            sender.sendMessage("Error trying to load world!");
+            sender.sendMessage("Error trying to load world '" + args.get(0) + "'!");
        }
    }
 }
@@ -8,9 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.enums.Action;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -21,8 +21,11 @@ import java.util.List;
 // This will contain all the properties that support the ADD/REMOVE
 // Anything not in here will only support the SET action

+/**
+ * Used to modify various aspects of worlds.
+ */
 public class ModifyAddCommand extends MultiverseCommand {
-    private WorldManager worldManager;
+    private MVWorldManager worldManager;

    public ModifyAddCommand(MultiverseCore plugin) {
        super(plugin);
@@ -36,7 +39,8 @@ public class ModifyAddCommand extends MultiverseCommand {
        this.addCommandExample("/mvm " + ChatColor.GOLD + "add " + ChatColor.GREEN + "sheep " + ChatColor.RED + "animals");
        this.addCommandExample("/mvm " + ChatColor.GOLD + "add " + ChatColor.GREEN + "creeper " + ChatColor.RED + "monsters");
        this.addCommandExample("/mvm " + ChatColor.GOLD + "add " + ChatColor.GREEN + "MyWorld " + ChatColor.RED + "worldblacklist");
-        this.setPermission("multiverse.core.modify.add", "Modify various aspects of worlds. See the help wiki for how to use this command properly. If you do not include a world, the current world will be used.", PermissionDefault.OP);
+        this.setPermission("multiverse.core.modify.add", "Modify various aspects of worlds. See the help wiki for how to use this command properly. "
+                + "If you do not include a world, the current world will be used.", PermissionDefault.OP);
        this.worldManager = this.plugin.getMVWorldManager();
    }

@@ -73,12 +77,17 @@ public class ModifyAddCommand extends MultiverseCommand {

        if (!ModifyCommand.validateAction(Action.Add, property)) {
            sender.sendMessage("Sorry, you can't ADD to " + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/4W8cY");
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/OMGwzx");
            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);
+            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);
        }
@@ -8,9 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.enums.Action;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -18,8 +18,11 @@ import org.bukkit.permissions.PermissionDefault;

 import java.util.List;

+/**
+ * Removes all values from a world-property.
+ */
 public class ModifyClearCommand extends MultiverseCommand {
-    private WorldManager worldManager;
+    private MVWorldManager worldManager;

    public ModifyClearCommand(MultiverseCore plugin) {
        super(plugin);
@@ -33,7 +36,8 @@ public class ModifyClearCommand extends MultiverseCommand {
        this.addCommandExample("/mvm " + ChatColor.GOLD + "clear " + ChatColor.RED + "animals");
        this.addCommandExample("/mvm " + ChatColor.GOLD + "clear " + ChatColor.RED + "monsters");
        this.addCommandExample("/mvm " + ChatColor.GOLD + "clear " + ChatColor.RED + "worldblacklist");
-        this.setPermission("multiverse.core.modify.clear", "Removes all values from a property. This will work on properties that contain lists.", PermissionDefault.OP);
+        this.setPermission("multiverse.core.modify.clear",
+                "Removes all values from a property. This will work on properties that contain lists.", PermissionDefault.OP);
        this.worldManager = this.plugin.getMVWorldManager();
    }

@@ -68,14 +72,20 @@ public class ModifyClearCommand extends MultiverseCommand {

        if (!ModifyCommand.validateAction(Action.Clear, property)) {
            sender.sendMessage("Sorry, you can't use CLEAR with " + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/cgB2B");
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/q1h01S");
            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.");
+            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.");
+            sender.sendMessage(ChatColor.RED + "Error: " + ChatColor.GOLD + property
+                    + ChatColor.WHITE + " was " + ChatColor.GOLD + "NOT" + ChatColor.WHITE + " cleared.");
        }
    }

@@ -10,7 +10,6 @@ package com.onarandombox.MultiverseCore.commands;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.enums.Action;
 import com.onarandombox.MultiverseCore.enums.AddProperties;
-import com.onarandombox.MultiverseCore.enums.SetProperties;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
@@ -20,6 +19,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+/**
+ * Used to modify various aspects of worlds.
+ */
 public class ModifyCommand extends MultiverseCommand {

    public ModifyCommand(MultiverseCore plugin) {
@@ -35,19 +37,24 @@ public class ModifyCommand extends MultiverseCommand {
        children.put("multiverse.core.modify.modify", true);
        children.put("multiverse.core.modify.clear", true);
        children.put("multiverse.core.modify.remove", true);
-        Permission modify = new Permission("multiverse.core.modify", "Modify various aspects of worlds. See the help wiki for how to use this command properly. If you do not include a world, the current world will be used.", PermissionDefault.OP, children);
+        Permission modify = new Permission("multiverse.core.modify",
+                "Modify various aspects of worlds. It requires add/set/clear/remove. See the examples below", PermissionDefault.OP, children);
+        this.addCommandExample(ChatColor.AQUA + "/mv modify set ?");
+        this.addCommandExample(ChatColor.GREEN + "/mv modify add ?");
+        this.addCommandExample(ChatColor.BLUE + "/mv modify clear ?");
+        this.addCommandExample(ChatColor.RED + "/mv modify remove ?");
        this.setPermission(modify);
    }

+    /**
+     * Validates the specified action.
+     *
+     * @param action The {@link Action}.
+     * @param property The property.
+     * @return Whether this action is valid.
+     */
    protected static boolean validateAction(Action action, String property) {
-        if (action == Action.Set) {
-            try {
-                SetProperties.valueOf(property);
-                return true;
-            } catch (IllegalArgumentException e) {
-                return false;
-            }
-        } else {
+        if (action != Action.Set) {
            try {
                AddProperties.valueOf(property);
                return true;
@@ -55,6 +62,7 @@ public class ModifyCommand extends MultiverseCommand {
                return false;
            }
        }
+        return false;
    }

    @Override
@@ -8,9 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.enums.Action;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -18,8 +18,11 @@ import org.bukkit.permissions.PermissionDefault;

 import java.util.List;

+/**
+ * Removes values from a world-property.
+ */
 public class ModifyRemoveCommand extends MultiverseCommand {
-    private WorldManager worldManager;
+    private MVWorldManager worldManager;

    public ModifyRemoveCommand(MultiverseCore plugin) {
        super(plugin);
@@ -37,7 +40,8 @@ public class ModifyRemoveCommand extends MultiverseCommand {
        this.addCommandExample("/mvm " + ChatColor.GOLD + "remove " + ChatColor.GREEN + "sheep " + ChatColor.RED + "animals");
        this.addCommandExample("/mvm " + ChatColor.GOLD + "remove " + ChatColor.GREEN + "creeper " + ChatColor.RED + "monsters");
        this.addCommandExample("/mvm " + ChatColor.GOLD + "remove " + ChatColor.GREEN + "MyWorld " + ChatColor.RED + "worldblacklist");
-        this.setPermission("multiverse.core.modify.remove", "Modify various aspects of worlds. See the help wiki for how to use this command properly. If you do not include a world, the current world will be used.", PermissionDefault.OP);
+        this.setPermission("multiverse.core.modify.remove", "Modify various aspects of worlds. See the help wiki for how to use this command properly. "
+                + "If you do not include a world, the current world will be used.", PermissionDefault.OP);
        this.worldManager = this.plugin.getMVWorldManager();
    }

@@ -74,13 +78,19 @@ public class ModifyRemoveCommand extends MultiverseCommand {

        if (!ModifyCommand.validateAction(Action.Remove, property)) {
            sender.sendMessage("Sorry, you can't REMOVE anything from" + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/4W8cY");
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/OMGwzx");
            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);
+            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);
+            sender.sendMessage(ChatColor.RED + "There was an error removing " + ChatColor.GRAY
+                    + value + ChatColor.WHITE + " from " + ChatColor.GOLD + property);
        }
    }

@@ -8,10 +8,10 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.enums.Action;
 import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
+import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -19,11 +19,15 @@ import org.bukkit.permissions.PermissionDefault;

 import java.util.List;

+/**
+ * Used to set world-properties.
+ */
 public class ModifySetCommand extends MultiverseCommand {
-    private WorldManager worldManager;
+    private MVWorldManager worldManager;

    public ModifySetCommand(MultiverseCore plugin) {
        super(plugin);
+        this.worldManager = this.plugin.getMVWorldManager();
        this.setName("Modify a World (Set a value)");
        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " set {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
        this.setArgRange(1, 3);
@@ -44,15 +48,21 @@ public class ModifySetCommand extends MultiverseCommand {
        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "hunger " + ChatColor.RED + "false");
        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "hidden " + ChatColor.RED + "true");
        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "pvp " + ChatColor.RED + "false");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "heal " + ChatColor.RED + "true");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "adjustspawn " + ChatColor.RED + "false");
        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "spawn");
-        this.setPermission("multiverse.core.modify.set", "Modify various aspects of worlds. See the help wiki for how to use this command properly. If you do not include a world, the current world will be used.", PermissionDefault.OP);
-        this.worldManager = this.plugin.getMVWorldManager();
+        this.setPermission("multiverse.core.modify.set", "Modify various aspects of worlds. See the help wiki for how to use this command properly. "
+                + "If you do not include a world, the current world will be used.", PermissionDefault.OP);
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
        // Special case for spawn:
        if (args.size() == 1) {
+            if (!(sender instanceof Player)) {
+                sender.sendMessage("You must be a player to set the" + ChatColor.GREEN + " spawn");
+                return;
+            }
            if (args.get(0).equalsIgnoreCase("spawn")) {
                SetSpawnCommand c = new SetSpawnCommand(this.plugin);
                c.setWorldSpawn(sender);
@@ -92,18 +102,24 @@ public class ModifySetCommand extends MultiverseCommand {
            return;
        }

-        if (!ModifyCommand.validateAction(Action.Set, property)) {
-            sender.sendMessage("Sorry, you can't SET " + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/l54PH");
-            return;
-        }
-        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !world.isValidAliasColor(value)) {
+        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !EnglishChatColor.isValidAliasColor(value)) {
            sender.sendMessage(value + " is not a valid color. Please pick one of the following:");
            sender.sendMessage(EnglishChatColor.getAllColors());
-        } else if (world.setVariable(property, value)) {
-            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Property " + ChatColor.AQUA + property + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
-        } else {
-            sender.sendMessage(ChatColor.RED + "There was an error setting " + ChatColor.GRAY + property);
+            return;
+        }
+        try {
+            if (world.setPropertyValue(property, value)) {
+                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));
+            }
+        } catch (PropertyDoesNotExistException e) {
+            sender.sendMessage(ChatColor.RED + "Sorry, You can't set: '" + ChatColor.GRAY + property + ChatColor.RED + "'");
+            sender.sendMessage("Valid world-properties: " + world.getAllPropertyNames());
        }
    }
 }
@@ -8,18 +8,30 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
 import com.pneumaticraft.commandhandler.Command;
 import org.bukkit.command.CommandSender;

 import java.util.List;

+/**
+ * A generic Multiverse-command.
+ */
 public abstract class MultiverseCommand extends Command {

+    /**
+     * The reference to the core.
+     */
    protected MultiverseCore plugin;
+    /**
+     * The reference to {@link MultiverseMessaging}.
+     */
+    protected MultiverseMessaging messaging;

    public MultiverseCommand(MultiverseCore plugin) {
        super(plugin);
        this.plugin = plugin;
+        this.messaging = this.plugin.getMessaging();
    }

    @Override
@@ -0,0 +1,164 @@
+/******************************************************************************
+ * 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.pneumaticraft.commandhandler.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.List;
+
+/**
+ * A generic paginated command.
+ * @param <T> The type of items on the page.
+ */
+public abstract class PaginatedCommand<T> extends Command {
+    private static final int DEFAULT_ITEMS_PER_PAGE = 9;
+    /**
+     * The number of items per page.
+     */
+    protected int itemsPerPage = DEFAULT_ITEMS_PER_PAGE;
+
+    public PaginatedCommand(JavaPlugin plugin) {
+        super(plugin);
+    }
+
+    /**
+     * Set the number of items per page.
+     *
+     * @param items The new number of items per page.
+     */
+    protected void setItemsPerPage(int items) {
+        itemsPerPage = items;
+    }
+
+    /**
+     * Gets filtered items.
+     * @param availableItems All available items.
+     * @param filter The filter-{@link String}.
+     * @return A list of items that match the filter.
+     */
+    protected abstract List<T> getFilteredItems(List<T> availableItems, String filter);
+
+    /**
+     * Constructs a single string from a list of strings.
+     *
+     * @param list The {@link List} of strings.
+     * @return A single {@link String}.
+     */
+    protected String stitchThisString(List<String> list) {
+        StringBuilder builder = new StringBuilder();
+        for (String s : list) {
+            builder.append(s);
+            builder.append(' ');
+        }
+        return builder.toString();
+    }
+
+    /**
+     * Shows a page.
+     *
+     * @param page The number of the page to show.
+     * @param sender The {@link CommandSender} that wants to see the page.
+     * @param cmds The items that should be displayed on the page.
+     */
+    protected void showPage(int page, CommandSender sender, List<T> cmds) {
+        // Ensure the page is at least 1.
+        page = (page <= 0) ? 1 : page;
+        int start = (page - 1) * itemsPerPage;
+        int end = start + itemsPerPage;
+
+        for (int i = start; i < end; i++) {
+            // For consistancy, print some extra lines if it's a player:
+            if (i < cmds.size()) {
+                sender.sendMessage(this.getItemText(cmds.get(i)));
+            } else if (sender instanceof Player) {
+                sender.sendMessage(" ");
+            }
+        }
+    }
+
+    /**
+     * Converts an item into a string.
+     *
+     * @param item The item.
+     * @return A {@link String}.
+     */
+    protected abstract String getItemText(T item);
+
+    /**
+     * Constructs a {@link FilterObject} from a {@link List} of arguments.
+     *
+     * @param args The {@link List} of arguments.
+     * @return The {@link FilterObject}.
+     */
+    protected FilterObject getPageAndFilter(List<String> args) {
+        int page = 1;
+
+        String filter = "";
+
+        if (args.size() == 0) {
+            filter = "";
+            page = 1;
+        } else if (args.size() == 1) {
+            try {
+                page = Integer.parseInt(args.get(0));
+            } catch (NumberFormatException ex) {
+                filter = args.get(0);
+                page = 1;
+            }
+        } else if (args.size() == 2) {
+            filter = args.get(0);
+            try {
+                page = Integer.parseInt(args.get(1));
+            } catch (NumberFormatException ex) {
+                page = 1;
+            }
+        }
+        return new FilterObject(page, filter);
+    }
+
+    /**
+     * "Key-Object" containing information about the page and the filter that were requested.
+     */
+    protected class FilterObject {
+        private Integer page;
+        private String filter;
+
+        public FilterObject(Integer page, String filter) {
+            this.page = page;
+            this.filter = filter;
+        }
+
+        /**
+         * Gets the page.
+         * @return The page.
+         */
+        public Integer getPage() {
+            return this.page;
+        }
+
+        /**
+         * Sets the page.
+         *
+         * @param page The new page.
+         */
+        public void setPage(int page) {
+            this.page = page;
+        }
+
+        /**
+         * Gets the filter.
+         * @return The filter.
+         */
+        public String getFilter() {
+            return this.filter;
+        }
+    }
+}
@@ -5,18 +5,22 @@
 * with this project.                                                         *
 ******************************************************************************/

-package com.onarandombox.utils;
+package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;

 /**
- * Dummy class to make old MV Plugins not explode.
- * If this loads, the user WILL get a severe telling them to update said plugin!
- * WILL BE DELETED ON 11/1/11
+ * A generic paginated Multiverse-command.
+ * @param <T> The type of items on the page.
 */
-@Deprecated
-public class WorldManager extends com.onarandombox.MultiverseCore.utils.WorldManager {
-    public WorldManager(MultiverseCore core) {
-        super(core);
+public abstract class PaginatedCoreCommand<T> extends PaginatedCommand<T> {
+    /**
+     * The reference to the core.
+     */
+    protected MultiverseCore plugin;
+
+    public PaginatedCoreCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.plugin = plugin;
    }
 }
@@ -8,9 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.PurgeWorlds;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
+import com.onarandombox.MultiverseCore.api.WorldPurger;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -20,8 +20,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

+/**
+ * Removes a type of mob from a world.
+ */
 public class PurgeCommand extends MultiverseCommand {
-    private WorldManager worldManager;
+    private MVWorldManager worldManager;

    public PurgeCommand(MultiverseCore plugin) {
        super(plugin);
@@ -62,7 +65,7 @@ public class PurgeCommand extends MultiverseCommand {
        }

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

-        PurgeWorlds purger = this.worldManager.getWorldPurger();
+        WorldPurger purger = this.worldManager.getTheWorldPurger();
        ArrayList<String> thingsToKill = new ArrayList<String>();
        if (deathName.equalsIgnoreCase("all") || deathName.equalsIgnoreCase("animals") || deathName.equalsIgnoreCase("monsters")) {
            thingsToKill.add(deathName.toUpperCase());
@@ -83,10 +86,7 @@ public class PurgeCommand extends MultiverseCommand {
            Collections.addAll(thingsToKill, deathName.toUpperCase().split(","));
        }
        for (MultiverseWorld w : worldsToRemoveEntitiesFrom) {
-            purger.purgeWorld(sender, w, thingsToKill, false, false);
+            purger.purgeWorld(w, thingsToKill, false, false, sender);
        }
-
-        return;
    }
-
 }
@@ -0,0 +1,53 @@
+/******************************************************************************
+ * 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.ArrayList;
+import java.util.List;
+
+/**
+ * Regenerates a world.
+ */
+public class RegenCommand extends MultiverseCommand {
+
+    public RegenCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Regenerates a World");
+        this.setCommandUsage("/mv regen" + ChatColor.GREEN + " {WORLD}" + ChatColor.GOLD + " [-s [SEED]]");
+        this.setArgRange(1, 3);
+        this.addKey("mvregen");
+        this.addKey("mv regen");
+        this.addCommandExample("You can use the -s with no args to get a new seed:");
+        this.addCommandExample("/mv regen " + ChatColor.GREEN + "MyWorld" + ChatColor.GOLD + " -s");
+        this.addCommandExample("or specifiy a seed to get that one:");
+        this.addCommandExample("/mv regen " + ChatColor.GREEN + "MyWorld" + ChatColor.GOLD + " -s" + ChatColor.AQUA + " gargamel");
+        this.setPermission("multiverse.core.regen", "Regenerates a world on your server. The previous state will be lost "
+                + ChatColor.RED + "PERMANENTLY.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Boolean useseed = (!(args.size() == 1));
+        Boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s"));
+        String seed = (args.size() == 3) ? args.get(2) : "";
+
+        Class<?>[] paramTypes = {String.class, Boolean.class, Boolean.class, String.class};
+        List<Object> objectArgs = new ArrayList<Object>();
+        objectArgs.add(args.get(0));
+        objectArgs.add(useseed);
+        objectArgs.add(randomseed);
+        objectArgs.add(seed);
+        this.plugin.getCommandHandler().queueCommand(sender, "mvregen", "regenWorld", objectArgs,
+                paramTypes, ChatColor.GREEN + "World Regenerated!", ChatColor.RED + "World could NOT be regenerated!");
+    }
+}
@@ -16,6 +16,9 @@ import org.bukkit.permissions.PermissionDefault;
 import java.util.ArrayList;
 import java.util.List;

+/**
+ * Reloads worlds.yml and config.yml.
+ */
 public class ReloadCommand extends MultiverseCommand {

    public ReloadCommand(MultiverseCore plugin) {
@@ -33,11 +36,13 @@ public class ReloadCommand extends MultiverseCommand {
    public void runCommand(CommandSender sender, List<String> args) {
        sender.sendMessage(ChatColor.GOLD + "Reloading all Multiverse Plugin configs...");
        this.plugin.loadConfigs();
+        this.plugin.getAnchorManager().loadAnchors();
        this.plugin.getMVWorldManager().loadWorlds(true);

        List<String> configsLoaded = new ArrayList<String>();
        configsLoaded.add("Multiverse-Core - config.yml");
        configsLoaded.add("Multiverse-Core - worlds.yml");
+        configsLoaded.add("Multiverse-Core - anchors.yml");
        // Create the event
        MVConfigReloadEvent configReload = new MVConfigReloadEvent(configsLoaded);
        // Fire it off
@@ -14,6 +14,9 @@ import org.bukkit.permissions.PermissionDefault;

 import java.util.List;

+/**
+ * Unloads a world and removes it from the config.
+ */
 public class RemoveCommand extends MultiverseCommand {

    public RemoveCommand(MultiverseCore plugin) {
@@ -24,7 +27,8 @@ public class RemoveCommand extends MultiverseCommand {
        this.addKey("mvremove");
        this.addKey("mv remove");
        this.addCommandExample("/mv remove " + ChatColor.GREEN + "MyWorld");
-        this.setPermission("multiverse.core.remove", "Unloads a world from Multiverse and removes it from worlds.yml, this does NOT DELETE the world folder.", PermissionDefault.OP);
+        this.setPermission("multiverse.core.remove",
+                "Unloads a world from Multiverse and removes it from worlds.yml, this does NOT DELETE the world folder.", PermissionDefault.OP);
    }

    @Override
@@ -0,0 +1,54 @@
+/******************************************************************************
+ * 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));
+    }
+}
@@ -8,8 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.BlockSafety;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
@@ -17,14 +18,17 @@ import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

 import java.util.List;
+import org.bukkit.Bukkit;

+/**
+ * Sets the spawn for a world.
+ */
 public class SetSpawnCommand extends MultiverseCommand {
-
    public SetSpawnCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Set World Spawn");
        this.setCommandUsage("/mv setspawn");
-        this.setArgRange(0, 0);
+        this.setArgRange(0, 6);
        this.addKey("mvsetspawn");
        this.addKey("mvss");
        this.addKey("mv set spawn");
@@ -34,27 +38,110 @@ public class SetSpawnCommand extends MultiverseCommand {
        this.setPermission("multiverse.core.spawn.set", "Sets the spawn for the current world.", PermissionDefault.OP);
    }

+    /**
+     * Dispatches the user's command depending on the number of parameters
+     * @param sender The player who executes the command, may be console as well.
+     * @param args Command line parameters
+     */
    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        setWorldSpawn(sender);
+        if (args.isEmpty()) {
+            setWorldSpawn(sender);
+        } else if (args.size() == 4) {
+            setWorldSpawn(sender, args.get(0), args.get(1), args.get(2), args.get(3));
+        } else if (args.size() == 6) {
+            setWorldSpawn(sender, args.get(0), args.get(1), args.get(2), args.get(3), args.get(4), args.get(5));
+        } else {
+            sender.sendMessage("Use no arguments for your current location, or world/x/y/z, or world/x/y/z/yaw/pitch!");
+        }
    }

+    /**
+     * Set the world spawn when no parameters are given
+     * @param sender The {@link CommandSender} who executes the command. 
+     *               Everything not a {@link Player}, e.g. console, gets rejected, as we can't get coordinates from there.
+     */
    protected void setWorldSpawn(CommandSender sender) {
        if (sender instanceof Player) {
            Player p = (Player) sender;
            Location l = p.getLocation();
            World w = p.getWorld();
-            MultiverseWorld foundWorld = this.plugin.getMVWorldManager().getMVWorld(w.getName());
-            if (foundWorld != null) {
-                foundWorld.setSpawnLocation(p.getLocation());
-                sender.sendMessage("Spawn was set to: " + LocationManipulation.strCoords(p.getLocation()));
-            } else {
-                w.setSpawnLocation(l.getBlockX(), l.getBlockY(), l.getBlockZ());
-                sender.sendMessage("Multiverse does not know about this world, only X,Y and Z set. Please import it to set the spawn fully (Pitch/Yaws).");
-            }
-
+            setWorldSpawn(sender, w, l);
        } else {
-            sender.sendMessage("You cannot use this command from the console.");
+            sender.sendMessage("You need to give coordinates to use this command from the console!");
+        }
+    }
+    
+    /**
+     * Set the world spawn when 4 parameters are given
+     * @param sender The {@link CommandSender} who executes the command
+     * @param world The world to set the spawn in
+     * @param x X-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param y Y-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param z Z-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     */
+    protected void setWorldSpawn(CommandSender sender, String world, String x, String y, String z) {
+        setWorldSpawn(sender, world, x, y, z, "0", "0");
+    }
+
+    /**
+     * Set the world spawn when 6 parameters are given
+     * @param sender The {@link CommandSender} who executes the command
+     * @param world The world to set the spawn in
+     * @param x X-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param y Y-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param z Z-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param yaw Yaw a newly spawned player should look at (as a {@link String} as it's from the command line, gets parsed into a float)
+     * @param pitch Pitch a newly spawned player should look at (as a {@link String} as it's from the command line, gets parsed into a float)
+     */
+    protected void setWorldSpawn(CommandSender sender, String world, String x, String y, String z, String yaw, String pitch) {
+        double dx, dy, dz;
+        float fpitch, fyaw;
+        World bukkitWorld = Bukkit.getWorld(world);
+        if (bukkitWorld == null) {
+            sender.sendMessage("World " + world + " is unknown!");
+            return;
+        }
+        try {
+            dx = Double.parseDouble(x);
+            dy = Double.parseDouble(y);
+            dz = Double.parseDouble(z);
+            fpitch = Float.parseFloat(pitch);
+            fyaw = Float.parseFloat(yaw);
+        } catch (NumberFormatException ex) {
+            sender.sendMessage("All coordinates must be numeric");
+            return;
+        }
+        Location l = new Location(bukkitWorld, dx, dy, dz, fyaw, fpitch);
+        setWorldSpawn(sender, bukkitWorld, l);
+    }
+
+    /**
+     * Does the actual spawn-setting-work.
+     *
+     * @param sender The {@link CommandSender} that's setting the spawn.
+     * @param w The {@link World} to set the spawn in
+     * @param l The {@link Location} to set the spawn to
+     */
+    private void setWorldSpawn(CommandSender sender, World w, Location l) {
+        MultiverseWorld foundWorld = this.plugin.getMVWorldManager().getMVWorld(w.getName());
+        if (foundWorld != null) {
+            foundWorld.setSpawnLocation(l);
+            BlockSafety bs = this.plugin.getBlockSafety();
+            if (!bs.playerCanSpawnHereSafely(l) && foundWorld.getAdjustSpawn()) {
+                sender.sendMessage("It looks like that location would normally be unsafe. But I trust you.");
+                sender.sendMessage("I'm turning off the Safe-T-Teleporter for spawns to this world.");
+                sender.sendMessage("If you want this turned back on just do:");
+                sender.sendMessage(ChatColor.AQUA + "/mvm set adjustspawn true " + foundWorld.getAlias());
+                foundWorld.setAdjustSpawn(false);
+            }
+            sender.sendMessage("Spawn was set to: " + plugin.getLocationManipulation().strCoords(l));
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
+        } else {
+            w.setSpawnLocation(l.getBlockX(), l.getBlockY(), l.getBlockZ());
+            sender.sendMessage("Multiverse does not know about this world, only X,Y and Z set. Please import it to set the spawn fully (Pitch/Yaws).");
        }
    }
 }
@@ -0,0 +1,52 @@
+/******************************************************************************
+ * 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");
+        }
+    }
+}
@@ -14,6 +14,9 @@ import org.bukkit.permissions.PermissionDefault;

 import java.util.List;

+/**
+ * Takes the player to the latest bed he's slept in.
+ */
 public class SleepCommand extends MultiverseCommand {

    public SleepCommand(MultiverseCore plugin) {
@@ -18,11 +18,15 @@ import org.bukkit.permissions.PermissionDefault;

 import java.util.List;

+/**
+ * Teleports a player to the spawn.
+ */
 public class SpawnCommand extends MultiverseCommand {

    public SpawnCommand(MultiverseCore plugin) {
        super(plugin);
-        Permission otherPerm = new Permission("multiverse.core.spawn.other", "Teleports another player to the spawn of the world they are in.", PermissionDefault.OP);
+        Permission otherPerm = new Permission("multiverse.core.spawn.other",
+                "Teleports another player to the spawn of the world they are in.", PermissionDefault.OP);
        this.setName("Spawn");
        this.setCommandUsage("/mv spawn" + ChatColor.GOLD + " [PLAYER]");
        this.setArgRange(0, 1);
@@ -81,6 +85,6 @@ public class SpawnCommand extends MultiverseCommand {
        } else {
            spawnLocation = player.getWorld().getSpawnLocation();
        }
-        this.plugin.getTeleporter().safelyTeleport(player, player, spawnLocation, false);
+        this.plugin.getSafeTTeleporter().safelyTeleport(player, player, spawnLocation, false);
    }
 }
@@ -1,59 +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 org.getspout.spoutapi.gui.GenericButton;
-import org.getspout.spoutapi.gui.GenericPopup;
-import org.getspout.spoutapi.gui.PopupScreen;
-import org.getspout.spoutapi.player.SpoutPlayer;
-
-import java.util.List;
-
-public class SpoutCommand extends MultiverseCommand {
-
-    public SpoutCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Edit World with Spout");
-        this.setCommandUsage("/mv spout");
-        this.setArgRange(0, 0);
-        this.addKey("mv spout");
-        this.setPermission("multiverse.core.spout", "Edit a world with spout.", PermissionDefault.OP);
-        this.addCommandExample("/mv spout");
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (!(sender instanceof Player)) {
-            sender.sendMessage(ChatColor.RED + "This command must be run as a player!");
-            return;
-        }
-        if (plugin.getSpout() == null) {
-            sender.sendMessage(ChatColor.RED + "You need spout installed on this server to use it with Multiverse!");
-            return;
-        }
-        SpoutPlayer p = (SpoutPlayer) sender;
-        if (!p.isSpoutCraftEnabled()) {
-            sender.sendMessage(ChatColor.RED + p.getName() + "You need to be using the Spoutcraft client to run this command!");
-            return;
-        }
-        PopupScreen pop = new GenericPopup();
-        GenericButton button = new GenericButton("Fish");
-        button.setX(50);
-        button.setY(50);
-        button.setWidth(100);
-        button.setHeight(40);
-        pop.attachWidget(this.plugin, button);
-        sender.sendMessage(ChatColor.GREEN + "YAY!");
-        p.getMainScreen().attachPopupScreen(pop);
-    }
-}
@@ -8,14 +8,15 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Teleporter;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.destination.CustomTeleporterDestination;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
 import com.onarandombox.MultiverseCore.destination.WorldDestination;
+import com.onarandombox.MultiverseCore.enums.TeleportResult;
 import com.onarandombox.MultiverseCore.event.MVTeleportEvent;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
-import com.onarandombox.MultiverseCore.utils.MVMessaging;
-import com.onarandombox.MultiverseCore.utils.SafeTTeleporter;
+import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -28,6 +29,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;

+/**
+ * Used to teleport players.
+ */
 public class TeleportCommand extends MultiverseCommand {
    private SafeTTeleporter playerTeleporter;

@@ -40,25 +44,24 @@ public class TeleportCommand extends MultiverseCommand {
        this.setArgRange(1, 2);
        this.addKey("mvtp");
        this.addKey("mv tp");
-        this.playerTeleporter = new SafeTTeleporter(this.plugin);
+        this.playerTeleporter = this.plugin.getSafeTTeleporter();
        this.setPermission(menu);
    }

+    private static final int UNSAFE_TELEPORT_EXPIRE_DELAY = 15;
+
    @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;

        if (args.size() == 2) {
            teleportee = this.plugin.getServer().getPlayer(args.get(0));
            if (teleportee == null) {
-                sender.sendMessage("Sorry, I couldn't find player: " + args.get(0));
+                this.messaging.sendMessage(sender, String.format("Sorry, I couldn't find player: %s%s",
+                        ChatColor.GOLD, args.get(0)), false);
                return;
            }
            destinationName = args.get(1);
@@ -66,7 +69,7 @@ public class TeleportCommand extends MultiverseCommand {
        } else {
            destinationName = args.get(0);
            if (!(sender instanceof Player)) {
-                sender.sendMessage("From the console, you must specify a player to teleport");
+                this.messaging.sendMessage(sender, String.format("From the console, you must specify a player to teleport"), false);
                return;
            }
            teleportee = (Player) sender;
@@ -76,7 +79,9 @@ public class TeleportCommand extends MultiverseCommand {
            String[] cannonSpeed = destinationName.split("-");
            try {
                double speed = Double.parseDouble(cannonSpeed[1]);
-                destinationName = "ca:" + teleportee.getWorld().getName() + ":" + teleportee.getLocation().getX() + "," + teleportee.getLocation().getY() + "," + teleportee.getLocation().getZ() + ":" + teleportee.getLocation().getPitch() + ":" + teleportee.getLocation().getYaw() + ":" + speed;
+                destinationName = "ca:" + teleportee.getWorld().getName() + ":" + teleportee.getLocation().getX()
+                        + "," + teleportee.getLocation().getY() + "," + teleportee.getLocation().getZ() + ":"
+                        + teleportee.getLocation().getPitch() + ":" + teleportee.getLocation().getYaw() + ":" + speed;
            } catch (Exception e) {
                destinationName = "i:invalid";
            }
@@ -94,7 +99,8 @@ public class TeleportCommand extends MultiverseCommand {
        }

        if (d != null && d instanceof InvalidDestination) {
-            sender.sendMessage("Multiverse does not know how to take you to: " + ChatColor.RED + destinationName);
+            this.messaging.sendMessage(sender, String.format("Multiverse does not know how to take you to %s%s",
+                    ChatColor.RED, destinationName), false);
            return;
        }

@@ -102,18 +108,21 @@ public class TeleportCommand extends MultiverseCommand {
            return;
        }

-        if (MultiverseCore.EnforceAccess && teleporter != null && !this.plugin.getMVPerms().canEnterDestination(teleporter, d)) {
+        if (plugin.getMVConfig().getEnforceAccess() && teleporter != null && !this.plugin.getMVPerms().canEnterDestination(teleporter, d)) {
            if (teleportee.equals(teleporter)) {
                teleporter.sendMessage("Doesn't look like you're allowed to go " + ChatColor.RED + "there...");
            } else {
-                teleporter.sendMessage("Doesn't look like you're allowed to send " + ChatColor.GOLD + teleportee.getName() + ChatColor.WHITE + " to " + ChatColor.RED + "there...");
+                teleporter.sendMessage("Doesn't look like you're allowed to send " + ChatColor.GOLD
+                        + teleportee.getName() + ChatColor.WHITE + " to " + ChatColor.RED + "there...");
            }
            return;
        } else if (teleporter != null && !this.plugin.getMVPerms().canTravelFromLocation(teleporter, d.getLocation(teleportee))) {
            if (teleportee.equals(teleporter)) {
-                teleporter.sendMessage("DOH! Doesn't look like you can get to " + ChatColor.RED + "THERE from " + ChatColor.GREEN + ((Player) teleporter).getWorld().getName());
+                this.messaging.sendMessage(teleporter, String.format("DOH! Doesn't look like you can get to %s%s %sfrom where you are...",
+                        ChatColor.GREEN, d.toString(), ChatColor.WHITE), false);
            } else {
-                teleporter.sendMessage("DOH! Doesn't look like " + ChatColor.GREEN + ((Player) teleporter).getWorld().getName() + " can get to " + ChatColor.RED + "THERE from where they are...");
+                this.messaging.sendMessage(teleporter, String.format("DOH! Doesn't look like %s%s %scan get to %sTHERE from where they are...",
+                        ChatColor.GREEN, ((Player) teleporter).getWorld().getName(), ChatColor.WHITE, ChatColor.RED), false);
            }
            return;
        }
@@ -126,14 +135,19 @@ public class TeleportCommand extends MultiverseCommand {
            if (teleportee.getWorld().equals(w)) {
                if (teleporter.equals(teleportee)) {
                    if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.self", true)) {
-                        teleporter.sendMessage("Sorry you don't have permission to go to the world spawn!");
-                        teleporter.sendMessage(ChatColor.RED + "  (multiverse.core.spawn.self)");
+                        this.messaging.sendMessages(teleporter, new String[]{
+                                String.format("Sorry you don't have permission to go to the world spawn!"),
+                                String.format("%s  (multiverse.core.spawn.self)",
+                                        ChatColor.RED) }, false);
                        return;
                    }
                } else {
                    if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.other", true)) {
-                        teleporter.sendMessage("Sorry you don't have permission to send " + teleportee.getDisplayName() + "to the world spawn!");
-                        teleporter.sendMessage(ChatColor.RED + "  (multiverse.core.spawn.other)");
+                        this.messaging.sendMessages(teleporter, new String[]{
+                                String.format("Sorry you don't have permission to send %s to the world spawn!",
+                                        teleportee.getDisplayName()),
+                                String.format("%s  (multiverse.core.spawn.other)",
+                                        ChatColor.RED) }, false);
                        return;
                    }
                }
@@ -141,13 +155,17 @@ public class TeleportCommand extends MultiverseCommand {
        }

        if (d.getLocation(teleportee) == null) {
-            teleporter.sendMessage("Sorry Boss, I tried everything, but just couldn't teleport ya there!");
+            this.messaging.sendMessage(teleporter, "Sorry Boss, I tried everything, but just couldn't teleport ya there!", false);
            return;
        }
-        if (!this.playerTeleporter.safelyTeleport(teleporter, teleportee, d)) {
-            this.plugin.log(Level.FINE, "Could not teleport " + teleportee.getName() + " to " + LocationManipulation.strCoordsRaw(d.getLocation(teleportee)));
+        Teleporter teleportObject = (d instanceof CustomTeleporterDestination) ?
+                ((CustomTeleporterDestination)d).getTeleporter() : this.playerTeleporter;
+        TeleportResult result = teleportObject.teleport(teleporter, teleportee, d);
+        if (result == TeleportResult.FAIL_UNSAFE) {
+            this.plugin.log(Level.FINE, "Could not teleport " + teleportee.getName()
+                    + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
            this.plugin.log(Level.FINE, "Queueing Command");
-            Class<?> paramTypes[] = {CommandSender.class, Player.class, Location.class};
+            Class<?>[] paramTypes = { CommandSender.class, Player.class, Location.class };
            List<Object> items = new ArrayList<Object>();
            items.add(teleporter);
            items.add(teleportee);
@@ -156,24 +174,31 @@ public class TeleportCommand extends MultiverseCommand {
            if (!teleportee.equals(teleporter)) {
                player = teleportee.getName();
            }
-            String message = ChatColor.GREEN + "Multiverse" + ChatColor.WHITE + " did not teleport " + ChatColor.AQUA + player + ChatColor.WHITE + " to " + ChatColor.DARK_AQUA + d.getName() + ChatColor.WHITE + " because it was unsafe.";
-            this.plugin.getCommandHandler().queueCommand(sender, "mvteleport", "teleportPlayer", items, paramTypes, message, "Would you like to try anyway?", "", "", 15);
-        } else {
-            // Player was teleported successfully (or the tp event was fired I should say);
-
+            String message = String.format("%sMultiverse %sdid not teleport %s%s %sto %s%s %sbecause it was unsafe.",
+                    ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE);
+            this.plugin.getCommandHandler().queueCommand(sender, "mvteleport", "teleportPlayer", items,
+                    paramTypes, message, "Would you like to try anyway?", "", "", UNSAFE_TELEPORT_EXPIRE_DELAY);
        }
+        // else: Player was teleported successfully (or the tp event was fired I should say)
    }

    private boolean checkSendPermissions(CommandSender teleporter, Player teleportee, MVDestination destination) {
-        MVMessaging message = this.plugin.getMessaging();
        if (teleporter.equals(teleportee)) {
            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.self." + destination.getIdentifier(), true)) {
-                message.sendMessages(teleporter, new String[]{"You don't have permission to teleport yourself to a " + ChatColor.GREEN + destination.getType() + " Destination.", ChatColor.RED + "   (multiverse.teleport.self." + destination.getIdentifier() + ")"});
+                this.messaging.sendMessages(teleporter, new String[]{
+                        String.format("%sYou don't have permission to teleport %syourself %sto a %s%s %sDestination",
+                                ChatColor.WHITE, ChatColor.AQUA, ChatColor.WHITE, ChatColor.RED, destination.getType(), ChatColor.WHITE),
+                        String.format("%s   (multiverse.teleport.self.%s)",
+                                ChatColor.RED, destination.getIdentifier()) }, false);
                return false;
            }
        } else {
            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.other." + destination.getIdentifier(), true)) {
-                message.sendMessages(teleporter, new String[]{"You don't have permission to teleport another player to a " + ChatColor.GREEN + destination.getType() + " Destination.", ChatColor.RED + "   (multiverse.teleport.other." + destination.getIdentifier() + ")"});
+                this.messaging.sendMessages(teleporter, new String[]{
+                        String.format("You don't have permission to teleport another player to a %s%s Destination.",
+                                ChatColor.GREEN, destination.getType()),
+                        String.format("%s(multiverse.teleport.other.%s)",
+                                ChatColor.RED, destination.getIdentifier()) }, false);
                return false;
            }
        }
@@ -9,11 +9,15 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

 import java.util.List;

+/**
+ * Unloads worlds from Multiverse.
+ */
 public class UnloadCommand extends MultiverseCommand {

    public UnloadCommand(MultiverseCore plugin) {
@@ -23,15 +27,16 @@ public class UnloadCommand extends MultiverseCommand {
        this.setArgRange(1, 1);
        this.addKey("mvunload");
        this.addKey("mv unload");
-        this.setPermission("multiverse.core.unload", "Unloads a world from Multiverse. This does NOT remove the world folder. This does NOT remove it from the config file.", PermissionDefault.OP);
+        this.setPermission("multiverse.core.unload",
+                "Unloads a world from Multiverse. This does NOT remove the world folder. This does NOT remove it from the config file.", PermissionDefault.OP);
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
        if (this.plugin.getMVWorldManager().unloadWorld(args.get(0))) {
-            sender.sendMessage("World Unloaded!");
+            Command.broadcastCommandMessage(sender, "Unloaded world '" + args.get(0) + "'!");
        } else {
-            sender.sendMessage("Error trying to unload world!");
+            sender.sendMessage("Error trying to unload world '" + args.get(0) + "'!");
        }
    }
 }
@@ -7,109 +7,221 @@

 package com.onarandombox.MultiverseCore.commands;

+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.event.MVVersionRequestEvent;
+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 com.pneumaticraft.commandhandler.CommandHandler;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.util.StringUtil;

-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.io.*;
+import java.util.HashMap;
 import java.util.List;
-import java.util.logging.Level;
+import java.util.Map;

+/**
+ * Dumps version info to the console.
+ */
 public class VersionCommand extends MultiverseCommand {
+    private static final URLShortener SHORTENER = new BitlyURLShortener();

    public VersionCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Multiverse Version");
-        this.setCommandUsage("/mv version " + ChatColor.GOLD + "-p");
-        this.setArgRange(0, 1);
+        this.setCommandUsage("/mv version " + ChatColor.GOLD + "-[bh] [--include-plugin-list]");
+        this.setArgRange(0, 2);
        this.addKey("mv version");
        this.addKey("mvv");
        this.addKey("mvversion");
-        this.setPermission("multiverse.core.version", "Dumps version info to the console, optionally to pastebin.com with a -p.", PermissionDefault.TRUE);
+        this.setPermission("multiverse.core.version",
+                "Dumps version info to the console, optionally to pastie.org with -p or pastebin.com with a -b.", PermissionDefault.TRUE);
    }

-    private String pasteBinBuffer = "";
+    private String getLegacyString() {
+        StringBuilder legacyFile = new StringBuilder();
+        legacyFile.append("[Multiverse-Core] Multiverse-Core Version: ").append(this.plugin.getDescription().getVersion()).append('\n');
+        legacyFile.append("[Multiverse-Core] Bukkit Version: ").append(this.plugin.getServer().getVersion()).append('\n');
+        legacyFile.append("[Multiverse-Core] Loaded Worlds: ").append(this.plugin.getMVWorldManager().getMVWorlds()).append('\n');
+        legacyFile.append("[Multiverse-Core] Multiverse Plugins Loaded: ").append(this.plugin.getPluginCount()).append('\n');
+        legacyFile.append("[Multiverse-Core] Economy being used: ").append(plugin.getEconomist().getEconomyName()).append('\n');
+        legacyFile.append("[Multiverse-Core] Permissions Plugin: ").append(this.plugin.getMVPerms().getType()).append('\n');
+        legacyFile.append("[Multiverse-Core] Dumping Config Values: (version ")
+                .append(this.plugin.getMVConfig().getVersion()).append(")").append('\n');
+        legacyFile.append("[Multiverse-Core]  messagecooldown: ").append(plugin.getMessaging().getCooldown()).append('\n');
+        legacyFile.append("[Multiverse-Core]  teleportcooldown: ").append(plugin.getMVConfig().getTeleportCooldown()).append('\n');
+        legacyFile.append("[Multiverse-Core]  worldnameprefix: ").append(plugin.getMVConfig().getPrefixChat()).append('\n');
+        legacyFile.append("[Multiverse-Core]  worldnameprefixFormat: ").append(plugin.getMVConfig().getPrefixChatFormat()).append('\n');
+        legacyFile.append("[Multiverse-Core]  enforceaccess: ").append(plugin.getMVConfig().getEnforceAccess()).append('\n');
+        legacyFile.append("[Multiverse-Core]  displaypermerrors: ").append(plugin.getMVConfig().getDisplayPermErrors()).append('\n');
+        legacyFile.append("[Multiverse-Core]  teleportintercept: ").append(plugin.getMVConfig().getTeleportIntercept()).append('\n');
+        legacyFile.append("[Multiverse-Core]  firstspawnoverride: ").append(plugin.getMVConfig().getFirstSpawnOverride()).append('\n');
+        legacyFile.append("[Multiverse-Core]  firstspawnworld: ").append(plugin.getMVConfig().getFirstSpawnWorld()).append('\n');
+        legacyFile.append("[Multiverse-Core]  debug: ").append(plugin.getMVConfig().getGlobalDebug()).append('\n');
+        legacyFile.append("[Multiverse-Core] Special Code: FRN002").append('\n');
+        return legacyFile.toString();
+    }
+
+    private String getMarkdownString() {
+        StringBuilder markdownString = new StringBuilder();
+        markdownString.append("# Multiverse-Core\n");
+        markdownString.append("## Overview\n");
+        markdownString.append("| Name | Value |\n");
+        markdownString.append("| --- | --- |\n");
+        markdownString.append("| Multiverse-Core Version | `").append(this.plugin.getDescription().getVersion()).append("` |\n");
+        markdownString.append("| Bukkit Version | `").append(this.plugin.getServer().getVersion()).append("` |\n");
+        //markdownString.append("| Loaded Worlds | `").append(this.plugin.getMVWorldManager().getMVWorlds()).append("` |\n");
+        markdownString.append("| Multiverse Plugins Loaded | `").append(this.plugin.getPluginCount()).append("` |\n");
+        markdownString.append("| Economy being used | `").append(plugin.getEconomist().getEconomyName()).append("` |\n");
+        markdownString.append("| Permissions Plugin | `").append(this.plugin.getMVPerms().getType()).append("` |\n");
+        markdownString.append("## Parsed Config\n");
+        markdownString.append("These are what Multiverse thought the in-memory values of the config were.\n\n");
+        markdownString.append("| Config Key  | Value |\n");
+        markdownString.append("| --- | --- |\n");
+        markdownString.append("| version | `").append(this.plugin.getMVConfig().getVersion()).append("` |\n");
+        markdownString.append("| messagecooldown | `").append(plugin.getMessaging().getCooldown()).append("` |\n");
+        markdownString.append("| teleportcooldown | `").append(plugin.getMVConfig().getTeleportCooldown()).append("` |\n");
+        markdownString.append("| worldnameprefix | `").append(plugin.getMVConfig().getPrefixChat()).append("` |\n");
+        markdownString.append("| worldnameprefixFormat | `").append(plugin.getMVConfig().getPrefixChatFormat()).append("` |\n");
+        markdownString.append("| enforceaccess | `").append(plugin.getMVConfig().getEnforceAccess()).append("` |\n");
+        markdownString.append("| displaypermerrors | `").append(plugin.getMVConfig().getDisplayPermErrors()).append("` |\n");
+        markdownString.append("| teleportintercept | `").append(plugin.getMVConfig().getTeleportIntercept()).append("` |\n");
+        markdownString.append("| firstspawnoverride | `").append(plugin.getMVConfig().getFirstSpawnOverride()).append("` |\n");
+        markdownString.append("| firstspawnworld | `").append(plugin.getMVConfig().getFirstSpawnWorld()).append("` |\n");
+        markdownString.append("| debug | `").append(plugin.getMVConfig().getGlobalDebug()).append("` |\n");
+        return markdownString.toString();
+    }
+
+    private String readFile(final String filename) {
+        String result;
+        try {
+            FileReader reader = new FileReader(filename);
+            BufferedReader bufferedReader = new BufferedReader(reader);
+            String line;
+            result = "";
+            while ((line = bufferedReader.readLine()) != null) {
+                result += line + '\n';
+            }
+        } catch (FileNotFoundException e) {
+            Logging.severe("Unable to find %s. Here's the traceback: %s", filename, e.getMessage());
+            e.printStackTrace();
+            result = String.format("ERROR: Could not load: %s", filename);
+        } catch (IOException e) {
+            Logging.severe("Something bad happend when reading %s. Here's the traceback: %s", filename, e.getMessage());
+            e.printStackTrace();
+            result = String.format("ERROR: Could not load: %s", filename);
+        }
+        return result;
+    }
+
+    private Map<String, String> getVersionFiles() {
+        Map<String, String> files = new HashMap<String, String>();
+
+        // Add the legacy file, but as markdown so it's readable
+        files.put("version.md", this.getMarkdownString());
+
+        // Add the config.yml
+        File configFile = new File(this.plugin.getDataFolder(), "config.yml");
+        files.put(configFile.getName(), this.readFile(configFile.getAbsolutePath()));
+
+        // Add the config.yml
+        File worldConfig = new File(this.plugin.getDataFolder(), "worlds.yml");
+        files.put(worldConfig.getName(), this.readFile(worldConfig.getAbsolutePath()));
+        return files;
+    }

    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
+    public void runCommand(final CommandSender sender, final 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.");
        }

-        logAndAddToPasteBinBuffer("Multiverse-Core Version: " + this.plugin.getDescription().getVersion());
-        logAndAddToPasteBinBuffer("Bukkit Version: " + this.plugin.getServer().getVersion());
-        logAndAddToPasteBinBuffer("Loaded Worlds: " + this.plugin.getMVWorldManager().getMVWorlds().size());
-        logAndAddToPasteBinBuffer("Multiverse Plugins Loaded: " + this.plugin.getPluginCount());
-        logAndAddToPasteBinBuffer("Economy being used: " + this.plugin.getBank().getEconUsed());
-        logAndAddToPasteBinBuffer("Permissions Plugin: " + this.plugin.getMVPerms().getType());
-        logAndAddToPasteBinBuffer("Dumping Config Values: (version " + this.plugin.getMVConfiguration().getString("version", "NOT SET") + ")");
-        logAndAddToPasteBinBuffer("messagecooldown: " + "Not yet IMPLEMENTED");
-        logAndAddToPasteBinBuffer("teleportcooldown: " + "Not yet IMPLEMENTED");
-        logAndAddToPasteBinBuffer("worldnameprefix: " + MultiverseCore.PrefixChat);
-        logAndAddToPasteBinBuffer("enforceaccess: " + MultiverseCore.EnforceAccess);
-        logAndAddToPasteBinBuffer("enforcegamemodes: " + MultiverseCore.EnforceGameModes);
-        logAndAddToPasteBinBuffer("bedrespawn: " + MultiverseCore.BedRespawn);
-        logAndAddToPasteBinBuffer("debug: " + MultiverseCore.GlobalDebug);
-        logAndAddToPasteBinBuffer("Special Code: FRN002");
-
-        MVVersionRequestEvent versionEvent = new MVVersionRequestEvent(pasteBinBuffer);
+        MVVersionEvent versionEvent = new MVVersionEvent(this.getLegacyString(), this.getVersionFiles());
+        final Map<String, String> files = this.getVersionFiles();
        this.plugin.getServer().getPluginManager().callEvent(versionEvent);
-        pasteBinBuffer = versionEvent.getPasteBinBuffer();

-        if (args.size() == 1 && args.get(0).equalsIgnoreCase("-p")) {
-            String pasteBinUrl = postToPasteBin();
-            sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteBinUrl);
-            this.plugin.log(Level.INFO, "Version info dumped here: " + pasteBinUrl);
+        String versionInfo = versionEvent.getVersionInfo();
+
+        if (CommandHandler.hasFlag("--include-plugin-list", args)) {
+            versionInfo = versionInfo + "\nPlugins: " + getPluginList();
        }
-    }

-    private void logAndAddToPasteBinBuffer(String string) {
-        this.pasteBinBuffer += "[Multiverse-Core] " + string + "\n";
-        this.plugin.log(Level.INFO, string);
-    }
+        final String data = versionInfo;

-    private String postToPasteBin() {
-        try {
-            String data = URLEncoder.encode("api_dev_key", "UTF-8") + "=" + URLEncoder.encode("d61d68d31e8e0392b59b50b277411c71", "UTF-8");
-            data += "&" + URLEncoder.encode("api_option", "UTF-8") + "=" + URLEncoder.encode("paste", "UTF-8");
-            data += "&" + URLEncoder.encode("api_paste_code", "UTF-8") + "=" + URLEncoder.encode(this.pasteBinBuffer, "UTF-8");
-            data += "&" + URLEncoder.encode("api_paste_private", "UTF-8") + "=" + URLEncoder.encode("1", "UTF-8");
-            data += "&" + URLEncoder.encode("api_paste_format", "UTF-8") + "=" + URLEncoder.encode("yaml", "UTF-8");
-            DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-            Date date = new Date();
-            data += "&" + URLEncoder.encode("api_paste_name", "UTF-8") + "=" + URLEncoder.encode("Multiverse 2 Dump " + dateFormat.format(date), "UTF-8");
-            data += "&" + URLEncoder.encode("api_user_key", "UTF-8") + "=" + URLEncoder.encode("c052ac52d2b0db88d36cc32ca462d151", "UTF-8");
-            URL url = new URL("http://pastebin.com/api/api_post.php");
-            URLConnection conn = url.openConnection();
-            conn.setDoOutput(true);
-            OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
-            wr.write(data);
-            wr.flush();
-
-            BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            String line;
-            String pasteBinUrl = "";
-            while ((line = rd.readLine()) != null) {
-                pasteBinUrl = line;
+        // log to console
+        String[] lines = data.split("\n");
+        for (String line : lines) {
+            if (!line.isEmpty()) {
+                Logging.info(line);
            }
-            wr.close();
-            rd.close();
-            return pasteBinUrl;
-        } catch (Exception e) {
-            System.out.print(e);
-            return "Error Posting to pastebin.com";
        }
+
+        BukkitRunnable logPoster = new BukkitRunnable() {
+            @Override
+            public void run() {
+                if (args.size() > 0) {
+                    String pasteUrl;
+                    if (CommandHandler.hasFlag("-b", args)) {
+                        // private post to pastebin
+                        pasteUrl = postToService(PasteServiceType.PASTEBIN, true, data, files);
+                    } else if (CommandHandler.hasFlag("-h", args)) {
+                        // private post to pastebin
+                        pasteUrl = postToService(PasteServiceType.HASTEBIN, true, data, files);
+                    } else {
+                        return;
+                    }
+
+                    if (!(sender instanceof ConsoleCommandSender)) {
+                        sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
+                    }
+                    Logging.info("Version info dumped here: %s", pasteUrl);
+                }
+            }
+        };
+
+        // Run the log posting operation asynchronously, since we don't know how long it will take.
+        logPoster.runTaskAsynchronously(this.plugin);
+    }
+
+    /**
+     * Send the current contents of this.pasteBinBuffer to a web service.
+     *
+     * @param type       Service type to send paste data to.
+     * @param isPrivate  Should the paste be marked as private.
+     * @param pasteData  Legacy string only data to post to a service.
+     * @param pasteFiles Map of filenames/contents of debug info.
+     * @return URL of visible paste
+     */
+    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData,
+                                        Map<String, String> pasteFiles) {
+        PasteService ps = PasteServiceFactory.getService(type, isPrivate);
+        try {
+            String result;
+            if (ps.supportsMultiFile()) {
+                result = ps.postData(ps.encodeData(pasteFiles), ps.getPostURL());
+            } else {
+                result = ps.postData(ps.encodeData(pasteData), ps.getPostURL());
+            }
+            return SHORTENER.shorten(result);
+        } catch (PasteFailedException e) {
+            System.out.print(e);
+            return "Error posting to service";
+        }
+    }
+
+    private String getPluginList() {
+        return StringUtils.join(plugin.getServer().getPluginManager().getPlugins(), ", ");
    }
 }
@@ -8,28 +8,35 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.WorldManager;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;

+/**
+ * States who is in what world.
+ */
 public class WhoCommand extends MultiverseCommand {

-    private WorldManager worldManager;
+    private MVWorldManager worldManager;

    public WhoCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Who?");
-        this.setCommandUsage("/mv who" + ChatColor.GOLD + " [WORLD]");
+        this.setCommandUsage("/mv who" + ChatColor.GOLD + " [WORLD|--all]");
        this.setArgRange(0, 1);
        this.addKey("mv who");
        this.addKey("mvw");
        this.addKey("mvwho");
+        this.addCommandExample("/mv who");
+        this.addCommandExample(String.format("/mv who %s--all", ChatColor.GREEN));
+        this.addCommandExample(String.format("/mv who %smyworld", ChatColor.GOLD));
        this.setPermission("multiverse.core.list.who", "States who is in what world.", PermissionDefault.OP);
        this.worldManager = this.plugin.getMVWorldManager();
    }
@@ -45,57 +52,67 @@ public class WhoCommand extends MultiverseCommand {
            showAll = false;
        }

-        List<MultiverseWorld> worlds = new ArrayList<MultiverseWorld>();
+        final Collection onlinePlayers = plugin.getServer().getOnlinePlayers();
+        final Collection<Player> visiblePlayers = new HashSet<Player>(onlinePlayers.size());
+        for (final Object player : onlinePlayers) {
+            if (player instanceof Player && (p == null || p.canSee((Player) player))) {
+                visiblePlayers.add((Player) player);
+            }
+        }

-        if (args.size() > 0) {
-            MultiverseWorld world = this.worldManager.getMVWorld(args.get(0));
+        if (args.size()  == 1) {
            if (args.get(0).equalsIgnoreCase("--all") || args.get(0).equalsIgnoreCase("-a")) {
                showAll = true;
-                worlds = new ArrayList<MultiverseWorld>(this.worldManager.getMVWorlds());
-            } else if (world != null) {
-                if (!world.isHidden()) {
-                    worlds.add(world);
-                }
            } else {
-                sender.sendMessage(ChatColor.RED + "World does not exist");
+                // single world mode
+                MultiverseWorld world = this.worldManager.getMVWorld(args.get(0));
+                if (world == null) {
+                    sender.sendMessage(ChatColor.RED + "That world does not exist.");
+                    return;
+                }
+
+                if (!this.plugin.getMVPerms().canEnterWorld(p, world)) {
+                    sender.sendMessage(ChatColor.RED + "You aren't allowed to access to this world!");
+                    return;
+                }
+
+                sender.sendMessage(String.format("%s--- Players in %s%s ---", ChatColor.AQUA,
+                        world.getColoredWorldString(), ChatColor.AQUA));
+                sender.sendMessage(this.buildPlayerString(world, p, visiblePlayers));
                return;
            }
-        } else {
-            worlds = new ArrayList<MultiverseWorld>(this.worldManager.getMVWorlds());
        }

-        if (worlds.size() == 0) {
-            sender.sendMessage("Multiverse does not know about any of your worlds :(");
-        } else if (worlds.size() == 1) {
-            sender.sendMessage(ChatColor.AQUA + "--- Players in" + worlds.get(0).getColoredWorldString() + ChatColor.AQUA + " ---");
-        } else {
-            sender.sendMessage(ChatColor.AQUA + "--- There are players in ---");
-        }
-
-        for (MultiverseWorld world : worlds) {
-            if (!(this.worldManager.isMVWorld(world.getName()))) {
-                continue;
-            }
-
-            if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
-                continue;
-            }
-            List<Player> players = world.getCBWorld().getPlayers();
-
-            String result = "";
-            if (players.size() <= 0 && !showAll) {
-                continue;
-            }
-
-            if (players.size() <= 0) {
-                result = "Empty";
-            } else {
-                for (Player player : players) {
-                    result += player.getDisplayName() + " ";
+        // multiworld mode
+        sender.sendMessage(ChatColor.AQUA + "--- Worlds and their players --- "
+                + visiblePlayers.size() + "/" + plugin.getServer().getMaxPlayers());
+        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)));
+                    shownOne = true;
                }
            }
-
-            sender.sendMessage(world.getColoredWorldString() + ChatColor.WHITE + " - " + result);
        }
+        if (!shownOne) {
+            sender.sendMessage("No worlds found.");
+        }
+        return;
+    }
+
+    private static String buildPlayerString(MultiverseWorld world, Player viewer, final Collection<Player> visiblePlayers) {
+        // Retrieve the players in this 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))
+                playerBuilder.append(player.getDisplayName()).append(", ");
+        }
+        String bString = playerBuilder.toString();
+        return (bString.length() == 0) ? "No players found." : bString.substring(0, bString.length() - 2);
    }
 }
@@ -0,0 +1,4 @@
+/**
+ * This package contains all Commands.
+ */
+package com.onarandombox.MultiverseCore.commands;
@@ -0,0 +1,84 @@
+package com.onarandombox.MultiverseCore.configuration;
+
+import java.util.Map;
+
+import com.onarandombox.MultiverseCore.utils.MaterialConverter;
+import me.main__.util.SerializationConfig.Property;
+import me.main__.util.SerializationConfig.SerializationConfig;
+
+import me.main__.util.SerializationConfig.Serializor;
+import org.bukkit.Material;
+import org.bukkit.configuration.serialization.SerializableAs;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Entryfee-settings.
+ */
+@SerializableAs("MVEntryFee")
+public class EntryFee extends SerializationConfig {
+    @Property
+    private double amount;
+    @Property(serializor = EntryFeeCurrencySerializor.class)
+    @Nullable
+    private Material currency;
+
+    public EntryFee() {
+        super();
+    }
+
+    public EntryFee(Map<String, Object> values) {
+        super(values);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void setDefaults() {
+        amount = 0D;
+        currency = null;
+    }
+
+    /**
+     * @return the amount
+     */
+    public double getAmount() {
+        return amount;
+    }
+
+    /**
+     * @return the currency
+     */
+    @Nullable
+    public Material 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(@Nullable Material currency) {
+        this.currency = currency;
+    }
+
+    public static final class EntryFeeCurrencySerializor implements Serializor<Material, Object> {
+        @Override
+        public String serialize(Material material) {
+            return material.toString();
+        }
+
+        @Override
+        public Material deserialize(Object o, Class<Material> aClass) {
+            return MaterialConverter.convertTypeString(o.toString());
+        }
+    }
+}
@@ -1,61 +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.configuration;
-
-import com.onarandombox.MultiverseCore.api.LoggablePlugin;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.util.config.Configuration;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.logging.Level;
-
-public abstract class MVConfigMigrator {
-    public List<String> createdDefaults = new ArrayList<String>();
-
-    public abstract boolean migrate(String name, File folder);
-
-    protected final void migrateListItem(Configuration newConfig, Configuration oldConfig, String key, String oldProperty, String newProperty) {
-        List<String> list = Arrays.asList(oldConfig.getString("worlds." + key + oldProperty).split(","));
-        if (list.size() > 0) {
-            if (list.get(0).length() == 0) {
-                list = new ArrayList<String>();
-            }
-        }
-        newConfig.setProperty("worlds." + key + newProperty, list);
-    }
-
-    protected final File detectMultiverseFolders(File folder, LoggablePlugin mvPlugin) {
-        File oldFolder = null;
-        mvPlugin.log(Level.INFO, "Starting Multiverse Configuration Migrator(MVCM)!");
-        // They still have MV 1 installed! Good!
-        if (mvPlugin.getServer().getPluginManager().getPlugin("MultiVerse") != null) {
-            mvPlugin.log(Level.INFO, "Found MultiVerse 1. Starting Config Migration...");
-            Plugin plugin = mvPlugin.getServer().getPluginManager().getPlugin("MultiVerse");
-            oldFolder = plugin.getDataFolder();
-        } else {
-            // They didn't have MV 1 enabled... let's try and find the folder...
-            File[] folders = folder.getParentFile().listFiles();
-            List<File> folderList = Arrays.asList(folders);
-            for (File f : folderList) {
-                if (f.getName().equalsIgnoreCase("MultiVerse")) {
-                    mvPlugin.log(Level.INFO, "Found the MultiVerse 1 config folder. Starting Config Migration...");
-                    oldFolder = f;
-                }
-            }
-            if (oldFolder == null) {
-                mvPlugin.log(Level.INFO, "Did not find the MV1 Folder. If you did not have MultiVerse 1 installed and this is the FIRST time you're running MV2, this message is GOOD. ");
-                mvPlugin.log(Level.INFO, "If you did, your configs were **NOT** migrated! Go Here: INSERTURLFORHELP");
-                return null;
-            }
-        }
-        return oldFolder;
-    }
-}
@@ -1,82 +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.configuration;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.util.config.Configuration;
-
-import java.io.File;
-import java.util.List;
-import java.util.logging.Level;
-
-public class MVCoreConfigMigrator extends MVConfigMigrator {
-    private MultiverseCore core;
-
-    public MVCoreConfigMigrator(MultiverseCore core) {
-        this.core = core;
-    }
-
-    public boolean migrate(String name, File folder) {
-        File oldFolder = this.detectMultiverseFolders(folder, core);
-
-        if (name.equalsIgnoreCase("worlds.yml")) {
-            return this.migrateWorlds(name, oldFolder, folder);
-        }
-
-        if (name.equalsIgnoreCase("config.yml")) {
-            return this.migrateMainConfig(name, oldFolder, folder);
-        }
-        return true;
-
-    }
-
-    private boolean migrateWorlds(String name, File oldFolder, File newFolder) {
-        Configuration newConfig = new Configuration(new File(newFolder, "worlds.yml"));
-        this.core.log(Level.INFO, "Trying to migrate worlds.yml...");
-        Configuration oldConfig = new Configuration(new File(oldFolder, "Worlds.yml"));
-        oldConfig.load();
-        List<String> keys = oldConfig.getKeys("worlds");
-        if (keys == null) {
-            this.core.log(Level.SEVERE, "Migration FAILURE!");
-            return false;
-        }
-        for (String key : keys) {
-            newConfig.setProperty("worlds." + key + ".animals.spawn", oldConfig.getProperty("worlds." + key + ".animals"));
-            newConfig.setProperty("worlds." + key + ".monsters.spawn", oldConfig.getProperty("worlds." + key + ".mobs"));
-            newConfig.setProperty("worlds." + key + ".pvp", oldConfig.getProperty("worlds." + key + ".pvp"));
-            newConfig.setProperty("worlds." + key + ".alias.name", oldConfig.getProperty("worlds." + key + ".alias"));
-            newConfig.setProperty("worlds." + key + ".tempspawn", oldConfig.getProperty("worlds." + key + ".spawn"));
-            newConfig.setProperty("worlds." + key + ".entryfee.amount", oldConfig.getProperty("worlds." + key + ".price"));
-            newConfig.setProperty("worlds." + key + ".entryfee.currency", -1);
-            newConfig.setProperty("worlds." + key + ".environment", oldConfig.getProperty("worlds." + key + ".environment"));
-            // Have to convert CSLs to arrays
-            migrateListItem(newConfig, oldConfig, key, ".blockBlacklist", ".blockblacklist");
-            migrateListItem(newConfig, oldConfig, key, ".worldBlacklist", ".worldblacklist");
-        }
-        newConfig.save();
-        this.core.log(Level.INFO, "Migration SUCCESS!");
-        return true;
-    }
-
-    private boolean migrateMainConfig(String name, File oldFolder, File newFolder) {
-        Configuration newConfig = new Configuration(new File(newFolder, "config.yml"));
-        this.core.log(Level.INFO, "Migrating config.yml...");
-        Configuration oldConfig = new Configuration(new File(oldFolder, "MultiVerse.yml"));
-        oldConfig.load();
-        newConfig.setProperty("worldnameprefix", oldConfig.getProperty("prefix"));
-        newConfig.setProperty("messagecooldown", oldConfig.getProperty("alertcooldown"));
-        // Default values:
-        newConfig.setProperty("opfallback", true);
-        newConfig.setProperty("disableautoheal", false);
-        newConfig.setProperty("fakepvp", false);
-        newConfig.setProperty("bedrespawn", true);
-        newConfig.setProperty("version", 2.2);
-        newConfig.save();
-        return true;
-    }
-}
@@ -0,0 +1,98 @@
+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);
+    }
+}
@@ -0,0 +1,50 @@
+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;
+    }
+}
@@ -0,0 +1,76 @@
+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;
+    }
+}
@@ -0,0 +1,27 @@
+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();
+    }
+}
@@ -0,0 +1,4 @@
+/**
+ * This package contains the Multiverse-configuration.
+ */
+package com.onarandombox.MultiverseCore.configuration;
@@ -0,0 +1,148 @@
+/******************************************************************************
+ * 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.destination;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.util.Vector;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * An anchor-{@link MVDestination}.
+ */
+public class AnchorDestination implements MVDestination {
+    private boolean isValid;
+    private Location location;
+    private MultiverseCore plugin;
+    private String name;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getIdentifier() {
+        return "a";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Vector getVelocity() {
+        return new Vector(0, 0, 0);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isThisType(JavaPlugin plugin, String destination) {
+        if (!(plugin instanceof MultiverseCore)) {
+            return false;
+        }
+        this.plugin = (MultiverseCore) plugin;
+        List<String> parsed = Arrays.asList(destination.split(":"));
+        // Need at least: a:name
+        if (!(parsed.size() == 2)) {
+            return false;
+        }
+        // If it's not an Anchor type
+        return parsed.get(0).equalsIgnoreCase("a");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Location getLocation(Entity e) {
+        return this.location;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isValid() {
+        return this.isValid;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDestination(JavaPlugin plugin, String destination) {
+        if (!(plugin instanceof MultiverseCore)) {
+            return;
+        }
+        this.plugin = (MultiverseCore) plugin;
+        List<String> parsed = Arrays.asList(destination.split(":"));
+        // Need at least: e:world:x,y,z
+        // OR e:world:x,y,z:pitch:yaw
+        // so basically 3 or 5
+        if (!(parsed.size() == 2)) {
+            this.isValid = false;
+            return;
+        }
+        this.name = parsed.get(1);
+        this.location = this.plugin.getAnchorManager().getAnchorLocation(parsed.get(1));
+        if (this.location == null) {
+            this.isValid = false;
+            return;
+        }
+        if (!parsed.get(0).equalsIgnoreCase(this.getIdentifier())) {
+            this.isValid = false;
+        }
+        this.isValid = true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getType() {
+        return "Anchor";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return "Anchor: " + this.name;
+    }
+
+    @Override
+    public String toString() {
+        if (isValid) {
+            return "a:" + this.name;
+        }
+        return "i:Invalid Destination";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getRequiredPermission() {
+        return "multiverse.access." + this.location.getWorld().getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean useSafeTeleporter() {
+        // This is an ANCHOR destination, don't safely teleport here.
+        return false;
+    }
+}
@@ -7,69 +7,116 @@

 package com.onarandombox.MultiverseCore.destination;

+import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;

 /**
- * Multiverse 2
- *
- * @author fernferret
+ * A bed-{@link MVDestination}.
 */
 public class BedDestination implements MVDestination {
-
+    public static final String OLD_BED_STRING = "b:playerbed";
+    private String playername = "";
    private boolean isValid;
    private Location knownBedLoc;
+    private MultiverseCore plugin;

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getIdentifier() {
        return "b";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isThisType(JavaPlugin plugin, String destination) {
        String[] split = destination.split(":");
-        this.isValid = split.length >= 1 && split.length <= 2 && split[0].equals(this.getIdentifier());
+        boolean validFormat = split.length >= 1 && split.length <= 2 && split[0].equals(this.getIdentifier());
+
+        OfflinePlayer p = Bukkit.getOfflinePlayer(split[1]);
+        boolean validPlayer = (p != null);
+
+        if (validFormat && validPlayer) this.playername = p.getName();
+
+        this.isValid = destination.equals(OLD_BED_STRING) || (validFormat && validPlayer);
+
        return this.isValid;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public Location getLocation(Entity entity) {
        if (entity instanceof Player) {
-            this.knownBedLoc = ((Player) entity).getBedSpawnLocation();
+            if (this.playername.isEmpty())
+                this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(((Player) entity).getBedSpawnLocation());
+            else
+                this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(Bukkit.getOfflinePlayer(this.playername).getBedSpawnLocation());
+
+            if (this.knownBedLoc == null) {
+                ((Player) entity).sendMessage("The bed was " + ChatColor.RED + "invalid or blocked" + ChatColor.RESET + ". Sorry.");
+            }
            return this.knownBedLoc;
        }
        return null;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public Vector getVelocity() {
        return new Vector();
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public void setDestination(JavaPlugin plugin, String destination) {
-        // Not needed.
+        this.plugin = (MultiverseCore) plugin;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isValid() {
        return this.isValid;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getType() {
        return "Bed";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getName() {
        return "Bed";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getRequiredPermission() {
        if (knownBedLoc != null) {
@@ -78,6 +125,9 @@ public class BedDestination implements MVDestination {
        return "";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean useSafeTeleporter() {
        // Bukkit should have already checked this.
@@ -86,6 +136,6 @@ public class BedDestination implements MVDestination {

    @Override
    public String toString() {
-        return "b:playerbed";
+        return playername.isEmpty() ? OLD_BED_STRING : ("b:" + playername);
    }
 }
@@ -17,12 +17,19 @@ import org.bukkit.util.Vector;
 import java.util.Arrays;
 import java.util.List;

+/**
+ * A cannon-{@link MVDestination}.
+ */
 public class CannonDestination implements MVDestination {
    private final String coordRegex = "(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*)";
    private boolean isValid;
    private Location location;
    private double speed;

+    /**
+     * {@inheritDoc}
+     */
+    @Override
    public Vector getVelocity() {
        double pitchRadians = Math.toRadians(location.getPitch());
        double yawRadians = Math.toRadians(location.getYaw());
@@ -35,20 +42,28 @@ public class CannonDestination implements MVDestination {
        return new Vector(x, y, z);
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getIdentifier() {
        return "ca";
    }

+    // NEED ca:world:x,y,z:pitch:yaw:speed
+    // so basically 6
+    private static final int SPLIT_SIZE = 6;
+
+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isThisType(JavaPlugin plugin, String destination) {
        if (!(plugin instanceof MultiverseCore)) {
            return false;
        }
        List<String> parsed = Arrays.asList(destination.split(":"));
-        // NEED ca:world:x,y,z:pitch:yaw:speed
-        // so basically 6
-        if (parsed.size() != 6) {
+        if (parsed.size() != SPLIT_SIZE) {
            return false;
        }
        // If it's not an Cannon type
@@ -66,35 +81,44 @@ public class CannonDestination implements MVDestination {
        }

        try {
+            // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
            Float.parseFloat(parsed.get(3));
            Float.parseFloat(parsed.get(4));
            Float.parseFloat(parsed.get(5));
+            // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
        } catch (NumberFormatException e) {
            return false;
        }
        return true;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public Location getLocation(Entity e) {
        return this.location;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isValid() {
        return this.isValid;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public void setDestination(JavaPlugin plugin, String destination) {
        if (!(plugin instanceof MultiverseCore)) {
            return;
        }
        List<String> parsed = Arrays.asList(destination.split(":"));
-        // Need at least: e:world:x,y,z
-        // OR e:world:x,y,z:pitch:yaw
-        // so basically 3 or 5
-        if (parsed.size() != 6) {
+
+        if (parsed.size() != SPLIT_SIZE) {
            this.isValid = false;
            return;
        }
@@ -129,9 +153,11 @@ public class CannonDestination implements MVDestination {
        this.location.setZ(coords[2]);

        try {
+            // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
            this.location.setPitch(Float.parseFloat(parsed.get(3)));
            this.location.setYaw(Float.parseFloat(parsed.get(4)));
            this.speed = Math.abs(Float.parseFloat(parsed.get(5)));
+            // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
        } catch (NumberFormatException e) {
            this.isValid = false;
            return;
@@ -141,18 +167,30 @@ public class CannonDestination implements MVDestination {

    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getType() {
        return "Cannon!";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getName() {
-        return "Cannon (" + this.location.getX() + ", " + this.location.getY() + ", " + this.location.getZ() + ":" +
-                this.location.getPitch() + ":" + this.location.getYaw() + ":" + this.speed + ")";
+        return "Cannon (" + this.location.getX() + ", " + this.location.getY() + ", " + this.location.getZ() + ":"
+                + this.location.getPitch() + ":" + this.location.getYaw() + ":" + this.speed + ")";

    }

+    /**
+     * Sets this {@link CannonDestination}.
+     *
+     * @param location The {@link Location}.
+     * @param speed The speed.
+     */
    public void setDestination(Location location, double speed) {
        if (location != null) {
            this.location = location;
@@ -162,21 +200,28 @@ public class CannonDestination implements MVDestination {
        this.isValid = false;
    }

-    @Override
-    public String toString() {
-        if (isValid) {
-            return "ca:" + location.getWorld().getName() + ":" + location.getX() + "," + location.getY() + "," + location.getZ() + ":" + location.getPitch() + ":" + location.getYaw() + ":" + this.speed;
-        }
-        return "i:Invalid Destination";
-    }
-
+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getRequiredPermission() {
        return "multiverse.access." + this.location.getWorld().getName();
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean useSafeTeleporter() {
        return false;
    }
+
+    @Override
+    public String toString() {
+        if (isValid) {
+            return "ca:" + location.getWorld().getName() + ":" + location.getX() + "," + location.getY()
+                    + "," + location.getZ() + ":" + location.getPitch() + ":" + location.getYaw() + ":" + this.speed;
+        }
+        return "i:Invalid Destination";
+    }
 }
@@ -0,0 +1,29 @@
+package com.onarandombox.MultiverseCore.destination;
+
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.util.Vector;
+
+public abstract class CustomTeleporterDestination implements MVDestination {
+    @Override
+    public final Location getLocation(final Entity entity) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final Vector getVelocity() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final boolean useSafeTeleporter() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public abstract String toString();
+
+    public abstract Teleporter getTeleporter();
+}
@@ -54,7 +54,7 @@ public class DestinationFactory {
            Class<? extends MVDestination> myClass = this.destList.get(idenChar);
            try {
                MVDestination mydest = myClass.newInstance();
-                if (!mydest.isThisType((MultiverseCore) this.plugin, destination)) {
+                if (!mydest.isThisType(this.plugin, destination)) {
                    return new InvalidDestination();
                }
                mydest.setDestination(this.plugin, destination);
@@ -66,6 +66,13 @@ public class DestinationFactory {
        return new InvalidDestination();
    }

+    /**
+     * Registers a {@link MVDestination}.
+     *
+     * @param c The {@link Class} of the {@link MVDestination} to register.
+     * @param identifier The {@link String}-identifier.
+     * @return True if the class was successfully registered.
+     */
    public boolean registerDestinationType(Class<? extends MVDestination> c, String identifier) {
        if (this.destList.containsKey(identifier)) {
            return false;
@@ -79,12 +86,14 @@ public class DestinationFactory {
        Permission other = this.plugin.getServer().getPluginManager().getPermission("multiverse.teleport.other." + identifier);
        PermissionTools pt = new PermissionTools(this.plugin);
        if (self == null) {
-            self = new Permission("multiverse.teleport.self." + identifier, "Permission to teleport yourself for the " + identifier + " destination.", PermissionDefault.OP);
+            self = new Permission("multiverse.teleport.self." + identifier,
+                    "Permission to teleport yourself for the " + identifier + " destination.", PermissionDefault.OP);
            this.plugin.getServer().getPluginManager().addPermission(self);
            pt.addToParentPerms("multiverse.teleport.self." + identifier);
        }
        if (other == null) {
-            other = new Permission("multiverse.teleport.other." + identifier, "Permission to teleport others for the " + identifier + " destination.", PermissionDefault.OP);
+            other = new Permission("multiverse.teleport.other." + identifier,
+                    "Permission to teleport others for the " + identifier + " destination.", PermissionDefault.OP);
            this.plugin.getServer().getPluginManager().addPermission(other);
            pt.addToParentPerms("multiverse.teleport.other." + identifier);
        }
@@ -17,20 +17,34 @@ import org.bukkit.util.Vector;
 import java.util.Arrays;
 import java.util.List;

+/**
+ * An exact {@link MVDestination}.
+ */
 public class ExactDestination implements MVDestination {
-    private final String coordRegex = "(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*)";
+    private final String coordRegex = "(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~),(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~),(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~)";
    private boolean isValid;
    private Location location;
+    private boolean relativeX, relativeY, relativeZ;

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getIdentifier() {
        return "e";
    }

+    /**
+     * {@inheritDoc}
+     */
+    @Override
    public Vector getVelocity() {
        return new Vector(0, 0, 0);
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isThisType(JavaPlugin plugin, String destination) {
        if (!(plugin instanceof MultiverseCore)) {
@@ -40,7 +54,7 @@ public class ExactDestination implements MVDestination {
        // Need at least: e:world:x,y,z
        // OR e:world:x,y,z:pitch:yaw
        // so basically 3 or 5
-        if (!(parsed.size() == 3 || parsed.size() == 5)) {
+        if (!(parsed.size() == 3 || parsed.size() == 5)) { // SUPPRESS CHECKSTYLE: MagicNumberCheck
            return false;
        }
        // If it's not an Exact type
@@ -63,23 +77,45 @@ public class ExactDestination implements MVDestination {

        try {
            Float.parseFloat(parsed.get(3));
-            Float.parseFloat(parsed.get(4));
+            Float.parseFloat(parsed.get(4)); // SUPPRESS CHECKSTYLE: MagicNumberCheck
        } catch (NumberFormatException e) {
            return false;
        }
        return true;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public Location getLocation(Entity e) {
-        return this.location;
+        Location loc = this.location.clone();
+        if (relativeX || relativeY || relativeZ) {
+            Location eLoc = e.getLocation();
+            loc.add(relativeX ? eLoc.getX() : 0, relativeY ? eLoc.getY() : 0, relativeZ ? eLoc.getZ() : 0);
+            // Since the location is relative, it makes sense to use the entity's pitch and yaw unless those were
+            // specified in the destination.
+            if (loc.getPitch() == 0) {
+                loc.setPitch(eLoc.getPitch());
+            }
+            if (loc.getYaw() == 0) {
+                loc.setYaw(eLoc.getYaw());
+            }
+        }
+        return loc;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isValid() {
        return this.isValid;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public void setDestination(JavaPlugin plugin, String destination) {
        if (!(plugin instanceof MultiverseCore)) {
@@ -89,7 +125,7 @@ public class ExactDestination implements MVDestination {
        // Need at least: e:world:x,y,z
        // OR e:world:x,y,z:pitch:yaw
        // so basically 3 or 5
-        if (!(parsed.size() == 3 || parsed.size() == 5)) {
+        if (!(parsed.size() == 3 || parsed.size() == 5)) { // SUPPRESS CHECKSTYLE: MagicNumberCheck
            this.isValid = false;
            return;
        }
@@ -112,11 +148,42 @@ public class ExactDestination implements MVDestination {
        double[] coords = new double[3];
        String[] coordString = parsed.get(2).split(",");
        for (int i = 0; i < 3; i++) {
-            try {
-                coords[i] = Double.parseDouble(coordString[i]);
-            } catch (NumberFormatException e) {
-                this.isValid = false;
-                return;
+            String[] relSplit = coordString[i].split("~");
+            boolean relative = false;
+            if (relSplit.length == 0) {
+                // coord is "~" form
+                relative = true;
+                coords[i] = 0;
+            } else if (relSplit.length == 1) {
+                // coord is "123" form
+                try {
+                    coords[i] = Double.parseDouble(relSplit[0]);
+                } catch (NumberFormatException e) {
+                    this.isValid = false;
+                    return;
+                }
+            } else {
+                // coord is "~123" form
+                relative = true;
+                try {
+                    coords[i] = Double.parseDouble(relSplit[1]);
+                } catch (NumberFormatException e) {
+                    this.isValid = false;
+                    return;
+                }
+            }
+            if (relative) {
+                switch (i) {
+                    case 0:
+                        relativeX = true;
+                        break;
+                    case 1:
+                        relativeY = true;
+                        break;
+                    case 2:
+                        relativeZ = true;
+                        break;
+                }
            }
        }
        this.location.setX(coords[0]);
@@ -130,7 +197,7 @@ public class ExactDestination implements MVDestination {

        try {
            this.location.setPitch(Float.parseFloat(parsed.get(3)));
-            this.location.setYaw(Float.parseFloat(parsed.get(4)));
+            this.location.setYaw(Float.parseFloat(parsed.get(4))); // SUPPRESS CHECKSTYLE: MagicNumberCheck
        } catch (NumberFormatException e) {
            this.isValid = false;
            return;
@@ -139,37 +206,55 @@ public class ExactDestination implements MVDestination {

    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getType() {
        return "Exact";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getName() {
-        return "Exact (" + this.location.getX() + ", " + this.location.getY() + ", " + this.location.getZ() + ":" + location.getPitch() + ":" + location.getYaw() + ")";
+        return "Exact (" + this.location.getX() + ", " + this.location.getY() + ", " + this.location.getZ()
+                + ":" + location.getPitch() + ":" + location.getYaw() + ")";
    }

+    /**
+     * Sets this {@link ExactDestination}.
+     *
+     * @param location The {@link Location}.
+     */
    public void setDestination(Location location) {
-        if (location != null) {
-            this.location = location;
-            this.isValid = true;
-        }
-        this.isValid = false;
+        this.isValid = (this.location = location) != null;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String toString() {
        if (isValid) {
-            return "e:" + location.getWorld().getName() + ":" + location.getX() + "," + location.getY() + "," + location.getZ() + ":" + location.getPitch() + ":" + location.getYaw();
+            return "e:" + location.getWorld().getName() + ":" + location.getX() + "," + location.getY()
+                    + "," + location.getZ() + ":" + location.getPitch() + ":" + location.getYaw();
        }
        return "i:Invalid Destination";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getRequiredPermission() {
        return "multiverse.access." + this.location.getWorld().getName();
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean useSafeTeleporter() {
        // This is an EXACT destination, don't safely teleport here.
@@ -14,38 +14,62 @@ import org.bukkit.entity.Entity;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;

+/**
+ * An invalid {@link MVDestination}.
+ */
 public class InvalidDestination implements MVDestination {

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getIdentifier() {
        return "i";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isThisType(JavaPlugin plugin, String destination) {
        return false;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public Location getLocation(Entity e) {
        return null;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isValid() {
        return false;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public void setDestination(JavaPlugin plugin, String destination) {
        // Nothing needed, it's invalid.
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getType() {
        return ChatColor.RED + "Invalid Destination";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getName() {
        return ChatColor.RED + "Invalid Destination";
@@ -56,15 +80,25 @@ public class InvalidDestination implements MVDestination {
        return "i:Invalid Destination";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getRequiredPermission() {
        return null;
    }

+    /**
+     * {@inheritDoc}
+     */
+    @Override
    public Vector getVelocity() {
        return new Vector(0, 0, 0);
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean useSafeTeleporter() {
        return false;
@@ -14,16 +14,25 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;

+/**
+ * A player-{@link MVDestination}.
+ */
 public class PlayerDestination implements MVDestination {
-    String player;
+    private String player;
    private boolean isValid;
    private JavaPlugin plugin;

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getIdentifier() {
        return "pl";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isThisType(JavaPlugin plugin, String destination) {
        String[] items = destination.split(":");
@@ -36,6 +45,9 @@ public class PlayerDestination implements MVDestination {
        return true;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public Location getLocation(Entity e) {
        Player p = plugin.getServer().getPlayer(this.player);
@@ -46,17 +58,23 @@ public class PlayerDestination implements MVDestination {
            plLoc = (Player) e.getPassenger();
        }

-        if (p != null && plLoc != null && !plLoc.getName().equalsIgnoreCase(p.getName())) {
+        if (p != null && plLoc != null) {
            return p.getLocation();
        }
        return null;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isValid() {
        return this.isValid;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public void setDestination(JavaPlugin plugin, String destination) {
        String[] items = destination.split(":");
@@ -71,11 +89,17 @@ public class PlayerDestination implements MVDestination {
        this.plugin = plugin;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getType() {
        return "Player";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getName() {
        return this.player;
@@ -86,15 +110,25 @@ public class PlayerDestination implements MVDestination {
        return "pl:" + this.player;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getRequiredPermission() {
        return "";
    }

+    /**
+     * {@inheritDoc}
+     */
+    @Override
    public Vector getVelocity() {
        return new Vector(0, 0, 0);
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean useSafeTeleporter() {
        return true;
@@ -8,25 +8,34 @@
 package com.onarandombox.MultiverseCore.destination;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Core;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;

+/**
+ * A world-{@link MVDestination}.
+ */
 public class WorldDestination implements MVDestination {
    private boolean isValid;
    private MultiverseWorld world;
-    float yaw = -1;
-    String direction = "";
+    private float yaw = -1;
+    private String direction = "";

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getIdentifier() {
        return "w";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isThisType(JavaPlugin plugin, String destination) {
        String[] items = destination.split(":");
@@ -48,6 +57,9 @@ public class WorldDestination implements MVDestination {
        return false;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public Location getLocation(Entity e) {
        Location spawnLoc = getAcurateSpawnLocation(e, this.world);
@@ -58,21 +70,32 @@ public class WorldDestination implements MVDestination {
        return spawnLoc;
    }

-    private Location getAcurateSpawnLocation(Entity e, MultiverseWorld world) {
+    private static Location getAcurateSpawnLocation(Entity e, MultiverseWorld world) {
        if (world != null) {
            return world.getSpawnLocation();
        } else {
+            // add 0.5 to x and z to center people
+            // (spawn location is stored as int meaning that you would spawn in the corner of a block)
            return e.getWorld().getSpawnLocation().add(.5, 0, .5);
        }
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isValid() {
        return this.isValid;
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public void setDestination(JavaPlugin plugin, String destination) {
+        // TODO Taking a JavaPlugin here is rather useless, if we keep casting it up to MultiverseCore.
+        // We should change that.
+        Core core = (Core) plugin;
        String[] items = destination.split(":");
        if (items.length > 3) {
            isValid = false;
@@ -80,28 +103,34 @@ public class WorldDestination implements MVDestination {
        }
        if (items.length == 1 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
            isValid = true;
-            this.world = ((MultiverseCore) plugin).getMVWorldManager().getMVWorld(items[0]);
+            this.world = core.getMVWorldManager().getMVWorld(items[0]);
            return;
        }
        if (items.length == 2 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
-            this.world = ((MultiverseCore) plugin).getMVWorldManager().getMVWorld(items[0]);
-            this.yaw = LocationManipulation.getYaw(items[1]);
+            this.world = core.getMVWorldManager().getMVWorld(items[0]);
+            this.yaw = core.getLocationManipulation().getYaw(items[1]);
            return;
        }
        if (items[0].equalsIgnoreCase("w") && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[1])) {
            this.world = ((MultiverseCore) plugin).getMVWorldManager().getMVWorld(items[1]);
            isValid = true;
            if (items.length == 3) {
-                this.yaw = LocationManipulation.getYaw(items[2]);
+                this.yaw = core.getLocationManipulation().getYaw(items[2]);
            }
        }
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getType() {
        return "World";
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getName() {
        return this.world.getColoredWorldString();
@@ -115,6 +144,9 @@ public class WorldDestination implements MVDestination {
        return this.world.getCBWorld().getName();
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public String getRequiredPermission() {
        // TODO: Potenitally replace spaces wiht tabs for friendlier yaml.
@@ -122,10 +154,17 @@ public class WorldDestination implements MVDestination {
        return "multiverse.access." + this.world.getName();
    }

+    /**
+     * {@inheritDoc}
+     */
+    @Override
    public Vector getVelocity() {
        return new Vector(0, 0, 0);
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean useSafeTeleporter() {
        return true;
@@ -0,0 +1,4 @@
+/**
+ * This package contains all destination-types.
+ */
+package com.onarandombox.MultiverseCore.destination;
@@ -8,10 +8,23 @@
 package com.onarandombox.MultiverseCore.enums;

 /**
- * Multiverse 2
- *
- * @author fernferret
+ * A enum containing all actions that can be used to modify world-properties.
 */
 public enum Action {
-    Set, Add, Remove, Clear
+    /**
+     * Setting a property.
+     */
+    Set,
+    /**
+     * Adding something to a list-property.
+     */
+    Add,
+    /**
+     * Removing something from a list-property.
+     */
+    Remove,
+    /**
+     * Clearing a list-property.
+     */
+    Clear
 }
@@ -8,10 +8,19 @@
 package com.onarandombox.MultiverseCore.enums;

 /**
- * Multiverse 2
- *
- * @author fernferret
+ * An enum containing all list-properties.
 */
 public enum AddProperties {
-    worldblacklist, animals, monsters
+    /**
+     * Worlds that people cannot go to from a world.
+     */
+    worldblacklist,
+    /**
+     * Animal-exceptions.
+     */
+    animals,
+    /**
+     * Monster-exceptions.
+     */
+    monsters
 }