Fix Properties not loading properly

Closes #397 This also fixes Active Properties not saving properly
Fixed shouldWeKillThisCreature() in MVEntityListener.
2012-01-13 17:49:22 -07:00 · 2012-01-12 19:01:10 +01:00 · 2012-01-10 19:29:55 -07:00 · 2012-01-06 20:53:38 -05:00 · 2012-01-06 18:00:34 +01:00 · 2012-01-05 22:16:34 -07:00
164 changed files with 14853 additions and 3386 deletions
@@ -2,6 +2,7 @@
 /.classpath
 /.project
 /.settings
+/.checkstyle

 # netbeans
 /nbproject
@@ -30,4 +31,14 @@
 *.iml
 *.ipr
 *.iws
-.idea/
+.idea/
+
+# Fern's utils
+uploadtoserver.sh
+
+# Testing files:
+debug.log
+
+# Doxygen
+/docs/html
+debug.txt
@@ -1,5 +1,18 @@
+Building
+========
+Update the submodules after you clone and before you build with maven.
+
+```
+$ git submodule update --init --recursive
+$ 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,142 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ 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">
+        <property name="severity" value="info"/>
+    </module>
+    <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"/>
+        <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="DoubleCheckedLocking"/>
+        <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="RedundantThrows"/>
+        <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>
@@ -1,160 +1,274 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.onarandombox.multiversecore</groupId>
-	<artifactId>Multiverse-Core</artifactId>
-	<version>2.0</version>
-	<name>Multiverse-Core</name>
-	<description>World Management Plugin</description>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.build.number>UNKNOWN</project.build.number>
-	</properties>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.onarandombox.multiversecore</groupId>
+    <artifactId>Multiverse-Core</artifactId>
+    <version>2.2</version>
+    <name>Multiverse-Core</name>
+    <description>World Management Plugin</description>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.number>UNKNOWN</project.build.number>
+    </properties>

-	<repositories>
-		<repository>
-			<id>OnARandomBox</id>
-			<url>http://repo.onarandombox.com/artifactory/repo</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>onarandombox</id>
+            <url>http://repo.onarandombox.com/content/groups/public</url>
+        </repository>
+    </repositories>

-	<build>
-		<defaultGoal>clean package</defaultGoal>
-		<plugins>
-			<!-- Compiler -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</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>
-				<executions>
-					<execution>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>replace</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<file>target/classes/plugin.yml</file>
-					<replacements>
-						<replacement>
-							<token>maven-version-number</token>
-							<value>${project.version}-${project.build.number}</value>
-						</replacement>
-					</replacements>
-				</configuration>
-			</plugin>
-			<!-- Jar Plugin -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.1</version>
-				<configuration>
-					<archive>
-						<manifestEntries>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</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>
-		</dependency>
-		<!-- Bukkit Dependency -->
+    <pluginRepositories>
+        <pluginRepository>
+            <id>doodleproject-repo</id>
+            <name>DoodleProject Maven 2 Repository</name>
+            <url>http://doodleproject.sourceforge.net/maven2/release</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>

-		<!-- Start of Economy Dependencies -->
-		<dependency>
-			<groupId>cosine.boseconomy</groupId>
-			<artifactId>BOSEconomy</artifactId>
-			<version>0.6.2</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
+    <ciManagement>
+        <system>jenkins</system>
+        <url>http://ci.onarandombox.com</url>
+    </ciManagement>

-		<dependency>
-			<groupId>fr.crafter.tickleman.RealShop</groupId>
-			<artifactId>RealShop</artifactId>
-			<version>0.63</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
+    <!-- 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>

-		<dependency>
-			<groupId>com.iConomy</groupId>
-			<artifactId>iConomy</artifactId>
-			<version>5.0</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
+    <build>
+        <defaultGoal>clean package</defaultGoal>
+        <plugins>
+            <!-- Compiler -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</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>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <file>target/classes/plugin.yml</file>
+                    <replacements>
+                        <replacement>
+                            <token>maven-version-number</token>
+                            <value>${project.version}-b${project.build.number}</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
+            <!-- Jar Plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.1</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <!-- Maven Source Plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.11</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>2.11</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <enableRulesSummary>true</enableRulesSummary>
+                    <configLocation>${project.basedir}/config/mv_checks.xml</configLocation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>

-		<dependency>
-			<groupId>com.nijiko.coelho.iConomy</groupId>
-			<artifactId>iConomy</artifactId>
-			<version>4.65</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
+    <dependencies>
+        <!-- Bukkit Dependency -->
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>1.0.0-R1-SNAPSHOT</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <!-- Bukkit Dependency -->
+        <!-- Start of Spout -->
+        <dependency>
+            <groupId>org.getspout</groupId>
+            <artifactId>spoutpluginapi</artifactId>
+            <version>dev-SNAPSHOT</version>
+        </dependency>
+        <!-- End of Spout -->
+        <!-- Start of Economy Dependencies -->
+        <dependency>
+            <groupId>cosine.boseconomy</groupId>
+            <artifactId>BOSEconomy</artifactId>
+            <version>0.6.2</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>
-		<!-- End of Economy Dependencies -->
+        <dependency>
+            <groupId>fr.crafter.tickleman.RealShop</groupId>
+            <artifactId>RealShop</artifactId>
+            <version>0.63</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>

-		<!-- Start of Permissions Dependencies -->
-		<dependency>
-			<groupId>com.nijikokun.bukkit</groupId>
-			<artifactId>Permissions</artifactId>
-			<version>3.2</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.2</version>
-		</dependency>
-		<!-- End of Permissions Dependencies -->
-	</dependencies>
+        <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 Test Dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>1.4.9</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-easymock</artifactId>
+            <version>1.4.9</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <version>1.4.9</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>3.0</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- End of Test Dependencies -->
+    </dependencies>
+    <distributionManagement>
+        <repository>
+            <id>OnARandomBox</id>
+            <url>http://repo.onarandombox.com/content/repositories/multiverse</url>
+        </repository>
+    </distributionManagement>
 </project>
@@ -1,11 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-import java.util.logging.Level;
-
-import org.bukkit.Server;
-
-public interface LoggablePlugin {
-    public void log(Level level, String msg);
-
-    public Server getServer();
-}
@@ -1,176 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-import java.util.List;
-import java.util.logging.Level;
-
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.nijiko.permissions.PermissionHandler;
-import com.nijikokun.bukkit.Permissions.Permissions;
-import com.onarandombox.utils.MVDestination;
-import com.pneumaticraft.commandhandler.PermissionsInterface;
-
-public class MVPermissions implements PermissionsInterface {
-
-    private MultiverseCore plugin;
-    private PermissionHandler permissions = null;
-
-    /**
-     * Constructor FTW
-     * 
-     * @param plugin Pass along the Core Plugin.
-     */
-    public MVPermissions(MultiverseCore plugin) {
-        this.plugin = plugin;
-        // We have to see if permissions was loaded before MV was
-        if (this.plugin.getServer().getPluginManager().getPlugin("Permissions") != null) {
-            this.setPermissions(((Permissions) this.plugin.getServer().getPluginManager().getPlugin("Permissions")).getHandler());
-            this.plugin.log(Level.INFO, "- Attached to Permissions");
-        }
-    }
-
-    /**
-     * Check if a Player can teleport to the Destination world from there current world.
-     * 
-     * @param p
-     * @param w
-     * @return
-     */
-    public Boolean canTravelFromWorld(Player p, MVWorld w) {
-        List<String> blackList = w.getWorldBlacklist();
-
-        boolean returnValue = true;
-
-        for (String s : blackList) {
-            if (s.equalsIgnoreCase(p.getWorld().getName())) {
-                returnValue = false;
-                break;
-            }
-        }
-
-        return returnValue;
-    }
-
-    public boolean canTravelFromLocation(Player teleporter, Location location) {
-        if (!this.plugin.isMVWorld(location.getWorld().getName())) {
-            return false;
-        }
-        return canTravelFromWorld(teleporter, this.plugin.getMVWorld(location.getWorld().getName()));
-    }
-
-    /**
-     * Check if the Player has the permissions to enter this world.
-     * 
-     * @param p
-     * @param w
-     * @return
-     */
-    public Boolean canEnterWorld(Player p, MVWorld w) {
-        return this.hasPermission(p, "multiverse.access." + w.getName(), false);
-    }
-
-    public Boolean canEnterLocation(Player p, Location l) {
-        if (l == null) {
-            return false;
-        }
-        String worldName = l.getWorld().getName();
-        if (!this.plugin.isMVWorld(worldName)) {
-            return false;
-        }
-        return this.hasPermission(p, "multiverse.access." + worldName, false);
-    }
-
-    public Boolean canEnterDestination(Player p, MVDestination d) {
-        if (d == null || d.getLocation(p) == null) {
-            return false;
-        }
-        String worldName = d.getLocation(p).getWorld().getName();
-        if (!this.plugin.isMVWorld(worldName)) {
-            return false;
-        }
-        if(!canEnterLocation(p, d.getLocation(p))) {
-            return false;
-        }
-        return this.hasPermission(p, d.getRequiredPermission(), false);
-    }
-
-    public void setPermissions(PermissionHandler handler) {
-        this.permissions = handler;
-    }
-
-    public boolean hasPermission(CommandSender sender, String node, boolean isOpRequired) {
-
-        if (!(sender instanceof Player)) {
-            return true;
-        }
-        
-        // NO one can access a null permission (mainly used for destinations):w
-        if(node == null) {
-            return false;
-        }
-        // Everyone can access an empty permission
-        // Currently used for the PlayerDestination
-        if(node.equals("")) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-
-        boolean opFallback = this.plugin.getConfig().getBoolean("opfallback", true);
-        if (this.permissions != null && this.permissions.has(player, node)) {
-            // If Permissions is enabled we check against them.
-            // this.plugin.log(Level.WARNING, "Allowed by P3/P2 ");
-            return true;
-        } else if (sender.hasPermission(node)) {
-            // If Now check the bukkit permissions
-            // this.plugin.log(Level.WARNING, "Allowed by BukkitPerms");
-            return true;
-        } else if (player.isOp() && opFallback) {
-            // If Player is Op we always let them use it if they have the fallback enabled!
-            // this.plugin.log(Level.WARNING, "Allowed by OP");
-            return true;
-        }
-
-        // If the Player doesn't have Permissions and isn't an Op then
-        // we return true if OP is not required, otherwise we return false
-        // This allows us to act as a default permission guidance
-
-        // If they have the op fallback disabled, NO commands will work without a permissions plugin.
-        return !isOpRequired && opFallback;
-
-    }
-
-    public String getType() {
-        String opsfallback = "";
-        if(this.plugin.getConfig().getBoolean("opfallback", true)) {
-            opsfallback = " WITH OPs.txt fallback";    
-        }
-        if (this.permissions != null) {
-            return "Permissions " + this.plugin.getServer().getPluginManager().getPlugin("Permissions").getDescription().getVersion() + opsfallback;
-        }
-        
-        return "Bukkit Permissions" + opsfallback;
-    }
-
-    public boolean hasAnyPermission(CommandSender sender, List<String> nodes, boolean isOpRequired) {
-        for (String node : nodes) {
-            if (this.hasPermission(sender, node, isOpRequired)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean hasAllPermission(CommandSender sender, List<String> nodes, boolean isOpRequired) {
-        for (String node : nodes) {
-            if (!this.hasPermission(sender, node, isOpRequired)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-}
@@ -1,96 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-import java.util.Date;
-
-import org.bukkit.entity.Player;
-import org.bukkit.util.config.Configuration;
-
-public class MVPlayerSession {
-
-    private Player player; // Player holder, may be unnecessary.
-
-    private Long teleportLast = 0L; // Timestamp for the Players last Portal Teleportation.
-    private Long messageLast = 0L; // Timestamp for the Players last Alert Message.
-
-    // private Location bedSpawn;
-    //
-    // // Beds are 2 blocks, thus we need to store both places
-    // private Location bedA;
-    // private Location bedB;
-
-    private Configuration config; // Configuration file to find out Cooldown Timers.
-
-    public MVPlayerSession(Player player, Configuration config, MultiverseCore multiVerseCore) {
-        this.player = player;
-        this.config = config;
-        // this.bedSpawn = null;
-    }
-
-    /**
-     * Update the Teleport time.
-     */
-    public void teleport() {
-        this.teleportLast = (new Date()).getTime();
-    }
-
-    /**
-     * Grab whether the cooldown on Portal use has expired or not.
-     * 
-     * @return
-     */
-    public boolean getTeleportable() {
-        Long time = (new Date()).getTime();
-        if ((time - this.teleportLast) > this.config.getInt("portalcooldown", 5000)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Send a Message to the Player as long as enough time has passed since the last message.
-     * 
-     * @param msg
-     */
-    public void message(String msg) {
-        Long time = (new Date()).getTime();
-        if ((time - this.messageLast) > this.config.getInt("messagecooldown", 2000)) {
-            this.player.sendMessage(msg);
-            this.messageLast = time;
-        }
-    }
-    
-    // Commented out bed code, i'll get rid of it soon.
-    // --FF
-    
-    // public void setRespawnLocation(Location location) {
-    // this.bedSpawn = location;
-    // }
-
-    // // This one simply spawns the player closer to the bed.
-    // public Location getBedRespawnLocation() {
-    // // There is a bedrespawn set
-    // if (this.bedSpawn != null) {
-    // if (!this.bs.playerCanSpawnHereSafely(this.bedSpawn) || !bedStillExists(this.bedSpawn)) {
-    // this.bedSpawn = null;
-    // return this.bedSpawn;
-    // }
-    // Location actualRespawn = this.bedSpawn;
-    // Location bedRespawn = new Location(actualRespawn.getWorld(), actualRespawn.getX(), actualRespawn.getY(), actualRespawn.getZ());
-    // bedRespawn.setY(bedRespawn.getY() - .25);
-    // return bedRespawn;
-    // }
-    // return null;
-    // }
-    //
-    // private boolean bedStillExists(Location bedSpawn) {
-    // //System.out.print("Dangers:");
-    // //this.bs.showDangers(bedSpawn);
-    // Location locationDown = new Location(bedSpawn.getWorld(), bedSpawn.getX(), bedSpawn.getY(), bedSpawn.getZ());
-    // locationDown.setY(locationDown.getY() - 1);
-    // if (locationDown.getBlock().getType() != Material.BED_BLOCK) {
-    // return false;
-    // }
-    // return true;
-    // }
-}
@@ -1,7 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-public interface MVPlugin extends LoggablePlugin {
-    public String dumpVersionInfo(String buffer);
-    public MultiverseCore getCore();
-    public void setCore(MultiverseCore core);
-}
@@ -1,216 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-import java.util.logging.Level;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Minecart;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Vehicle;
-
-import com.onarandombox.utils.BlockSafety;
-
-public class MVTeleport {
-
-    MultiverseCore plugin;
-
-    BlockSafety bs = new BlockSafety();
-
-    public MVTeleport(MultiverseCore plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * This method will be specific to beds, and check on top of the bed then around it.
-     * 
-     * @return
-     */
-    public Location getSafeBedDestination(Location bedLocation) {
-        // System.out.print(bedLocation);
-        Location idealLocation = bedLocation;
-        idealLocation.setY(idealLocation.getY() + 1);
-        idealLocation.setX(idealLocation.getX() + .5);
-        idealLocation.setZ(idealLocation.getZ() + .5);
-        // System.out.print(idealLocation);
-        if (this.bs.playerCanSpawnHereSafely(idealLocation)) {
-            // System.out.print(idealLocation);
-            return bedLocation;
-        }
-        return null;
-    }
-
-    private Location getSafeLocation(Location l) {
-
-        // Check around the player first in a configurable radius:
-        // TODO: Make this configurable
-        Location safe = checkAboveAndBelowLocation(l, 6, 9);
-        if (safe != null) {
-            safe.setX(safe.getBlockX() + .5);
-            safe.setZ(safe.getBlockZ() + .5);
-        }
-        return safe;
-    }
-
-    private Location checkAboveAndBelowLocation(Location l, int tolerance, int radius) {
-        // Tolerance must be an even number:
-        if (tolerance % 2 != 0) {
-            tolerance += 1;
-        }
-        // We want half of it, so we can go up and down
-        tolerance /= 2;
-
-        // For now this will just do a straight up block.
-        Location locToCheck = l.clone();
-        // Check the main level
-        Location safe = this.checkAroundLocation(locToCheck, radius);
-        if (safe != null) {
-            return safe;
-        }
-        // We've already checked zero right above this.
-        int currentLevel = 1;
-        while (currentLevel <= tolerance) {
-            // Check above
-            locToCheck = l.clone();
-            locToCheck.add(0, currentLevel, 0);
-            safe = this.checkAroundLocation(locToCheck, radius);
-            if (safe != null) {
-                return safe;
-            }
-
-            // Check below
-            locToCheck = l.clone();
-            locToCheck.subtract(0, currentLevel, 0);
-            safe = this.checkAroundLocation(locToCheck, radius);
-            if (safe != null) {
-                return safe;
-            }
-            currentLevel++;
-        }
-
-        return null;
-    }
-
-    /**
-     * For my crappy algorithm, radius MUST be odd
-     * 
-     * @param l
-     * @param radius
-     * @return
-     */
-    private Location checkAroundLocation(Location l, int diameter) {
-        if (diameter % 2 == 0) {
-            diameter += 1;
-        }
-        Location checkLoc = l.clone();
-
-        // Start at 3, the min diameter around a block
-        int loopcounter = 3;
-        while (loopcounter <= diameter) {
-            boolean foundSafeArea = checkAroundSpecificDiameter(checkLoc, loopcounter);
-            // If a safe area was found:
-            if (foundSafeArea) {
-                // Return the checkLoc, it is the safe location.
-                return checkLoc;
-            }
-            // Otherwise, let's reset our location
-            checkLoc = l.clone();
-            // And increment the radius
-            loopcounter += 2;
-        }
-        return null;
-    }
-
-    private boolean checkAroundSpecificDiameter(Location checkLoc, int circle) {
-        // Adjust the circle to get how many blocks to step out.
-        // A radius of 3 makes the block step 1
-        // A radius of 5 makes the block step 2
-        // A radius of 7 makes the block step 3
-        // ...
-        int adjustedCircle = ((circle - 1) / 2);
-        checkLoc.add(adjustedCircle, 0, 0);
-        if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-            return true;
-        }
-        // Now we go to the right that adjustedCircle many
-        for (int i = 0; i < adjustedCircle; i++) {
-            checkLoc.add(0, 0, 1);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-
-        // Then down adjustedCircle *2
-        for (int i = 0; i < adjustedCircle * 2; i++) {
-            checkLoc.add(-1, 0, 0);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-
-        // Then left adjustedCircle *2
-        for (int i = 0; i < adjustedCircle * 2; i++) {
-            checkLoc.add(0, 0, -1);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-
-        // Then up Then left adjustedCircle *2
-        for (int i = 0; i < adjustedCircle * 2; i++) {
-            checkLoc.add(1, 0, 0);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-
-        // Then finish up by doing adjustedCircle - 1
-        for (int i = 0; i < adjustedCircle - 1; i++) {
-            checkLoc.add(0, 0, 1);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean safelyTeleport(Entity e, Location l) {
-        if (this.bs.playerCanSpawnHereSafely(l)) {
-            e.teleport(l);
-            //this.plugin.log(Level.WARNING, "The first location you gave me was safe.");
-            return true;
-        }
-        if(e instanceof Minecart) {
-            Minecart m = (Minecart)e;
-            if(!this.bs.canSpawnCartSafely(m)) {
-                return false;
-            }
-        }
-        else if(e instanceof Vehicle) {
-            Vehicle v = (Vehicle)e;
-            if(!this.bs.canSpawnVehicleSafely(v)) {
-                return false;
-            }
-        }
-        Location safeLocation = this.getSafeLocation(l);
-        if (safeLocation != null) {
-            // Add offset to account for a vehicle on dry land!
-            if (!this.bs.isEntitiyOnTrack(e, safeLocation)) {
-                safeLocation.setY(safeLocation.getBlockY() + .5);
-            }
-            e.teleport(safeLocation);
-            //this.plugin.log(Level.WARNING, "Had to look for a bit, but I found a safe place for ya!");
-            return true;
-        }
-        if (e instanceof Player) {
-            Player p = (Player) e;
-            p.sendMessage("No safe locations found!");
-        }
-        else if (e.getPassenger() instanceof Player) {
-            Player p = (Player) e.getPassenger();
-            p.sendMessage("No safe locations found!");
-        }
-        this.plugin.log(Level.WARNING, "Sorry champ, you're basically trying to teleport into a minefield. I should just kill you now.");
-        return false;
-    }
-
-}
@@ -0,0 +1,166 @@
+/******************************************************************************
+ * 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.api;
+
+import com.fernferret.allpay.AllPay;
+import com.fernferret.allpay.GenericBank;
+import com.onarandombox.MultiverseCore.destination.DestinationFactory;
+import com.onarandombox.MultiverseCore.utils.*;
+import com.pneumaticraft.commandhandler.CommandHandler;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.Player;
+
+/**
+ * Multiverse 2 Core API
+ * <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.
+     *
+     * @return The Multiverse config file.
+     */
+    FileConfiguration getMVConfiguration();
+
+    /**
+     * Gets the Banking system that Multiverse-Core has hooked into.
+     *
+     * @return A {@link GenericBank} that can be used for payments.
+     */
+    GenericBank getBank();
+
+    /**
+     * Reloads the Multiverse Configuration files:
+     * worlds.yml and config.yml.
+     */
+    void loadConfigs();
+
+    /**
+     * Gets the Multiverse message system. This allows you to send messages
+     * to users at specified intervals.
+     *
+     * @return The loaded {@link MVMessaging}.
+     */
+    MVMessaging getMessaging();
+
+    /**
+     * Gets the {@link MVPlayerSession} for the given player.
+     * This will also create a player session if one does not exist
+     * for a player.
+     *
+     * @param player The player's session to grab.
+     *
+     * @return The corresponding {@link MVPlayerSession}.
+     */
+    MVPlayerSession getPlayerSession(Player player);
+
+    /**
+     * Gets the instantiated Safe-T-Teleporter for performing
+     * safe teleports.
+     *
+     * @return A non-null {@link SafeTTeleporter}.
+     */
+    SafeTTeleporter getTeleporter();
+
+    /**
+     * Multiverse uses an advanced permissions setup, this object
+     * simplifies getting/setting permissions.
+     *
+     * @return A non-null {@link MVPermissions}.
+     */
+    MVPermissions getMVPerms();
+
+    /**
+     * Multiverse uses {@link CommandHandler} to make adding and using commands
+     * a piece of cake.
+     *
+     * @return A non-null {@link CommandHandler}.
+     */
+    CommandHandler getCommandHandler();
+
+    /**
+     * Gets the factory class responsible for loading many different destinations
+     * on demand.
+     *
+     * @return A valid {@link DestinationFactory}.
+     */
+    DestinationFactory getDestFactory();
+
+    /**
+     * Gets the primary class responsible for managing Multiverse Worlds.
+     *
+     * @return {@link WorldManager}.
+     */
+    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.
+     */
+    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed);
+
+    /**
+     * Sets the {@link GenericBank}-Bank AllPay is using.
+     *
+     * @param bank The new {@link GenericBank}
+     */
+    void setBank(GenericBank bank);
+
+    /**
+     * Gets this plugin's {@link AllPay}-Banker.
+     *
+     * @return An {@link AllPay}-Banker
+     */
+    AllPay getBanker();
+
+    /**
+     * 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();
+}
@@ -0,0 +1,20 @@
+/******************************************************************************
+ * 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.api;
+
+/**
+ * A fancy text.
+ */
+public interface FancyText {
+    /**
+     * Gets the {@link String}-representation of this {@link FancyText}.
+     *
+     * @return The {@link String}-representation of this {@link FancyText}.
+     */
+    String getFancyText();
+}
@@ -0,0 +1,30 @@
+/******************************************************************************
+ * 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.api;
+
+import org.bukkit.Server;
+
+import java.util.logging.Level;
+
+/** A simple API to require plugins to have a log method. */
+public interface LoggablePlugin {
+    /**
+     * Logs a message at the specified level.
+     *
+     * @param level The Log-{@link Level}.
+     * @param msg   The message to log.
+     */
+    void log(Level level, String msg);
+
+    /**
+     * Gets the server instance that this plugin is attached to.
+     *
+     * @return A {@link Server} instance.
+     */
+    Server getServer();
+}
@@ -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.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.java.JavaPlugin;
+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!
+ */
+public interface MVDestination {
+    /**
+     * Returns the identifier or prefix that is required for this destination.
+     * <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.
+     */
+    String getIdentifier();
+
+    /**
+     * Allows you to determine if a Destination is valid for the type it thinks it is.
+     * <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
+     * and does not even NEED to be called, but it's highly recommended if you're teleporting, but it's mainly for
+     * Multiverse Internal use.
+     *
+     * @param plugin      The plugin who the type belongs to.
+     * @param destination The destination string. ex: p:MyPortal:nw
+     *
+     * @return True if the destination is valid, false if not.
+     */
+    boolean isThisType(JavaPlugin plugin, String destination);
+
+    /**
+     * Returns the location a specific entity will spawn at.
+     * <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>
+     * 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.
+     */
+    Location getLocation(Entity entity);
+
+    /**
+     * Returns the velocity vector for this destination.
+     * <p>
+     * Plugins wishing to fully support MVDestinations MUST implement this.
+     *
+     * @return A vector representing the speed/direction the player should travel when arriving
+     */
+    Vector getVelocity();
+
+    /**
+     * Sets the destination string.
+     * <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
+     * "p:HomePortal"
+     *
+     * @param plugin      The plugin who the type belongs to.
+     * @param destination The destination string. ex: p:MyPortal:nw
+     */
+    void setDestination(JavaPlugin plugin, String destination);
+
+    /**
+     * Returns true if the destination is valid and players will be taken to it.
+     * <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.
+     */
+    boolean isValid();
+
+    /**
+     * Gives you a general friendly description of the type of destination.
+     * <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.
+     */
+    String getType();
+
+    /**
+     * Gives you a specific name of the destination.
+     * <p>
+     * For example, the PlayerDestination sets this to The Player's Name.
+     *
+     * @return A friendly string stating the name of the destination.
+     */
+    String getName();
+
+    /**
+     * Returns a string that can easily be saved in the config that contains all the details needed to rebuild this
+     * destination.
+     * <p>
+     * ex: e:0,0,0:50:50
+     *
+     * @return The savable config string.
+     */
+    String toString();
+
+    /**
+     * Returns the permissions string required to go here.
+     * <p>
+     * ex: multiverse.access.world
+     * <p>
+     * NOTE: This is NOT the permission to use the teleport command.
+     *
+     * @return the permissions string required to go here.
+     */
+    String getRequiredPermission();
+
+    /**
+     * Should the Multiverse SafeTeleporter be used?
+     * <p>
+     * If not, MV will blindly take people to the location specified.
+     *
+     * @return True if the SafeTeleporter will be used, false if not.
+     */
+    boolean useSafeTeleporter();
+}
@@ -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.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.
+     *
+     * @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}.
+     */
+    @Deprecated
+    String dumpVersionInfo(String buffer);
+
+    /**
+     * Gets the reference to MultiverseCore.
+     *
+     * @return A valid {@link MultiverseCore}.
+     */
+    MultiverseCore getCore();
+
+    /**
+     * Sets the reference to MultiverseCore.
+     *
+     * @param core A valid {@link MultiverseCore}.
+     */
+    void setCore(MultiverseCore core);
+
+    /**
+     * Allows Multiverse or a plugin to query another Multiverse plugin to see what version its protocol is. This
+     * number
+     * should change when something will break the code.
+     *
+     * @return The Integer protocol version.
+     */
+    int getProtocolVersion();
+}
@@ -0,0 +1,227 @@
+/******************************************************************************
+ * 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.api;
+
+import com.onarandombox.MultiverseCore.utils.PurgeWorlds;
+import org.bukkit.World;
+import org.bukkit.World.Environment;
+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>
+ * This API contains all of the world managing
+ * functions that your heart desires!
+ */
+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.
+     * @return True if the world is added, false if not.
+     */
+    boolean addWorld(String name, Environment env, String seedString, 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 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, String generator, boolean useSpawnAdjust);
+
+    /**
+     * 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 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.
+     */
+    boolean deleteWorld(String name, boolean removeConfig);
+
+    /**
+     * Unload a world from Multiverse.
+     *
+     * @param name Name of the world to unload
+     * @return True if the world was unloaded, false if not.
+     */
+    boolean unloadWorld(String name);
+
+    /**
+     * 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.
+     */
+    boolean loadWorld(String name);
+
+    /**
+     * Removes all players from the specified world.
+     *
+     * @param name World to remove players from.
+     */
+    void removePlayersFromWorld(String name);
+
+    /**
+     * Test if a given chunk generator is valid.
+     *
+     * @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
+     */
+    ChunkGenerator getChunkGenerator(String generator, String generatorID, String worldName);
+
+    /**
+     * Returns a list of all the worlds Multiverse knows about.
+     *
+     * @return A list of {@link MultiverseWorld}.
+     */
+    Collection<MultiverseWorld> getMVWorlds();
+
+
+    /**
+     * Returns a {@link MultiverseWorld} if it exists, and null if it does not.
+     * This will search name AND alias.
+     *
+     * @param name The name or alias of the world to get.
+     * @return A {@link MultiverseWorld} or null.
+     */
+    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.
+     */
+    MultiverseWorld getMVWorld(World world);
+
+    /**
+     * 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.
+     */
+    boolean isMVWorld(String name);
+
+    /**
+     * 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.
+     */
+    boolean isMVWorld(World world);
+
+    /**
+     * Load the Worlds & Settings from the configuration file.
+     *
+     * @param forceLoad If set to true, this will perform a total
+     *                  reset and not just load new worlds.
+     */
+    void loadWorlds(boolean forceLoad);
+
+    /**
+     * Loads the Worlds & 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}.
+     */
+    PurgeWorlds getWorldPurger();
+
+    /**
+     * 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();
+}
@@ -0,0 +1,555 @@
+/******************************************************************************
+ * 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.api;
+
+import com.onarandombox.MultiverseCore.configuration.MVConfigProperty;
+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.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.Permission;
+
+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}
+     */
+    World getCBWorld();
+
+    /**
+     * Adds the property to the given value.
+     * It will throw a PropertyDoesNotExistException if the property is not found.
+     *
+     * @param property The name of a world property to set.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @param sender   The sender who wants this value to be set.
+     * @return True if the value was set, false if not.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     */
+    boolean setProperty(String property, String value, CommandSender sender) throws PropertyDoesNotExistException;
+
+    /**
+     * Gets the actual MVConfigProperty from this world.
+     * It will throw a PropertyDoesNotExistException if the property is not found.
+     *
+     * @param property The name of a world property to get.
+     * @return A valid MVWorldProperty.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     * @deprecated Use {@link #getProperty(String, Class)} instead
+     */
+    @Deprecated
+    MVConfigProperty<?> getProperty(String property) throws PropertyDoesNotExistException;
+
+    /**
+     * Gets the string representation of a property.
+     * It will throw a PropertyDoesNotExistException if the property is not found.
+     *
+     * @param property The name of a world property to get.
+     * @return A valid MVWorldProperty.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     */
+    String getPropertyValue(String property) throws PropertyDoesNotExistException;
+
+    /**
+     * Gets the actual MVConfigProperty from this world.
+     * It will throw a PropertyDoesNotExistException if the property is not found.
+     *
+     * @param property The name of a world property to get.
+     * @param expected The type of the expected property. Use Object.class if this doesn't matter for you.
+     * @param <T> The type of the expected property.
+     *
+     * @return A valid MVWorldProperty.
+     *
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     */
+    <T> MVConfigProperty<T> getProperty(String property, Class<T> expected) throws PropertyDoesNotExistException;
+
+    /**
+     * Removes all values from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     *
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to clear.
+     * @return True if it was cleared, false if not.
+     */
+    boolean clearVariable(String property);
+
+    /**
+     * Adds a value to the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     *
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to add a value to.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @return True if the value was added, false if not.
+     */
+    boolean addToVariable(String property, String value);
+
+    /**
+     * Removes a value from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     *
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to remove a value
+     *                 from.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @return True if the value was removed, false if not.
+     */
+    boolean removeFromVariable(String property, String value);
+
+    /**
+     * Gets the environment of this world.
+     *
+     * @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 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 name of this world. This cannot be changed.
+     *
+     * @return The name of the world as a String.
+     */
+    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.
+     */
+    String getAlias();
+
+    /**
+     * Sets the alias of the world.
+     *
+     * @param alias A string that is the new alias.
+     */
+    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.
+     */
+    boolean setColor(String color);
+
+    /**
+     * Gets the color that this world's name/alias will display as.
+     *
+     * @return The color of this world.
+     */
+    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.
+     */
+    boolean isValidAliasColor(String color);
+
+    /**
+     * Returns a very nicely colored string (using Alias and Color if they are set).
+     *
+     * @return A nicely colored string.
+     */
+    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.
+     */
+    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.
+     */
+    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.
+     */
+    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 PVP is enabled in this world in some form (fake or not).
+     *
+     * @return True if players can take damage from other players.
+     */
+    boolean isPVPEnabled();
+
+    /**
+     * Gets whether or not this world will display in chat, mvw and mvl regardless if a user has the
+     * access permissions to go to this world.
+     *
+     * @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);
+
+    /**
+     * 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 weather is enabled in this world.
+     *
+     * @return True if weather events will occur, false if not.
+     */
+    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.
+     */
+    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.
+     */
+    boolean isKeepingSpawnInMemory();
+
+    /**
+     * Sets the difficulty of this world and returns true if success.
+     * Valid string values are either an integer of difficulty(0-3) or
+     * the name that resides in the Bukkit enum, ex. PEACEFUL
+     *
+     * @param difficulty The difficulty to set the world to as a string.
+     * @return True if success, false if the provided string
+     *         could not be translated to a difficulty.
+     */
+    boolean setDifficulty(String difficulty);
+
+    /**
+     * Gets the difficulty of this world.
+     *
+     * @return The difficulty of this world.
+     */
+    Difficulty getDifficulty();
+
+    /**
+     * Sets the spawn location for a world.
+     *
+     * @param spawnLocation The spawn location for a world.
+     */
+    void setSpawnLocation(Location spawnLocation);
+
+    /**
+     * Gets the spawn location of this world.
+     *
+     * @return The spawn location of this world.
+     */
+    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.
+     */
+    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.
+     */
+    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.
+     */
+    boolean setGameMode(String gameMode);
+
+    /**
+     * Gets the GameMode of this world.
+     *
+     * @return The GameMode of this world.
+     */
+    GameMode getGameMode();
+
+    /**
+     * Gets the permission required to enter this world.
+     *
+     * @return The permission required to be exempt from charges to/from this world.
+     */
+    Permission getAccessPermission();
+
+    /**
+     * Gets the permission required to be exempt when entering.
+     *
+     * @return The permission required to be exempt when entering.
+     */
+    Permission getExemptPermission();
+
+    /**
+     * 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)}
+     *
+     * @param price The Amount of money/item to enter the world.
+     */
+    void setPrice(double price);
+
+    /**
+     * Gets the amount of currency it requires to enter this world.
+     *
+     * @return The amount it costs to enter this world.
+     */
+    double getPrice();
+
+    /**
+     * 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
+     *
+     * @param item The Type of currency that will be used when users enter this world.
+     */
+    void setCurrency(int item);
+
+    /**
+     * Gets the Type of currency that will be used when users enter this world.
+     *
+     * @return The Type of currency that will be used when users enter this world.
+     */
+    int getCurrency();
+
+    /**
+     * 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 world players will respawn in if they die in this one.
+     *
+     * @return A world that exists on the server.
+     */
+    World getRespawnToWorld();
+
+    /**
+     * 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 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();
+
+    /**
+     * Gets a list of all the worlds that players CANNOT travel to from this world,
+     * regardless of their access permissions.
+     *
+     * @return A List of world names.
+     */
+    List<String> getWorldBlacklist();
+
+    /**
+     * Returns a list of animals. This list always negates the {@link #canAnimalsSpawn()} result.
+     *
+     * @return A list of animals that will spawn if {@link #canAnimalsSpawn()} is false.
+     */
+    List<String> getAnimalList();
+
+    /**
+     * Sets whether or not animals can spawn.
+     * If there are values in {@link #getAnimalList()} and this is false,
+     * those animals become the exceptions, and will spawn
+     *
+     * @param allowAnimalSpawn True to allow spawning of monsters, false to prevent.
+     */
+    void setAllowAnimalSpawn(boolean allowAnimalSpawn);
+
+    /**
+     * Returns a list of monsters. This list always negates the {@link #canMonstersSpawn()} ()} result.
+     *
+     * @return A list of monsters that will spawn if {@link #canMonstersSpawn()} is false.
+     */
+    List<String> getMonsterList();
+
+    /**
+     * Sets whether or not monsters can spawn.
+     * If there are values in {@link #getMonsterList()} and this is false,
+     * those monsters become the exceptions, and will spawn
+     *
+     * @param allowMonsterSpawn True to allow spawning of monsters, false to prevent.
+     */
+    void setAllowMonsterSpawn(boolean allowMonsterSpawn);
+
+    /**
+     * Clears a list property (sets it to []).
+     *
+     * @param property The property to clear.
+     * @return True if success, false if fail.
+     */
+    boolean clearList(String property);
+
+    /**
+     * Sets whether or not a world will auto-heal players if the difficulty is on peaceful.
+     *
+     * @param heal True if the world will heal.
+     */
+    void setAutoHeal(boolean heal);
+
+    /**
+     * 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.
+     */
+    boolean getAutoHeal();
+
+    /**
+     * 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-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-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 Multiverse should auto-load this world.
+     *
+     * @return True if Multiverse should auto-load this world.
+     */
+    boolean getAutoLoad();
+
+    /**
+     * 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);
+
+    /**
+     * 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();
+
+    /**
+     * Gets all the names of all properties that can be SET.
+     *
+     * @return All property names, with alternating colors.
+     */
+    String getAllPropertyNames();
+
+    /**
+     * Sets the current time in a world.
+     *
+     * 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);
+
+    /**
+     * Same as {@link #getTime()}, but returns a string.
+     * @return The time as a short string: 12:34pm
+     */
+    String getTime();
+}
@@ -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,138 @@
+/******************************************************************************
+ * 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.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", "Allows management of Anchor Destinations.", 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) {
+        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);
+        }
+
+        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() == 2) {
+            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;
+        }
+        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;
+    }
+}
@@ -0,0 +1,62 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.destination.InvalidDestination;
+import com.onarandombox.MultiverseCore.utils.MVPermissions;
+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 {
+
+    public CheckCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Help you validate your multiverse settings");
+        this.setCommandUsage("/mv check " + ChatColor.GREEN + "{PLAYER} {DESTINATION}");
+        this.setArgRange(2, 2);
+        this.addKey("mv check");
+        this.addKey("mvcheck");
+        this.addCommandExample("/mv check " + ChatColor.GREEN + "fernferret " + ChatColor.LIGHT_PURPLE + "w:MyWorld");
+        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);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Player p = this.plugin.getServer().getPlayer(args.get(0));
+        if (p == null) {
+            sender.sendMessage("Could not find player " + ChatColor.GREEN + args.get(0));
+            sender.sendMessage("Are they online?");
+            return;
+        }
+        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("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");
+        }
+    }
+}
@@ -0,0 +1,97 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.enums.ConfigProperty;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Allows you to set Global MV Variables.
+ */
+public class ConfigCommand extends MultiverseCommand {
+    public ConfigCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Configuration");
+        this.setCommandUsage("/mv config " + ChatColor.GREEN + "{PROPERTY} {VALUE}");
+        this.setArgRange(1, 2);
+        this.addKey("mv config");
+        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.setPermission("multiverse.core.config", "Allows you to set Global MV Variables.", PermissionDefault.OP);
+    }
+
+    @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 += ", ";
+            }
+            sender.sendMessage(currentvals.substring(0, currentvals.length() - 2));
+            return;
+        }
+        if (args.get(0).equalsIgnoreCase("firstspawnworld")) {
+            this.plugin.getMVConfiguration().set(args.get(0).toLowerCase(), args.get(1));
+            // Don't forget to set the world!
+            this.plugin.getMVWorldManager().setFirstSpawnWorld(args.get(1));
+        } else 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.saveMVConfigs()) {
+            sender.sendMessage(ChatColor.GREEN + "SUCCESS!" + ChatColor.WHITE + " Values were updated successfully!");
+            this.plugin.loadConfigs();
+        } else {
+            sender.sendMessage(ChatColor.RED + "FAIL!" + ChatColor.WHITE + " Check your console for details!");
+        }
+    }
+}
@@ -1,12 +1,21 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MultiverseCore;
+import java.util.List;

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

    public ConfirmCommand(MultiverseCore plugin) {
@@ -17,8 +26,9 @@ public class ConfirmCommand extends MultiverseCommand {
        this.setArgRange(0, 0);
        this.addKey("mvconfirm");
        this.addKey("mv confirm");
+        this.addCommandExample("/mv confirm");
        this.setPermission("multiverse.core.confirm", "If you have not been prompted to use this, it will not do anything.", PermissionDefault.OP);
-        
+
    }

    @Override
@@ -1,7 +1,16 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.utils.LocationManipulation;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -9,13 +18,14 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.utils.LocationManipulation;
+import java.text.DecimalFormat;
+import java.util.List;

+/**
+ * Returns detailed information on the Players where abouts.
+ */
 public class CoordCommand extends MultiverseCommand {
-
-    private LocationManipulation locMan = new LocationManipulation();
+    private MVWorldManager worldManager;

    public CoordCommand(MultiverseCore plugin) {
        super(plugin);
@@ -25,7 +35,9 @@ public class CoordCommand extends MultiverseCommand {
        this.addKey("mv coord");
        this.addKey("mvcoord");
        this.addKey("mvco");
+        this.addCommandExample("/mv coord");
        this.setPermission("multiverse.core.coord", "Returns detailed information on the Players where abouts.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
    }

    @Override
@@ -34,20 +46,22 @@ public class CoordCommand extends MultiverseCommand {
        if (sender instanceof Player) {
            Player p = (Player) sender;
            World world = p.getWorld();
-            
-            if(!this.plugin.isMVWorld(world.getName())) {
+
+            if (!this.worldManager.isMVWorld(world.getName())) {
                this.plugin.showNotMVWorldMessage(sender, world.getName());
                return;
            }
-            
-            MVWorld mvworld = this.plugin.getMVWorld(world.getName());
-            // TODO: Convert to fancy stuff
-            
+
+            MultiverseWorld mvworld = this.worldManager.getMVWorld(world.getName());
+
            p.sendMessage(ChatColor.AQUA + "--- Location Information ---");
            p.sendMessage(ChatColor.AQUA + "World: " + ChatColor.WHITE + world.getName());
            p.sendMessage(ChatColor.AQUA + "Alias: " + mvworld.getColoredWorldString());
            p.sendMessage(ChatColor.AQUA + "World Scale: " + ChatColor.WHITE + mvworld.getScaling());
-            p.sendMessage(ChatColor.AQUA + "Coordinates: " + ChatColor.WHITE + this.locMan.strCoords(p.getLocation()));
+            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())));
        } else {
@@ -1,46 +1,61 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;

+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.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.util.List;

-import org.bukkit.ChatColor;
-import org.bukkit.World.Environment;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.pneumaticraft.commandhandler.CommandHandler;
-
+/**
+ * Creates a new world and loads it.
+ */
 public class CreateCommand extends MultiverseCommand {
+    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("/mv create" + ChatColor.GREEN + " {NAME} {ENV}" + ChatColor.GOLD + " -s [SEED] -g [GENERATOR[:ID]] [-n]");
+        this.setArgRange(2, 7); // 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 + "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();
    }

    @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);
-
-        if (new File(worldName).exists() || this.plugin.isMVWorld(worldName)) {
+        boolean useSpawnAdjust = true;
+        for (String s : args) {
+            if (s.equalsIgnoreCase("-n")) {
+                useSpawnAdjust = false;
+            }
+        }
+        if (worldFile.exists() || this.worldManager.isMVWorld(worldName)) {
            sender.sendMessage(ChatColor.RED + "A Folder/World already exists with this name!");
            sender.sendMessage(ChatColor.RED + "If you are confident it is a world you can import with /mvimport");
            return;
@@ -52,12 +67,13 @@ public class CreateCommand extends MultiverseCommand {
            EnvironmentCommand.showEnvironments(sender);
            return;
        }
-        sender.sendMessage(ChatColor.AQUA + "Starting world creation...");
-        if (this.plugin.addWorld(worldName, environment, seed, generator)) {
-            sender.sendMessage(ChatColor.GREEN + "Complete!");
+
+        Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'...");
+
+        if (this.worldManager.addWorld(worldName, environment, seed, generator, useSpawnAdjust)) {
+            Command.broadcastCommandMessage(sender, "Complete!");
        } else {
-            sender.sendMessage(ChatColor.RED + "FAILED.");
+            Command.broadcastCommandMessage(sender, "FAILED.");
        }
-        return;
    }
 }
@@ -0,0 +1,65 @@
+/******************************************************************************
+ * 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;
+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.setArgRange(0, 1);
+        this.addKey("mv debug");
+        this.addKey("mv d");
+        this.addKey("mvdebug");
+        this.addCommandExample("/mv debug " + ChatColor.GOLD + "2");
+        this.setPermission("multiverse.core.debug", "Spams the console a bunch.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() == 1) {
+            if (args.get(0).equalsIgnoreCase("off")) {
+                MultiverseCore.GlobalDebug = 0;
+            } else {
+                try {
+                    int debugLevel = Integer.parseInt(args.get(0));
+                    if (debugLevel > 3 || debugLevel < 0) {
+                        throw new NumberFormatException();
+                    }
+                    MultiverseCore.GlobalDebug = 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!)");
+                }
+
+            }
+        }
+        this.displayDebugMode(sender);
+    }
+
+    private void displayDebugMode(CommandSender sender) {
+        if (MultiverseCore.GlobalDebug == 0) {
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
+        } else {
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + MultiverseCore.GlobalDebug);
+            this.plugin.log(Level.FINE, "Multiverse Debug ENABLED");
+        }
+    }
+}
@@ -1,14 +1,23 @@
+/******************************************************************************
+ * 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.ArrayList;
-import java.util.List;
-
+import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MultiverseCore;
+import java.util.ArrayList;
+import java.util.List;

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

    public DeleteCommand(MultiverseCore plugin) {
@@ -18,13 +27,15 @@ public class DeleteCommand extends MultiverseCommand {
        this.setArgRange(1, 1);
        this.addKey("mvdelete");
        this.addKey("mv delete");
+        this.addCommandExample("/mv create " + 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 };
+        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 Deleted!", ChatColor.RED + "World could NOT be deleted!");
    }
 }
@@ -1,14 +1,22 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MultiverseCore;
-
+import java.util.List;

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

    public EnvironmentCommand(MultiverseCore plugin) {
@@ -20,15 +28,20 @@ public class EnvironmentCommand extends MultiverseCommand {
        this.addKey("mv env");
        this.addKey("mv environment");
        this.addKey("mv environments");
+        this.addCommandExample("/mv env");
        this.setPermission("multiverse.core.list.environments", "Lists valid known environments.", 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");
    }

    @Override
@@ -0,0 +1,60 @@
+/******************************************************************************
+ * 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 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) {
+        super(plugin);
+        this.setName("World Information");
+        this.setCommandUsage("/mv generators");
+        this.setArgRange(0, 0);
+        this.addKey("mv generators");
+        this.addKey("mvgenerators");
+        this.addKey("mv gens");
+        this.addKey("mvgens");
+        this.addCommandExample("/mv generators");
+        this.setPermission("multiverse.core.generator", "Returns a list of Loaded Generator Plugins.", PermissionDefault.OP);
+    }
+
+    @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!");
+        Plugin[] plugins = this.plugin.getServer().getPluginManager().getPlugins();
+        List<String> generators = new ArrayList<String>();
+        for (Plugin p : plugins) {
+            if (p.isEnabled() && p.getDefaultWorldGenerator("world", "") != null) {
+                generators.add(p.getDescription().getName());
+            }
+        }
+        sender.sendMessage(ChatColor.AQUA + "--- Loaded Generator Plugins ---");
+        String loadedGens = "";
+        boolean altColor = false;
+        for (String s : generators) {
+            loadedGens += (altColor ? ChatColor.YELLOW : ChatColor.WHITE) + s + " ";
+            altColor = !altColor;
+        }
+        if (loadedGens.length() == 0) {
+            loadedGens = ChatColor.RED + "No Generator Plugins found.";
+        }
+        sender.sendMessage(loadedGens);
+    }
+}
@@ -1,19 +1,28 @@
+/******************************************************************************
+ * 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.                                                         *
+ ******************************************************************************/
+
+// TODO maybe remove this comment...?
 // 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 java.util.ArrayList;
-import java.util.List;
-
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.pneumaticraft.commandhandler.Command;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.pneumaticraft.commandhandler.Command;
+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);
@@ -26,42 +35,53 @@ public class HelpCommand extends MultiverseCommand {
        this.addKey("mv help");
        this.addKey("mvsearch");
        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;
            }
        }
@@ -74,55 +94,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(" ");
-            }
-        }
-    }
-
 }
@@ -1,39 +1,136 @@
+/******************************************************************************
+ * 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.io.File;
-import java.util.List;
-
+import com.onarandombox.MultiverseCore.MultiverseCore;
+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 com.onarandombox.MultiverseCore.MultiverseCore;
+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 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, 3);
        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("/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 boolean checkIfIsWorld(File worldFolder) {
+        if (worldFolder.isDirectory()) {
+            File[] files = worldFolder.listFiles(new FilenameFilter() {
+                @Override
+                public boolean accept(File file, String name) {
+                    return name.equalsIgnoreCase("level.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;
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
        String worldName = args.get(0);
-        if (this.plugin.isMVWorld(worldName) && new File(worldName).exists()) {
-            sender.sendMessage(ChatColor.RED + "Multiverse already knows about this world!");
+
+        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) {
+            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);
@@ -44,18 +141,21 @@ public class ImportCommand extends MultiverseCommand {
            return;
        }

-        if (new File(worldName).exists() && env != null) {
-            sender.sendMessage(ChatColor.AQUA + "Starting world import...");
-            this.plugin.addWorld(worldName, environment, null, generator);
-            sender.sendMessage(ChatColor.GREEN + "Complete!");
-            return;
+        if (worldFile.exists() && env != null) {
+            Command.broadcastCommandMessage(sender, "Starting import of world '" + worldName + "'...");
+            if (this.worldManager.addWorld(worldName, environment, null, generator, useSpawnAdjust))
+                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
+            else
+                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
        } 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...");
+            String worldList = this.getPotentialWorlds();
+            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
+            sender.sendMessage(worldList);
        }
    }
 }
@@ -1,22 +1,37 @@
+/******************************************************************************
+ * 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.ArrayList;
-import java.util.List;
-
+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.FancyColorScheme;
+import com.onarandombox.MultiverseCore.utils.FancyHeader;
+import com.onarandombox.MultiverseCore.utils.FancyMessage;
+import com.onarandombox.MultiverseCore.utils.LocationManipulation;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.utils.FancyColorScheme;
-import com.onarandombox.utils.FancyHeader;
-import com.onarandombox.utils.FancyMessage;
-import com.onarandombox.utils.FancyText;
+import java.util.ArrayList;
+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 MVWorldManager worldManager;

    public InfoCommand(MultiverseCore plugin) {
        super(plugin);
@@ -26,7 +41,10 @@ public class InfoCommand extends MultiverseCommand {
        this.addKey("mvinfo");
        this.addKey("mvi");
        this.addKey("mv info");
+        this.addCommandExample("/mv info " + ChatColor.GOLD + "1");
+        this.addCommandExample("/mv info " + ChatColor.GOLD + "3");
        this.setPermission("multiverse.core.info", "Returns detailed information on the world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
    }

    @Override
@@ -43,9 +61,8 @@ public class InfoCommand extends MultiverseCommand {
                sender.sendMessage("You must enter a" + ChatColor.LIGHT_PURPLE + " world" + ChatColor.WHITE + " from the console!");
                return;
            }
-        }
-        else if (args.size() == 1) {
-            if (this.plugin.getMVWorld(args.get(0)) != null) {
+        } else if (args.size() == 1) {
+            if (this.worldManager.getMVWorld(args.get(0)) != null) {
                // then we have a world!
                worldName = args.get(0);
            } else {
@@ -62,8 +79,7 @@ public class InfoCommand extends MultiverseCommand {
                    return;
                }
            }
-        }
-        else if (args.size() == 2) {
+        } else if (args.size() == 2) {
            worldName = args.get(0);
            try {
                pageNum = Integer.parseInt(args.get(1)) - 1;
@@ -72,8 +88,12 @@ public class InfoCommand extends MultiverseCommand {
            }
        }

-        if (this.plugin.isMVWorld(worldName)) {
-            showPage(pageNum, sender, this.buildEntireCommand(this.plugin.getMVWorld(worldName)));
+        if (this.worldManager.isMVWorld(worldName)) {
+            Player p = null;
+            if (sender instanceof Player) {
+                p = (Player) sender;
+            }
+            showPage(pageNum, sender, this.buildEntireCommand(this.worldManager.getMVWorld(worldName), p));
        } else if (this.plugin.getServer().getWorld(worldName) != null) {
            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}");
@@ -81,7 +101,7 @@ public class InfoCommand extends MultiverseCommand {
        }
    }

-    private List<List<FancyText>> buildEntireCommand(MVWorld world) {
+    private List<List<FancyText>> buildEntireCommand(MultiverseWorld world, Player p) {
        List<FancyText> message = new ArrayList<FancyText>();
        List<List<FancyText>> worldInfo = new ArrayList<List<FancyText>>();
        // Page 1
@@ -89,18 +109,20 @@ 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));
-        message.add(new FancyMessage("Seed: ", world.getCBWorld().getSeed() + "", colors));
-        Location spawn = world.getCBWorld().getSpawnLocation();
-        message.add(new FancyMessage("Spawn Location: ", "(" + spawn.getBlockX() + ", " + spawn.getBlockY() + ", " + spawn.getBlockZ() + ")", colors));
-        message.add(new FancyMessage("World Scale: ", world.getScaling().toString(), colors));
+        message.add(new FancyMessage("Game Mode: ", world.getGameMode().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));
        if (world.getPrice() > 0) {
-            message.add(new FancyMessage("Price to enter this world: ", this.plugin.getBank().getFormattedAmount(world.getPrice(), world.getCurrency()), colors));
+            message.add(new FancyMessage("Price to enter this world: ",
+                    this.plugin.getBank().getFormattedAmount(p, world.getPrice(), world.getCurrency()), colors));
        } else {
            message.add(new FancyMessage("Price to enter this world: ", ChatColor.GREEN + "FREE!", colors));
        }

        if (world.getRespawnToWorld() != null) {
-            MVWorld respawn = this.plugin.getMVWorld(world.getRespawnToWorld());
+            MultiverseWorld respawn = this.worldManager.getMVWorld(world.getRespawnToWorld());
            if (respawn != null) {
                message.add(new FancyMessage("Players will respawn in: ", respawn.getColoredWorldString(), colors));
            } else {
@@ -112,44 +134,46 @@ public class InfoCommand extends MultiverseCommand {
        worldInfo.add(message);
        // 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("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.getPvp().toString(), 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.allowMonsterSpawning().toString(), 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.allowMonsterSpawning()) {
-                message.add(new FancyMessage("Monsters that" + ChatColor.RED + " CAN NOT " + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getMonsterList()), colors));
+            if (world.canMonstersSpawn()) {
+                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));
            }
        } else {
-            message.add(new FancyMessage("Monsters that CAN spawn: ", world.allowMonsterSpawning() ? "ALL" : "NONE", colors));
+            message.add(new FancyMessage("Monsters that CAN spawn: ", world.canMonstersSpawn() ? "ALL" : "NONE", colors));
        }
        worldInfo.add(message);

        // Page 4
        message = new ArrayList<FancyText>();
        message.add(new FancyHeader("Animal Settings", colors));
-        message.add(new FancyMessage("Multiverse Setting: ", world.allowAnimalSpawning().toString(), 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.allowMonsterSpawning()) {
-                message.add(new FancyMessage("Animals that" + ChatColor.RED + " CAN NOT " + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getAnimalList()), colors));
+            if (world.canMonstersSpawn()) {
+                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));
            }
        } else {
-            message.add(new FancyMessage("Animals that CAN spawn: ", world.allowAnimalSpawning() ? "ALL" : "NONE", colors));
+            message.add(new FancyMessage("Animals that CAN spawn: ", world.canAnimalsSpawn() ? "ALL" : "NONE", colors));
        }
        worldInfo.add(message);

@@ -157,10 +181,10 @@ public class InfoCommand extends MultiverseCommand {
    }

    private String toCommaSeperated(List<String> list) {
-        if(list == null || list.size() == 0) {
+        if (list == null || list.size() == 0) {
            return "";
        }
-        if(list.size() == 1) {
+        if (list.size() == 1) {
            return list.get(0);
        }
        String result = list.get(0);
@@ -172,6 +196,12 @@ 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;
    }
@@ -1,40 +1,45 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
+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;
-        }
+    private List<String> getFancyWorldList(Player p) {
+        List<String> worldList = new ArrayList<String>();
+        for (MultiverseWorld world : this.plugin.getMVWorldManager().getMVWorlds()) {

-        String output = ChatColor.LIGHT_PURPLE + "Worlds which you can view:\n";
-        for (MVWorld world : this.plugin.getMVWorlds()) {
-
-            if (p != null && (!this.plugin.getPermissions().canEnterWorld(p, world))) {
+            if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
                continue;
            }

@@ -44,15 +49,80 @@ 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;
            }
-            output += world.getColoredWorldString() + ChatColor.WHITE + " - " + color + world.getEnvironment() + " \n";
+            String outputCache = world.getColoredWorldString() + ChatColor.WHITE + " - " + color + world.getEnvironment();
+            if (world.isHidden()) {
+                if (p == null || p.hasPermission("multiverse.core.modify")) {
+                    // Prefix hidden worlds with an "[H]"
+                    worldList.add(ChatColor.GRAY + "[H]" + outputCache);
+                }
+            } else {
+                worldList.add(outputCache);
+            }
+        }
+        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);
+            }
        }
-        String[] response = output.split("\n");
-        for (String msg : response) {
-            sender.sendMessage(msg);
+        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);
    }
 }
@@ -0,0 +1,42 @@
+/******************************************************************************
+ * 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.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) {
+        super(plugin);
+        this.setName("Load World");
+        this.setCommandUsage("/mv load" + ChatColor.GREEN + " {WORLD}");
+        this.setArgRange(1, 1);
+        this.addKey("mvload");
+        this.addKey("mv load");
+        this.addCommandExample("/mv load " + ChatColor.GREEN + "MyUnloadedWorld");
+        this.setPermission("multiverse.core.load", "Loads a world into Multiverse.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (this.plugin.getMVWorldManager().loadWorld(args.get(0))) {
+            Command.broadcastCommandMessage(sender, "Loaded world '" + args.get(0) + "'!");
+        } else {
+            sender.sendMessage("Error trying to load world '" + args.get(0) + "'!");
+        }
+    }
+}
@@ -1,19 +1,31 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.Action;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
+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 MVWorldManager worldManager;

    public ModifyAddCommand(MultiverseCore plugin) {
        super(plugin);
@@ -24,7 +36,12 @@ public class ModifyAddCommand extends MultiverseCommand {
        this.addKey("mvmadd");
        this.addKey("mv modify add");
        this.addKey("mvmodify add");
-        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.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.worldManager = this.plugin.getMVWorldManager();
    }

    @Override
@@ -43,14 +60,14 @@ public class ModifyAddCommand extends MultiverseCommand {
            return;
        }

-        MVWorld world;
+        MultiverseWorld world;
        String value = args.get(0);
        String property = args.get(1);

        if (args.size() == 2) {
-            world = this.plugin.getMVWorld(p.getWorld().getName());
+            world = this.worldManager.getMVWorld(p.getWorld().getName());
        } else {
-            world = this.plugin.getMVWorld(args.get(2));
+            world = this.worldManager.getMVWorld(args.get(2));
        }

        if (world == null) {
@@ -64,8 +81,9 @@ public class ModifyAddCommand extends MultiverseCommand {
            return;
        }

-        if (world.addToList(property, value)) {
-            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + value + ChatColor.WHITE + " was " + ChatColor.GREEN + "added to " + ChatColor.GREEN + property);
+        if (world.addToVariable(property, value)) {
+            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA
+                    + value + ChatColor.WHITE + " was " + ChatColor.GREEN + "added to " + ChatColor.GREEN + property);
        } else {
            sender.sendMessage(value + " could not be added to " + property);
        }
@@ -1,16 +1,28 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.Action;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
+import java.util.List;

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

    public ModifyClearCommand(MultiverseCore plugin) {
        super(plugin);
@@ -21,7 +33,12 @@ public class ModifyClearCommand extends MultiverseCommand {
        this.addKey("mvmclear");
        this.addKey("mv modify clear");
        this.addKey("mvmodify clear");
-        this.setPermission("multiverse.core.modify.clear", "Removes all values from a property. This will work on properties that contain lists.", PermissionDefault.OP);
+        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.worldManager = this.plugin.getMVWorldManager();
    }

    @Override
@@ -39,13 +56,13 @@ public class ModifyClearCommand extends MultiverseCommand {
            return;
        }

-        MVWorld world;
+        MultiverseWorld world;
        String property = args.get(0);

        if (args.size() == 1) {
-            world = this.plugin.getMVWorld(p.getWorld().getName());
+            world = this.worldManager.getMVWorld(p.getWorld().getName());
        } else {
-            world = this.plugin.getMVWorld(args.get(1));
+            world = this.worldManager.getMVWorld(args.get(1));
        }

        if (world == null) {
@@ -60,9 +77,11 @@ public class ModifyClearCommand extends MultiverseCommand {
        }
        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.");
        } 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.");
        }
    }

@@ -1,29 +1,27 @@
+/******************************************************************************
+ * 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.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.enums.Action;
+import com.onarandombox.MultiverseCore.enums.AddProperties;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-enum AddProperties {
-    blockblacklist, playerwhitelist, playerblacklist, worldblacklist, animals, monsters
-}
-
-enum Action {
-    Set, Add, Remove, Clear
-}
-
-// Color == Aliascolor
-enum SetProperties {
-    alias, animals, monsters, pvp, scaling, aliascolor, color, respawn, currency, curr, price, scale, spawnmemory, memory, weather, storm
-}
+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) {
@@ -39,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;
@@ -59,6 +62,7 @@ public class ModifyCommand extends MultiverseCommand {
                return false;
            }
        }
+        return false;
    }

    @Override
@@ -1,16 +1,28 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.Action;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
+import java.util.List;

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

    public ModifyRemoveCommand(MultiverseCore plugin) {
        super(plugin);
@@ -25,7 +37,12 @@ public class ModifyRemoveCommand extends MultiverseCommand {
        this.addKey("mvmdelete");
        this.addKey("mv modify delete");
        this.addKey("mvmodify delete");
-        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.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.worldManager = this.plugin.getMVWorldManager();
    }

    @Override
@@ -44,14 +61,14 @@ public class ModifyRemoveCommand extends MultiverseCommand {
            return;
        }

-        MVWorld world;
+        MultiverseWorld world;
        String value = args.get(0);
        String property = args.get(1);

        if (args.size() == 2) {
-            world = this.plugin.getMVWorld(p.getWorld().getName());
+            world = this.worldManager.getMVWorld(p.getWorld().getName());
        } else {
-            world = this.plugin.getMVWorld(args.get(2));
+            world = this.worldManager.getMVWorld(args.get(2));
        }

        if (world == null) {
@@ -64,10 +81,12 @@ public class ModifyRemoveCommand extends MultiverseCommand {
            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/4W8cY");
            return;
        }
-        if (world.removeFromList(property, value)) {
-            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + value + ChatColor.WHITE + " was " + ChatColor.RED + "removed from " + ChatColor.GREEN + property);
+        if (world.removeFromVariable(property, value)) {
+            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + value + ChatColor.WHITE
+                    + " was " + ChatColor.RED + "removed from " + ChatColor.GREEN + property);
        } 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);
        }
    }

@@ -1,31 +1,78 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
+import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
+import java.util.List;

+/**
+ * Used to set world-properties.
+ */
 public class ModifySetCommand extends MultiverseCommand {
+    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(2, 3);
+        this.setArgRange(1, 3);
        this.addKey("mvm set");
        this.addKey("mvmset");
        this.addKey("mv modify set");
        this.addKey("mvmodify set");
-        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.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "mode " + ChatColor.RED + "creative");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "animals " + ChatColor.RED + "false");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "monsters " + ChatColor.RED + "false");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "alias " + ChatColor.RED + "MyWorld");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "color " + ChatColor.RED + "green");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "curr " + ChatColor.RED + "3");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "price " + ChatColor.RED + "5");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "scale " + ChatColor.RED + "1.2");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "memory " + ChatColor.RED + "true");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "diff " + ChatColor.RED + "hard");
+        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);
    }

    @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);
+
+            } else {
+                sender.sendMessage("Spawn is the only param with no" + ChatColor.GREEN + " VALUE");
+                sender.sendMessage("Type " + ChatColor.GREEN + "/mv modify ?" + ChatColor.WHITE + " For help.");
+            }
+            return;
+        }
        // We NEED a world from the command line
        Player p = null;
        if (sender instanceof Player) {
@@ -40,14 +87,14 @@ public class ModifySetCommand extends MultiverseCommand {
            return;
        }

-        MVWorld world;
+        MultiverseWorld world;
        String value = args.get(1);
        String property = args.get(0);

        if (args.size() == 2) {
-            world = this.plugin.getMVWorld(p.getWorld().getName());
+            world = this.worldManager.getMVWorld(p.getWorld().getName());
        } else {
-            world = this.plugin.getMVWorld(args.get(2));
+            world = this.worldManager.getMVWorld(args.get(2));
        }

        if (world == null) {
@@ -55,17 +102,22 @@ 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");
+        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !world.isValidAliasColor(value)) {
+            sender.sendMessage(value + " is not a valid color. Please pick one of the following:");
+            sender.sendMessage(EnglishChatColor.getAllColors());
            return;
        }
-        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !world.isValidAliasColor(value)) {
-            sender.sendMessage(value + " is not a valid color. Please see our Github Wiki for the complete color list.");
-        } 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);
+        try {
+            if (world.setProperty(property, value, sender)) {
+                sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Property " + ChatColor.AQUA + property
+                        + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
+            } else {
+                sender.sendMessage(world.getProperty(property, Object.class).getHelp());
+            }
+        } catch (PropertyDoesNotExistException e) {
+            sender.sendMessage(ChatColor.RED + "Sorry, You can't set: '" + ChatColor.GRAY + property + ChatColor.RED + "'");
+            // TODO: Display the list
+            sender.sendMessage(ChatColor.GOLD + "For a full list of thingys, see our wiki.");
        }
    }
 }
@@ -1,18 +1,37 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;

+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.utils.MVMessaging;
+import com.pneumaticraft.commandhandler.Command;
+import org.bukkit.command.CommandSender;
+
 import java.util.List;

-import org.bukkit.command.CommandSender;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.pneumaticraft.commandhandler.Command;
-
+/**
+ * A generic Multiverse-command.
+ */
 public abstract class MultiverseCommand extends Command {

+    /**
+     * The reference to the core.
+     */
    protected MultiverseCore plugin;
+    /**
+     * The reference to {@link MVMessaging}.
+     */
+    protected MVMessaging 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;
+        }
+    }
+}
@@ -0,0 +1,26 @@
+/******************************************************************************
+ * 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;
+
+/**
+ * A generic paginated Multiverse-command.
+ * @param <T> The type of items on the page.
+ */
+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;
+    }
+}
@@ -1,19 +1,30 @@
+/******************************************************************************
+ * 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.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.utils.PurgeWorlds;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.utils.PurgeWorlds;
+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 MVWorldManager worldManager;

    public PurgeCommand(MultiverseCore plugin) {
        super(plugin);
@@ -22,7 +33,14 @@ public class PurgeCommand extends MultiverseCommand {
        this.setArgRange(1, 2);
        this.addKey("mvpurge");
        this.addKey("mv purge");
+        this.addCommandExample("/mv purge " + ChatColor.GREEN + "all");
+        this.addCommandExample("/mv purge " + ChatColor.GOLD + "all " + ChatColor.GREEN + "all");
+        this.addCommandExample("/mv purge " + ChatColor.GREEN + "monsters");
+        this.addCommandExample("/mv purge " + ChatColor.GOLD + "all " + ChatColor.GREEN + "animals");
+        this.addCommandExample("/mv purge " + ChatColor.GOLD + "MyWorld " + ChatColor.GREEN + "squid");
+        this.addCommandExample("/mv purge " + ChatColor.GOLD + "MyWorld_nether " + ChatColor.GREEN + "ghast");
        this.setPermission("multiverse.core.purge", "Removed the specified type of mob from the specified world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
    }

    @Override
@@ -46,32 +64,29 @@ public class PurgeCommand extends MultiverseCommand {
            deathName = args.get(1);
        }

-        if (!worldName.equalsIgnoreCase("all") && !this.plugin.isMVWorld(worldName)) {
-            ((MultiverseCore)this.plugin).showNotMVWorldMessage(sender, worldName);
+        if (!worldName.equalsIgnoreCase("all") && !this.worldManager.isMVWorld(worldName)) {
+            ((MultiverseCore) this.plugin).showNotMVWorldMessage(sender, worldName);
            sender.sendMessage("It cannot be purged.");
            return;
        }

-        List<MVWorld> worldsToRemoveEntitiesFrom = new ArrayList<MVWorld>();
+        List<MultiverseWorld> worldsToRemoveEntitiesFrom = new ArrayList<MultiverseWorld>();
        // Handle all case any user who names a world "all" should know better...
        if (worldName.equalsIgnoreCase("all")) {
-            worldsToRemoveEntitiesFrom.addAll(this.plugin.getMVWorlds());
+            worldsToRemoveEntitiesFrom.addAll(this.worldManager.getMVWorlds());
        } else {
-            worldsToRemoveEntitiesFrom.add(this.plugin.getMVWorld(worldName));
+            worldsToRemoveEntitiesFrom.add(this.worldManager.getMVWorld(worldName));
        }

-        PurgeWorlds purger = this.plugin.getWorldPurger();
+        PurgeWorlds purger = this.worldManager.getWorldPurger();
        ArrayList<String> thingsToKill = new ArrayList<String>();
        if (deathName.equalsIgnoreCase("all") || deathName.equalsIgnoreCase("animals") || deathName.equalsIgnoreCase("monsters")) {
            thingsToKill.add(deathName.toUpperCase());
        } else {
            Collections.addAll(thingsToKill, deathName.toUpperCase().split(","));
        }
-        for (MVWorld w : worldsToRemoveEntitiesFrom) {
+        for (MultiverseWorld w : worldsToRemoveEntitiesFrom) {
            purger.purgeWorld(sender, w, thingsToKill, false, false);
        }
-
-        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!");
+    }
+}
@@ -1,15 +1,24 @@
+/******************************************************************************
+ * 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.ArrayList;
-import java.util.List;
-
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent;
+import java.util.ArrayList;
+import java.util.List;

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

    public ReloadCommand(MultiverseCore plugin) {
@@ -19,6 +28,7 @@ public class ReloadCommand extends MultiverseCommand {
        this.setArgRange(0, 0);
        this.addKey("mvreload");
        this.addKey("mv reload");
+        this.addCommandExample("/mv reload");
        this.setPermission("multiverse.core.reload", "Reloads worlds.yml and config.yml.", PermissionDefault.OP);
    }

@@ -26,18 +36,21 @@ 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.loadWorlds(true);
-        
-        // Create the event
+        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
        this.plugin.getServer().getPluginManager().callEvent(configReload);
-        for(String s : configReload.getAllConfigsLoaded()) {
+        for (String s : configReload.getAllConfigsLoaded()) {
            sender.sendMessage(s);
        }
-        
+
        sender.sendMessage(ChatColor.GREEN + "Reload Complete!");
    }

@@ -1,13 +1,22 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MultiverseCore;
+import java.util.List;

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

    public RemoveCommand(MultiverseCore plugin) {
@@ -17,12 +26,14 @@ public class RemoveCommand extends MultiverseCommand {
        this.setArgRange(1, 1);
        this.addKey("mvremove");
        this.addKey("mv remove");
-        this.setPermission("multiverse.core.remove", "Unloads a world from Multiverse and removes it from worlds.yml, this does NOT remove the world folder.", PermissionDefault.OP);
+        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);
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        if (this.plugin.removeWorldFromConfig(args.get(0))) {
+        if (this.plugin.getMVWorldManager().removeWorldFromConfig(args.get(0))) {
            sender.sendMessage("World removed from config!");
        } else {
            sender.sendMessage("Error trying to remove world from config!");
@@ -1,17 +1,29 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.utils.BlockSafety;
+import com.onarandombox.MultiverseCore.utils.LocationManipulation;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MultiverseCore;
+import java.util.List;

+/**
+ * Sets the spawn for a world.
+ */
 public class SetSpawnCommand extends MultiverseCommand {
-
    public SetSpawnCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Set World Spawn");
@@ -22,17 +34,42 @@ public class SetSpawnCommand extends MultiverseCommand {
        this.addKey("mv set spawn");
        this.addKey("mv setspawn");
        this.addKey("mvset spawn");
+        this.addCommandExample("/mv set spawn");
        this.setPermission("multiverse.core.spawn.set", "Sets the spawn for the current world.", PermissionDefault.OP);
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
+        setWorldSpawn(sender);
+    }
+
+    /**
+     * Does the actual spawn-setting-work.
+     *
+     * @param sender The {@link CommandSender} that's setting the spawn.
+     */
+    protected void setWorldSpawn(CommandSender sender) {
        if (sender instanceof Player) {
            Player p = (Player) sender;
            Location l = p.getLocation();
            World w = p.getWorld();
-            w.setSpawnLocation(l.getBlockX(), l.getBlockY(), l.getBlockZ());
-            p.sendMessage(w.getName() + " - Spawn set to X: " + l.getBlockX() + "  Y: " + l.getBlockY() + " Z: " + l.getBlockZ());
+            MultiverseWorld foundWorld = this.plugin.getMVWorldManager().getMVWorld(w.getName());
+            if (foundWorld != null) {
+                foundWorld.setSpawnLocation(p.getLocation());
+                BlockSafety bs = new BlockSafety();
+                if (!bs.playerCanSpawnHereSafely(p.getLocation()) && 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: " + 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).");
+            }
+
        } else {
            sender.sendMessage("You cannot use this command from the console.");
        }
@@ -1,13 +1,22 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MultiverseCore;
+import java.util.List;

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

    public SleepCommand(MultiverseCore plugin) {
@@ -29,13 +38,5 @@ public class SleepCommand extends MultiverseCommand {
        if (p == null) {
            return;
        }
-//        MVPlayerSession session = this.plugin.getPlayerSession(p);
-//        if (session.getBedRespawnLocation() != null) {
-//            p.teleport(session.getBedRespawnLocation());
-//        } else {
-//            sender.sendMessage("Hmm this is awkward...");
-//            sender.sendMessage("Something is wrong with your bed.");
-//            sender.sendMessage("It has either been destroyed or obstructed.");
-//        }
    }
 }
@@ -1,20 +1,32 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MultiverseCore;
+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);
@@ -23,7 +35,7 @@ public class SpawnCommand extends MultiverseCommand {
        this.addKey("mvs");
        this.setPermission("multiverse.core.spawn.self", "Teleports you to the Spawn Point of the world you are in.", PermissionDefault.OP);
        this.addAdditonalPermission(otherPerm);
-        
+
    }

    @Override
@@ -34,14 +46,15 @@ public class SpawnCommand extends MultiverseCommand {
        }
        // If a persons name was passed in, you must be A. the console, or B have permissions
        if (args.size() == 1) {
-            if (player != null && !this.plugin.getPermissions().hasPermission(player, "multiverse.core.spawn.other", true)) {
+            if (player != null && !this.plugin.getMVPerms().hasPermission(player, "multiverse.core.spawn.other", true)) {
                sender.sendMessage("You don't have permission to teleport another player to spawn. (multiverse.core.spawn.other)");
                return;
            }
            Player target = this.plugin.getServer().getPlayer(args.get(0));
            if (target != null) {
                target.sendMessage("Teleporting to this world's spawn...");
-                target.teleport(target.getWorld().getSpawnLocation());
+                spawnAccurately(target);
+
                if (player != null) {
                    target.sendMessage("You were teleported by: " + ChatColor.YELLOW + player.getName());
                } else {
@@ -51,16 +64,27 @@ public class SpawnCommand extends MultiverseCommand {
                sender.sendMessage(args.get(0) + " is not logged on right now!");
            }
        } else {
-            if (player != null && !this.plugin.getPermissions().hasPermission(player, "multiverse.core.spawn.self", true)) {
+            if (player != null && !this.plugin.getMVPerms().hasPermission(player, "multiverse.core.spawn.self", true)) {
                sender.sendMessage("You don't have permission to teleport yourself to spawn. (multiverse.core.spawn.self)");
                return;
            }
            if (player != null) {
                player.sendMessage("Teleporting to this world's spawn...");
-                player.teleport(player.getWorld().getSpawnLocation());
+                spawnAccurately(player);
            } else {
                sender.sendMessage("From the console, you must provide a PLAYER.");
            }
        }
    }
+
+    private void spawnAccurately(Player player) {
+        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(player.getWorld().getName());
+        Location spawnLocation;
+        if (world != null) {
+            spawnLocation = world.getSpawnLocation();
+        } else {
+            spawnLocation = player.getWorld().getSpawnLocation();
+        }
+        this.plugin.getTeleporter().safelyTeleport(player, player, spawnLocation, false);
+    }
 }
@@ -0,0 +1,65 @@
+/******************************************************************************
+ * 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;
+
+/**
+ * Edit a world with spout.
+ */
+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");
+        // TODO maybe use constants for these
+        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+        button.setX(50);
+        button.setY(50);
+        button.setWidth(100);
+        button.setHeight(40);
+        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+        pop.attachWidget(this.plugin, button);
+        sender.sendMessage(ChatColor.GREEN + "YAY!");
+        p.getMainScreen().attachPopupScreen(pop);
+    }
+}
@@ -1,44 +1,58 @@
+/******************************************************************************
+ * 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.ArrayList;
-import java.util.List;
-
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVDestination;
+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.SafeTTeleporter;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MVTeleport;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.utils.MVDestination;
-import com.onarandombox.utils.DestinationFactory;
-import com.onarandombox.utils.InvalidDestination;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;

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

    public TeleportCommand(MultiverseCore plugin) {
        super(plugin);
-        Permission self = new Permission("multiverse.core.tp.self", "Allows you to teleport yourself to other worlds.", PermissionDefault.OP);
-        Permission other = new Permission("multiverse.core.tp.other", "Allows you to teleport others to other worlds.", PermissionDefault.OP);
+        Permission menu = new Permission("multiverse.teleport.*", "Allows you to display the teleport menu.", PermissionDefault.OP);

        this.setName("Teleport");
        this.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {WORLD}");
        this.setArgRange(1, 2);
        this.addKey("mvtp");
        this.addKey("mv tp");
-        this.playerTeleporter = new MVTeleport(this.plugin);
-        // setPermission in some for is REQUIRED
-        this.setPermission(self);
-        this.addAdditonalPermission(other);
+        this.playerTeleporter = new SafeTTeleporter(this.plugin);
+        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.
-        Player teleporter = null;
+        CommandSender teleporter = sender;
        Player teleportee = null;
        if (sender instanceof Player) {
            teleporter = (Player) sender;
@@ -47,72 +61,147 @@ public class TeleportCommand extends MultiverseCommand {
        String destinationName;

        if (args.size() == 2) {
-            if (teleporter != null && !this.plugin.getPermissions().hasPermission(sender, "multiverse.core.tp.other", true)) {
-                sender.sendMessage("You don't have permission to teleport another player. (multiverse.core.tp.other)");
-                return;
-            }
            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);

        } else {
            destinationName = args.get(0);
-            if (teleporter != null && !this.plugin.getPermissions().hasPermission(sender, "multiverse.core.tp.self", true)) {
-                sender.sendMessage("You don't have permission to teleport yourself between worlds. (multiverse.core.tp.self)");
-                return;
-            }
-
            if (!(sender instanceof Player)) {
-                sender.sendMessage("From the console, you must specifiy a player to teleport");
+                this.messaging.sendMessage(sender, String.format("From the console, you must specify a player to teleport"), false);
                return;
            }
-            teleporter = (Player) sender;
            teleportee = (Player) sender;
        }
+        // Special case for cannons:
+        if (destinationName.matches("(?i)cannon-[\\d]+(\\.[\\d]+)?")) {
+            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;
+            } catch (Exception e) {
+                destinationName = "i:invalid";
+            }

-        DestinationFactory df = this.plugin.getDestinationFactory();// .parseDestination(worldName, (MultiverseCore) this.plugin);
+        }
+        DestinationFactory df = this.plugin.getDestFactory();
        MVDestination d = df.getDestination(destinationName);
-        if (d != null && d instanceof InvalidDestination) {
-            sender.sendMessage("Multiverse does not know how to take you to: " + ChatColor.RED + destinationName);
+
+
+        MVTeleportEvent teleportEvent = new MVTeleportEvent(d, teleportee, teleporter, true);
+        this.plugin.getServer().getPluginManager().callEvent(teleportEvent);
+        if (teleportEvent.isCancelled()) {
+            this.plugin.log(Level.FINE, "Someone else cancelled the MVTeleport Event!!!");
            return;
        }

-        if (teleporter != null && !this.plugin.getPermissions().canEnterDestination(teleporter, d)) {
+        if (d != null && d instanceof InvalidDestination) {
+            this.messaging.sendMessage(sender, String.format("Multiverse does not know how to take you to %s%s",
+                    ChatColor.RED, destinationName), false);
+            return;
+        }
+
+        if (!this.checkSendPermissions(teleporter, teleportee, d)) {
+            return;
+        }
+
+        if (MultiverseCore.EnforceAccess && 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.getPermissions().canTravelFromLocation(teleporter, d.getLocation(teleportee))) {
+        } 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 + 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 + 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;
        }
-        Location l = d.getLocation(teleportee);
-        if (l == null) {
-            teleporter.sendMessage("Sorry Boss, I tried everything, but just couldn't teleport ya there!");
+
+        // Special check to verify if players are tryint to teleport to the same
+        // WORLDDestination as the world they're in, that they ALSO have multiverse.core.spawn.self
+
+        if (d instanceof WorldDestination) {
+            World w = d.getLocation(teleportee).getWorld();
+            if (teleportee.getWorld().equals(w)) {
+                if (teleporter.equals(teleportee)) {
+                    if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.self", true)) {
+                        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)) {
+                        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;
+                    }
+                }
+            }
+        }
+
+        if (d.getLocation(teleportee) == null) {
+            this.messaging.sendMessage(teleporter, "Sorry Boss, I tried everything, but just couldn't teleport ya there!", false);
            return;
        }
-        if (!this.playerTeleporter.safelyTeleport(teleportee, l)) {
-            Class<?> paramTypes[] = { Player.class, Location.class };
+        TeleportResult result = this.playerTeleporter.safelyTeleport(teleporter, teleportee, d);
+        if (result == TeleportResult.FAIL_UNSAFE) {
+            this.plugin.log(Level.FINE, "Could not teleport " + teleportee.getName() + " to " + LocationManipulation.strCoordsRaw(d.getLocation(teleportee)));
+            this.plugin.log(Level.FINE, "Queueing Command");
+            Class<?>[] paramTypes = { CommandSender.class, Player.class, Location.class };
            List<Object> items = new ArrayList<Object>();
+            items.add(teleporter);
            items.add(teleportee);
-            items.add(l);
+            items.add(d.getLocation(teleportee));
            String player = "you";
            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 {
-            teleportee.setVelocity(d.getVelocity());
+            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) {
+        if (teleporter.equals(teleportee)) {
+            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.self." + destination.getIdentifier(), true)) {
+                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)) {
+                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;
+            }
+        }
+        return true;
    }
 }
@@ -1,13 +1,23 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MultiverseCore;
+import java.util.List;

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

    public UnloadCommand(MultiverseCore plugin) {
@@ -17,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.removeWorldFromList(args.get(0))) {
-            sender.sendMessage("World Unloaded!");
+        if (this.plugin.getMVWorldManager().unloadWorld(args.get(0))) {
+            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) + "'!");
        }
    }
 }
@@ -1,37 +1,43 @@
+/******************************************************************************
+ * 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.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.List;
-import java.util.logging.Level;
-
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.event.MVVersionEvent;
+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 org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.event.MVVersionRequestEvent;
+import java.util.List;
+import java.util.logging.Level;

+/**
+ * Dumps version info to the console.
+ */
 public class VersionCommand extends MultiverseCommand {

    public VersionCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Multiverse Version");
-        this.setCommandUsage("/mv version " + ChatColor.GOLD + "-p");
+        this.setCommandUsage("/mv version " + ChatColor.GOLD + "-[pb]");
        this.setArgRange(0, 1);
        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 = "";
-
    @Override
    public void runCommand(CommandSender sender, List<String> args) {
        // Check if the command was sent from a Player.
@@ -39,62 +45,65 @@ public class VersionCommand extends MultiverseCommand {
            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.getMVWorlds().size());
-        logAndAddToPasteBinBuffer("Multiverse Plugins Loaded: " + this.plugin.getPluginCount());
-        logAndAddToPasteBinBuffer("Economy being used: " + this.plugin.getBank().getEconUsed());
-        logAndAddToPasteBinBuffer("Permissions Plugin: " + this.plugin.getPermissions().getType());
-        logAndAddToPasteBinBuffer("Dumping Config Values: (version " + this.plugin.getConfig().getString("version", "NOT SET") + ")");
-        logAndAddToPasteBinBuffer("messagecooldown: " + this.plugin.getConfig().getString("messagecooldown", "NOT SET"));
-        logAndAddToPasteBinBuffer("teleportcooldown: " + this.plugin.getConfig().getString("teleportcooldown", "NOT SET"));
-        logAndAddToPasteBinBuffer("worldnameprefix: " + this.plugin.getConfig().getString("worldnameprefix", "NOT SET"));
-        logAndAddToPasteBinBuffer("opfallback: " + this.plugin.getConfig().getString("opfallback", "NOT SET"));
-        logAndAddToPasteBinBuffer("disableautoheal: " + this.plugin.getConfig().getString("disableautoheal", "NOT SET"));
-        logAndAddToPasteBinBuffer("fakepvp: " + this.plugin.getConfig().getString("fakepvp", "NOT SET"));
-        logAndAddToPasteBinBuffer("Special Code: FRN001");
-        
-        MVVersionRequestEvent versionEvent = new MVVersionRequestEvent(pasteBinBuffer);
+        StringBuilder buffer = new StringBuilder();
+        buffer.append("[Multiverse-Core] Multiverse-Core Version: ").append(this.plugin.getDescription().getVersion()).append('\n');
+        buffer.append("[Multiverse-Core] Bukkit Version: ").append(this.plugin.getServer().getVersion()).append('\n');
+        buffer.append("[Multiverse-Core] Loaded Worlds: ").append(this.plugin.getMVWorldManager().getMVWorlds().size()).append('\n');
+        buffer.append("[Multiverse-Core] Multiverse Plugins Loaded: ").append(this.plugin.getPluginCount()).append('\n');
+        buffer.append("[Multiverse-Core] Economy being used: ").append(this.plugin.getBank().getEconUsed()).append('\n');
+        buffer.append("[Multiverse-Core] Permissions Plugin: ").append(this.plugin.getMVPerms().getType()).append('\n');
+        buffer.append("[Multiverse-Core] Dumping Config Values: (version ")
+                .append(this.plugin.getMVConfiguration().getDouble("version", -1)).append(")").append('\n');
+        buffer.append("[Multiverse-Core]  messagecooldown: ").append(this.plugin.getMessaging().getCooldown()).append('\n');
+        buffer.append("[Multiverse-Core]  teleportcooldown: ").append("Not yet IMPLEMENTED").append('\n');
+        buffer.append("[Multiverse-Core]  worldnameprefix: ").append(MultiverseCore.PrefixChat).append('\n');
+        buffer.append("[Multiverse-Core]  enforceaccess: ").append(MultiverseCore.EnforceAccess).append('\n');
+        buffer.append("[Multiverse-Core]  displaypermerrors: ").append(MultiverseCore.DisplayPermErrors).append('\n');
+        buffer.append("[Multiverse-Core]  teleportintercept: ").append(MultiverseCore.TeleportIntercept).append('\n');
+        buffer.append("[Multiverse-Core]  firstspawnoverride: ").append(MultiverseCore.FirstSpawnOverride).append('\n');
+        buffer.append("[Multiverse-Core]  firstspawnworld: ").append(this.plugin.getMVConfiguration().getString("firstspawnworld", "NOT SET")).append('\n');
+        buffer.append("[Multiverse-Core]  debug: ").append(MultiverseCore.GlobalDebug).append('\n');
+        buffer.append("[Multiverse-Core] Special Code: FRN002").append('\n');
+
+        MVVersionEvent versionEvent = new MVVersionEvent(buffer.toString());
        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);
+
+        // log to console
+        String data = versionEvent.getVersionInfo();
+        String[] lines = data.split("\n");
+        for (String line : lines) {
+            this.plugin.log(Level.INFO, line);
+        }
+
+        if (args.size() == 1) {
+            String pasteUrl = "";
+            if (args.get(0).equalsIgnoreCase("-p")) {
+                pasteUrl = postToService(PasteServiceType.PASTIE, true, data); // private post to pastie
+            } else if (args.get(0).equalsIgnoreCase("-b")) {
+                pasteUrl = postToService(PasteServiceType.PASTEBIN, true, data); // private post to pastie
+            } else {
+                return;
+            }
+
+            sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
+            this.plugin.log(Level.INFO, "Version info dumped here: " + pasteUrl);
        }
    }

-    private void logAndAddToPasteBinBuffer(String string) {
-        this.pasteBinBuffer += "[Multiverse-Core] " + string + "\n";
-        this.plugin.log(Level.INFO, string);
-    }
-
-    private String postToPasteBin() {
+    /**
+     * Send the current contents of this.pasteBinBuffer to a web service.
+     *
+     * @param type      Service type to send to
+     * @param isPrivate Should the paste be marked as private.
+     * @return URL of visible paste
+     */
+    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData) {
+        PasteService ps = PasteServiceFactory.getService(type, isPrivate);
        try {
-            String data = URLEncoder.encode("api_dev_key", "UTF-8") + "=" + URLEncoder.encode("33ab32380506d99d872b69d35dc9d007", "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");
-
-            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;
-            }
-            wr.close();
-            rd.close();
-            return pasteBinUrl;
-        } catch (Exception e) {
+            return ps.postData(ps.encodeData(pasteData), ps.getPostURL());
+        } catch (PasteFailedException e) {
            System.out.print(e);
-            return "Error Posting to pastebin.com";
+            return "Error posting to service";
        }
    }
 }
@@ -1,18 +1,30 @@
+/******************************************************************************
+ * 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.ArrayList;
-import java.util.List;
-
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
+import java.util.ArrayList;
+import java.util.List;

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

+    private MVWorldManager worldManager;
+
    public WhoCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Who?");
@@ -22,6 +34,7 @@ public class WhoCommand extends MultiverseCommand {
        this.addKey("mvw");
        this.addKey("mvwho");
        this.setPermission("multiverse.core.list.who", "States who is in what world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
    }

    @Override
@@ -35,36 +48,39 @@ public class WhoCommand extends MultiverseCommand {
            showAll = false;
        }

-        List<MVWorld> worlds = new ArrayList<MVWorld>();
+        List<MultiverseWorld> worlds = new ArrayList<MultiverseWorld>();

        if (args.size() > 0) {
+            MultiverseWorld world = this.worldManager.getMVWorld(args.get(0));
            if (args.get(0).equalsIgnoreCase("--all") || args.get(0).equalsIgnoreCase("-a")) {
                showAll = true;
-                worlds = new ArrayList<MVWorld>(this.plugin.getMVWorlds());
-            } else if (this.plugin.isMVWorld(args.get(0))) {
-                worlds.add(this.plugin.getMVWorld(args.get(0)));
+                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");
                return;
            }
        } else {
-            worlds = new ArrayList<MVWorld>(this.plugin.getMVWorlds());
+            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" + ChatColor.YELLOW + worlds.get(0) + ChatColor.AQUA + " ---");
+            sender.sendMessage(ChatColor.AQUA + "--- Players in" + worlds.get(0).getColoredWorldString() + ChatColor.AQUA + " ---");
        } else {
            sender.sendMessage(ChatColor.AQUA + "--- There are players in ---");
        }

-        for (MVWorld world : worlds) {
-            if (!(this.plugin.isMVWorld(world.getName()))) {
+        for (MultiverseWorld world : worlds) {
+            if (!(this.worldManager.isMVWorld(world.getName()))) {
                continue;
            }

-            if (p != null && (!this.plugin.getPermissions().canEnterWorld(p, world))) {
+            if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
                continue;
            }
            List<Player> players = world.getCBWorld().getPlayers();
@@ -78,7 +94,7 @@ public class WhoCommand extends MultiverseCommand {
                result = "Empty";
            } else {
                for (Player player : players) {
-                    result += player.getName() + " ";
+                    result += player.getDisplayName() + " " + ChatColor.WHITE;
                }
            }

@@ -0,0 +1,4 @@
+/**
+ * This package contains all Commands.
+ */
+package com.onarandombox.MultiverseCore.commands;
@@ -0,0 +1,115 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2012.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+/**
+ * A {@link String} config-property that will NOT be saved to the config.
+ */
+public class ActiveStringConfigProperty implements MVActiveConfigProperty<String> {
+    private String name;
+    private String value;
+    private String method;
+    private String help;
+
+    public ActiveStringConfigProperty(String name, String defaultValue, String help) {
+        this.name = name;
+        this.help = help;
+        this.value = defaultValue;
+        this.parseValue(defaultValue);
+    }
+
+    public ActiveStringConfigProperty(String name, String defaultValue, String help, String method) {
+        this(name, defaultValue, help);
+        this.method = method;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getMethod() {
+        return this.method;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setMethod(String methodName) {
+        this.method = methodName;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Class<?> getPropertyClass() {
+        return String.class;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        if (value == null) {
+            return false;
+        }
+        this.setValue(value);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return "";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(String value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+}
@@ -0,0 +1,135 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link Boolean} config-property.
+ */
+public class BooleanConfigProperty implements MVActiveConfigProperty<Boolean> {
+    private String name;
+    private Boolean value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+    private String method;
+
+    public BooleanConfigProperty(ConfigurationSection section, String name, Boolean defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public BooleanConfigProperty(ConfigurationSection section, String name, Boolean defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.setValue(this.section.getBoolean(this.configNode, defaultValue));
+    }
+
+    public BooleanConfigProperty(ConfigurationSection section, String name, Boolean defaultValue, String configNode, String help, String method) {
+        this(section, name, defaultValue, configNode, help);
+        this.method = method;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Boolean getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(Boolean value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        if (value == null) {
+            return false;
+        }
+        if (value.toLowerCase().equals("true") || value.toLowerCase().equals("false")) {
+            this.setValue(Boolean.parseBoolean(value));
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Gets the method that will be executed.
+     *
+     * @return The name of the method in MVWorld to be called.
+     */
+    @Override
+    public String getMethod() {
+        return this.method;
+    }
+
+    /**
+     * Sets the method that will be executed.
+     *
+     * @param methodName The name of the method in MVWorld to be called.
+     */
+    @Override
+    public void setMethod(String methodName) {
+        this.method = methodName;
+    }
+
+    /**
+     * Returns the class of the object we're looking at.
+     *
+     * @return the class of the object we're looking at.
+     */
+    @Override
+    public Class<?> getPropertyClass() {
+        return Boolean.class;
+    }
+}
@@ -0,0 +1,98 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link EnglishChatColor} config-property.
+ */
+public class ColorConfigProperty implements MVConfigProperty<EnglishChatColor> {
+    private String name;
+    private EnglishChatColor value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+
+    public ColorConfigProperty(ConfigurationSection section, String name, EnglishChatColor defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public ColorConfigProperty(ConfigurationSection section, String name, EnglishChatColor defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.parseValue(this.section.getString(this.configNode, defaultValue.toString()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public EnglishChatColor getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(EnglishChatColor value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value.getText());
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        EnglishChatColor color = EnglishChatColor.fromString(value);
+        if (color == null) {
+            return false;
+        }
+        this.setValue(color);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+}
@@ -0,0 +1,292 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2012.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
+import org.bukkit.Difficulty;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.configuration.ConfigurationSection;
+
+/** A factory to create config properties for a given world. */
+public class ConfigPropertyFactory {
+    private ConfigurationSection section;
+
+    public ConfigPropertyFactory(ConfigurationSection section) {
+        this.section = section;
+    }
+
+    // Booleans
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public BooleanConfigProperty getNewProperty(String name, boolean defaultValue, String help) {
+        return new BooleanConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public BooleanConfigProperty getNewProperty(String name, boolean defaultValue, String node, String help) {
+        return new BooleanConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    /**
+     * Constructs a new ActiveBooleanConfigProperty
+     *
+     * This property will execute 'method' after it has been successfully set.
+     *
+     * @param name The name of this ConifgProperty
+     * @param defaultValue The default value.
+     * @param help What string is shown for help.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param method The method that should be executed.
+     * @return The ActiveStringConfigProperty
+     */
+    public BooleanConfigProperty getNewProperty(String name, boolean defaultValue, String help, String node, String method) {
+        return new BooleanConfigProperty(this.section, name, defaultValue, help, node, method);
+    }
+
+    // Integers
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public IntegerConfigProperty getNewProperty(String name, int defaultValue, String help) {
+        return new IntegerConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public IntegerConfigProperty getNewProperty(String name, int defaultValue, String node, String help) {
+        return new IntegerConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    // Doubles
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public DoubleConfigProperty getNewProperty(String name, double defaultValue, String help) {
+        return new DoubleConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public DoubleConfigProperty getNewProperty(String name, double defaultValue, String node, String help) {
+        return new DoubleConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @param method The name of the method that's used to set this property.
+     * @return The ConfigProperty.
+     */
+    public DoubleConfigProperty getNewProperty(String name, double defaultValue, String node, String help, String method) {
+        return new DoubleConfigProperty(this.section, name, defaultValue, node, help, method);
+    }
+
+    // Strings
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public StringConfigProperty getNewProperty(String name, String defaultValue, String help) {
+        return new StringConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public StringConfigProperty getNewProperty(String name, String defaultValue, String node, String help) {
+        return new StringConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    // Colors
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public ColorConfigProperty getNewProperty(String name, EnglishChatColor defaultValue, String help) {
+        return new ColorConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public ColorConfigProperty getNewProperty(String name, EnglishChatColor defaultValue, String node, String help) {
+        return new ColorConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    // Difficulty
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public DifficultyConfigProperty getNewProperty(String name, Difficulty defaultValue, String help) {
+        return new DifficultyConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public DifficultyConfigProperty getNewProperty(String name, Difficulty defaultValue, String node, String help) {
+        return new DifficultyConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    // GameMode
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public GameModeConfigProperty getNewProperty(String name, GameMode defaultValue, String help) {
+        return new GameModeConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public GameModeConfigProperty getNewProperty(String name, GameMode defaultValue, String node, String help) {
+        return new GameModeConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    // GameMode
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public LocationConfigProperty getNewProperty(String name, Location defaultValue, String help) {
+        return new LocationConfigProperty(this.section, name, defaultValue, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @return The ConfigProperty.
+     */
+    public LocationConfigProperty getNewProperty(String name, Location defaultValue, String node, String help) {
+        return new LocationConfigProperty(this.section, name, defaultValue, node, help);
+    }
+
+    /**
+     * Constructs a new ConfigProperty.
+     *
+     * @param name The name of this ConfigProperty.
+     * @param defaultValue The default-value.
+     * @param node The name of the configuration-node this ConfigProperty will be stored as.
+     * @param help The text that's displayed when a user failed to set the property.
+     * @param method The name of the method that's used to set this property.
+     * @return The ConfigProperty.
+     */
+    public LocationConfigProperty getNewProperty(String name, Location defaultValue, String node, String help, String method) {
+        return new LocationConfigProperty(this.section, name, defaultValue, node, help, method);
+    }
+
+    /**
+     * Constructs a new ActiveStringConfigProperty
+     *
+     * This property will execute 'method' after it has been successfully set.
+     * This string will NOT be saved to the config file.
+     *
+     * @param name The name of this ConifgProperty
+     * @param defaultValue The default value.
+     * @param help What string is shown for help.
+     * @param method The method that should be executed.
+     * @param saveToConfig Should the variable save to the config?
+     * @return The ActiveStringConfigProperty
+     */
+    public ActiveStringConfigProperty getNewProperty(String name, String defaultValue, String help, String method, boolean saveToConfig) {
+        return new ActiveStringConfigProperty(name, defaultValue, help, method);
+    }
+}
@@ -1,50 +0,0 @@
-package com.onarandombox.MultiverseCore.configuration;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-public class DefaultConfig {
-
-    public DefaultConfig(File folder, String name, MVConfigMigrator migrator) {
-        File actual = new File(folder, name);
-        if (actual.exists() && migrator.createdDefaults.contains(name)) {
-            actual.delete();
-        }
-        // If defaults have been created, and we're being called again, we should try to migrate
-        if (!actual.exists() && !migrator.migrate(name, folder)) {
-
-            InputStream defConfig = this.getClass().getResourceAsStream("/defaults/" + name);
-            if (defConfig != null) {
-                FileOutputStream newConfig = null;
-
-                try {
-                    newConfig = new FileOutputStream(actual);
-                    byte[] buf = new byte[8192];
-                    int length = 0;
-
-                    while ((length = defConfig.read(buf)) > 0) {
-                        newConfig.write(buf, 0, length);
-                    }
-                    migrator.createdDefaults.add(name);
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                } finally {
-                    try {
-                        if (defConfig != null)
-                            defConfig.close();
-                    } catch (Exception e) {
-                    }
-
-                    try {
-                        if (newConfig != null)
-                            newConfig.close();
-                    } catch (Exception e) {
-
-                    }
-                }
-            }
-        }
-    }
-}
@@ -0,0 +1,129 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.Difficulty;
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link Difficulty} config-property.
+ */
+public class DifficultyConfigProperty implements MVActiveConfigProperty<Difficulty> {
+    private String name;
+    private Difficulty value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+
+    public DifficultyConfigProperty(ConfigurationSection section, String name, Difficulty defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public DifficultyConfigProperty(ConfigurationSection section, String name, Difficulty defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.parseValue(this.section.getString(this.configNode, defaultValue.toString()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Difficulty getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(Difficulty value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value.toString());
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        try {
+            return this.setValue(Difficulty.getByValue(Integer.parseInt(value)));
+        } catch (NumberFormatException nfe) {
+            try {
+                return this.setValue(Difficulty.valueOf(value.toUpperCase()));
+            } catch (Exception e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Gets the method that will be executed.
+     *
+     * @return The name of the method in MVWorld to be called.
+     */
+    @Override
+    public String getMethod() {
+        return "setActualDifficulty";
+    }
+
+    /**
+     * Sets the method that will be executed.
+     *
+     * @param methodName The name of the method in MVWorld to be called.
+     */
+    @Override
+    public void setMethod(String methodName) {
+        // Unused here. This will only ever be setDifficulty.
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Class<?> getPropertyClass() {
+        return Difficulty.class;
+    }
+}
@@ -0,0 +1,133 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link Double} config-property.
+ */
+public class DoubleConfigProperty implements MVActiveConfigProperty<Double> {
+    private String name;
+    private Double value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+    private String method;
+
+    public DoubleConfigProperty(ConfigurationSection section, String name, Double defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public DoubleConfigProperty(ConfigurationSection section, String name, Double defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.setValue(this.section.getDouble(this.configNode, defaultValue));
+    }
+
+    public DoubleConfigProperty(ConfigurationSection section, String name, Double defaultValue, String configNode, String help, String method) {
+        this(section, name, defaultValue, configNode, help);
+        this.method = method;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Double getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(Double value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        try {
+            this.setValue(Double.parseDouble(value));
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Gets the method that will be executed.
+     *
+     * @return The name of the method in MVWorld to be called.
+     */
+    @Override
+    public String getMethod() {
+        return this.method;
+    }
+
+    /**
+     * Sets the method that will be executed.
+     *
+     * @param methodName The name of the method in MVWorld to be called.
+     */
+    @Override
+    public void setMethod(String methodName) {
+        this.method = methodName;
+    }
+
+    /**
+     * Returns the class of the object we're looking at.
+     *
+     * @return the class of the object we're looking at.
+     */
+    @Override
+    public Class<?> getPropertyClass() {
+        return Double.class;
+    }
+}
@@ -0,0 +1,129 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.GameMode;
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link GameMode} config-property.
+ */
+public class GameModeConfigProperty implements MVActiveConfigProperty<GameMode> {
+    private String name;
+    private GameMode value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+
+    public GameModeConfigProperty(ConfigurationSection section, String name, GameMode defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public GameModeConfigProperty(ConfigurationSection section, String name, GameMode defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.parseValue(this.section.getString(this.configNode, defaultValue.toString()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GameMode getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(GameMode value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value.toString());
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        try {
+            return this.setValue(GameMode.getByValue(Integer.parseInt(value)));
+        } catch (NumberFormatException nfe) {
+            try {
+                return this.setValue(GameMode.valueOf(value.toUpperCase()));
+            } catch (Exception e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Gets the method that will be executed.
+     *
+     * @return The name of the method in MVWorld to be called.
+     */
+    @Override
+    public String getMethod() {
+        return "setActualGameMode";
+    }
+
+    /**
+     * Sets the method that will be executed.
+     *
+     * @param methodName The name of the method in MVWorld to be called.
+     */
+    @Override
+    public void setMethod(String methodName) {
+        // Not required. Gamemode will only ever be one.
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Class<?> getPropertyClass() {
+        return GameMode.class;
+    }
+}
@@ -0,0 +1,97 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link Integer} config-property.
+ */
+public class IntegerConfigProperty implements MVConfigProperty<Integer> {
+    private String name;
+    private Integer value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+
+    public IntegerConfigProperty(ConfigurationSection section, String name, Integer defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public IntegerConfigProperty(ConfigurationSection section, String name, Integer defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.setValue(this.section.getInt(this.configNode, defaultValue));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Integer getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(Integer value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        try {
+            this.setValue(Integer.parseInt(value));
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+}
@@ -0,0 +1,151 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import com.onarandombox.MultiverseCore.utils.LocationManipulation;
+import org.bukkit.Location;
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link Location} config-property.
+ */
+public class LocationConfigProperty implements MVActiveConfigProperty<Location> {
+    private String name;
+    private Location value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+    private String method;
+
+    public LocationConfigProperty(ConfigurationSection section, String name, Location defaultValue, String help) {
+        this(section, name, defaultValue, name, help);
+    }
+
+    public LocationConfigProperty(ConfigurationSection section, String name, Location defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.setValue(this.getLocationFromConfig(defaultValue));
+    }
+
+    public LocationConfigProperty(ConfigurationSection section, String name, Location defaultValue, String configNode, String help, String method) {
+        this(section, name, defaultValue, configNode, help);
+        this.method = method;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Location getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        Location parsed = LocationManipulation.stringToLocation(value);
+        return this.setValue(parsed);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(Location value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode + ".x", this.value.getX());
+        this.section.set(configNode + ".y", this.value.getY());
+        this.section.set(configNode + ".z", this.value.getZ());
+        this.section.set(configNode + ".pitch", this.value.getPitch());
+        this.section.set(configNode + ".yaw", this.value.getYaw());
+        this.section.set(configNode + ".world", this.value.getWorld().getName());
+
+        return true;
+    }
+
+    private Location getLocationFromConfig(Location defaultValue) {
+        double x = this.section.getDouble(this.configNode + ".x", defaultValue.getX());
+        double y = this.section.getDouble(this.configNode + ".y", defaultValue.getY());
+        double z = this.section.getDouble(this.configNode + ".z", defaultValue.getZ());
+        double pitch = this.section.getDouble(this.configNode + ".pitch", defaultValue.getPitch());
+        double yaw = this.section.getDouble(this.configNode + ".yaw", defaultValue.getYaw());
+        String w = this.section.getString(this.configNode + ".world", defaultValue.getWorld().getName());
+        Location found = LocationManipulation.stringToLocation(w + ":" + x + "," + y + "," + z + ":" + yaw + ":" + pitch);
+        if (found != null) {
+            return found;
+        }
+        return defaultValue;
+    }
+
+    @Override
+    public String toString() {
+        return LocationManipulation.strCoordsRaw(this.value);
+    }
+
+    /**
+     * Gets the method that will be executed.
+     *
+     * @return The name of the method in MVWorld to be called.
+     */
+    @Override
+    public String getMethod() {
+        return this.method;
+    }
+
+    /**
+     * Sets the method that will be executed.
+     *
+     * @param methodName The name of the method in MVWorld to be called.
+     */
+    @Override
+    public void setMethod(String methodName) {
+        this.method = methodName;
+    }
+
+    /**
+     * Returns the class of the object we're looking at.
+     *
+     * @return the class of the object we're looking at.
+     */
+    @Override
+    public Class<?> getPropertyClass() {
+        return Location.class;
+    }
+}
@@ -0,0 +1,35 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2012.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+/**
+ * An "active" {@link MVConfigProperty} that uses the specified method to be "actually" set.
+ * @param <T> The type of the config-property.
+ * @see MVConfigProperty
+ */
+public interface MVActiveConfigProperty<T> extends MVConfigProperty<T> {
+    /**
+     * Gets the method that will be executed.
+     *
+     * @return The name of the method in MVWorld to be called.
+     */
+    String getMethod();
+
+    /**
+     * Sets the method that will be executed.
+     *
+     * @param methodName The name of the method in MVWorld to be called.
+     */
+    void setMethod(String methodName);
+
+    /**
+     * Returns the class of the object we're looking at.
+     * @return the class of the object we're looking at.
+     */
+    Class<?> getPropertyClass();
+}
@@ -1,18 +1,35 @@
+/******************************************************************************
+ * 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;

-import org.bukkit.plugin.Plugin;
-import org.bukkit.util.config.Configuration;
-
-import com.onarandombox.MultiverseCore.LoggablePlugin;
+/*
+ * This is a mess, so I'm just going to suppress all warnings here.
+ * BEGIN CHECKSTYLE-SUPPRESSION: ALL
+ */

+/**
+ * @deprecated This isn't used any more, is it?
+ */
+@Deprecated
 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) {
@@ -24,7 +41,7 @@ public abstract class MVConfigMigrator {
        }
        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)!");
@@ -52,3 +69,7 @@ public abstract class MVConfigMigrator {
        return oldFolder;
    }
 }
+
+/*
+ * END CHECKSTYLE-SUPPRESSION: ALL
+ */
@@ -0,0 +1,67 @@
+/******************************************************************************
+ * 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;
+
+/**
+ * A generic config-property.
+ *
+ * @param <T> The type of the config-property.
+ */
+public interface MVConfigProperty<T> {
+    /**
+     * Gets the name of this property.
+     *
+     * @return The name of this property.
+     */
+    String getName();
+
+    /**
+     * Gets the value of this property.
+     *
+     * @return The value of this property.
+     */
+    T getValue();
+
+    /**
+     * Gets the string representation of this value.
+     *
+     * @return The value of this property as a string.
+     */
+    String toString();
+
+    /**
+     * Gets the help string for this.
+     *
+     * @return The value of this property as a string.
+     */
+    String getHelp();
+
+    /**
+     * Sets the value of this property.
+     *
+     * @param value The T representation of this value.
+     * @return True the value was successfully set.
+     */
+    boolean setValue(T value);
+
+    /**
+     * This parseValue should be used with strings.
+     *
+     * @param value The string representation of the value to set.
+     *
+     * @return True if the value was set, false if not.
+     */
+    boolean parseValue(String value);
+
+    /**
+     * Gets the name of the config-node that this {@link MVConfigProperty} is saved as.
+     *
+     * @return The name of the config-node that this {@link MVConfigProperty} is saved as.
+     */
+    String getConfigNode();
+}
@@ -1,76 +0,0 @@
-package com.onarandombox.MultiverseCore.configuration;
-
-import java.io.File;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.bukkit.util.config.Configuration;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-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,96 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+/**
+ * A {@link String} config-property.
+ */
+public class StringConfigProperty implements MVConfigProperty<String> {
+    private String name;
+    private String value;
+    private String configNode;
+    private ConfigurationSection section;
+    private String help;
+
+    public StringConfigProperty(ConfigurationSection section, String name, String defaultValue, String help) {
+        this(section, name, defaultValue, defaultValue, help);
+    }
+
+    public StringConfigProperty(ConfigurationSection section, String name, String defaultValue, String configNode, String help) {
+        this.name = name;
+        this.configNode = configNode;
+        this.section = section;
+        this.help = help;
+        this.value = defaultValue;
+        this.parseValue(this.section.getString(this.configNode, defaultValue));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean parseValue(String value) {
+        if (value == null) {
+            return false;
+        }
+        this.setValue(value);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getHelp() {
+        return this.help;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setValue(String value) {
+        if (value == null) {
+            return false;
+        }
+        this.value = value;
+        this.section.set(configNode, this.value);
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+}
@@ -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;
+    }
+}
@@ -0,0 +1,119 @@
+/******************************************************************************
+ * 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.api.MVDestination;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.util.Vector;
+
+/**
+ * A bed-{@link MVDestination}.
+ */
+public class BedDestination implements MVDestination {
+
+    private boolean isValid;
+    private Location knownBedLoc;
+
+    /**
+     * {@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());
+        return this.isValid;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Location getLocation(Entity entity) {
+        if (entity instanceof Player) {
+            this.knownBedLoc = ((Player) entity).getBedSpawnLocation();
+            return this.knownBedLoc;
+        }
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Vector getVelocity() {
+        return new Vector();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDestination(JavaPlugin plugin, String destination) {
+        // Not needed.
+    }
+
+    /**
+     * {@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) {
+            return "multiverse.access." + knownBedLoc.getWorld().getName();
+        }
+        return "";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean useSafeTeleporter() {
+        // Bukkit should have already checked this.
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "b:playerbed";
+    }
+}
@@ -1,21 +1,35 @@
-package com.onarandombox.utils;
+/******************************************************************************
+ * 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.                                                         *
+ ******************************************************************************/

-import java.util.Arrays;
-import java.util.List;
+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 com.onarandombox.MultiverseCore.MultiverseCore;
+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());
@@ -28,20 +42,28 @@ public class CannonDestination implements MVDestination {
        return new Vector(x, y, z);
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
-    public String getIdentifer() {
+    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
@@ -50,7 +72,7 @@ public class CannonDestination implements MVDestination {
        }

        // If it's not a MV world
-        if (!((MultiverseCore) plugin).isMVWorld(parsed.get(1))) {
+        if (!((MultiverseCore) plugin).getMVWorldManager().isMVWorld(parsed.get(1))) {
            return false;
        }
        // Verify X,Y,Z are numbers
@@ -59,49 +81,58 @@ 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 dest) {
+    public void setDestination(JavaPlugin plugin, String destination) {
        if (!(plugin instanceof MultiverseCore)) {
            return;
        }
-        List<String> parsed = Arrays.asList(dest.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) {
+        List<String> parsed = Arrays.asList(destination.split(":"));
+
+        if (parsed.size() != SPLIT_SIZE) {
            this.isValid = false;
            return;
        }
-        if (!parsed.get(0).equalsIgnoreCase(this.getIdentifer())) {
+        if (!parsed.get(0).equalsIgnoreCase(this.getIdentifier())) {
            this.isValid = false;
            return;
        }

-        if (!((MultiverseCore) plugin).isMVWorld(parsed.get(1))) {
+        if (!((MultiverseCore) plugin).getMVWorldManager().isMVWorld(parsed.get(1))) {
            this.isValid = false;
            return;
        }

-        this.location = new Location(((MultiverseCore) plugin).getMVWorld(parsed.get(1)).getCBWorld(), 0, 0, 0);
+        this.location = new Location(((MultiverseCore) plugin).getMVWorldManager().getMVWorld(parsed.get(1)).getCBWorld(), 0, 0, 0);

        if (!parsed.get(2).matches(this.coordRegex)) {
            this.isValid = false;
@@ -122,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;
@@ -134,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;
@@ -155,16 +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,104 @@
+/******************************************************************************
+ * 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 com.onarandombox.MultiverseCore.commands.TeleportCommand;
+import com.onarandombox.MultiverseCore.utils.PermissionTools;
+import com.pneumaticraft.commandhandler.Command;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/** A factory class that will create destinations from specific strings. */
+public class DestinationFactory {
+    private MultiverseCore plugin;
+    private Map<String, Class<? extends MVDestination>> destList;
+    private Command teleportCommand;
+
+    public DestinationFactory(MultiverseCore plugin) {
+        this.plugin = plugin;
+        this.destList = new HashMap<String, Class<? extends MVDestination>>();
+        List<Command> cmds = this.plugin.getCommandHandler().getAllCommands();
+        for (Command c : cmds) {
+            if (c instanceof TeleportCommand) {
+                this.teleportCommand = c;
+            }
+        }
+    }
+
+    /**
+     * Gets a new destination from a string.
+     * Returns a new InvalidDestination if the string could not be parsed.
+     *
+     * @param destination The destination in string format.
+     *
+     * @return A non-null MVDestination
+     */
+    public MVDestination getDestination(String destination) {
+        String idenChar = "";
+        if (destination.split(":").length > 1) {
+            idenChar = destination.split(":")[0];
+        }
+
+        if (this.destList.containsKey(idenChar)) {
+            Class<? extends MVDestination> myClass = this.destList.get(idenChar);
+            try {
+                MVDestination mydest = myClass.newInstance();
+                if (!mydest.isThisType((MultiverseCore) this.plugin, destination)) {
+                    return new InvalidDestination();
+                }
+                mydest.setDestination(this.plugin, destination);
+                return mydest;
+            } catch (InstantiationException e) {
+            } catch (IllegalAccessException e) {
+            }
+        }
+        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;
+        }
+        this.destList.put(identifier, c);
+        // Special case for world defaults:
+        if (identifier.equals("")) {
+            identifier = "w";
+        }
+        Permission self = this.plugin.getServer().getPluginManager().getPermission("multiverse.teleport.self." + identifier);
+        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);
+            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);
+            this.plugin.getServer().getPluginManager().addPermission(other);
+            pt.addToParentPerms("multiverse.teleport.other." + identifier);
+        }
+        this.teleportCommand.addAdditonalPermission(self);
+        this.teleportCommand.addAdditonalPermission(other);
+        return true;
+    }
+}
@@ -1,29 +1,49 @@
-package com.onarandombox.utils;
+/******************************************************************************
+ * 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.                                                         *
+ ******************************************************************************/

-import java.util.Arrays;
-import java.util.List;
+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 com.onarandombox.MultiverseCore.MultiverseCore;
+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 boolean isValid;
    private Location location;

+    /**
+     * {@inheritDoc}
+     */
    @Override
-    public String getIdentifer() {
+    public String getIdentifier() {
        return "e";
    }
-    
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
    public Vector getVelocity() {
-        return new Vector(0,0,0);
+        return new Vector(0, 0, 0);
    }

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public boolean isThisType(JavaPlugin plugin, String destination) {
        if (!(plugin instanceof MultiverseCore)) {
@@ -33,7 +53,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
@@ -42,7 +62,7 @@ public class ExactDestination implements MVDestination {
        }

        // If it's not a MV world
-        if (!((MultiverseCore) plugin).isMVWorld(parsed.get(1))) {
+        if (!((MultiverseCore) plugin).getMVWorldManager().isMVWorld(parsed.get(1))) {
            return false;
        }

@@ -56,47 +76,56 @@ 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;
    }

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

+    /**
+     * {@inheritDoc}
+     */
    @Override
-    public void setDestination(JavaPlugin plugin, String dest) {
+    public void setDestination(JavaPlugin plugin, String destination) {
        if (!(plugin instanceof MultiverseCore)) {
            return;
        }
-        List<String> parsed = Arrays.asList(dest.split(":"));
+        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() == 3 || parsed.size() == 5)) {
+        if (!(parsed.size() == 3 || parsed.size() == 5)) { // SUPPRESS CHECKSTYLE: MagicNumberCheck
            this.isValid = false;
            return;
        }

-        if (!parsed.get(0).equalsIgnoreCase(this.getIdentifer())) {
+        if (!parsed.get(0).equalsIgnoreCase(this.getIdentifier())) {
            this.isValid = false;
            return;
        }

-        if (!((MultiverseCore) plugin).isMVWorld(parsed.get(1))) {
+        if (!((MultiverseCore) plugin).getMVWorldManager().isMVWorld(parsed.get(1))) {
            this.isValid = false;
            return;
        }
-        this.location = new Location(((MultiverseCore) plugin).getMVWorld(parsed.get(1)).getCBWorld(), 0, 0, 0);
+        this.location = new Location(((MultiverseCore) plugin).getMVWorldManager().getMVWorld(parsed.get(1)).getCBWorld(), 0, 0, 0);

        if (!parsed.get(2).matches(this.coordRegex)) {
            this.isValid = false;
@@ -123,7 +152,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;
@@ -132,16 +161,28 @@ 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;
@@ -150,16 +191,32 @@ public class ExactDestination implements MVDestination {
        this.isValid = false;
    }

+    /**
+     * {@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.
+        return false;
+    }
 }
@@ -0,0 +1,107 @@
+/******************************************************************************
+ * 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.api.MVDestination;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+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";
+    }
+
+    @Override
+    public String toString() {
+        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;
+    }
+
+}
@@ -1,24 +1,41 @@
-package com.onarandombox.utils;
+/******************************************************************************
+ * 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.api.MVDestination;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 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 getIdentifer() {
+    public String getIdentifier() {
        return "pl";
    }

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

+    /**
+     * {@inheritDoc}
+     */
    @Override
    public Location getLocation(Entity e) {
        Player p = plugin.getServer().getPlayer(this.player);
@@ -38,20 +58,26 @@ 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 dest) {
-        String[] items = dest.split(":");
+    public void setDestination(JavaPlugin plugin, String destination) {
+        String[] items = destination.split(":");
        if (items.length != 2) {
            this.isValid = false;
        }
@@ -63,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;
@@ -78,12 +110,28 @@ 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);
+        return new Vector(0, 0, 0);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean useSafeTeleporter() {
+        return true;
    }

 }
@@ -0,0 +1,170 @@
+/******************************************************************************
+ * 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 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;
+    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(":");
+        if (items.length > 3) {
+            return false;
+        }
+        if (items.length == 1 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
+            // This case is: world
+            return true;
+        }
+        if (items.length == 2 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
+            // This case is: world:n
+            return true;
+        } else if (items[0].equalsIgnoreCase("w") && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[1])) {
+            // This case is: w:world
+            // and w:world:ne
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Location getLocation(Entity e) {
+        Location spawnLoc = getAcurateSpawnLocation(e, this.world);
+        if (this.yaw >= 0) {
+            // Only modify the yaw if its set.
+            spawnLoc.setYaw(this.yaw);
+        }
+        return spawnLoc;
+    }
+
+    private 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) {
+        String[] items = destination.split(":");
+        if (items.length > 3) {
+            isValid = false;
+            return;
+        }
+        if (items.length == 1 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
+            isValid = true;
+            this.world = ((MultiverseCore) plugin).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]);
+            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]);
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getType() {
+        return "World";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return this.world.getColoredWorldString();
+    }
+
+    @Override
+    public String toString() {
+        if (direction.length() > 0 && yaw >= 0) {
+            return this.world.getCBWorld().getName() + ":" + this.direction;
+        }
+        return this.world.getCBWorld().getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getRequiredPermission() {
+        // TODO: Potenitally replace spaces wiht tabs for friendlier yaml.
+        // this.world.getName().replace(" ","_");
+        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;
@@ -0,0 +1,30 @@
+/******************************************************************************
+ * 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.enums;
+
+/**
+ * A enum containing all actions that can be used to modify world-properties.
+ */
+public enum Action {
+    /**
+     * Setting a property.
+     */
+    Set,
+    /**
+     * Adding something to a list-property.
+     */
+    Add,
+    /**
+     * Removing something from a list-property.
+     */
+    Remove,
+    /**
+     * Clearing a list-property.
+     */
+    Clear
+}
@@ -0,0 +1,26 @@
+/******************************************************************************
+ * 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.enums;
+
+/**
+ * An enum containing all list-properties.
+ */
+public enum AddProperties {
+    /**
+     * Worlds that people cannot go to from a world.
+     */
+    worldblacklist,
+    /**
+     * Animal-exceptions.
+     */
+    animals,
+    /**
+     * Monster-exceptions.
+     */
+    monsters
+}
@@ -0,0 +1,64 @@
+/******************************************************************************
+ * 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.enums;
+
+/**
+ * An enum containing all config-properties that can be set.
+ */
+public enum ConfigProperty {
+    /**
+     * How long to leave in between sending a message to the player. (NOT YET IMPLEMENTED)
+     */
+    messagecooldown,
+    /**
+     * How fast are people allowed to use /MVTP (NOT YET IMPLEMENTED).
+     */
+    teleportcooldown,
+    /**
+     * Prefix chat-messages with world-names.
+     */
+    worldnameprefix,
+    /**
+     * If value is set to false, Multiverse will NOT enforce world access permissions.
+     */
+    enforceaccess,
+    /**
+     * Whether users should get detailed information about the permissions they would need.
+     */
+    displaypermerrors,
+    /**
+     * Debug-information.
+     */
+    debug,
+    /**
+     * The world new users will spawn in.
+     */
+    firstspawnworld,
+    /**
+     * Whether Multiverse should intercept teleports.
+     */
+    teleportintercept,
+    /**
+     * Whether Multiverse should override the first spawn.
+     */
+    firstspawnoverride;
+
+    /**
+     * Constructs a string containing all values in this enum.
+     *
+     * @return That {@link String}.
+     */
+    public static String getAllValues() {
+        String buffer = "";
+        for (ConfigProperty c : ConfigProperty.values()) {
+            // All values will NOT Contain spaces.
+            buffer += c.toString() + " ";
+        }
+        return buffer;
+    }
+}
@@ -0,0 +1,102 @@
+/******************************************************************************
+ * 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.enums;
+
+import org.bukkit.ChatColor;
+
+/**
+ * A regular {@link ChatColor} represented by an english string.
+ */
+public enum EnglishChatColor {
+    /*
+     * I know. this is quite ugly.
+     */
+    /** AQUA. */
+    AQUA("AQUA", ChatColor.AQUA),
+    /** BLACK. */
+    BLACK("BLACK", ChatColor.BLACK),
+    /** BLUE. */
+    BLUE("BLUE", ChatColor.BLUE),
+    /** DARKAQUA. */
+    DARKAQUA("DARKAQUA", ChatColor.DARK_AQUA),
+    /** DARKBLUE. */
+    DARKBLUE("DARKBLUE", ChatColor.DARK_BLUE),
+    /** DARKGRAY. */
+    DARKGRAY("DARKGRAY", ChatColor.DARK_GRAY),
+    /** DARKGREEN. */
+    DARKGREEN("DARKGREEN", ChatColor.DARK_GREEN),
+    /** DARKPURPLE. */
+    DARKPURPLE("DARKPURPLE", ChatColor.DARK_PURPLE),
+    /** DARKRED. */
+    DARKRED("DARKRED", ChatColor.DARK_RED),
+    /** GOLD. */
+    GOLD("GOLD", ChatColor.GOLD),
+    /** GRAY. */
+    GRAY("GRAY", ChatColor.GRAY),
+    /** GREEN. */
+    GREEN("GREEN", ChatColor.GREEN),
+    /** LIGHTPURPLE. */
+    LIGHTPURPLE("LIGHTPURPLE", ChatColor.LIGHT_PURPLE),
+    /** RED. */
+    RED("RED", ChatColor.RED),
+    /** YELLOW. */
+    YELLOW("YELLOW", ChatColor.YELLOW),
+    /** WHITE. */
+    WHITE("WHITE", ChatColor.WHITE);
+    private ChatColor color;
+    private String text;
+
+    EnglishChatColor(String name, ChatColor color) {
+        this.color = color;
+        this.text = name;
+    }
+
+    /**
+     * Gets the text.
+     * @return The text.
+     */
+    public String getText() {
+        return this.text;
+    }
+
+    /**
+     * Gets the color.
+     * @return The color as {@link ChatColor}.
+     */
+    public ChatColor getColor() {
+        return this.color;
+    }
+
+    /**
+     * Constructs a string containing all available colors.
+     * @return That {@link String}.
+     */
+    public static String getAllColors() {
+        String buffer = "";
+        for (EnglishChatColor c : EnglishChatColor.values()) {
+            buffer += c.getColor() + c.getText() + " ";
+        }
+        return buffer;
+    }
+
+    /**
+     * Constructs an {@link EnglishChatColor} from a {@link String}.
+     * @param text The {@link String}.
+     * @return The {@link EnglishChatColor}.
+     */
+    public static EnglishChatColor fromString(String text) {
+        if (text != null) {
+            for (EnglishChatColor c : EnglishChatColor.values()) {
+                if (text.equalsIgnoreCase(c.text)) {
+                    return c;
+                }
+            }
+        }
+        return null;
+    }
+}
@@ -0,0 +1,38 @@
+/******************************************************************************
+ * 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.enums;
+
+/**
+ * An enum containing possible teleport-results.
+ */
+public enum TeleportResult {
+    /**
+     * Insufficient permissions.
+     */
+    FAIL_PERMISSION,
+    /**
+     * The teleport was unsafe.
+     */
+    FAIL_UNSAFE,
+    /**
+     * The player was to poor.
+     */
+    FAIL_TOO_POOR,
+    /**
+     * The teleport was invalid.
+     */
+    FAIL_INVALID,
+    /**
+     * Unknown reason.
+     */
+    FAIL_OTHER,
+    /**
+     * The player was successfully teleported.
+     */
+    SUCCESS
+}
@@ -0,0 +1,4 @@
+/**
+ * This package contains all enums.
+ */
+package com.onarandombox.MultiverseCore.enums;
@@ -1,23 +0,0 @@
-package com.onarandombox.MultiverseCore.event;
-
-import java.util.List;
-
-import org.bukkit.event.Event;
-
-public class MVConfigMigrateEvent extends Event {
-    private static final long serialVersionUID = 3647950355746345397L;
-    private List<String> configsLoaded;
-
-    public MVConfigMigrateEvent(List<String> configsLoaded) {
-        super("MVConfigMigrate");
-        this.configsLoaded = configsLoaded;
-    }
-    
-    public void addConfig(String config) {
-        this.configsLoaded.add(config);
-    }
-    
-    public List<String> getAllConfigsLoaded() {
-        return this.configsLoaded;
-    }
-}
@@ -1,9 +1,19 @@
-package com.onarandombox.MultiverseCore.event;
+/******************************************************************************
+ * 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.                                                         *
+ ******************************************************************************/

-import java.util.List;
+package com.onarandombox.MultiverseCore.event;

 import org.bukkit.event.Event;

+import java.util.List;
+
+/**
+ * Called when the Multiverse-config should be reloaded.
+ */
 public class MVConfigReloadEvent extends Event {
    private static final long serialVersionUID = 3647950355746345397L;
    private List<String> configsLoaded;
@@ -12,11 +22,19 @@ public class MVConfigReloadEvent extends Event {
        super("MVConfigReload");
        this.configsLoaded = configsLoaded;
    }
-    
+
+    /**
+     * Adds a config to this event.
+     * @param config The config to add.
+     */
    public void addConfig(String config) {
        this.configsLoaded.add(config);
    }
-    
+
+    /**
+     * Gets all loaded configs.
+     * @return A list of all loaded configs.
+     */
    public List<String> getAllConfigsLoaded() {
        return this.configsLoaded;
    }
@@ -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.event;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+
+/**
+ * This event is thrown when a portal is touched.
+ */
+public class MVPlayerTouchedPortalEvent extends Event implements Cancellable {
+    private Player p;
+    private Location l;
+    private boolean isCancelled;
+
+    public MVPlayerTouchedPortalEvent(Player p, Location l) {
+        super("MVPlayerTouchedPortalEvent");
+        this.p = p;
+        this.l = l;
+    }
+
+    /**
+     * Gets the {@link Location} of the portal-block that was touched.
+     * @return The {@link Location} of the portal-block that was touched.
+     */
+    public Location getBlockTouched() {
+        return this.l;
+    }
+
+    /**
+     * Gets the {@link Player} that's touching the portal.
+     * @return The {@link Player} that's touching the portal.
+     */
+    public Player getPlayer() {
+        return this.p;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return this.isCancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean b) {
+        this.isCancelled = b;
+    }
+}
@@ -1,11 +1,20 @@
+/******************************************************************************
+ * 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.event;

 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;

+/**
+ * Called when a player is respawning.
+ */
 public class MVRespawnEvent extends Event {
-    private static final long serialVersionUID = -2991894063331856687L;
    private Player player;
    private Location location;
    private String respawnMethod;
@@ -18,18 +27,34 @@ public class MVRespawnEvent extends Event {
        this.respawnMethod = respawnMethod;
    }

+    /**
+     * Gets the {@link Player} that's respawning.
+     * @return The {@link Player} that's respawning.
+     */
    public Player getPlayer() {
        return this.player;
    }

+    /**
+     * Gets the respawn-method.
+     * @return The respawn-method.
+     */
    public String getRespawnMethod() {
        return this.respawnMethod;
    }

+    /**
+     * Gets the player's respawn-{@link Location}.
+     * @return The player's respawn-{@link Location}.
+     */
    public Location getPlayersRespawnLocation() {
        return this.location;
    }

+    /**
+     * Sets the player's respawn-{@link Location}.
+     * @param l The new respawn-{@link Location}.
+     */
    public void setRespawnLocation(Location l) {
        this.location = l;
    }
@@ -1,33 +1,89 @@
+/******************************************************************************
+ * 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.event;

+import com.onarandombox.MultiverseCore.api.MVDestination;
+
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;

-import com.onarandombox.utils.MVDestination;
-
-public class MVTeleportEvent extends Event {
-    private static final long serialVersionUID = 854826818438649269L;
-    private Player player;
+/**
+ * Event that gets called when a player use the /mvtp command.
+ */
+public class MVTeleportEvent extends Event implements Cancellable {
+    private Player teleportee;
+    private CommandSender teleporter;
    private MVDestination dest;
-    private String teleportString;
+    private boolean useSafeTeleport;
+    private boolean isCancelled;

-
-    public MVTeleportEvent(MVDestination dest, Player p, String teleportString) {
-        super("MVTeleport");
-        this.player = p;
+    public MVTeleportEvent(MVDestination dest, Player teleportee, CommandSender teleporter, boolean safeTeleport) {
+        super("SafeTTeleporter");
+        this.teleportee = teleportee;
+        this.teleporter = teleporter;
        this.dest = dest;
-        this.teleportString = teleportString;
+        this.useSafeTeleport = safeTeleport;
    }

-    public Player getPlayer() {
-        return this.player;
+    /**
+     * Returns the player who will be teleported by this event.
+     *
+     * @return The player who will be teleported by this event.
+     */
+    public Player getTeleportee() {
+        return this.teleportee;
    }

-    public String getDestString() {
-        return this.teleportString;
+    /**
+     * Returns the location the player was before the teleport.
+     *
+     * @return The location the player was before the teleport.
+     */
+    public Location getFrom() {
+        return this.teleportee.getLocation();
    }

-    public Class<? extends MVDestination> getDestType() {
-        return this.dest.getClass();
+    /**
+     * Gets the {@link CommandSender} who requested the Teleport.
+     *
+     * @return The {@link CommandSender} who requested the Teleport
+     */
+    public CommandSender getTeleporter() {
+        return this.teleporter;
+    }
+
+    /**
+     * Returns the destination that the player will spawn at.
+     *
+     * @return The destination the player will spawn at.
+     */
+    public MVDestination getDestination() {
+        return this.dest;
+    }
+
+    /**
+     * Looks if this {@link MVTeleportEvent} is using the {@link SafeTTeleporter}.
+     * @return True if this {@link MVTeleportEvent} is using the {@link SafeTTeleporter}.
+     */
+    public boolean isUsingSafeTTeleporter() {
+        return useSafeTeleport;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return this.isCancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.isCancelled = cancel;
    }
 }