Use final fields where needed.

Merge pull request #2503 from Multiverse/getplayerexact
Use getPlayerExact in favour of getPlayer.
2020-12-15 11:26:59 +08:00 · 2020-12-14 10:28:58 +08:00 · 2020-12-12 09:58:19 -05:00 · 2020-12-12 10:49:49 +08:00 · 2020-12-11 12:48:19 -05:00 · 2020-11-27 12:58:11 +08:00
170 changed files with 11049 additions and 5380 deletions
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 💬 Multiverse Discord Server
+    url: https://discord.gg/NZtfKky
+    about: Need help with using Multiverse-Core or just want to chat with the devs? Join the Multiverse Discord Server for help!
@@ -0,0 +1,56 @@
+---
+name: ❓ Help!
+about: Encountered a problem with Multiverse-Core? Not sure how to fix it?
+title: ''
+labels: 'Type: Assistance'
+assignees: ''
+
+---
+
+<!-- Multiverse-Core help guide
+
+Don't write inside the arrows as they will be hidden when you post your issue.
+
+Get latest build from: http://ci.onarandombox.com/view/Multiverse/
+
+If you need help other submodules of Multiverse, go to their respective git repo:
+    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
+    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
+    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
+    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
+
+Or come join our Discord server to get help sooner: https://discord.gg/NZtfKky
+
+If you're happy to wait (or you were sent here from Discord), read on:
+
+1.  Check the Usage and FAQ pages to see if it answers your queries:
+      https://github.com/Multiverse/Multiverse-Core/wiki/Basics
+      https://github.com/Multiverse/Multiverse-Core/wiki/FAQ
+
+2.  Fill out the template.
+      This will help us understand what problem you've encountered and help us
+      find a solution.
+
+3.  When linking files, do not attach them to the post!
+      Copy and paste any logs into https://gist.github.com/ or other similar service.
+
+4.  Delete this line and all above lines before posting your issue!       -->
+
+### Information
+
+* **Server version:** <!-- Insert output of `/version` command -->
+
+* **Full output of `/mv version -p`:** <!-- Replace this with the command output's https://paste.gg/ link -->
+
+* **Server log:** <!-- Upload `logs/latest.log` to https://gist.github.com/ -->
+
+### Help request
+
+**Problem**
+<!-- What problem did you encounter? -->
+
+**What I have tried**
+<!-- What have you tried so far? -->
+
+**Screenshots**
+<!-- If relevant, include any screenshots here. -->
@@ -0,0 +1,59 @@
+---
+name: 🐛 Report a Bug
+about: Report a Multiverse-Core bug. Only use this if you're 100% sure it's something wrong with Multiverse-Core - otherwise, try "Help!".
+title: ''
+labels: 'Bug: Unconfirmed'
+assignees: ''
+
+---
+
+<!-- Multiverse-Core bug reporting guide
+
+Don't put anything inside this block, as it won't be included in the issue.
+
+Get latest build from: http://ci.onarandombox.com/view/Multiverse/
+
+If you are having issues with other submodules of Multiverse, go to their respective git repo:
+    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
+    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
+    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
+    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
+
+If you are reporting a bug, please follow the following steps:
+
+1.  Fill out the template in full.
+      Run the commands in the console. Don't just put "latest" as a version,
+      or we will ignore it.
+
+2.  When linking files, do not attach them to the post!
+      Copy and paste any logs into https://gist.github.com/, then paste a
+      link to them in the relevant parts of the template.
+      **DO NOT drag files into this box!**
+
+3.  Make sure not to write between the arrows, as anything there will be
+    hidden.
+
+4.  Delete this line and all above lines before posting your issue!       -->
+
+### Information
+
+* **Server version:** <!-- Insert output of `/version` command -->
+
+* **Full output of `/mv version -p`:** <!-- Replace this with the command output's https://paste.gg/ link -->
+
+* **Server log:** <!-- Upload `logs/latest.log` to https://gist.github.com/ -->
+
+### Details
+I was **`<able / not able>`** to reproduce my issue on a freshly setup and up-to-date server with the latest version of Multiverse plugins with no other plugins and with no kinds of other server or client mods.
+
+**Description**  
+<!-- Replace this with a brief summary of the bug. -->
+
+**Steps to reproduce**  
+<!-- Replace this with exactly what you did to cause the bug. -->
+
+**Expected behavior**  
+<!-- Replace this with what you expected to happen. -->
+
+**Screenshots**  
+<!-- Replace this with screenshots, if necessary. -->
@@ -0,0 +1,54 @@
+---
+name: 💡 Request a Feature
+about: Suggest a feature you want to see in Multiverse-Core!
+title: ''
+labels: 'Type: Idea'
+assignees: ''
+
+---
+
+<!-- Multiverse-Core feature request guide
+
+Fill out the template. Don't write inside the arrows as they will be hidden
+when you post your issue.
+
+Get latest build from: http://ci.onarandombox.com/view/Multiverse/
+
+If you are look for other submodules of Multiverse, go to their respective git repo:
+    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
+    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
+    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
+    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
+
+Not sure if your feature fits in Multiverse-Core? Feel free to ask on our Discord
+server: https://discord.gg/NZtfKky
+
+If you have a feature suggestion for Multiverse-Core, read the following tips:
+
+1.  Fill out the template.
+      This will help us understand what you're requesting and why you want us
+      to add it.
+
+2.  Keep it simple.
+      Make sure it's easy to understand what you're requesting. A good way is
+      to keep it to one request per GitHub issue, as we can then easily track
+      feature requests.
+
+3.  Check whether it has already been asked or added.
+      You can search the issue tracker to see if your feature has already been
+      requested at https://github.com/Multiverse/Multiverse-Core/issues.
+
+4.  Ask yourself: "Does this belong in Multiverse-Core?"
+      There are lots of features that we reject because most servers won't
+      need or use them. If your feature is very specific or already exists in
+      another plugin, it might not be a good fit for Multiverse-Core.
+
+5.  Delete this line and all above lines before posting your issue!       -->
+
+### Feature request
+
+**Feature description**
+<!-- What feature are you suggesting? -->
+
+**How the feature is useful**
+<!-- How is the feature useful to players, server owners and/or developers? -->
@@ -12,6 +12,7 @@

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

 # vim
 .*.sw[a-p]
@@ -1,7 +0,0 @@
-[submodule "lib/allpay"]
-	path = lib/allpay
-	url = git://github.com/FernFerret/AllPay.git
-[submodule "lib/commandhandler"]
-	path = lib/commandhandler
-	url = git://github.com/PneumatiCraft/CommandHandler.git
-        branch = notrie
@@ -0,0 +1,6 @@
+language: java
+jdk:
+  - oraclejdk8
+notifications:
+  email: false
+dist: trusty
@@ -1,11 +1,8 @@
 Building
 ========
-Update the submodules after you clone and before you build with maven.
+Simply build the source with maven:

-```
-$ git submodule update --init --recursive
-$ mvn install
-```
+    $ mvn install

 More details are available on the [build instructions wiki page](https://github.com/Multiverse/Multiverse-Core/wiki/Building).

@@ -16,3 +13,4 @@ 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.
+
@@ -13,9 +13,7 @@
    <module name="JavadocPackage">
        <property name="allowLegacy" value="true"/>
    </module>
-    <module name="NewlineAtEndOfFile">
-        <property name="severity" value="info"/>
-    </module>
+    <module name="NewlineAtEndOfFile" />
    <module name="Translation"/>
    <module name="FileLength"/>
    <module name="FileTabCharacter">
@@ -78,7 +76,10 @@
        <module name="UnusedImports">
            <property name="processJavadoc" value="true"/>
        </module>
-        <module name="MethodLength"/>
+        <module name="MethodLength">
+            <property name="severity" value="warning"/>
+            <property name="countEmpty" value="false"/>
+        </module>
        <module name="ParameterNumber"/>
        <module name="EmptyForIteratorPad"/>
        <module name="MethodParamPad"/>
@@ -103,7 +104,6 @@
        </module>
        <module name="LeftCurly"/>
        <module name="RightCurly"/>
-        <module name="DoubleCheckedLocking"/>
        <module name="EmptyStatement"/>
        <module name="EqualsHashCode"/>
        <module name="HiddenField">
@@ -115,7 +115,6 @@
            <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
@@ -3,19 +3,41 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.onarandombox.multiversecore</groupId>
    <artifactId>Multiverse-Core</artifactId>
-    <version>2.3</version>
+    <version>4.2.3-SNAPSHOT</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>
+        <project.bitly-access-token>bitly-access-token</project.bitly-access-token>
    </properties>

    <repositories>
+      <!-- Spigot -->
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
        <repository>
            <id>onarandombox</id>
            <url>http://repo.onarandombox.com/content/groups/public</url>
        </repository>
+        <repository>
+            <id>spigot</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>vault-repo</id>
+            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+        </repository>
+        <repository>
+            <id>minebench-repo</id>
+            <url>https://repo.minebench.de/</url>
+        </repository>
+        <repository>
+            <id>CodeMC</id>
+            <url>https://repo.codemc.org/repository/maven-public</url>
+        </repository>
    </repositories>

    <pluginRepositories>
@@ -48,6 +70,17 @@
                <project.build.number>${env.BUILD_NUMBER}</project.build.number>
            </properties>
        </profile>
+        <profile>
+            <id>bitly</id>
+            <activation>
+                <property>
+                    <name>env.BITLY_ACCESS_TOKEN</name>
+                </property>
+            </activation>
+            <properties>
+                <project.bitly-access-token>${env.BITLY_ACCESS_TOKEN}</project.bitly-access-token>
+            </properties>
+        </profile>
    </profiles>

    <build>
@@ -57,61 +90,62 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.7.0</version>
                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                </configuration>
            </plugin>
-            <!-- Build Helper - Additional Source Folders -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <id>add-wsdl-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.basedir}/lib/allpay/src/main/java</source>
-                                <source>${project.basedir}/lib/commandhandler/src</source>
-                                <source>${project.basedir}/lib/commandhandler/lib/ShellParser/src</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
            <plugin>
                <groupId>com.google.code.maven-replacer-plugin</groupId>
                <artifactId>maven-replacer-plugin</artifactId>
-                <version>1.3.8</version>
+                <version>1.4.1</version>
                <executions>
                    <execution>
+                        <id>replace-bitly-access-token</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                        <configuration>
+                            <basedir>${project.build.sourceDirectory}</basedir>
+                            <includes>
+                                <include>com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java</include>
+                            </includes>
+                            <replacements>
+                                <replacement>
+                                    <token>bitly-access-token</token>
+                                    <value>${project.bitly-access-token}</value>
+                                </replacement>
+                            </replacements>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>replace-maven-version-number</id>
                        <phase>prepare-package</phase>
                        <goals>
                            <goal>replace</goal>
                        </goals>
+                        <configuration>
+                            <basedir>${project.build.directory}/classes</basedir>
+                            <includes>
+                                <include>plugin.yml</include>
+                            </includes>
+                            <replacements>
+                                <replacement>
+                                    <token>maven-version-number</token>
+                                    <value>${project.version}-b${project.build.number}</value>
+                                </replacement>
+                            </replacements>
+                        </configuration>
                    </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>
+                <version>3.0.2</version>
                <configuration>
                    <archive>
                        <manifestEntries>
@@ -119,16 +153,10 @@
                    </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>
+                <version>3.0.0-M3</version>
                <configuration>
                    <parallel>methods</parallel>
                    <threadCount>10</threadCount>
@@ -141,141 +169,229 @@
                    <dependency>
                        <groupId>org.apache.maven.surefire</groupId>
                        <artifactId>surefire-junit47</artifactId>
-                        <version>2.11</version>
+                        <version>3.0.0-M3</version>
                    </dependency>
                </dependencies>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.17</version>
                <configuration>
                    <enableRulesSummary>true</enableRulesSummary>
                    <configLocation>${project.basedir}/config/mv_checks.xml</configLocation>
                </configuration>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <executions>
+                    <execution>
+                        <id>javadoc-jar</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <failOnError>false</failOnError>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>me.main__.util</pattern>
+                                    <shadedPattern>com.onarandombox.serializationconfig</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.pneumaticraft.commandhandler</pattern>
+                                    <shadedPattern>com.onarandombox.commandhandler</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>buscript</pattern>
+                                    <shadedPattern>com.onarandombox.buscript</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.bstats</pattern>
+                                    <shadedPattern>com.onarandombox.bstats</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.dumptruckman.minecraft.util.Logging</pattern>
+                                    <shadedPattern>com.onarandombox.MultiverseCore.utils.CoreLogging</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.dumptruckman.minecraft.util.DebugLog</pattern>
+                                    <shadedPattern>com.onarandombox.MultiverseCore.utils.DebugFileLogger</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.codehaus.jettison</pattern>
+                                    <shadedPattern>com.onarandombox.jettison</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>de.themoep.idconverter</pattern>
+                                    <shadedPattern>com.onarandombox.idconverter</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>se.eris</groupId>
+                <artifactId>notnull-instrumenter-maven-plugin</artifactId>
+                <version>0.6.8</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>instrument</goal>
+                            <goal>tests-instrument</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
        </plugins>
    </build>

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

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

 package com.onarandombox.MultiverseCore.api;

-import com.fernferret.allpay.AllPay;
-import com.fernferret.allpay.GenericBank;
+import buscript.Buscript;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
-import com.onarandombox.MultiverseCore.utils.*;
+import com.onarandombox.MultiverseCore.utils.AnchorManager;
+import com.onarandombox.MultiverseCore.utils.MVEconomist;
+import com.onarandombox.MultiverseCore.utils.MVPermissions;
+import com.onarandombox.MultiverseCore.utils.MVPlayerSession;
+import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety;
+import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
+import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
+import com.onarandombox.MultiverseCore.utils.VaultHandler;
 import com.pneumaticraft.commandhandler.CommandHandler;
-import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;

 /**
@@ -23,18 +28,22 @@ import org.bukkit.entity.Player;
 public interface Core {

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

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

    /**
     * Reloads the Multiverse Configuration files:
@@ -46,9 +55,9 @@ public interface Core {
     * Gets the Multiverse message system. This allows you to send messages
     * to users at specified intervals.
     *
-     * @return The loaded {@link MVMessaging}.
+     * @return The loaded {@link MultiverseMessaging}.
     */
-    MVMessaging getMessaging();
+    MultiverseMessaging getMessaging();

    /**
     * Gets the {@link MVPlayerSession} for the given player.
@@ -61,14 +70,6 @@ public interface Core {
     */
    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.
@@ -96,7 +97,7 @@ public interface Core {
    /**
     * Gets the primary class responsible for managing Multiverse Worlds.
     *
-     * @return {@link WorldManager}.
+     * @return {@link MVWorldManager}.
     */
    MVWorldManager getMVWorldManager();

@@ -123,23 +124,12 @@ public interface Core {
     * @param seed The seed of the world.
     *
     * @return True if success, false if fail.
+     *
+     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String)} instead.
     */
+    @Deprecated
    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed);

-    /**
-     * Sets the {@link GenericBank}-Bank AllPay is using.
-     *
-     * @param bank The new {@link GenericBank}
-     */
-    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.
     */
@@ -163,4 +153,65 @@ public interface Core {
     * @return The readable authors-{@link String}
     */
    String getAuthors();
+
+    /**
+     * Gets the {@link BlockSafety} this {@link Core} is using.
+     * @return The {@link BlockSafety} this {@link Core} is using.
+     * @see BlockSafety
+     * @see SimpleBlockSafety
+     */
+    BlockSafety getBlockSafety();
+
+    /**
+     * Sets the {@link BlockSafety} this {@link Core} is using.
+     * @param blockSafety The new {@link BlockSafety}.
+     * @see BlockSafety
+     * @see SimpleBlockSafety
+     */
+    void setBlockSafety(BlockSafety blockSafety);
+
+    /**
+     * Gets the {@link LocationManipulation} this {@link Core} is using.
+     * @return The {@link LocationManipulation} this {@link Core} is using.
+     * @see LocationManipulation
+     * @see SimpleLocationManipulation
+     */
+    LocationManipulation getLocationManipulation();
+
+    /**
+     * Sets the {@link LocationManipulation} this {@link Core} is using.
+     * @param locationManipulation The new {@link LocationManipulation}.
+     * @see LocationManipulation
+     * @see SimpleLocationManipulation
+     */
+    void setLocationManipulation(LocationManipulation locationManipulation);
+
+    /**
+     * Gets the {@link SafeTTeleporter} this {@link Core} is using.
+     * @return The {@link SafeTTeleporter} this {@link Core} is using.
+     * @see SafeTTeleporter
+     * @see SimpleSafeTTeleporter
+     */
+    SafeTTeleporter getSafeTTeleporter();
+
+    /**
+     * Sets the {@link SafeTTeleporter} this {@link Core} is using.
+     * @param safeTTeleporter The new {@link SafeTTeleporter}.
+     * @see SafeTTeleporter
+     * @see SimpleSafeTTeleporter
+     */
+    void setSafeTTeleporter(SafeTTeleporter safeTTeleporter);
+
+    /**
+     * Gets the {@link MultiverseCoreConfig}.
+     * @return The configuration.
+     */
+    MultiverseCoreConfig getMVConfig();
+
+    /**
+     * Gets the buscript object for Multiverse.  This is what handles Javascript processing.
+     *
+     * @return The Multiverse buscript object.
+     */
+    Buscript getScriptAPI();
 }
@@ -0,0 +1,99 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Vehicle;
+import org.bukkit.util.Vector;
+
+/**
+ * Used to manipulate locations.
+ */
+public interface LocationManipulation {
+    /**
+     * Convert a Location into a Colon separated string to allow us to store it in text.
+     * <p>
+     * WORLD:X,Y,Z:yaw:pitch
+     * <p>
+     * The corresponding String2Loc function is {@link #stringToLocation}
+     *
+     * @param location The Location to save.
+     * @return The location as a string in this format: WORLD:x,y,z:yaw:pitch
+     */
+    String locationToString(Location location);
+
+    /**
+     * This method simply does some rounding, rather than forcing a call to the server to get the blockdata.
+     *
+     * @param l The location to round to the block location
+     * @return A rounded location.
+     */
+    Location getBlockLocation(Location l);
+
+    /**
+     * Returns a new location from a given string. The format is as follows:
+     * <p>
+     * WORLD:X,Y,Z:yaw:pitch
+     * <p>
+     * The corresponding Location2String function is {@link #stringToLocation}
+     *
+     * @param locationString The location represented as a string (WORLD:X,Y,Z:yaw:pitch)
+     * @return A new location defined by the string or null if the string was invalid.
+     */
+    Location stringToLocation(String locationString);
+
+    /**
+     * Returns a colored string with the coords.
+     *
+     * @param l The {@link Location}
+     * @return The {@link String}
+     */
+    String strCoords(Location l);
+
+    /**
+     * Converts a location to a printable readable formatted string including pitch/yaw.
+     *
+     * @param l The {@link Location}
+     * @return The {@link String}
+     */
+    String strCoordsRaw(Location l);
+
+    /**
+     * Return the NESW Direction a Location is facing.
+     *
+     * @param location The {@link Location}
+     * @return The NESW Direction
+     */
+    String getDirection(Location location);
+
+    /**
+     * Returns the float yaw position for the given cardinal direction.
+     *
+     * @param orientation The cardinal direction
+     * @return The yaw
+     */
+    float getYaw(String orientation);
+
+    /**
+     * Returns a speed float from a given vector.
+     *
+     * @param v The {@link Vector}
+     * @return The speed
+     */
+    float getSpeed(Vector v);
+
+    /**
+     * Returns a translated vector from the given direction.
+     *
+     * @param v The old {@link Vector}
+     * @param direction The new direction
+     * @return The translated {@link Vector}
+     */
+    Vector getTranslatedVector(Vector v, String direction);
+
+    /**
+     * Returns the next Location that a {@link Vehicle} is traveling at.
+     *
+     * @param v The {@link Vehicle}
+     * @return The {@link Location}
+     */
+    Location getNextBlock(Vehicle v);
+}
@@ -7,11 +7,17 @@

 package com.onarandombox.MultiverseCore.api;

+import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.Server;

 import java.util.logging.Level;

-/** A simple API to require plugins to have a log method. */
+/**
+ * A simple API to require plugins to have a log method.
+ *
+ * @deprecated Replaced by {@link Logging}.
+ * */
+@Deprecated
 public interface LoggablePlugin {
    /**
     * Logs a message at the specified level.
@@ -45,7 +45,7 @@ public interface MVDestination {
    boolean isThisType(JavaPlugin plugin, String destination);

    /**
-     * Returns the location a specific entity will spawn at.
+     * Returns the location a specific entity will spawn at when being teleported to this Destination.
     * <p>
     * To just retrieve the location as it is stored you can just pass null, but be warned some destinations may return
     * null back to you if you do this. It is always safer to pass an actual entity. This is used so things like
@@ -30,14 +30,14 @@ public interface MVPlugin extends LoggablePlugin {
    /**
     * Gets the reference to MultiverseCore.
     *
-     * @return A valid {@link MultiverseCore}.
+     * @return A valid {@link com.onarandombox.MultiverseCore}.
     */
    MultiverseCore getCore();

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

@@ -8,6 +8,7 @@
 package com.onarandombox.MultiverseCore.api;

 import com.onarandombox.MultiverseCore.utils.PurgeWorlds;
+import com.onarandombox.MultiverseCore.utils.SimpleWorldPurger;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldType;
@@ -28,37 +29,65 @@ 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 type       The Type of the world to be made.
-     * @param generator  The Custom generator plugin to use.
+     * @param name               World Name
+     * @param env                Environment Type
+     * @param seedString         The seed in the form of a string.
+     *                             If the seed is a Long,
+     *                             it will be interpreted as such.
+     * @param type               The Type of the world to be made.
+     * @param generateStructures If true, this world will get NPC villages.
+     * @param generator          The Custom generator plugin to use.
     * @return True if the world is added, false if not.
     */
-    boolean addWorld(String name, Environment env, String seedString, WorldType type, String generator);
+    boolean addWorld(String name, Environment env, String seedString, WorldType type, Boolean generateStructures,
+                     String generator);

    /**
     * Add a new World to the Multiverse Setup.
     *
-     * @param name           World Name
-     * @param env            Environment Type
-     * @param seedString     The seed in the form of a string.
-     *                       If the seed is a Long,
-     *                       it will be interpreted as such.
-     * @param type       The Type of the world to be made.
-     * @param generator      The Custom generator plugin to use.
+     * @param name               World Name
+     * @param env                Environment Type
+     * @param seedString         The seed in the form of a string.
+     *                             If the seed is a Long,
+     *                             it will be interpreted as such.
+     * @param type               The Type of the world to be made.
+     * @param generateStructures If true, this world will get NPC villages.
+     * @param generator          The Custom generator plugin to use.
     * @param useSpawnAdjust If true, multiverse will search for a safe spawn. If not, It will not modify the level.dat.
     * @return True if the world is added, false if not.
     */
-    boolean addWorld(String name, Environment env, String seedString, WorldType type, String generator, boolean useSpawnAdjust);
+    boolean addWorld(String name, Environment env, String seedString, WorldType type, Boolean generateStructures,
+                     String generator, boolean useSpawnAdjust);

    /**
-     * Remove the world from the Multiverse list, from the
-     * config and deletes the folder.
+     * Make a copy of a world.
     *
-     * @param name The name of the world to remove
+     * @param oldName            Name of world to be copied
+     * @param newName            Name of world to be created
+     * @param generator          The Custom generator plugin to use. Ignored.
+     * @return True if the world is copied successfully, false if not.
+     * @deprecated Use {@link #cloneWorld(String, String)} instead.
+     */
+    @Deprecated
+    boolean cloneWorld(String oldName, String newName, String generator);
+
+    /**
+     * Make a copy of a world.
+     *
+     * @param oldName
+     *            Name of world to be copied
+     * @param newName
+     *            Name of world to be created
+     * @return True if the world is copied successfully, false if not.
+     */
+    boolean cloneWorld(String oldName, String newName);
+
+    /**
+     * Remove the world from the Multiverse list, from the config and deletes
+     * the folder.
+     *
+     * @param name
+     *            The name of the world to remove
     * @return True if success, false if failure.
     */
    boolean deleteWorld(String name);
@@ -74,6 +103,17 @@ public interface MVWorldManager {
     */
    boolean deleteWorld(String name, boolean removeConfig);

+    /**
+     *
+     * @param name The name of the world to remove
+     * @param removeFromConfig If true(default), we'll remove the entries from the
+     *                         config. If false, they'll stay and the world may come back.
+     * @param deleteWorldFolder If true the world folder will be completely deleted. If false
+     *                          only the contents of the world folder will be deleted
+     * @return True if success, false if failure.
+     */
+    boolean deleteWorld(String name, boolean removeFromConfig, boolean deleteWorldFolder);
+
    /**
     * Unload a world from Multiverse.
     *
@@ -82,6 +122,15 @@ public interface MVWorldManager {
     */
    boolean unloadWorld(String name);

+    /**
+     * Unload a world from Multiverse with option to prevent calling unloadWorld in Bukkit.
+     *
+     * @param name Name of the world to unload
+     * @param unloadBukkit True if Bukkit world should be unloaded
+     * @return True if the world was unloaded, false if not.
+     */
+    boolean unloadWorld(String name, boolean unloadBukkit);
+
    /**
     * Loads the world. Only use this if the world has been
     * unloaded with {@link #unloadWorld(String)}.
@@ -150,7 +199,7 @@ public interface MVWorldManager {
    boolean isMVWorld(World world);

    /**
-     * Load the Worlds & Settings from the configuration file.
+     * Load the Worlds &amp; Settings from the configuration file.
     *
     * @param forceLoad If set to true, this will perform a total
     *                  reset and not just load new worlds.
@@ -158,7 +207,7 @@ public interface MVWorldManager {
    void loadWorlds(boolean forceLoad);

    /**
-     * Loads the Worlds & Settings for any worlds that bukkit loaded before us.
+     * Loads the Worlds &amp; Settings for any worlds that bukkit loaded before us.
     * <p>
     * This way people will _always_ have some worlds in the list.
     */
@@ -168,9 +217,21 @@ public interface MVWorldManager {
     * Return the World Purger.
     *
     * @return A valid {@link PurgeWorlds}.
+     * @deprecated {@link PurgeWorlds} is deprecated!
     */
+    @Deprecated
    PurgeWorlds getWorldPurger();

+    /**
+     * Gets the {@link WorldPurger}.
+     * <p>
+     * TODO: Remove {@link #getWorldPurger()} and replace it with this method.
+     * @return The {@link WorldPurger} this {@link MVWorldManager} is using.
+     * @see WorldPurger
+     * @see SimpleWorldPurger
+     */
+    WorldPurger getTheWorldPurger();
+
    /**
     * Gets the world players will spawn in on first join.
     * Currently this always returns worlds.get(0) from Bukkit.
@@ -227,4 +288,30 @@ public interface MVWorldManager {
     * @return The {@link MultiverseWorld} new players should spawn in.
     */
    MultiverseWorld getFirstSpawnWorld();
+
+    /**
+     * Regenerates a world.
+     *
+     * @param name Name of the world to regenerate
+     * @param useNewSeed If a new seed should be used
+     * @param randomSeed IF the new seed should be random
+     * @param seed The seed of the world.
+     *
+     * @return True if success, false if fail.
+     */
+    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed);
+
+    boolean isKeepingSpawnInMemory(World world);
+    
+    /**
+     * Checks whether Multiverse knows about a provided unloaded world. This
+     * method will check the parameter against the alias mappings.
+     *
+     * @param name The name of the unloaded world
+     * @param includeLoaded The value to return if the world is loaded
+     *
+     * @return True if the world exists and is unloaded. False if the world
+     * does not exist. {@code includeLoaded} if the world exists and is loaded.
+     */
+    boolean hasUnloadedWorld(String name, boolean includeLoaded);
 }
@@ -0,0 +1,230 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
+
+/**
+ * The configuration of MultiverseCore.
+ */
+public interface MultiverseCoreConfig extends ConfigurationSerializable {
+    /**
+     * Sets a property using a {@link String}.
+     * @param property The name of the property.
+     * @param value The value.
+     * @return True on success, false if the operation failed.
+     */
+    boolean setConfigProperty(String property, String value);
+
+    /**
+     * Sets portalCooldown.
+     * @param portalCooldown The new value.
+     */
+    void setTeleportCooldown(int portalCooldown);
+
+    /**
+     * Gets portalCooldown.
+     * @return portalCooldown.
+     */
+    int getTeleportCooldown();
+
+    /**
+     * Sets firstSpawnWorld.
+     * @param firstSpawnWorld The new value.
+     */
+    void setFirstSpawnWorld(String firstSpawnWorld);
+
+    /**
+     * Gets firstSpawnWorld.
+     * @return firstSpawnWorld.
+     */
+    String getFirstSpawnWorld();
+
+    /**
+     * Sets version.
+     * @param version The new value.
+     */
+    void setVersion(int version);
+
+    /**
+     * Gets version.
+     * @return version.
+     */
+    double getVersion();
+
+    /**
+     * Sets messageCooldown.
+     * @param messageCooldown The new value.
+     */
+    void setMessageCooldown(int messageCooldown);
+
+    /**
+     * Gets messageCooldown.
+     * @return messageCooldown.
+     */
+    int getMessageCooldown();
+
+    /**
+     * Sets globalDebug.
+     * @param globalDebug The new value.
+     */
+    void setGlobalDebug(int globalDebug);
+
+    /**
+     * Gets globalDebug.
+     * @return globalDebug.
+     */
+    int getGlobalDebug();
+
+    /**
+     * Sets displayPermErrors.
+     * @param displayPermErrors The new value.
+     */
+    void setDisplayPermErrors(boolean displayPermErrors);
+
+    /**
+     * Gets displayPermErrors.
+     * @return displayPermErrors.
+     */
+    boolean getDisplayPermErrors();
+
+    /**
+     * Sets firstSpawnOverride.
+     * @param firstSpawnOverride The new value.
+     */
+    void setFirstSpawnOverride(boolean firstSpawnOverride);
+
+    /**
+     * Gets firstSpawnOverride.
+     * @return firstSpawnOverride.
+     */
+    boolean getFirstSpawnOverride();
+
+    /**
+     * Sets teleportIntercept.
+     * @param teleportIntercept The new value.
+     */
+    void setTeleportIntercept(boolean teleportIntercept);
+
+    /**
+     * Gets teleportIntercept.
+     * @return teleportIntercept.
+     */
+    boolean getTeleportIntercept();
+
+    /**
+     * Sets prefixChat.
+     * @param prefixChat The new value.
+     */
+    void setPrefixChat(boolean prefixChat);
+
+    /**
+     * Gets prefixChat.
+     * @return prefixChat.
+     */
+    boolean getPrefixChat();
+    
+    /**
+     * Sets prefixChatFormat.
+     * @param prefixChatFormat The new value.
+     */
+    void setPrefixChatFormat(String prefixChatFormat);
+
+    /**
+     * Gets prefixChatFormat.
+     * @return prefixChatFormat.
+     */
+    String getPrefixChatFormat();
+
+    /**
+     * Sets enforceAccess.
+     * @param enforceAccess The new value.
+     */
+    void setEnforceAccess(boolean enforceAccess);
+
+    /**
+     * Gets enforceAccess.
+     * @return enforceAccess.
+     */
+    boolean getEnforceAccess();
+
+    /**
+     * Sets useasyncchat.
+     * @param useAsyncChat The new value.
+     */
+    void setUseAsyncChat(boolean useAsyncChat);
+
+    /**
+     * Gets useasyncchat.
+     * @return useasyncchat.
+     */
+    boolean getUseAsyncChat();
+
+    /**
+     * Sets whether to suppress startup messages.
+     *
+     * @param silentStart true to suppress messages.
+     */
+    void setSilentStart(boolean silentStart);
+
+    /**
+     * Whether we are suppressing startup messages.
+     *
+     * @return true if we are suppressing startup messages.
+     */
+    boolean getSilentStart();
+
+    /**
+     * Sets whether or not to let Bukkit determine portal search radius on its own or if Multiverse should give input.
+     *
+     * @param useDefaultPortalSearch True to let Bukkit determine portal search radius on its own.
+     */
+    void setUseDefaultPortalSearch(boolean useDefaultPortalSearch);
+
+    /**
+     * Gets whether or not Bukkit will be determining portal search radius on its own or if Multiverse should help.
+     *
+     * @return True means Bukkit will use its own default values.
+     */
+    boolean isUsingDefaultPortalSearch();
+
+    /**
+     * Sets the radius at which vanilla style portals will be searched for to connect to worlds together.
+     *
+     * @param searchRadius The portal search radius.
+     */
+    void setPortalSearchRadius(int searchRadius);
+
+    /**
+     * Gets the radius at which vanilla style portals will be searched for to connect to worlds together.
+     *
+     * @return The portal search radius.
+     */
+    int getPortalSearchRadius();
+
+    /**
+     * Gets whether or not the automatic purge of entities is enabled.
+     *
+     * @return True if automatic purge is enabled.
+     */
+    boolean isAutoPurgeEnabled();
+
+    /**
+     * Sets whether or not the automatic purge of entities is enabled.
+     *
+     * @param autopurge True if automatic purge should be enabled.
+     */
+    void setAutoPurgeEnabled(boolean autopurge);
+
+    /**
+     * Gets whether or not the donation/patreon messages are shown.
+     *
+     * @return True if donation/patreon messages should be shown.
+     */
+    boolean isShowingDonateMessage();
+
+    /**
+     * Sets whether or not the donation/patreon messages are shown.
+     *
+     * @param idonotwanttodonate True if donation/patreon messages should be shown.
+     */
+    void setShowDonateMessage(boolean idonotwanttodonate);
+}
@@ -0,0 +1,56 @@
+package com.onarandombox.MultiverseCore.api;
+
+import java.util.Collection;
+
+import org.bukkit.command.CommandSender;
+
+/**
+ * Multiverse-messaging.
+ */
+public interface MultiverseMessaging {
+    /**
+     * Sets the message-cooldown.
+     * @param milliseconds The new message-cooldown in milliseconds.
+     */
+    void setCooldown(int milliseconds);
+
+    /**
+     * Sends a message to the specified sender if the cooldown has passed.
+     *
+     * @param sender         The person/console to send the message to.
+     * @param message        The message to send.
+     * @param ignoreCooldown If true this message will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
+    boolean sendMessage(CommandSender sender, String message, boolean ignoreCooldown);
+
+    /**
+     * Sends a group of messages to the specified sender if the cooldown has passed.
+     * This method is needed, since sending many messages in quick succession would violate
+     * the cooldown.
+     *
+     * @param sender         The person/console to send the message to.
+     * @param messages       The messages to send.
+     * @param ignoreCooldown If true these messages will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
+    boolean sendMessages(CommandSender sender, String[] messages, boolean ignoreCooldown);
+
+    /**
+     * Sends a group of messages to the specified sender if the cooldown has passed.
+     * This method is needed, since sending many messages in quick succession would violate
+     * the cooldown.
+     *
+     * @param sender         The person/console to send the message to.
+     * @param messages       The messages to send.
+     * @param ignoreCooldown If true these messages will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
+    boolean sendMessages(CommandSender sender, Collection<String> messages, boolean ignoreCooldown);
+
+    /**
+     * Gets the message-cooldown.
+     * @return The message-cooldown.
+     */
+    int getCooldown();
+}
@@ -0,0 +1,161 @@
+package com.onarandombox.MultiverseCore.api;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.utils.DebugLog;
+import com.pneumaticraft.commandhandler.CommandHandler;
+
+/**
+ * Make things easier for MV-Plugins!
+ */
+public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
+    private MultiverseCore core;
+    /**
+     * Prefix for standard log entrys.
+     */
+    protected String logTag;
+    private DebugLog debugLog;
+
+    /**
+     * {@inheritDoc}
+     *
+     * Note: You can't override this, use {@link #onPluginEnable()} instead!
+     * @see #onPluginEnable()
+     */
+    @Override
+    public final void onEnable() {
+        MultiverseCore theCore = (MultiverseCore) this.getServer().getPluginManager().getPlugin("Multiverse-Core");
+        if (theCore == null) {
+            this.getLogger().severe("Core not found! The plugin dev needs to add a dependency!");
+            this.getLogger().severe("Disabling!");
+            this.getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+        if (theCore.getProtocolVersion() < this.getProtocolVersion()) {
+            this.getLogger().severe("You need a newer version of Multiverse-Core!");
+            this.getLogger().severe("Disabling!");
+            this.getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+        this.setCore(theCore);
+
+        this.getServer().getLogger().info(String.format("%s - Version %s enabled - By %s",
+                this.getDescription().getName(), this.getDescription().getVersion(), getAuthors()));
+        getDataFolder().mkdirs();
+        File debugLogFile = new File(getDataFolder(), "debug.log");
+        try {
+            debugLogFile.createNewFile();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        debugLog = new DebugLog(this.getDescription().getName(), getDataFolder() + File.separator + "debug.log");
+        debugLog.setTag(String.format("[%s-Debug]", this.getDescription().getName()));
+
+        this.onPluginEnable();
+    }
+
+    /**
+     * Parse the Authors Array into a readable String with ',' and 'and'.
+     *
+     * @return The readable authors-{@link String}
+     */
+    protected String getAuthors() {
+        String authors = "";
+        List<String> auths = this.getDescription().getAuthors();
+        if (auths.size() == 0) {
+            return "";
+        }
+
+        if (auths.size() == 1) {
+            return auths.get(0);
+        }
+
+        for (int i = 0; i < auths.size(); i++) {
+            if (i == this.getDescription().getAuthors().size() - 1) {
+                authors += " and " + this.getDescription().getAuthors().get(i);
+            } else {
+                authors += ", " + this.getDescription().getAuthors().get(i);
+            }
+        }
+        return authors.substring(2);
+    }
+
+    /**
+     * Called when the plugin is enabled.
+     * @see #onEnable()
+     */
+    protected abstract void onPluginEnable();
+
+    /**
+     * You can register commands here.
+     * @param handler The CommandHandler.
+     */
+    protected abstract void registerCommands(CommandHandler handler);
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!this.isEnabled()) {
+            sender.sendMessage("This plugin is Disabled!");
+            return true;
+        }
+
+        ArrayList<String> allArgs = new ArrayList<String>(args.length + 1);
+        allArgs.add(command.getName());
+        allArgs.addAll(Arrays.asList(args));
+        return this.getCore().getCommandHandler().locateAndRunCommand(sender, allArgs);
+    }
+
+    @Override
+    public void log(Level level, String msg) {
+        int debugLevel = this.getCore().getMVConfig().getGlobalDebug();
+        if ((level == Level.FINE && debugLevel >= 1) || (level == Level.FINER && debugLevel >= 2)
+                || (level == Level.FINEST && debugLevel >= 3)) {
+            debugLog.log(level, msg);
+        } else if (level != Level.FINE && level != Level.FINER && level != Level.FINEST) {
+            String message = new StringBuilder(getLogTag()).append(msg).toString();
+            this.getServer().getLogger().log(level, message);
+            debugLog.log(level, message);
+        }
+    }
+
+    private String getLogTag() {
+        if (logTag == null)
+            logTag = String.format("[%s]", this.getDescription().getName());
+        return logTag;
+    }
+
+    /**
+     * Sets the debug log-tag.
+     * @param tag The new tag.
+     */
+    protected final void setDebugLogTag(String tag) {
+        this.debugLog.setTag(tag);
+    }
+
+    @Override
+    public final String dumpVersionInfo(String buffer) {
+        throw new UnsupportedOperationException("This is gone.");
+    }
+
+    @Override
+    public final MultiverseCore getCore() {
+        if (this.core == null)
+            throw new IllegalStateException("Core is null!");
+        return this.core;
+    }
+
+    @Override
+    public final void setCore(MultiverseCore core) {
+        this.core = core;
+    }
+}
@@ -7,17 +7,18 @@

 package com.onarandombox.MultiverseCore.api;

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

 import java.util.List;

@@ -25,7 +26,6 @@ import java.util.List;
 * The API for a Multiverse Handled World.
 */
 public interface MultiverseWorld {
-
    /**
     * Returns the Bukkit world object that this world describes.
     *
@@ -34,79 +34,24 @@ public interface MultiverseWorld {
    World getCBWorld();

    /**
-     * Adds the property to the given value.
-     * It will throw a PropertyDoesNotExistException if the property is not found.
+     * Gets the name of this world. The name cannot be changed.
+     * <p>
+     * Note for plugin developers: Usually {@link #getAlias()}
+     * is what you want to use instead of this method.
     *
-     * @param property The name of a 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.
+     * @return The name of the world as a String.
     */
-    boolean setProperty(String property, String value, CommandSender sender) throws PropertyDoesNotExistException;
+    String getName();

    /**
-     * Gets the actual MVConfigProperty from this world.
-     * It will throw a PropertyDoesNotExistException if the property is not found.
+     * Gets the type of this world. As of 1.2 this will be:
+     * FLAT, NORMAL or VERSION_1_1
+     * <p>
+     * This is <b>not</b> the generator.
     *
-     * @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
+     * @return The Type of this world.
     */
-    @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);
+    WorldType getWorldType();

    /**
     * Gets the environment of this world.
@@ -124,27 +69,137 @@ public interface MultiverseWorld {
     */
    void setEnvironment(World.Environment environment);

+    /**
+     * Gets the difficulty of this world.
+     *
+     * @return The difficulty of this world.
+     */
+    Difficulty getDifficulty();
+
+    /**
+     * Sets the difficulty of this world and returns true if success.
+     * Valid string values are either an integer of difficulty(0-3) or
+     * the name that resides in the Bukkit enum, ex. {@code PEACEFUL}
+     *
+     * @param difficulty The difficulty to set the world to as a string.
+     * @return True if success, false if the provided string
+     *         could not be translated to a difficulty.
+     * @deprecated Use {@link #setDifficulty(Difficulty)} or, if you have to
+     * pass a string, use {@link #setPropertyValue(String, String)} instead.
+     */
+    @Deprecated
+    boolean setDifficulty(String difficulty);
+
+    /**
+     * Sets the difficulty of this world and returns {@code true} on success.
+     * Valid string values are either an integer of difficulty(0-3) or
+     * the name that resides in the Bukkit enum, ex. PEACEFUL
+     *
+     * @param difficulty The new difficulty.
+     * @return True if success, false if the operation failed... for whatever reason.
+     */
+    boolean setDifficulty(Difficulty difficulty);
+
    /**
     * Gets the world seed of this world.
     *
     * @return The Long version of the seed.
     */
-    Long getSeed();
+    long getSeed();

    /**
     * Sets the seed of this world.
     *
     * @param seed A Long that is the seed.
     */
-    void setSeed(Long seed);
+    void setSeed(long seed);

    /**
-     * Gets the name of this world. This cannot be changed.
+     * Gets the generator of this world.
     *
-     * @return The name of the world as a String.
+     * @return The name of the generator.
     */
-    String getName();
+    String getGenerator();

+    /**
+     * Sets the generator of this world.
+     *
+     * @param generator The new generator's name.
+     */
+    void setGenerator(String generator);
+
+    /**
+     * Gets the help-message for a property.
+     * @param property The name of the property.
+     * @return The help-message.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found.
+     */
+    String getPropertyHelp(String property) throws PropertyDoesNotExistException;
+
+    /**
+     * Gets a property as {@link String}.
+     *
+     * @param property The name of a world property to get.
+     * @return The string-representation of that property.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     */
+    String getPropertyValue(String property) throws PropertyDoesNotExistException;
+
+    /**
+     * Sets a property to a given value.
+     *
+     * @param property The name of a world property to set.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @return True if the value was set, false if not.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     */
+    boolean setPropertyValue(String property, String value) throws PropertyDoesNotExistException;
+
+    /**
+     * Adds a value to the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     *
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to add a value to.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @return True if the value was added, false if not.
+     * @deprecated We changed the entire world-config-system. This is not compatible any more.
+     */
+    @Deprecated
+    boolean addToVariable(String property, String value);
+
+    /**
+     * Removes a value from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     *
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to remove a value
+     *                 from.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @return True if the value was removed, false if not.
+     * @deprecated We changed the entire world-config-system. This is not compatible any more.
+     */
+    @Deprecated
+    boolean removeFromVariable(String property, String value);
+
+    /**
+     * Removes all values from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     *
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to clear.
+     * @return True if it was cleared, false if not.
+     * @deprecated We changed the entire world-config-system. This is not compatible any more.
+     */
+    @Deprecated
+    boolean clearVariable(String property);
+
+    /**
+     * Clears a list property (sets it to []).
+     *
+     * @param property The property to clear.
+     * @return True if success, false if fail.
+     * @deprecated We changed the entire world-config-system. This is not compatible any more.
+     */
+    @Deprecated
+    boolean clearList(String property);
+    // end of old config stuff
+
+    // permission stuff
    /**
     * Gets the lowercased name of the world. This method is required, since the permissables
     * lowercase all permissions when recalculating.
@@ -157,6 +212,21 @@ public interface MultiverseWorld {
     */
    String getPermissibleName();

+    /**
+     * Gets the permission required to enter this world.
+     *
+     * @return The permission required to be exempt from charges to/from this world.
+     */
+    Permission getAccessPermission();
+
+    /**
+     * Gets the permission required to be exempt when entering.
+     *
+     * @return The permission required to be exempt when entering.
+     */
+    Permission getExemptPermission();
+    // end of permission stuff
+
    /**
     * Gets the alias of this world.
     * <p>
@@ -173,6 +243,13 @@ public interface MultiverseWorld {
     */
    void setAlias(String alias);

+    /**
+     * Gets the color that this world's name/alias will display as.
+     *
+     * @return The color of this world.
+     */
+    ChatColor getColor();
+
    /**
     * Sets the color that this world's name/alias will display as.
     *
@@ -182,18 +259,29 @@ public interface MultiverseWorld {
    boolean setColor(String color);

    /**
-     * Gets the color that this world's name/alias will display as.
+     * Gets the style that this world's name/alias will display as.
     *
-     * @return The color of this world.
+     * @return The style of this world. {@code null} for "normal" style.
     */
-    ChatColor getColor();
+    ChatColor getStyle();
+
+    /**
+     * Sets the style that this world's name/alias will display as.
+     *
+     * @param style A valid style name.
+     * @return True if the style was set, false if not.
+     */
+    boolean setStyle(String style);

    /**
     * Tells you if someone entered a valid color.
     *
     * @param color A string that may translate to a color.
     * @return True if it is a color, false if not.
+     *
+     * @deprecated This has been moved: {@link com.onarandombox.MultiverseCore.enums.EnglishChatColor#isValidAliasColor(String)}
     */
+    @Deprecated
    boolean isValidAliasColor(String color);

    /**
@@ -203,6 +291,7 @@ public interface MultiverseWorld {
     */
    String getColoredWorldString();

+    // animals&monster stuff
    /**
     * Gets whether or not animals are allowed to spawn in this world.
     *
@@ -210,6 +299,22 @@ public interface MultiverseWorld {
     */
    boolean canAnimalsSpawn();

+    /**
+     * Sets whether or not animals can spawn.
+     * If there are values in {@link #getAnimalList()} and this is false,
+     * those animals become the exceptions, and will spawn
+     *
+     * @param allowAnimalSpawn True to allow spawning of monsters, false to prevent.
+     */
+    void setAllowAnimalSpawn(boolean allowAnimalSpawn);
+
+    /**
+     * Returns a list of animals. This list always negates the {@link #canAnimalsSpawn()} result.
+     *
+     * @return A list of animals that will spawn if {@link #canAnimalsSpawn()} is false.
+     */
+    List<String> getAnimalList();
+
    /**
     * Gets whether or not monsters are allowed to spawn in this world.
     *
@@ -218,7 +323,31 @@ public interface MultiverseWorld {
    boolean canMonstersSpawn();

    /**
-     * Turn pvp on or off. This setting is used to set the world's PVP mode, and thus relies on fakePVP
+     * Sets whether or not monsters can spawn.
+     * If there are values in {@link #getMonsterList()} and this is false,
+     * those monsters become the exceptions, and will spawn
+     *
+     * @param allowMonsterSpawn True to allow spawning of monsters, false to prevent.
+     */
+    void setAllowMonsterSpawn(boolean allowMonsterSpawn);
+
+    /**
+     * Returns a list of monsters. This list always negates the {@link #canMonstersSpawn()} result.
+     *
+     * @return A list of monsters that will spawn if {@link #canMonstersSpawn()} is false.
+     */
+    List<String> getMonsterList();
+    // end of animal&monster stuff
+
+    /**
+     * Gets whether or not PVP is enabled in this world in some form (fake or not).
+     *
+     * @return True if players can take damage from other players.
+     */
+    boolean isPVPEnabled();
+
+    /**
+     * Turn pvp on or off. This setting is used to set the world's PVP mode.
     *
     * @param pvpMode True to enable PVP damage, false to disable it.
     */
@@ -233,13 +362,6 @@ public interface MultiverseWorld {
    @Deprecated
    boolean getFakePVP();

-    /**
-     * Gets whether or not PVP is enabled in this world in some form (fake or not).
-     *
-     * @return True if players can take damage from other players.
-     */
-    boolean isPVPEnabled();
-
    /**
     * Gets whether or not this world will display in chat, mvw and mvl regardless if a user has the
     * access permissions to go to this world.
@@ -256,6 +378,13 @@ public interface MultiverseWorld {
     */
    void setHidden(boolean hidden);

+    /**
+     * Gets whether weather is enabled in this world.
+     *
+     * @return True if weather events will occur, false if not.
+     */
+    boolean isWeatherEnabled();
+
    /**
     * Sets whether or not there will be weather events in a given world.
     * If set to false, Multiverse will disable the weather in the world immediately.
@@ -265,11 +394,11 @@ public interface MultiverseWorld {
    void setEnableWeather(boolean enableWeather);

    /**
-     * Gets whether weather is enabled in this world.
+     * Gets whether or not CraftBukkit is keeping the chunks for this world in memory.
     *
-     * @return True if weather events will occur, false if not.
+     * @return True if CraftBukkit is keeping spawn chunks in memory.
     */
-    boolean isWeatherEnabled();
+    boolean isKeepingSpawnInMemory();

    /**
     * If true, tells Craftbukkit to keep a worlds spawn chunks loaded in memory (default: true)
@@ -281,29 +410,11 @@ public interface MultiverseWorld {
    void setKeepSpawnInMemory(boolean keepSpawnInMemory);

    /**
-     * Gets whether or not CraftBukkit is keeping the chunks for this world in memory.
+     * Gets the spawn location of this world.
     *
-     * @return True if CraftBukkit is keeping spawn chunks in memory.
+     * @return The spawn location of this world.
     */
-    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();
+    Location getSpawnLocation();

    /**
     * Sets the spawn location for a world.
@@ -313,11 +424,11 @@ public interface MultiverseWorld {
    void setSpawnLocation(Location spawnLocation);

    /**
-     * Gets the spawn location of this world.
+     * Gets whether or not the hunger level of players will go down in a world.
     *
-     * @return The spawn location of this world.
+     * @return True if it will go down, false if it will remain steady.
     */
-    Location getSpawnLocation();
+    boolean getHunger();

    /**
     * Sets whether or not the hunger level of players will go down in a world.
@@ -327,22 +438,6 @@ public interface MultiverseWorld {
     */
    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.
     *
@@ -351,27 +446,24 @@ public interface MultiverseWorld {
    GameMode getGameMode();

    /**
-     * Gets the permission required to enter this world.
+     * Sets the game mode of this world.
     *
-     * @return The permission required to be exempt from charges to/from this world.
+     * @param gameMode A valid game mode string (either
+     *                 an int ex. 0 or a string ex. creative).
+     * @return True if the game mode was successfully changed, false if not.
+     * @deprecated Use {@link #setGameMode(GameMode)} instead. If you have to
+     * pass a string, use {@link #setPropertyValue(String, String)}.
     */
-    Permission getAccessPermission();
+    @Deprecated
+    boolean setGameMode(String gameMode);

    /**
-     * Gets the permission required to be exempt when entering.
+     * Sets the game mode of this world.
     *
-     * @return The permission required to be exempt when entering.
+     * @param gameMode The new {@link GameMode}.
+     * @return True if the game mode was successfully changed, false if not.
     */
-    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);
+    boolean setGameMode(GameMode gameMode);

    /**
     * Gets the amount of currency it requires to enter this world.
@@ -380,20 +472,38 @@ public interface MultiverseWorld {
     */
    double getPrice();

+    /**
+     * Sets the price for entry to this world.
+     * You can think of this like an amount.
+     * The type can be set with {@link #setCurrency(Material)}
+     *
+     * @param price The Amount of money/item to enter the world.
+     */
+    void setPrice(double price);
+
+    /**
+     * Gets the type of currency that will be used when users enter this world. A value of null indicates a non-item
+     * based currency is used.
+     *
+     * @return The type of currency that will be used when users enter this world.
+     */
+    @Nullable
+    Material getCurrency();
+
    /**
     * Sets the type of item that will be required given the price is not 0.
-     * Use -1 to use an AllPay economy, or any valid itemid
+     * Use a value of null to specify a non-item based currency.
     *
     * @param item The Type of currency that will be used when users enter this world.
     */
-    void setCurrency(int item);
+    void setCurrency(@Nullable Material item);

    /**
-     * Gets the Type of currency that will be used when users enter this world.
+     * Gets the world players will respawn in if they die in this one.
     *
-     * @return The Type of currency that will be used when users enter this world.
+     * @return A world that exists on the server.
     */
-    int getCurrency();
+    World getRespawnToWorld();

    /**
     * Sets the world players will respawn in if they die in this one.
@@ -405,11 +515,12 @@ public interface MultiverseWorld {
    boolean setRespawnToWorld(String respawnWorld);

    /**
-     * Gets the world players will respawn in if they die in this one.
+     * Gets the scaling value of this world.Really only has an effect if you use
+     * Multiverse-NetherPortals.
     *
-     * @return A world that exists on the server.
+     * @return This world's non-negative, non-zero scale.
     */
-    World getRespawnToWorld();
+    double getScaling();

    /**
     * Sets the scale of this world. Really only has an effect if you use
@@ -421,60 +532,11 @@ public interface MultiverseWorld {
    boolean setScaling(double scaling);

    /**
-     * Gets the scaling value of this world.Really only has an effect if you use
-     * Multiverse-NetherPortals.
+     * Gets whether or not a world will auto-heal players if the difficulty is on peaceful.
     *
-     * @return This world's non-negative, non-zero scale.
+     * @return True if the world should heal (default), false if not.
     */
-    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);
+    boolean getAutoHeal();

    /**
     * Sets whether or not a world will auto-heal players if the difficulty is on peaceful.
@@ -484,11 +546,11 @@ public interface MultiverseWorld {
    void setAutoHeal(boolean heal);

    /**
-     * Gets whether or not a world will auto-heal players if the difficulty is on peaceful.
+     * Gets whether or not Multiverse should auto-adjust the spawn for this world.
     *
-     * @return True if the world should heal (default), false if not.
+     * @return True if Multiverse should adjust the spawn, false if not.
     */
-    boolean getAutoHeal();
+    boolean getAdjustSpawn();

    /**
     * Sets whether or not Multiverse should auto-adjust the spawn for this world.
@@ -498,11 +560,11 @@ public interface MultiverseWorld {
    void setAdjustSpawn(boolean adjust);

    /**
-     * Gets whether or not Multiverse should auto-adjust the spawn for this world.
+     * Gets whether or not Multiverse should auto-load this world.
     *
-     * @return True if Multiverse should adjust the spawn, false if not.
+     * @return True if Multiverse should auto-load this world.
     */
-    boolean getAdjustSpawn();
+    boolean getAutoLoad();

    /**
     * Sets whether or not Multiverse should auto-load this world.
@@ -514,11 +576,12 @@ public interface MultiverseWorld {
    void setAutoLoad(boolean autoLoad);

    /**
-     * Gets whether or not Multiverse should auto-load this world.
+     * 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 Multiverse should auto-load this world.
+     * @return True if players dying in this world should respawn at their bed.
     */
-    boolean getAutoLoad();
+    boolean getBedRespawn();

    /**
     * Sets whether or not a player who dies in this world will respawn in their
@@ -531,19 +594,26 @@ public interface MultiverseWorld {
    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.
+     * Sets the player limit for this world after which players without an override
+     * permission node will not be allowed in. A value of -1 or less signifies no limit
     *
-     * @return True if players dying in this world should respawn at their bed.
+     * @param limit The new limit
     */
-    boolean getBedRespawn();
+    void setPlayerLimit(int limit);

    /**
-     * Gets all the names of all properties that can be SET.
+     * Gets the player limit for this world after which players without an override
+     * permission node will not be allowed in. A value of -1 or less signifies no limit
     *
-     * @return All property names, with alternating colors.
+     * @return The player limit
     */
-    String getAllPropertyNames();
+    int getPlayerLimit();
+
+    /**
+     * Same as {@link #getTime()}, but returns a string.
+     * @return The time as a short string: 12:34pm
+     */
+    String getTime();

    /**
     * Sets the current time in a world.
@@ -559,18 +629,46 @@ public interface MultiverseWorld {
    boolean setTime(String timeAsString);

    /**
-     * Same as {@link #getTime()}, but returns a string.
-     * @return The time as a short string: 12:34pm
+     * Sets The types of portals that are allowed in this world.
+     *
+     * @param type The type of portals allowed in this world.
     */
-    String getTime();
+    void allowPortalMaking(AllowedPortalType type);

    /**
-     * Gets the type of this world. As of 1.1-R1 this will be:
-     * FLAT or NORMAL
-     * <p>
-     * This is *not* the generator.
+     * Gets which type(s) of portals are allowed to be constructed in this world.
     *
-     * @return The Type of this world.
+     * @return The type of portals that are allowed.
     */
-    WorldType getWorldType();
+    AllowedPortalType getAllowedPortals();
+
+    // properties that are not "getter+setter" style
+    /**
+     * Gets a list of all the worlds that players CANNOT travel to from this world,
+     * regardless of their access permissions.
+     *
+     * @return A List of world names.
+     */
+    List<String> getWorldBlacklist();
+
+    /**
+     * Gets all the names of all properties that can be SET.
+     *
+     * @return All property names, with alternating colors.
+     */
+    String getAllPropertyNames();
+
+    /**
+     * Whether or not players are allowed to fly in this world.
+     *
+     * @return True if players allowed to fly in this world.
+     */
+    boolean getAllowFlight();
+
+    /**
+     * Sets whether or not players are allowed to fly in this world.
+     *
+     * @param allowFlight True to allow flight in this world.
+     */
+    void setAllowFlight(final boolean allowFlight);
 }
@@ -0,0 +1,71 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+
+import com.onarandombox.MultiverseCore.enums.TeleportResult;
+
+/**
+ * Used to safely teleport people.
+ */
+public interface SafeTTeleporter extends Teleporter {
+
+    /**
+     * Gets the next safe location around the given location.
+     * @param l A {@link Location}.
+     * @return A safe {@link Location}.
+     */
+    Location getSafeLocation(Location l);
+
+    /**
+     * Gets the next safe location around the given location.
+     * @param l A {@link Location}.
+     * @param tolerance The tolerance.
+     * @param radius The radius.
+     * @return A safe {@link Location}.
+     */
+    Location getSafeLocation(Location l, int tolerance, int radius);
+
+    /**
+     * Safely teleport the entity to the MVDestination. This will perform checks to see if the place is safe, and if
+     * it's not, will adjust the final destination accordingly.
+     *
+     * @param teleporter Person who performed the teleport command.
+     * @param teleportee Entity to teleport
+     * @param d          Destination to teleport them to
+     * @return true for success, false for failure
+     */
+    TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, MVDestination d);
+
+    /**
+     * Safely teleport the entity to the Location. This may perform checks to
+     * see if the place is safe, and if
+     * it's not, will adjust the final destination accordingly.
+     *
+     * @param teleporter Person who issued the teleport command.
+     * @param teleportee Entity to teleport.
+     * @param location   Location to teleport them to.
+     * @param safely     Should the destination be checked for safety before teleport?
+     * @return true for success, false for failure.
+     */
+    TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, Location location,
+            boolean safely);
+
+    /**
+     * Returns a safe location for the entity to spawn at.
+     *
+     * @param e The entity to spawn
+     * @param d The MVDestination to take the entity to.
+     * @return A new location to spawn the entity at.
+     */
+    Location getSafeLocation(Entity e, MVDestination d);
+
+    /**
+     * Finds a portal-block next to the specified {@link Location}.
+     * @param l The {@link Location}
+     * @return The next portal-block's {@link Location}.
+     */
+    Location findPortalBlockNextTo(Location l);
+
+}
@@ -0,0 +1,10 @@
+package com.onarandombox.MultiverseCore.api;
+
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.enums.TeleportResult;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public interface Teleporter {
+    TeleportResult teleport(CommandSender teleporter, Player teleportee, MVDestination destination);
+}
@@ -0,0 +1,68 @@
+package com.onarandombox.MultiverseCore.api;
+
+import java.util.List;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+
+/**
+ * Used to remove animals from worlds that don't belong there.
+ */
+public interface WorldPurger {
+    /**
+     * Synchronizes the given worlds with their settings.
+     *
+     * @param worlds A list of {@link MultiverseWorld}
+     */
+    void purgeWorlds(List<MultiverseWorld> worlds);
+
+    /**
+     * Convenience method for {@link #purgeWorld(MultiverseWorld, java.util.List, boolean, boolean)} that takes the settings from the world-config.
+     *
+     * @param world The {@link MultiverseWorld}.
+     */
+    void purgeWorld(MultiverseWorld world);
+
+    /**
+     * Clear all animals/monsters that do not belong to a world according to the config.
+     *
+     * @param mvworld The {@link MultiverseWorld}.
+     * @param thingsToKill A {@link List} of animals/monsters to be killed.
+     * @param negateAnimals Whether the monsters in the list should be negated.
+     * @param negateMonsters Whether the animals in the list should be negated.
+     */
+    void purgeWorld(MultiverseWorld mvworld, List<String> thingsToKill, boolean negateAnimals,
+            boolean negateMonsters);
+
+    /**
+     * Clear all animals/monsters that do not belong to a world according to the config.
+     *
+     * @param mvworld The {@link MultiverseWorld}.
+     * @param thingsToKill A {@link List} of animals/monsters to be killed.
+     * @param negateAnimals Whether the monsters in the list should be negated.
+     * @param negateMonsters Whether the animals in the list should be negated.
+     * @param sender The {@link CommandSender} that initiated the action. He will/should be notified.
+     */
+    void purgeWorld(MultiverseWorld mvworld, List<String> thingsToKill, boolean negateAnimals,
+            boolean negateMonsters, CommandSender sender);
+
+    /**
+     * Determines whether the specified creature should be killed.
+     *
+     * @param e The creature.
+     * @param thingsToKill A {@link List} of animals/monsters to be killed.
+     * @param negateAnimals Whether the monsters in the list should be negated.
+     * @param negateMonsters Whether the animals in the list should be negated.
+     * @return {@code true} if the creature should be killed, otherwise {@code false}.
+     */
+    boolean shouldWeKillThisCreature(Entity e, List<String> thingsToKill, boolean negateAnimals, boolean negateMonsters);
+
+    /**
+     * Determines whether the specified creature should be killed and automatically reads the params from a world object.
+     *
+     * @param w The world.
+     * @param e The creature.
+     * @return {@code true} if the creature should be killed, otherwise {@code false}.
+     */
+    boolean shouldWeKillThisCreature(MultiverseWorld w, Entity e);
+}
@@ -11,6 +11,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;

 import java.util.ArrayList;
@@ -34,7 +35,11 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "otherthing");
        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "awesomething " + ChatColor.RED + "-d");
        this.addCommandExample("/mv anchors ");
-        this.setPermission("multiverse.core.anchor", "Allows management of Anchor Destinations.", PermissionDefault.OP);
+        this.setPermission("multiverse.core.anchor.list", "Allows a player to list all anchors.", PermissionDefault.OP);
+        this.addAdditonalPermission(new Permission("multiverse.core.anchor.create",
+                "Allows a player to create anchors.", PermissionDefault.OP));
+        this.addAdditonalPermission(new Permission("multiverse.core.anchor.delete",
+                "Allows a player to delete anchors.", PermissionDefault.OP));
        this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
    }

@@ -49,6 +54,11 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
    }

    private void showList(CommandSender sender, List<String> args) {
+        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.list", true)) {
+            sender.sendMessage(ChatColor.RED + "You don't have the permission to list anchors!");
+            return;
+        }
+
        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse Anchor List ]====");
        Player p = null;
        if (sender instanceof Player) {
@@ -85,6 +95,8 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {

        if (filterObject.getPage() > totalPages) {
            filterObject.setPage(totalPages);
+        } else if (filterObject.getPage() < 1) {
+            filterObject.setPage(1);
        }

        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
@@ -98,11 +110,19 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
            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!");
+        if (args.size() == 1 && (this.getPageAndFilter(args).getPage() != 1 || args.get(0).equals("1"))) {
+            this.showList(sender, args);
+            return;
+        }
+        if (args.size() == 2 && args.get(1).equalsIgnoreCase("-d")) {
+            if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.delete", true)) {
+                sender.sendMessage(ChatColor.RED + "You don't have the permission to delete anchors!");
            } else {
-                sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "deleted!");
+                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;
        }
@@ -111,13 +131,17 @@ public class AnchorCommand extends PaginatedCoreCommand<String> {
            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!");
-        }

+        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.create", true)) {
+            sender.sendMessage(ChatColor.RED + "You don't have the permission to create anchors!");
+        } else {
+            Player player = (Player) sender;
+            if (this.plugin.getAnchorManager().saveAnchorLocation(args.get(0), player.getLocation())) {
+                sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.GREEN + "created!");
+            } else {
+                sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "created!");
+            }
+        }
    }

    @Override
@@ -37,7 +37,7 @@ public class CheckCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        Player p = this.plugin.getServer().getPlayer(args.get(0));
+        Player p = this.plugin.getServer().getPlayerExact(args.get(0));
        if (p == null) {
            sender.sendMessage("Could not find player " + ChatColor.GREEN + args.get(0));
            sender.sendMessage("Are they online?");
@@ -45,18 +45,13 @@ public class CheckCommand extends MultiverseCommand {
        }
        MVDestination dest = this.plugin.getDestFactory().getDestination(args.get(1));
        if (dest instanceof InvalidDestination) {
-            sender.sendMessage("You asked if '" + args.get(0) + "' could go to " + ChatColor.GREEN + args.get(0) + ChatColor.WHITE + ",");
+            sender.sendMessage(String.format("You asked if '%s' could go to %s%s%s,",
+                    args.get(0), ChatColor.GREEN, args.get(0), ChatColor.WHITE));
            sender.sendMessage("but I couldn't find a Destination of that name? Did you type it correctly?");
            return;
        }

        MVPermissions perms = this.plugin.getMVPerms();
-        if (perms.canEnterDestination(p, dest)) {
-            sender.sendMessage(ChatColor.GREEN + args.get(0) + ChatColor.WHITE + " can travel to " + ChatColor.GREEN + args.get(1));
-        } else {
-            sender.sendMessage(ChatColor.AQUA + args.get(0) + ChatColor.RED + " CANNOT travel to " + ChatColor.AQUA + args.get(1));
-            sender.sendMessage("Please turn debug mode to 3 then watch the console to find out why!");
-            sender.sendMessage("Use: " + ChatColor.GREEN + "/mv debug 3");
-        }
+        perms.tellMeWhyICantDoThis(sender, p, dest);
    }
 }
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import java.util.List;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+
+/**
+ * Creates a clone of a world.
+ */
+public class CloneCommand extends MultiverseCommand {
+    private final MVWorldManager worldManager;
+
+    public CloneCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Clone World");
+        this.setCommandUsage("/mv clone" + ChatColor.GREEN + " {TARGET} {NAME}" + ChatColor.GOLD + " -g [GENERATOR[:ID]]");
+        this.setArgRange(2, 4); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        this.addKey("mvclone");
+        this.addKey("mvcl");
+        this.addKey("mv cl");
+        this.addKey("mv clone");
+        this.addCommandExample("/mv clone " + ChatColor.GOLD + "world" + ChatColor.GREEN + " world_backup");
+        this.addCommandExample("/mv clone " + ChatColor.GOLD + "skyblock_pristine" + ChatColor.GREEN + " skyblock");
+        this.setPermission("multiverse.core.clone", "Clones a world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        String oldName = args.get(0);
+	    if (!this.worldManager.hasUnloadedWorld(oldName, true)) {
+            // If no world was found, we can't clone.
+            sender.sendMessage("Sorry, Multiverse doesn't know about world " + oldName + ", so we can't clone it!");
+            sender.sendMessage("Check the " + ChatColor.GREEN + "/mv list" + ChatColor.WHITE + " command to verify it is listed.");
+            return;
+        }
+        if (this.plugin.getMVWorldManager().cloneWorld(oldName, args.get(1))) {
+            sender.sendMessage(ChatColor.GREEN + "World cloned!");
+        } else {
+            sender.sendMessage(ChatColor.RED + "World could NOT be cloned!");
+        }
+    }
+}
@@ -8,17 +8,18 @@
 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;
+import java.util.Map;

 /**
 * Allows you to set Global MV Variables.
 */
 public class ConfigCommand extends MultiverseCommand {
+
    public ConfigCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Configuration");
@@ -28,7 +29,6 @@ public class ConfigCommand extends MultiverseCommand {
        this.addKey("mvconfig");
        this.addKey("mv conf");
        this.addKey("mvconf");
-        this.addCommandExample("All values: " + ConfigProperty.getAllValues());
        this.addCommandExample("/mv config show");
        this.addCommandExample("/mv config " + ChatColor.GREEN + "debug" + ChatColor.AQUA + " 3");
        this.addCommandExample("/mv config " + ChatColor.GREEN + "enforceaccess" + ChatColor.AQUA + " false");
@@ -38,55 +38,31 @@ public class ConfigCommand extends MultiverseCommand {
    @Override
    public void runCommand(CommandSender sender, List<String> args) {
        if (args.size() <= 1) {
-            String[] allProps = ConfigProperty.getAllValues().split(" ");
-            String currentvals = "";
-            for (String prop : allProps) {
-                currentvals += ChatColor.GREEN;
-                currentvals += prop;
-                currentvals += ChatColor.WHITE;
-                currentvals += " = ";
-                currentvals += ChatColor.GOLD;
-                currentvals += this.plugin.getMVConfiguration().get(prop, "NOT SET");
-                currentvals += ChatColor.WHITE;
-                currentvals += ", ";
+            StringBuilder builder = new StringBuilder();
+            Map<String, Object> serializedConfig = this.plugin.getMVConfig().serialize();
+            for (Map.Entry<String, Object> entry : serializedConfig.entrySet()) {
+                builder.append(ChatColor.GREEN);
+                builder.append(entry.getKey());
+                builder.append(ChatColor.WHITE).append(" = ").append(ChatColor.GOLD);
+                builder.append(entry.getValue().toString());
+                builder.append(ChatColor.WHITE).append(", ");
            }
-            sender.sendMessage(currentvals.substring(0, currentvals.length() - 2));
+            String message = builder.toString();
+            message = message.substring(0, message.length() - 2);
+            sender.sendMessage(message);
            return;
        }
+        if (!this.plugin.getMVConfig().setConfigProperty(args.get(0).toLowerCase(), args.get(1))) {
+            sender.sendMessage(String.format("%sSetting '%s' to '%s' failed!", ChatColor.RED, args.get(0).toLowerCase(), args.get(1)));
+            return;
+        }
+
+        // special rule
        if (args.get(0).equalsIgnoreCase("firstspawnworld")) {
-            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();
@@ -10,7 +10,6 @@ package com.onarandombox.MultiverseCore.commands;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -25,7 +24,7 @@ import java.util.List;
 * Returns detailed information on the Players where abouts.
 */
 public class CoordCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
+    private final MVWorldManager worldManager;

    public CoordCommand(MultiverseCore plugin) {
        super(plugin);
@@ -61,9 +60,9 @@ public class CoordCommand extends MultiverseCommand {
            DecimalFormat df = new DecimalFormat();
            df.setMinimumFractionDigits(0);
            df.setMaximumFractionDigits(2);
-            p.sendMessage(ChatColor.AQUA + "Coordinates: " + ChatColor.WHITE + LocationManipulation.strCoords(p.getLocation()));
-            p.sendMessage(ChatColor.AQUA + "Direction: " + ChatColor.WHITE + LocationManipulation.getDirection(p.getLocation()));
-            p.sendMessage(ChatColor.AQUA + "Block: " + ChatColor.WHITE + Material.getMaterial(world.getBlockTypeIdAt(p.getLocation())));
+            p.sendMessage(ChatColor.AQUA + "Coordinates: " + ChatColor.WHITE + plugin.getLocationManipulation().strCoords(p.getLocation()));
+            p.sendMessage(ChatColor.AQUA + "Direction: " + ChatColor.WHITE + plugin.getLocationManipulation().getDirection(p.getLocation()));
+            p.sendMessage(ChatColor.AQUA + "Block: " + ChatColor.WHITE + world.getBlockAt(p.getLocation()).getType());
        } else {
            sender.sendMessage("This command needs to be used from a Player.");
        }
@@ -18,19 +18,22 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

 import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;

 /**
 * Creates a new world and loads it.
 */
 public class CreateCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
+    private final 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]] -t [WORLDTYPE] [-n]");
-        this.setArgRange(2, 9); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        this.setCommandUsage(String.format("/mv create %s{NAME} {ENV} %s-s [SEED] -g [GENERATOR[:ID]] -t [WORLDTYPE] [-n] -a [true|false]",
+                ChatColor.GREEN, ChatColor.GOLD));
+        this.setArgRange(2, 11); // SUPPRESS CHECKSTYLE: MagicNumberCheck
        this.addKey("mvcreate");
        this.addKey("mvc");
        this.addKey("mv create");
@@ -51,6 +54,11 @@ public class CreateCommand extends MultiverseCommand {
        String env = args.get(1);
        String seed = CommandHandler.getFlag("-s", args);
        String generator = CommandHandler.getFlag("-g", args);
+        boolean allowStructures = true;
+        String structureString = CommandHandler.getFlag("-a", args);
+        if (structureString != null) {
+            allowStructures = Boolean.parseBoolean(structureString);
+        }
        String typeString = CommandHandler.getFlag("-t", args);
        boolean useSpawnAdjust = true;
        for (String s : args) {
@@ -58,7 +66,14 @@ public class CreateCommand extends MultiverseCommand {
                useSpawnAdjust = false;
            }
        }
-        if (worldFile.exists() || this.worldManager.isMVWorld(worldName)) {
+
+        if (this.worldManager.isMVWorld(worldName)) {
+            sender.sendMessage(ChatColor.RED + "Multiverse cannot create " + ChatColor.GOLD + ChatColor.UNDERLINE
+                    + "another" + ChatColor.RESET + ChatColor.RED + " world named " + worldName);
+            return;
+        }
+
+        if (worldFile.exists()) {
            sender.sendMessage(ChatColor.RED + "A Folder/World already exists with this name!");
            sender.sendMessage(ChatColor.RED + "If you are confident it is a world you can import with /mvimport");
            return;
@@ -81,10 +96,22 @@ public class CreateCommand extends MultiverseCommand {
            EnvironmentCommand.showWorldTypes(sender);
            return;
        }
-
+        // Determine if the generator is valid. #918
+        if (generator != null) {
+            List<String> genarray = new ArrayList<String>(Arrays.asList(generator.split(":")));
+            if (genarray.size() < 2) {
+                // If there was only one arg specified, pad with another empty one.
+                genarray.add("");
+            }
+            if (this.worldManager.getChunkGenerator(genarray.get(0), genarray.get(1), "test") == null) {
+                // We have an invalid generator.
+                sender.sendMessage("Invalid generator! '" + generator + "'. " + ChatColor.RED + "Aborting world creation.");
+                return;
+            }
+        }
        Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'...");

-        if (this.worldManager.addWorld(worldName, environment, seed, type, generator, useSpawnAdjust)) {
+        if (this.worldManager.addWorld(worldName, environment, seed, type, allowStructures, generator, useSpawnAdjust)) {
            Command.broadcastCommandMessage(sender, "Complete!");
        } else {
            Command.broadcastCommandMessage(sender, "FAILED.");
@@ -7,6 +7,7 @@

 package com.onarandombox.MultiverseCore.commands;

+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -23,7 +24,7 @@ public class DebugCommand extends MultiverseCommand {
    public DebugCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Turn Debug on/off?");
-        this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off]");
+        this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off|silent]");
        this.setArgRange(0, 1);
        this.addKey("mv debug");
        this.addKey("mv d");
@@ -36,30 +37,31 @@ public class DebugCommand extends MultiverseCommand {
    public void runCommand(CommandSender sender, List<String> args) {
        if (args.size() == 1) {
            if (args.get(0).equalsIgnoreCase("off")) {
-                MultiverseCore.GlobalDebug = 0;
+                plugin.getMVConfig().setGlobalDebug(0);
            } else {
                try {
                    int debugLevel = Integer.parseInt(args.get(0));
                    if (debugLevel > 3 || debugLevel < 0) {
                        throw new NumberFormatException();
                    }
-                    MultiverseCore.GlobalDebug = debugLevel;
+                    plugin.getMVConfig().setGlobalDebug(debugLevel);
                } catch (NumberFormatException e) {
                    sender.sendMessage(ChatColor.RED + "Error" + ChatColor.WHITE
                            + " setting debug level. Please use a number 0-3 " + ChatColor.AQUA + "(3 being many many messages!)");
                }
-
            }
+            plugin.saveMVConfigs();
        }
        this.displayDebugMode(sender);
    }

    private void displayDebugMode(CommandSender sender) {
-        if (MultiverseCore.GlobalDebug == 0) {
+        final int debugLevel = plugin.getMVConfig().getGlobalDebug();
+        if (debugLevel == 0) {
            sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
        } else {
-            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + MultiverseCore.GlobalDebug);
-            this.plugin.log(Level.FINE, "Multiverse Debug ENABLED");
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel);
+            Logging.fine("Multiverse Debug ENABLED");
        }
    }
 }
@@ -27,15 +27,19 @@ public class DeleteCommand extends MultiverseCommand {
        this.setArgRange(1, 1);
        this.addKey("mvdelete");
        this.addKey("mv delete");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "MyWorld");
+        this.addCommandExample("/mv delete " + ChatColor.GOLD + "MyWorld");
        this.setPermission("multiverse.core.delete", "Deletes a world on your server. " + ChatColor.RED + "PERMANENTLY.", PermissionDefault.OP);
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
+        String worldName = args.get(0);
+
        Class<?>[] paramTypes = {String.class};
        List<Object> objectArgs = new ArrayList<Object>(args);
-        this.plugin.getCommandHandler().queueCommand(sender, "mvdelete", "deleteWorld", objectArgs,
-                paramTypes, ChatColor.GREEN + "World Deleted!", ChatColor.RED + "World could NOT be deleted!");
+        this.plugin.getCommandHandler()
+                   .queueCommand(sender, "mvdelete", "deleteWorld", objectArgs,
+                                 paramTypes, ChatColor.GREEN + "World '" + worldName + "' Deleted!",
+                                 ChatColor.RED + "World '" + worldName + "' could NOT be deleted!");
    }
 }
@@ -53,8 +53,8 @@ public class EnvironmentCommand extends MultiverseCommand {
     */
    public static void showWorldTypes(CommandSender sender) {
        sender.sendMessage(ChatColor.YELLOW + "Valid World Types are:");
-        sender.sendMessage(String.format("%sNORMAL %sor %sFLAT",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA));
+        sender.sendMessage(String.format("%sNORMAL%s, %sFLAT, %sLARGEBIOMES %sor %sVERSION_1_1",
+                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, ChatColor.RED, ChatColor.WHITE, ChatColor.GOLD));
    }

    @Override
@@ -71,10 +71,15 @@ public class EnvironmentCommand extends MultiverseCommand {
     */
    public static WorldType getWorldTypeFromString(String type) {
        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
-        if (type.equalsIgnoreCase("normal"))
+        if (type.equalsIgnoreCase("normal")) {
            type = "NORMAL";
-        if (type.equalsIgnoreCase("flat"))
+        } else if (type.equalsIgnoreCase("flat")) {
            type = "FLAT";
+        } else if (type.equalsIgnoreCase("largebiomes")) {
+            type = "LARGE_BIOMES";
+        } else if (type.equalsIgnoreCase("amplified")) {
+            type = "AMPLIFIED";
+        }
        try {
            // Now that we've converted a potentially unfriendly value
            // to a friendly one, get it from the ENUM!
@@ -91,6 +96,7 @@ public class EnvironmentCommand extends MultiverseCommand {
     * @return The environment as {@link org.bukkit.World.Environment}
     */
    public static World.Environment getEnvFromString(String env) {
+        env = env.toUpperCase();
        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
        if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER"))
            env = "NETHER";
@@ -0,0 +1,116 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.GameRule;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class GameruleCommand extends MultiverseCommand {
+
+    public GameruleCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Set a Minecraft Game Rule for a World.");
+        this.setCommandUsage("/mv gamerule " + ChatColor.GREEN + "{RULE} {VALUE}" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(2, 3);
+        this.addKey("mv gamerule");
+        this.addKey("mv rule");
+        this.addKey("mvgamerule");
+        this.addKey("mvrule");
+        this.addCommandExample("/mv gamerule " + ChatColor.GREEN + "doMobLoot false");
+        this.addCommandExample("/mvrule " + ChatColor.GREEN + "keepInventory true " + ChatColor.RED + "world_nether");
+        this.setPermission("multiverse.core.gamerule.set", "Allows a player to set a gamerule.", PermissionDefault.OP);
+    }
+
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        final Player p;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        } else {
+            p = null;
+        }
+
+        if (args.size() == 2 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        final GameRule gameRule = GameRule.getByName(args.get(0));
+        final String value = args.get(1);
+        final World world;
+        if (args.size() == 2) {
+            world = p.getWorld();
+        } else {
+            world = Bukkit.getWorld(args.get(2));
+            if (world == null) {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(2)
+                        + ChatColor.WHITE + " does not exist.");
+                return;
+            }
+        }
+
+        if (gameRule == null) {
+            sender.sendMessage(ChatColor.RED + "Failure! " + ChatColor.AQUA + args.get(0) + ChatColor.WHITE
+                    + " is not a valid gamerule.");
+        } else {
+            if (gameRule.getType() == Boolean.class) {
+                boolean booleanValue;
+                if (value.equalsIgnoreCase("true")) {
+                    booleanValue = true;
+                } else if (value.equalsIgnoreCase("false")) {
+                    booleanValue = false;
+                } else {
+                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "it can only be set to true or false.");
+                    return;
+                }
+
+                if (!world.setGameRule(gameRule, booleanValue)) {
+                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "something went wrong.");
+                    return;
+                }
+            } else if (gameRule.getType() == Integer.class) {
+                try {
+                    if (!world.setGameRule(gameRule, Integer.parseInt(value))) {
+                        throw new NumberFormatException();
+                    }
+                } catch (NumberFormatException e) {
+                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "it can only be set to a positive integer.");
+                    return;
+                }
+            } else {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule.getName()
+                        + ChatColor.WHITE + " isn't supported yet, please let us know about it.");
+                return;
+            }
+
+            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule.getName()
+                    + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value + ChatColor.WHITE + ".");
+        }
+    }
+
+    private String getErrorMessage(String gameRule, String value) {
+        return ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                + ChatColor.WHITE + " could not be set to " + ChatColor.RED + value + ChatColor.WHITE + ", ";
+    }
+}
@@ -0,0 +1,82 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.GameRule;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class GamerulesCommand extends MultiverseCommand {
+
+    public GamerulesCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("List the Minecraft Game Rules for a World.");
+        this.setCommandUsage("/mv gamerules" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(0, 1);
+        this.addKey("mv gamerules");
+        this.addKey("mv rules");
+        this.addKey("mvgamerules");
+        this.addKey("mvrules");
+        this.addCommandExample("/mv gamerules");
+        this.addCommandExample("/mvrules " + ChatColor.RED + "world_nether");
+        this.setPermission("multiverse.core.gamerule.list", "Allows a player to list gamerules.", PermissionDefault.OP);
+    }
+
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        final Player p;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        } else {
+            p = null;
+        }
+
+        if (args.size() == 0 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        final World world;
+        if (args.size() == 0) {
+            world = p.getWorld();
+        } else {
+            world = Bukkit.getWorld(args.get(0));
+            if (world == null) {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(0)
+                        + ChatColor.WHITE + " does not exist.");
+                return;
+            }
+        }
+
+        final StringBuilder gameRules = new StringBuilder();
+        for (final String gameRule : world.getGameRules()) {
+            if (gameRules.length() != 0) {
+                gameRules.append(ChatColor.WHITE).append(", ");
+            }
+            gameRules.append(ChatColor.AQUA).append(gameRule).append(ChatColor.WHITE).append(": ");
+            gameRules.append(ChatColor.GREEN).append(world.getGameRuleValue(GameRule.getByName(gameRule)));
+        }
+        sender.sendMessage("=== Gamerules for " + ChatColor.AQUA + world.getName() + ChatColor.WHITE + " ===");
+        sender.sendMessage(gameRules.toString());
+    }
+}
@@ -7,6 +7,7 @@

 package com.onarandombox.MultiverseCore.commands;

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

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        this.plugin.log(Level.INFO, "PLEASE IGNORE the 'Plugin X does not contain any generators' message below!");
+        Logging.info("PLEASE IGNORE the 'Plugin X does not contain any generators' message below!");
        Plugin[] plugins = this.plugin.getServer().getPluginManager().getPlugins();
        List<String> generators = new ArrayList<String>();
        for (Plugin p : plugins) {
@@ -13,7 +13,6 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
-import org.bukkit.WorldType;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
@@ -33,14 +32,14 @@ public class ImportCommand extends MultiverseCommand {
    public ImportCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Import World");
-        this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV} " + ChatColor.GOLD + " -g [GENERATOR[:ID]] [-n] -t [TYPE]");
-        this.setArgRange(2, 5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV}" + ChatColor.GOLD + " -g [GENERATOR[:ID]] [-n]");
+        this.setArgRange(1, 5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
        this.addKey("mvimport");
        this.addKey("mvim");
        this.addKey("mv import");
        this.addCommandExample("/mv import " + ChatColor.GOLD + "gargamel" + ChatColor.GREEN + " normal");
-        this.addCommandExample("/mv import " + ChatColor.GOLD + "flatroom" + ChatColor.GREEN + " normal" + ChatColor.AQUA + " -t flat");
        this.addCommandExample("/mv import " + ChatColor.GOLD + "hell_world" + ChatColor.GREEN + " nether");
+        this.addCommandExample("To import a world that uses a generator, you'll need the generator:");
        this.addCommandExample("/mv import " + ChatColor.GOLD + "CleanRoom" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " CleanRoomGenerator");
        this.setPermission("multiverse.core.import", "Imports a new world of the specified type.", PermissionDefault.OP);
        this.worldManager = this.plugin.getMVWorldManager();
@@ -53,12 +52,12 @@ public class ImportCommand extends MultiverseCommand {
     * @param worldFolder The File that may be a world.
     * @return True if it looks like a world, false if not.
     */
-    private boolean checkIfIsWorld(File worldFolder) {
+    private static boolean checkIfIsWorld(File worldFolder) {
        if (worldFolder.isDirectory()) {
            File[] files = worldFolder.listFiles(new FilenameFilter() {
                @Override
                public boolean accept(File file, String name) {
-                    return name.equalsIgnoreCase("level.dat");
+                    return name.toLowerCase().endsWith(".dat");
                }
            });
            if (files != null && files.length > 0) {
@@ -96,10 +95,15 @@ public class ImportCommand extends MultiverseCommand {
        }
        return worldList;
    }
+    
+    private String trimWorldName(String userInput) {
+        // Removes relative paths.
+        return userInput.replaceAll("^[./\\\\]+", "");
+    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        String worldName = args.get(0);
+        String worldName = trimWorldName(args.get(0));

        if (worldName.toLowerCase().equals("--list") || worldName.toLowerCase().equals("-l")) {
            String worldList = this.getPotentialWorlds();
@@ -113,7 +117,7 @@ public class ImportCommand extends MultiverseCommand {
        }
        // 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) {
+        if (args.size() == 1 || worldName.length() < 1) {
            this.showHelp(sender);
            return;
        }
@@ -128,7 +132,6 @@ public class ImportCommand extends MultiverseCommand {
        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);

        String generator = CommandHandler.getFlag("-g", args);
-        String typeString = CommandHandler.getFlag("-t", args);
        boolean useSpawnAdjust = true;
        for (String s : args) {
            if (s.equalsIgnoreCase("-n")) {
@@ -144,32 +147,25 @@ public class ImportCommand extends MultiverseCommand {
            return;
        }

-        // If they didn't specify a type, default to NORMAL
-        if (typeString == null) {
-            typeString = "NORMAL";
-        }
-        WorldType type = EnvironmentCommand.getWorldTypeFromString(typeString);
-        if (type == null) {
-            sender.sendMessage(ChatColor.RED + "That is not a valid World Type.");
-            EnvironmentCommand.showWorldTypes(sender);
-            return;
-        }
-
-        if (worldFile.exists() && env != null) {
-            Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
-            if (this.worldManager.addWorld(worldName, environment, null, type, generator, useSpawnAdjust))
-                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
-            else
-                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
+        if (!worldFile.exists()) {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            String worldList = this.getPotentialWorlds();
+            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
+            sender.sendMessage(worldList);
+        } else if (!checkIfIsWorld(worldFile)) {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            sender.sendMessage(String.format("'%s' does not appear to be a world. It is lacking a .dat file.",
+                                             worldName));
        } else if (env == null) {
            sender.sendMessage(ChatColor.RED + "FAILED.");
            sender.sendMessage("That world environment did not exist.");
            sender.sendMessage("For a list of available world types, type: " + ChatColor.AQUA + "/mvenv");
        } else {
-            sender.sendMessage(ChatColor.RED + "FAILED.");
-            String worldList = this.getPotentialWorlds();
-            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
-            sender.sendMessage(worldList);
+            Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
+            if (this.worldManager.addWorld(worldName, environment, null, null, null, generator, useSpawnAdjust))
+                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
+            else
+                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
        }
    }
 }
@@ -14,7 +14,6 @@ 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;
@@ -31,7 +30,7 @@ import java.util.List;
 * Returns detailed information about a world.
 */
 public class InfoCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
+    private final MVWorldManager worldManager;

    public InfoCommand(MultiverseCore plugin) {
        super(plugin);
@@ -62,9 +61,13 @@ public class InfoCommand extends MultiverseCommand {
                return;
            }
        } else if (args.size() == 1) {
-            if (this.worldManager.getMVWorld(args.get(0)) != null) {
+            if (this.worldManager.isMVWorld(args.get(0))) {
                // then we have a world!
                worldName = args.get(0);
+            } else if (this.worldManager.getUnloadedWorlds().contains(args.get(0))) {
+                sender.sendMessage("That world exists, but it is unloaded!");
+                sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, args.get(0)));
+                return;
            } else {
                if (sender instanceof Player) {
                    Player p = (Player) sender;
@@ -72,7 +75,8 @@ public class InfoCommand extends MultiverseCommand {
                    try {
                        pageNum = Integer.parseInt(args.get(0)) - 1;
                    } catch (NumberFormatException e) {
-                        pageNum = 0;
+                        sender.sendMessage("That world does not exist.");
+                        return;
                    }
                } else {
                    sender.sendMessage("You must enter a" + ChatColor.LIGHT_PURPLE + " world" + ChatColor.WHITE + " from the console!");
@@ -94,8 +98,11 @@ public class InfoCommand extends MultiverseCommand {
                p = (Player) sender;
            }
            showPage(pageNum, sender, this.buildEntireCommand(this.worldManager.getMVWorld(worldName), p));
+        } else if (this.worldManager.getUnloadedWorlds().contains(worldName)) {
+            sender.sendMessage("That world exists, but it is unloaded!");
+            sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, worldName));
        } else if (this.plugin.getServer().getWorld(worldName) != null) {
-            sender.sendMessage("That world exists, but multiverse does not know about it!");
+            sender.sendMessage("That world exists, but Multiverse does not know about it!");
            sender.sendMessage("You can import it with" + ChatColor.AQUA + "/mv import " + ChatColor.GREEN + worldName + ChatColor.LIGHT_PURPLE + "{ENV}");
            sender.sendMessage("For available environments type " + ChatColor.GREEN + "/mv env");
        }
@@ -110,14 +117,21 @@ public class InfoCommand extends MultiverseCommand {
        message.add(new FancyMessage("World Name: ", world.getName(), colors));
        message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
        message.add(new FancyMessage("Game Mode: ", world.getGameMode().toString(), colors));
-        message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
+        message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
+
        //message.add(new FancyMessage("Game Mode: ", StringUtils.capitalize(world.getGameMode().toString()), colors));
        Location spawn = world.getSpawnLocation();
-        message.add(new FancyMessage("Spawn Location: ", LocationManipulation.strCoords(spawn), colors));
-        message.add(new FancyMessage("World Scale: ", world.getScaling() + "", colors));
+        message.add(new FancyMessage("Spawn Location: ", plugin.getLocationManipulation().strCoords(spawn), colors));
+        message.add(new FancyMessage("World Scale: ", String.valueOf(world.getScaling()), colors));
+        message.add(new FancyMessage("World Seed: ", String.valueOf(world.getSeed()), colors));
        if (world.getPrice() > 0) {
            message.add(new FancyMessage("Price to enter this world: ",
-                    this.plugin.getBank().getFormattedAmount(p, world.getPrice(), world.getCurrency()), colors));
+                    plugin.getEconomist().formatPrice(world.getPrice(), world.getCurrency()),
+                    colors));
+        } else if (world.getPrice() < 0) {
+            message.add(new FancyMessage("Reward for entering this world: ",
+                    plugin.getEconomist().formatPrice(-world.getPrice(), world.getCurrency()),
+                    colors));
        } else {
            message.add(new FancyMessage("Price to enter this world: ", ChatColor.GREEN + "FREE!", colors));
        }
@@ -136,7 +150,8 @@ public class InfoCommand extends MultiverseCommand {
        // Page 2
        message = new ArrayList<FancyText>();
        message.add(new FancyHeader("More World Settings", colors));
-        message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
+        message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
+        message.add(new FancyMessage("Structures: ", world.getCBWorld().canGenerateStructures() + "", colors));
        message.add(new FancyMessage("Weather: ", world.isWeatherEnabled() + "", colors));
        message.add(new FancyMessage("Players will get hungry: ", world.getHunger() + "", colors));
        message.add(new FancyMessage("Keep spawn in memory: ", world.isKeepingSpawnInMemory() + "", colors));
@@ -166,8 +181,8 @@ public class InfoCommand extends MultiverseCommand {
        message.add(new FancyHeader("Animal Settings", colors));
        message.add(new FancyMessage("Multiverse Setting: ", world.canAnimalsSpawn() + "", colors));
        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getAllowAnimals() + "", colors));
-        if (world.getMonsterList().size() > 0) {
-            if (world.canMonstersSpawn()) {
+        if (world.getAnimalList().size() > 0) {
+            if (world.canAnimalsSpawn()) {
                message.add(new FancyMessage("Animals that" + ChatColor.RED + " CAN NOT "
                        + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getAnimalList()), colors));
            } else {
@@ -181,7 +196,7 @@ public class InfoCommand extends MultiverseCommand {
        return worldInfo;
    }

-    private String toCommaSeperated(List<String> list) {
+    private static String toCommaSeperated(List<String> list) {
        if (list == null || list.size() == 0) {
            return "";
        }
@@ -207,7 +222,7 @@ public class InfoCommand extends MultiverseCommand {
        return positive ? ChatColor.GREEN : ChatColor.RED;
    }

-    private void showPage(int page, CommandSender sender, List<List<FancyText>> doc) {
+    private static void showPage(int page, CommandSender sender, List<List<FancyText>> doc) {
        page = page < 0 ? 0 : page;
        page = page > doc.size() - 1 ? doc.size() - 1 : page;
        boolean altColor = false;
@@ -26,7 +26,7 @@ public class ListCommand extends PaginatedCoreCommand<String> {
    public ListCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("World Listing");
-        this.setCommandUsage("/mv list");
+        this.setCommandUsage("/mv list [page]");
        this.setArgRange(0, 2);
        this.addKey("mvlist");
        this.addKey("mvl");
@@ -52,14 +52,16 @@ public class ListCommand extends PaginatedCoreCommand<String> {
            } else if (env == Environment.THE_END) {
                color = ChatColor.AQUA;
            }
-            String outputCache = world.getColoredWorldString() + ChatColor.WHITE + " - " + color + world.getEnvironment();
+            StringBuilder builder = new StringBuilder();
+            builder.append(world.getColoredWorldString()).append(ChatColor.WHITE);
+            builder.append(" - ").append(color).append(world.getEnvironment());
            if (world.isHidden()) {
-                if (p == null || p.hasPermission("multiverse.core.modify")) {
+                if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.core.modify", true)) {
                    // Prefix hidden worlds with an "[H]"
-                    worldList.add(ChatColor.GRAY + "[H]" + outputCache);
+                    worldList.add(ChatColor.GRAY + "[H]" + builder.toString());
                }
            } else {
-                worldList.add(outputCache);
+                worldList.add(builder.toString());
            }
        }
        for (String name : this.plugin.getMVWorldManager().getUnloadedWorlds()) {
@@ -25,7 +25,7 @@ import java.util.List;
 * Used to modify various aspects of worlds.
 */
 public class ModifyAddCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
+    private final MVWorldManager worldManager;

    public ModifyAddCommand(MultiverseCore plugin) {
        super(plugin);
@@ -77,13 +77,17 @@ public class ModifyAddCommand extends MultiverseCommand {

        if (!ModifyCommand.validateAction(Action.Add, property)) {
            sender.sendMessage("Sorry, you can't ADD to " + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/4W8cY");
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/OMGwzx");
            return;
        }

+        // TODO fix this
        if (world.addToVariable(property, value)) {
            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA
                    + value + ChatColor.WHITE + " was " + ChatColor.GREEN + "added to " + ChatColor.GREEN + property);
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
        } else {
            sender.sendMessage(value + " could not be added to " + property);
        }
@@ -22,7 +22,7 @@ import java.util.List;
 * Removes all values from a world-property.
 */
 public class ModifyClearCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
+    private final MVWorldManager worldManager;

    public ModifyClearCommand(MultiverseCore plugin) {
        super(plugin);
@@ -72,13 +72,17 @@ public class ModifyClearCommand extends MultiverseCommand {

        if (!ModifyCommand.validateAction(Action.Clear, property)) {
            sender.sendMessage("Sorry, you can't use CLEAR with " + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/cgB2B");
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/q1h01S");
            return;
        }
+        // TODO fix this
        if (world.clearList(property)) {
            sender.sendMessage(property + " was cleared. It contains 0 values now.");
            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + property + ChatColor.WHITE + " was "
                    + ChatColor.GREEN + "CLEARED" + ChatColor.WHITE + ". It contains " + ChatColor.LIGHT_PURPLE + "0" + ChatColor.WHITE + " values now.");
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
        } else {
            sender.sendMessage(ChatColor.RED + "Error: " + ChatColor.GOLD + property
                    + ChatColor.WHITE + " was " + ChatColor.GOLD + "NOT" + ChatColor.WHITE + " cleared.");
@@ -22,7 +22,7 @@ import java.util.List;
 * Removes values from a world-property.
 */
 public class ModifyRemoveCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
+    private final MVWorldManager worldManager;

    public ModifyRemoveCommand(MultiverseCore plugin) {
        super(plugin);
@@ -78,12 +78,16 @@ public class ModifyRemoveCommand extends MultiverseCommand {

        if (!ModifyCommand.validateAction(Action.Remove, property)) {
            sender.sendMessage("Sorry, you can't REMOVE anything from" + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/4W8cY");
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/OMGwzx");
            return;
        }
+        // TODO fix this
        if (world.removeFromVariable(property, value)) {
            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + value + ChatColor.WHITE
                    + " was " + ChatColor.RED + "removed from " + ChatColor.GREEN + property);
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
        } else {
            sender.sendMessage(ChatColor.RED + "There was an error removing " + ChatColor.GRAY
                    + value + ChatColor.WHITE + " from " + ChatColor.GOLD + property);
@@ -23,7 +23,7 @@ import java.util.List;
 * Used to set world-properties.
 */
 public class ModifySetCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
+    private final MVWorldManager worldManager;

    public ModifySetCommand(MultiverseCore plugin) {
        super(plugin);
@@ -102,22 +102,24 @@ public class ModifySetCommand extends MultiverseCommand {
            return;
        }

-        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !world.isValidAliasColor(value)) {
+        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !EnglishChatColor.isValidAliasColor(value)) {
            sender.sendMessage(value + " is not a valid color. Please pick one of the following:");
            sender.sendMessage(EnglishChatColor.getAllColors());
            return;
        }
        try {
-            if (world.setProperty(property, value, sender)) {
+            if (world.setPropertyValue(property, value)) {
                sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Property " + ChatColor.AQUA + property
                        + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
+                if (!plugin.saveWorldConfig()) {
+                    sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+                }
            } else {
-                sender.sendMessage(world.getProperty(property, Object.class).getHelp());
+                sender.sendMessage(ChatColor.RED + world.getPropertyHelp(property));
            }
        } 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.");
+            sender.sendMessage("Valid world-properties: " + world.getAllPropertyNames());
        }
    }
 }
@@ -8,7 +8,7 @@
 package com.onarandombox.MultiverseCore.commands;

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

@@ -24,9 +24,9 @@ public abstract class MultiverseCommand extends Command {
     */
    protected MultiverseCore plugin;
    /**
-     * The reference to {@link MVMessaging}.
+     * The reference to {@link MultiverseMessaging}.
     */
-    protected MVMessaging messaging;
+    protected MultiverseMessaging messaging;

    public MultiverseCommand(MultiverseCore plugin) {
        super(plugin);
@@ -10,7 +10,7 @@ package com.onarandombox.MultiverseCore.commands;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.PurgeWorlds;
+import com.onarandombox.MultiverseCore.api.WorldPurger;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -24,7 +24,7 @@ import java.util.List;
 * Removes a type of mob from a world.
 */
 public class PurgeCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
+    private final MVWorldManager worldManager;

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

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

-        PurgeWorlds purger = this.worldManager.getWorldPurger();
+        WorldPurger purger = this.worldManager.getTheWorldPurger();
        ArrayList<String> thingsToKill = new ArrayList<String>();
        if (deathName.equalsIgnoreCase("all") || deathName.equalsIgnoreCase("animals") || deathName.equalsIgnoreCase("monsters")) {
            thingsToKill.add(deathName.toUpperCase());
@@ -86,7 +86,7 @@ public class PurgeCommand extends MultiverseCommand {
            Collections.addAll(thingsToKill, deathName.toUpperCase().split(","));
        }
        for (MultiverseWorld w : worldsToRemoveEntitiesFrom) {
-            purger.purgeWorld(sender, w, thingsToKill, false, false);
+            purger.purgeWorld(w, thingsToKill, false, false, sender);
        }
    }
 }
@@ -27,6 +27,7 @@ public class ReloadCommand extends MultiverseCommand {
        this.setCommandUsage("/mv reload");
        this.setArgRange(0, 0);
        this.addKey("mvreload");
+        this.addKey("mvr");
        this.addKey("mv reload");
        this.addCommandExample("/mv reload");
        this.setPermission("multiverse.core.reload", "Reloads worlds.yml and config.yml.", PermissionDefault.OP);
@@ -0,0 +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 com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * States who is in what world.
+ */
+public class ScriptCommand extends MultiverseCommand {
+
+    public ScriptCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Runs a script.");
+        this.setCommandUsage("/mv script" + ChatColor.GOLD + " {script} [target]");
+        this.setArgRange(1, 2);
+        this.addKey("mv script");
+        this.addKey("mvscript");
+        this.addCommandExample(String.format("/mv script %sscript.txt", ChatColor.GOLD));
+        this.addCommandExample(String.format("/mv script %stest.txt %ssomeplayer", ChatColor.GOLD, ChatColor.GREEN));
+        this.setPermission("multiverse.core.script", "Runs a script.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (plugin.getScriptAPI() == null) {
+            sender.sendMessage("Buscript failed to load while the server was starting. Scripts cannot be run.");
+            return;
+        }
+        File file = new File(plugin.getScriptAPI().getScriptFolder(), args.get(0));
+        if (!file.exists()) {
+            sender.sendMessage("That script file does not exist in the Multiverse-Core scripts directory!");
+            return;
+        }
+        Player player = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+        }
+        String target = null;
+        if (args.size() == 2) {
+            target = args.get(1);
+        }
+        plugin.getScriptAPI().executeScript(file, target, player);
+        sender.sendMessage(String.format("Script '%s%s%s' finished!", ChatColor.GOLD, file.getName(), ChatColor.WHITE));
+    }
+}
@@ -8,9 +8,8 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.BlockSafety;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.BlockSafety;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -19,6 +18,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

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

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

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

    /**
-     * Does the actual spawn-setting-work.
-     *
-     * @param sender The {@link CommandSender} that's setting the spawn.
+     * Set the world spawn when no parameters are given
+     * @param sender The {@link CommandSender} who executes the command. 
+     *               Everything not a {@link Player}, e.g. console, gets rejected, as we can't get coordinates from there.
     */
    protected void setWorldSpawn(CommandSender sender) {
        if (sender instanceof Player) {
            Player p = (Player) sender;
            Location l = p.getLocation();
            World w = p.getWorld();
-            MultiverseWorld foundWorld = this.plugin.getMVWorldManager().getMVWorld(w.getName());
-            if (foundWorld != null) {
-                foundWorld.setSpawnLocation(p.getLocation());
-                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).");
-            }
-
+            setWorldSpawn(sender, w, l);
        } else {
-            sender.sendMessage("You cannot use this command from the console.");
+            sender.sendMessage("You need to give coordinates to use this command from the console!");
+        }
+    }
+    
+    /**
+     * Set the world spawn when 4 parameters are given
+     * @param sender The {@link CommandSender} who executes the command
+     * @param world The world to set the spawn in
+     * @param x X-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param y Y-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param z Z-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     */
+    protected void setWorldSpawn(CommandSender sender, String world, String x, String y, String z) {
+        setWorldSpawn(sender, world, x, y, z, "0", "0");
+    }
+
+    /**
+     * Set the world spawn when 6 parameters are given
+     * @param sender The {@link CommandSender} who executes the command
+     * @param world The world to set the spawn in
+     * @param x X-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param y Y-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param z Z-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param yaw Yaw a newly spawned player should look at (as a {@link String} as it's from the command line, gets parsed into a float)
+     * @param pitch Pitch a newly spawned player should look at (as a {@link String} as it's from the command line, gets parsed into a float)
+     */
+    protected void setWorldSpawn(CommandSender sender, String world, String x, String y, String z, String yaw, String pitch) {
+        double dx, dy, dz;
+        float fpitch, fyaw;
+        World bukkitWorld = Bukkit.getWorld(world);
+        if (bukkitWorld == null) {
+            sender.sendMessage("World " + world + " is unknown!");
+            return;
+        }
+        try {
+            dx = Double.parseDouble(x);
+            dy = Double.parseDouble(y);
+            dz = Double.parseDouble(z);
+            fpitch = Float.parseFloat(pitch);
+            fyaw = Float.parseFloat(yaw);
+        } catch (NumberFormatException ex) {
+            sender.sendMessage("All coordinates must be numeric");
+            return;
+        }
+        Location l = new Location(bukkitWorld, dx, dy, dz, fyaw, fpitch);
+        setWorldSpawn(sender, bukkitWorld, l);
+    }
+
+    /**
+     * Does the actual spawn-setting-work.
+     *
+     * @param sender The {@link CommandSender} that's setting the spawn.
+     * @param w The {@link World} to set the spawn in
+     * @param l The {@link Location} to set the spawn to
+     */
+    private void setWorldSpawn(CommandSender sender, World w, Location l) {
+        MultiverseWorld foundWorld = this.plugin.getMVWorldManager().getMVWorld(w.getName());
+        if (foundWorld != null) {
+            foundWorld.setSpawnLocation(l);
+            BlockSafety bs = this.plugin.getBlockSafety();
+            if (!bs.playerCanSpawnHereSafely(l) && foundWorld.getAdjustSpawn()) {
+                sender.sendMessage("It looks like that location would normally be unsafe. But I trust you.");
+                sender.sendMessage("I'm turning off the Safe-T-Teleporter for spawns to this world.");
+                sender.sendMessage("If you want this turned back on just do:");
+                sender.sendMessage(ChatColor.AQUA + "/mvm set adjustspawn true " + foundWorld.getAlias());
+                foundWorld.setAdjustSpawn(false);
+            }
+            sender.sendMessage("Spawn was set to: " + plugin.getLocationManipulation().strCoords(l));
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
+        } else {
+            w.setSpawnLocation(l.getBlockX(), l.getBlockY(), l.getBlockZ());
+            sender.sendMessage("Multiverse does not know about this world, only X,Y and Z set. Please import it to set the spawn fully (Pitch/Yaws).");
        }
    }
 }
@@ -0,0 +1,52 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Enables debug-information.
+ */
+public class SilentCommand extends MultiverseCommand {
+
+    public SilentCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Turn silent mode on/off?");
+        this.setCommandUsage("/mv silent" + ChatColor.GOLD + " [true|false|on|off]");
+        this.setArgRange(0, 1);
+        this.addKey("mv silent");
+        this.addKey("mvsilent");
+        this.addCommandExample("/mv silent " + ChatColor.GOLD + "true");
+        this.setPermission("multiverse.core.silent", "Reduces the amount of startup messages.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() == 1) {
+            if (args.get(0).equalsIgnoreCase("on")) {
+                args.set(0, "true");
+            }
+            plugin.getMVConfig().setSilentStart(Boolean.valueOf(args.get(0)));
+            plugin.saveMVConfigs();
+        }
+        this.displaySilentMode(sender);
+    }
+
+    private void displaySilentMode(CommandSender sender) {
+        if (plugin.getMVConfig().getSilentStart()) {
+            sender.sendMessage("Multiverse Silent Start mode is " + ChatColor.GREEN + "ON");
+        } else {
+            sender.sendMessage("Multiverse Silent Start mode is " + ChatColor.RED + "OFF");
+        }
+    }
+}
@@ -50,7 +50,7 @@ public class SpawnCommand extends MultiverseCommand {
                sender.sendMessage("You don't have permission to teleport another player to spawn. (multiverse.core.spawn.other)");
                return;
            }
-            Player target = this.plugin.getServer().getPlayer(args.get(0));
+            Player target = this.plugin.getServer().getPlayerExact(args.get(0));
            if (target != null) {
                target.sendMessage("Teleporting to this world's spawn...");
                spawnAccurately(target);
@@ -85,6 +85,6 @@ public class SpawnCommand extends MultiverseCommand {
        } else {
            spawnLocation = player.getWorld().getSpawnLocation();
        }
-        this.plugin.getTeleporter().safelyTeleport(player, player, spawnLocation, false);
+        this.plugin.getSafeTTeleporter().safelyTeleport(player, player, spawnLocation, false);
    }
 }
@@ -1,65 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-import org.getspout.spoutapi.gui.GenericButton;
-import org.getspout.spoutapi.gui.GenericPopup;
-import org.getspout.spoutapi.gui.PopupScreen;
-import org.getspout.spoutapi.player.SpoutPlayer;
-
-import java.util.List;
-
-/**
- * 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);
-    }
-}
@@ -7,15 +7,17 @@

 package com.onarandombox.MultiverseCore.commands;

+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Teleporter;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.destination.CustomTeleporterDestination;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
 import com.onarandombox.MultiverseCore.destination.WorldDestination;
 import com.onarandombox.MultiverseCore.enums.TeleportResult;
 import com.onarandombox.MultiverseCore.event.MVTeleportEvent;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
-import com.onarandombox.MultiverseCore.utils.SafeTTeleporter;
+import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -32,18 +34,18 @@ import java.util.logging.Level;
 * Used to teleport players.
 */
 public class TeleportCommand extends MultiverseCommand {
-    private SafeTTeleporter playerTeleporter;
+    private final SafeTTeleporter playerTeleporter;

    public TeleportCommand(MultiverseCore plugin) {
        super(plugin);
        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.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {DESTINATION}");
        this.setArgRange(1, 2);
        this.addKey("mvtp");
        this.addKey("mv tp");
-        this.playerTeleporter = new SafeTTeleporter(this.plugin);
+        this.playerTeleporter = this.plugin.getSafeTTeleporter();
        this.setPermission(menu);
    }

@@ -51,17 +53,13 @@ public class TeleportCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        // Check if the command was sent from a Player.
        CommandSender teleporter = sender;
        Player teleportee = null;
-        if (sender instanceof Player) {
-            teleporter = (Player) sender;
-        }

        String destinationName;

        if (args.size() == 2) {
-            teleportee = this.plugin.getServer().getPlayer(args.get(0));
+            teleportee = this.plugin.getServer().getPlayerExact(args.get(0));
            if (teleportee == null) {
                this.messaging.sendMessage(sender, String.format("Sorry, I couldn't find player: %s%s",
                        ChatColor.GOLD, args.get(0)), false);
@@ -97,7 +95,7 @@ public class TeleportCommand extends MultiverseCommand {
        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!!!");
+            Logging.fine("Someone else cancelled the MVTeleport Event!!!");
            return;
        }

@@ -111,7 +109,7 @@ public class TeleportCommand extends MultiverseCommand {
            return;
        }

-        if (MultiverseCore.EnforceAccess && teleporter != null && !this.plugin.getMVPerms().canEnterDestination(teleporter, d)) {
+        if (plugin.getMVConfig().getEnforceAccess() && teleporter != null && !this.plugin.getMVPerms().canEnterDestination(teleporter, d)) {
            if (teleportee.equals(teleporter)) {
                teleporter.sendMessage("Doesn't look like you're allowed to go " + ChatColor.RED + "there...");
            } else {
@@ -161,10 +159,13 @@ public class TeleportCommand extends MultiverseCommand {
            this.messaging.sendMessage(teleporter, "Sorry Boss, I tried everything, but just couldn't teleport ya there!", false);
            return;
        }
-        TeleportResult result = this.playerTeleporter.safelyTeleport(teleporter, teleportee, d);
+        Teleporter teleportObject = (d instanceof CustomTeleporterDestination) ?
+                ((CustomTeleporterDestination)d).getTeleporter() : this.playerTeleporter;
+        TeleportResult result = teleportObject.teleport(teleporter, teleportee, d);
        if (result == TeleportResult.FAIL_UNSAFE) {
-            this.plugin.log(Level.FINE, "Could not teleport " + teleportee.getName() + " to " + LocationManipulation.strCoordsRaw(d.getLocation(teleportee)));
-            this.plugin.log(Level.FINE, "Queueing Command");
+            Logging.fine("Could not teleport " + teleportee.getName()
+                    + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
+            Logging.fine("Queueing Command");
            Class<?>[] paramTypes = { CommandSender.class, Player.class, Location.class };
            List<Object> items = new ArrayList<Object>();
            items.add(teleporter);
@@ -174,7 +175,7 @@ public class TeleportCommand extends MultiverseCommand {
            if (!teleportee.equals(teleporter)) {
                player = teleportee.getName();
            }
-            String message = String.format("%sMultiverse %sdid not teleport %s%s%sto %s%s%sbecause it was unsafe.",
+            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);
@@ -7,103 +7,215 @@

 package com.onarandombox.MultiverseCore.commands;

+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteFailedException;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteService;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
+import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
+import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerFactory;
+import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerType;
+import com.pneumaticraft.commandhandler.CommandHandler;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
+import org.bukkit.scheduler.BukkitRunnable;

+import java.io.File;
 import java.util.List;
-import java.util.logging.Level;
+import java.util.Map;

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

    public VersionCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Multiverse Version");
-        this.setCommandUsage("/mv version " + ChatColor.GOLD + "-[pb]");
-        this.setArgRange(0, 1);
+        this.setCommandUsage("/mv version " + ChatColor.GOLD + "[-b|-h|-p] [--include-plugin-list]");
+        this.setArgRange(0, 2);
        this.addKey("mv version");
+        this.addKey("mvver");
        this.addKey("mvv");
        this.addKey("mvversion");
        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);
+                "Dumps version info to the console, optionally to pastebin.com with -b, to hastebin.com using -h, or to paste.gg with -p.", PermissionDefault.TRUE);
+    }
+
+    private String getLegacyString() {
+        return "[Multiverse-Core] Multiverse-Core Version: " + this.plugin.getDescription().getVersion() + '\n'
+                + "[Multiverse-Core] Bukkit Version: " + this.plugin.getServer().getVersion() + '\n'
+                + "[Multiverse-Core] Loaded Worlds: " + this.plugin.getMVWorldManager().getMVWorlds() + '\n'
+                + "[Multiverse-Core] Multiverse Plugins Loaded: " + this.plugin.getPluginCount() + '\n'
+                +"[Multiverse-Core] Economy being used: " + plugin.getEconomist().getEconomyName() + '\n'
+                + "[Multiverse-Core] Permissions Plugin: " + this.plugin.getMVPerms().getType() + '\n'
+                + "[Multiverse-Core] Dumping Config Values: (version " + this.plugin.getMVConfig().getVersion() + ")" + '\n'
+                + "[Multiverse-Core]   enforceaccess: " + plugin.getMVConfig().getEnforceAccess() + '\n'
+                + "[Multiverse-Core]   prefixchat: " + plugin.getMVConfig().getPrefixChat() + '\n'
+                + "[Multiverse-Core]   prefixchatformat: " + plugin.getMVConfig().getPrefixChatFormat() + '\n'
+                + "[Multiverse-Core]   useasyncchat: " + plugin.getMVConfig().getUseAsyncChat() + '\n'
+                + "[Multiverse-Core]   teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + '\n'
+                + "[Multiverse-Core]   firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + '\n'
+                + "[Multiverse-Core]   displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + '\n'
+                + "[Multiverse-Core]   globaldebug: " + plugin.getMVConfig().getGlobalDebug() + '\n'
+                + "[Multiverse-Core]   silentstart: " + plugin.getMVConfig().getSilentStart() + '\n'
+                + "[Multiverse-Core]   messagecooldown: " + plugin.getMessaging().getCooldown() + '\n'
+                + "[Multiverse-Core]   version: " + plugin.getMVConfig().getVersion() + '\n'
+                + "[Multiverse-Core]   firstspawnworld: " + plugin.getMVConfig().getFirstSpawnWorld() + '\n'
+                + "[Multiverse-Core]   teleportcooldown: " + plugin.getMVConfig().getTeleportCooldown() + '\n'
+                + "[Multiverse-Core]   defaultportalsearch: " + plugin.getMVConfig().isUsingDefaultPortalSearch() + '\n'
+                + "[Multiverse-Core]   portalsearchradius: " + plugin.getMVConfig().getPortalSearchRadius() + '\n'
+                + "[Multiverse-Core]   autopurge: " + plugin.getMVConfig().isAutoPurgeEnabled() + '\n'
+                + "[Multiverse-Core] Special Code: FRN002" + '\n';
+    }
+
+    private String getMarkdownString() {
+        return "# Multiverse-Core" + '\n'
+                + "## Overview" + '\n'
+                + "| Name | Value |" + '\n'
+                + "| --- | --- |" + '\n'
+                + "| Multiverse-Core Version | `" + this.plugin.getDescription().getVersion() + "` |" + '\n'
+                + "| Bukkit Version | `" + this.plugin.getServer().getVersion() + "` |" + '\n'
+                + "| Loaded Worlds | `" + this.plugin.getMVWorldManager().getMVWorlds() + "` |" + '\n'
+                + "| Multiverse Plugins Loaded | `" + this.plugin.getPluginCount() + "` |" + '\n'
+                + "| Economy being used | `" + plugin.getEconomist().getEconomyName() + "` |" + '\n'
+                + "| Permissions Plugin | `" + this.plugin.getMVPerms().getType() + "` |" + '\n'
+                + "## Parsed Config" + '\n'
+                + "These are what Multiverse thought the in-memory values of the config were." + "\n\n"
+                + "| Config Key  | Value |" + '\n'
+                + "| --- | --- |" + '\n'
+                + "| version | `" + this.plugin.getMVConfig().getVersion() + "` |" + '\n'
+                + "| messagecooldown | `" + plugin.getMessaging().getCooldown() + "` |" + '\n'
+                + "| teleportcooldown | `" + plugin.getMVConfig().getTeleportCooldown() + "` |" + '\n'
+                + "| worldnameprefix | `" + plugin.getMVConfig().getPrefixChat() + "` |" + '\n'
+                + "| worldnameprefixFormat | `" + plugin.getMVConfig().getPrefixChatFormat() + "` |" + '\n'
+                + "| enforceaccess | `" + plugin.getMVConfig().getEnforceAccess() + "` |" + '\n'
+                + "| displaypermerrors | `" + plugin.getMVConfig().getDisplayPermErrors() + "` |" + '\n'
+                + "| teleportintercept | `" + plugin.getMVConfig().getTeleportIntercept() + "` |" + '\n'
+                + "| firstspawnoverride | `" + plugin.getMVConfig().getFirstSpawnOverride() + "` |" + '\n'
+                + "| firstspawnworld | `" + plugin.getMVConfig().getFirstSpawnWorld() + "` |" + '\n'
+                + "| debug | `" + plugin.getMVConfig().getGlobalDebug() + "` |" + '\n';
+    }
+
+    private void addVersionInfoToEvent(MVVersionEvent event) {
+        // add the legacy version info
+        event.appendVersionInfo(this.getLegacyString());
+
+        // add the legacy file, but as markdown so it's readable
+        // TODO Readd this in 5.0.0
+        // event.putDetailedVersionInfo("version.md", this.getMarkdownString());
+
+        // add config.yml
+        File configFile = new File(this.plugin.getDataFolder(), "config.yml");
+        event.putDetailedVersionInfo("multiverse-core/config.yml", configFile);
+
+        // add worlds.yml
+        File worldsFile = new File(this.plugin.getDataFolder(), "worlds.yml");
+        event.putDetailedVersionInfo("multiverse-core/worlds.yml", worldsFile);
    }

    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
+    public void runCommand(final CommandSender sender, final List<String> args) {
        // Check if the command was sent from a Player.
        if (sender instanceof Player) {
            sender.sendMessage("Version info dumped to console. Please check your server logs.");
        }

-        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();

-        MVVersionEvent versionEvent = new MVVersionEvent(buffer.toString());
+        this.addVersionInfoToEvent(versionEvent);
        this.plugin.getServer().getPluginManager().callEvent(versionEvent);

+        if (CommandHandler.hasFlag("--include-plugin-list", args)) {
+            versionEvent.appendVersionInfo('\n' + "Plugins: " + getPluginList());
+            versionEvent.putDetailedVersionInfo("plugins.txt", "Plugins: " + getPluginList());
+        }
+
+        final String versionInfo = versionEvent.getVersionInfo();
+        versionEvent.putDetailedVersionInfo("version.txt", versionInfo);
+
+        final Map<String, String> files = versionEvent.getDetailedVersionInfo();
+
        // log to console
-        String data = versionEvent.getVersionInfo();
-        String[] lines = data.split("\n");
+        String[] lines = versionInfo.split("\\r?\\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;
+            if (!line.isEmpty()) {
+                this.plugin.getServer().getLogger().info(line);
            }
-
-            sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
-            this.plugin.log(Level.INFO, "Version info dumped here: " + pasteUrl);
        }
+
+        BukkitRunnable logPoster = new BukkitRunnable() {
+            @Override
+            public void run() {
+                if (args.size() > 0) {
+                    String pasteUrl;
+                    if (CommandHandler.hasFlag("-b", args)) {
+                        // private post to pastebin
+                        pasteUrl = postToService(PasteServiceType.PASTEBIN, true, versionInfo, files);
+                    } else if (CommandHandler.hasFlag("-g", args)) {
+                        // private post to github
+                        pasteUrl = postToService(PasteServiceType.GITHUB, true, versionInfo, files);
+                    } else if (CommandHandler.hasFlag("-h", args)) {
+                        // private post to hastebin
+                        pasteUrl = postToService(PasteServiceType.HASTEBIN, true, versionInfo, files);
+                    } else if (CommandHandler.hasFlag("-p", args)) {
+                        // private post to paste.gg
+                        pasteUrl = postToService(PasteServiceType.PASTEGG, true, versionInfo, files);
+                    } else {
+                        return;
+                    }
+
+                    if (!(sender instanceof ConsoleCommandSender)) {
+                        sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
+                    }
+                    Logging.info("Version info dumped here: %s", pasteUrl);
+                }
+            }
+        };
+
+        // Run the log posting operation asynchronously, since we don't know how long it will take.
+        logPoster.runTaskAsynchronously(this.plugin);
    }

    /**
     * Send the current contents of this.pasteBinBuffer to a web service.
     *
-     * @param type      Service type to send to
-     * @param isPrivate Should the paste be marked as private.
+     * @param type       Service type to send paste data to.
+     * @param isPrivate  Should the paste be marked as private.
+     * @param pasteData  Legacy string only data to post to a service.
+     * @param pasteFiles Map of filenames/contents of debug info.
     * @return URL of visible paste
     */
-    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData) {
+    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData, Map<String, String> pasteFiles) {
        PasteService ps = PasteServiceFactory.getService(type, isPrivate);
+
        try {
-            return ps.postData(ps.encodeData(pasteData), ps.getPostURL());
+            String result;
+            if (ps.supportsMultiFile()) {
+                result = ps.postData(pasteFiles);
+            } else {
+                result = ps.postData(pasteData);
+            }
+
+            if (SHORTENER != null) return SHORTENER.shorten(result);
+            return result;
        } catch (PasteFailedException e) {
-            System.out.print(e);
-            return "Error posting to service";
+            e.printStackTrace();
+            return "Error posting to service.";
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return "That service isn't supported yet.";
        }
    }
+
+    private String getPluginList() {
+        return StringUtils.join(plugin.getServer().getPluginManager().getPlugins(), ", ");
+    }
 }
@@ -15,24 +15,27 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

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

 /**
 * States who is in what world.
 */
 public class WhoCommand extends MultiverseCommand {
-
-    private MVWorldManager worldManager;
+    private final MVWorldManager worldManager;

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

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

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

-        if (worlds.size() == 0) {
-            sender.sendMessage("Multiverse does not know about any of your worlds :(");
-        } else if (worlds.size() == 1) {
-            sender.sendMessage(ChatColor.AQUA + "--- Players in" + worlds.get(0).getColoredWorldString() + ChatColor.AQUA + " ---");
-        } else {
-            sender.sendMessage(ChatColor.AQUA + "--- There are players in ---");
-        }
-
-        for (MultiverseWorld world : worlds) {
-            if (!(this.worldManager.isMVWorld(world.getName()))) {
-                continue;
-            }
-
-            if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
-                continue;
-            }
-            List<Player> players = world.getCBWorld().getPlayers();
-
-            String result = "";
-            if (players.size() <= 0 && !showAll) {
-                continue;
-            }
-
-            if (players.size() <= 0) {
-                result = "Empty";
-            } else {
-                for (Player player : players) {
-                    result += player.getDisplayName() + " " + ChatColor.WHITE;
+        // multiworld mode
+        sender.sendMessage(ChatColor.AQUA + "--- Worlds and their players --- "
+                + visiblePlayers.size() + "/" + plugin.getServer().getMaxPlayers());
+        boolean shownOne = false;
+        for (MultiverseWorld world : this.worldManager.getMVWorlds()) {
+            if (this.plugin.getMVPerms().canEnterWorld(p, world)) { // only show world if the player can access it
+                if (showAll || !world.getCBWorld().getPlayers().isEmpty()) { // either show all or show if the world is not empty
+                    sender.sendMessage(String.format("%s%s - %s", world.getColoredWorldString(), ChatColor.WHITE, buildPlayerString(world, p, visiblePlayers)));
+                    shownOne = true;
                }
            }
-
-            sender.sendMessage(world.getColoredWorldString() + ChatColor.WHITE + " - " + result);
        }
+        if (!shownOne) {
+            sender.sendMessage("No worlds found.");
+        }
+        return;
+    }
+
+    private static String buildPlayerString(MultiverseWorld world, Player viewer, final Collection<Player> visiblePlayers) {
+        // Retrieve the players in this world
+        List<Player> players = world.getCBWorld().getPlayers();
+        StringBuilder playerBuilder = new StringBuilder();
+        for (Player player : players) {
+            // If the viewer is the console or the viewier is allowed to see the player, show them.
+            // Make sure we're also ONLY showing online players.
+            // Since we already checked visible players, we'll just make sure who we're about to show is in that.
+            if (visiblePlayers.contains(player))
+                playerBuilder.append(player.getDisplayName()).append(", ");
+        }
+        String bString = playerBuilder.toString();
+        return (bString.length() == 0) ? "No players found." : bString.substring(0, bString.length() - 2);
    }
 }
@@ -1,115 +0,0 @@
-/******************************************************************************
- * 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;
-    }
-}
@@ -1,135 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.configuration;
-
-import 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;
-    }
-}
@@ -1,98 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.configuration;
-
-import com.onarandombox.MultiverseCore.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();
-    }
-}
@@ -1,292 +0,0 @@
-/******************************************************************************
- * 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,129 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.configuration;
-
-import 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;
-    }
-}
@@ -1,133 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.configuration;
-
-import 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,84 @@
+package com.onarandombox.MultiverseCore.configuration;
+
+import java.util.Map;
+
+import com.onarandombox.MultiverseCore.utils.MaterialConverter;
+import me.main__.util.SerializationConfig.Property;
+import me.main__.util.SerializationConfig.SerializationConfig;
+
+import me.main__.util.SerializationConfig.Serializor;
+import org.bukkit.Material;
+import org.bukkit.configuration.serialization.SerializableAs;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Entryfee-settings.
+ */
+@SerializableAs("MVEntryFee")
+public class EntryFee extends SerializationConfig {
+    @Property
+    private double amount;
+    @Property(serializor = EntryFeeCurrencySerializor.class)
+    @Nullable
+    private Material currency;
+
+    public EntryFee() {
+        super();
+    }
+
+    public EntryFee(Map<String, Object> values) {
+        super(values);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void setDefaults() {
+        amount = 0D;
+        currency = null;
+    }
+
+    /**
+     * @return the amount
+     */
+    public double getAmount() {
+        return amount;
+    }
+
+    /**
+     * @return the currency
+     */
+    @Nullable
+    public Material getCurrency() {
+        return currency;
+    }
+
+    /**
+     * Sets the amount.
+     * @param amount The new value.
+     */
+    public void setAmount(double amount) {
+        this.amount = amount;
+    }
+
+    /**
+     * Sets the currency.
+     * @param currency The new value.
+     */
+    public void setCurrency(@Nullable Material currency) {
+        this.currency = currency;
+    }
+
+    public static final class EntryFeeCurrencySerializor implements Serializor<Material, Object> {
+        @Override
+        public String serialize(Material material) {
+            return material.toString();
+        }
+
+        @Override
+        public Material deserialize(Object o, Class<Material> aClass) {
+            return MaterialConverter.convertTypeString(o.toString());
+        }
+    }
+}
@@ -1,129 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.configuration;
-
-import 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;
-    }
-}
@@ -1,97 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.configuration;
-
-import 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();
-    }
-}
@@ -1,151 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.configuration;
-
-import com.onarandombox.MultiverseCore.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;
-    }
-}
@@ -1,35 +0,0 @@
-/******************************************************************************
- * 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,75 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.configuration;
-
-import com.onarandombox.MultiverseCore.api.LoggablePlugin;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.util.config.Configuration;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.logging.Level;
-
-/*
- * 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) {
-        List<String> list = Arrays.asList(oldConfig.getString("worlds." + key + oldProperty).split(","));
-        if (list.size() > 0) {
-            if (list.get(0).length() == 0) {
-                list = new ArrayList<String>();
-            }
-        }
-        newConfig.setProperty("worlds." + key + newProperty, list);
-    }
-
-    protected final File detectMultiverseFolders(File folder, LoggablePlugin mvPlugin) {
-        File oldFolder = null;
-        mvPlugin.log(Level.INFO, "Starting Multiverse Configuration Migrator(MVCM)!");
-        // They still have MV 1 installed! Good!
-        if (mvPlugin.getServer().getPluginManager().getPlugin("MultiVerse") != null) {
-            mvPlugin.log(Level.INFO, "Found MultiVerse 1. Starting Config Migration...");
-            Plugin plugin = mvPlugin.getServer().getPluginManager().getPlugin("MultiVerse");
-            oldFolder = plugin.getDataFolder();
-        } else {
-            // They didn't have MV 1 enabled... let's try and find the folder...
-            File[] folders = folder.getParentFile().listFiles();
-            List<File> folderList = Arrays.asList(folders);
-            for (File f : folderList) {
-                if (f.getName().equalsIgnoreCase("MultiVerse")) {
-                    mvPlugin.log(Level.INFO, "Found the MultiVerse 1 config folder. Starting Config Migration...");
-                    oldFolder = f;
-                }
-            }
-            if (oldFolder == null) {
-                mvPlugin.log(Level.INFO, "Did not find the MV1 Folder. If you did not have MultiVerse 1 installed and this is the FIRST time you're running MV2, this message is GOOD. ");
-                mvPlugin.log(Level.INFO, "If you did, your configs were **NOT** migrated! Go Here: INSERTURLFORHELP");
-                return null;
-            }
-        }
-        return oldFolder;
-    }
-}
-
-/*
- * END CHECKSTYLE-SUPPRESSION: ALL
- */
@@ -1,67 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.configuration;
-
-/**
- * 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();
-}
@@ -0,0 +1,98 @@
+package com.onarandombox.MultiverseCore.configuration;
+
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
+import org.bukkit.configuration.serialization.SerializableAs;
+
+/**
+ * Just like a regular {@link Location}, however {@code world} is usually {@code null}
+ * or just a weak reference and it implements {@link ConfigurationSerializable}.
+ */
+@SerializableAs("MVSpawnLocation")
+public class SpawnLocation extends Location implements ConfigurationSerializable {
+    private Reference<World> worldRef;
+
+    public SpawnLocation(double x, double y, double z) {
+        super(null, x, y, z);
+    }
+
+    public SpawnLocation(double x, double y, double z, float yaw, float pitch) {
+        super(null, x, y, z, yaw, pitch);
+    }
+
+    public SpawnLocation(Location loc) {
+        this(loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public World getWorld() {
+        return (this.worldRef != null) ? this.worldRef.get() : null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setWorld(World world) {
+        this.worldRef = new WeakReference<World>(world);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Chunk getChunk() {
+        if ((this.worldRef != null) && (this.worldRef.get() != null))
+            return this.worldRef.get().getChunkAt(this);
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Block getBlock() {
+        if ((this.worldRef != null) && (this.worldRef.get() != null))
+            return this.worldRef.get().getBlockAt(this);
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Map<String, Object> serialize() {
+        Map<String, Object> serialized = new HashMap<String, Object>(5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        serialized.put("x", this.getX());
+        serialized.put("y", this.getY());
+        serialized.put("z", this.getZ());
+        serialized.put("pitch", this.getPitch());
+        serialized.put("yaw", this.getYaw());
+        return serialized;
+    }
+
+    /**
+     * Let Bukkit be able to deserialize this.
+     * @param args The map.
+     * @return The deserialized object.
+     */
+    public static SpawnLocation deserialize(Map<String, Object> args) {
+        double x = ((Number) args.get("x")).doubleValue();
+        double y = ((Number) args.get("y")).doubleValue();
+        double z = ((Number) args.get("z")).doubleValue();
+        float pitch = ((Number) args.get("pitch")).floatValue();
+        float yaw = ((Number) args.get("yaw")).floatValue();
+        return new SpawnLocation(x, y, z, yaw, pitch);
+    }
+}
@@ -0,0 +1,50 @@
+package com.onarandombox.MultiverseCore.configuration;
+
+import java.util.Map;
+
+import me.main__.util.SerializationConfig.Property;
+import me.main__.util.SerializationConfig.SerializationConfig;
+
+import org.bukkit.configuration.serialization.SerializableAs;
+
+/**
+ * Spawning-Settings.
+ */
+@SerializableAs("MVSpawnSettings")
+public class SpawnSettings extends SerializationConfig {
+    @Property
+    private SubSpawnSettings animals;
+    @Property
+    private SubSpawnSettings monsters;
+
+    public SpawnSettings() {
+        super();
+    }
+
+    public SpawnSettings(Map<String, Object> values) {
+        super(values);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDefaults() {
+        animals = new SubSpawnSettings();
+        monsters = new SubSpawnSettings();
+    }
+
+    /**
+     * @return the animal-settings
+     */
+    public SubSpawnSettings getAnimalSettings() {
+        return animals;
+    }
+
+    /**
+     * @return the monster-settings
+     */
+    public SubSpawnSettings getMonsterSettings() {
+        return monsters;
+    }
+}
@@ -1,96 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.configuration;
-
-import 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,76 @@
+package com.onarandombox.MultiverseCore.configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import me.main__.util.SerializationConfig.Property;
+import me.main__.util.SerializationConfig.SerializationConfig;
+
+import org.bukkit.configuration.serialization.SerializableAs;
+
+/**
+ * SpawnSubSettings.
+ */
+@SerializableAs("MVSpawnSubSettings")
+public class SubSpawnSettings extends SerializationConfig {
+    @Property
+    private boolean spawn;
+    @Property
+    private int spawnrate;
+    @Property
+    private List<String> exceptions;
+
+    public SubSpawnSettings() {
+        super();
+    }
+
+    public SubSpawnSettings(Map<String, Object> values) {
+        super(values);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDefaults() {
+        spawn = true;
+        exceptions = new ArrayList<String>();
+        spawnrate = -1;
+    }
+
+    /**
+     * @return spawn
+     */
+    public boolean doSpawn() {
+        return spawn;
+    }
+
+    /**
+     * @param spawn The new value.
+     */
+    public void setSpawn(boolean spawn) {
+        this.spawn = spawn;
+    }
+
+    /**
+     * @return The exceptions
+     */
+    public List<String> getExceptions() {
+        return exceptions;
+    }
+
+    /**
+     * @param rate The new spawn rate
+     */
+    public void setSpawnRate(int rate) {
+        this.spawnrate = rate;
+    }
+
+    /**
+     * @return The spawn rate
+     */
+    public int getSpawnRate() {
+        return this.spawnrate;
+    }
+}
@@ -0,0 +1,27 @@
+package com.onarandombox.MultiverseCore.configuration;
+
+import org.bukkit.Bukkit;
+
+import com.onarandombox.MultiverseCore.MVWorld;
+import com.onarandombox.MultiverseCore.event.MVWorldPropertyChangeEvent;
+
+import me.main__.util.SerializationConfig.ChangeDeniedException;
+import me.main__.util.SerializationConfig.ObjectUsingValidator;
+
+/**
+ * Validates world-property-changes.
+ * @param <T> The type of the property that should be validated.
+ */
+public class WorldPropertyValidator<T> extends ObjectUsingValidator<T, MVWorld> {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public T validateChange(String property, T newValue, T oldValue, MVWorld object) throws ChangeDeniedException {
+        MVWorldPropertyChangeEvent<T> event = new MVWorldPropertyChangeEvent<T>(object, null, property, newValue);
+        Bukkit.getPluginManager().callEvent(event);
+        if (event.isCancelled())
+            throw new ChangeDeniedException();
+        return event.getTheNewValue();
+    }
+}
@@ -7,8 +7,13 @@

 package com.onarandombox.MultiverseCore.destination;

+import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -18,9 +23,11 @@ import org.bukkit.util.Vector;
 * A bed-{@link MVDestination}.
 */
 public class BedDestination implements MVDestination {
-
+    public static final String OWN_BED_STRING = "playerbed";
+    private String playername = "";
    private boolean isValid;
    private Location knownBedLoc;
+    private MultiverseCore plugin;

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

@@ -46,7 +61,14 @@ public class BedDestination implements MVDestination {
    @Override
    public Location getLocation(Entity entity) {
        if (entity instanceof Player) {
-            this.knownBedLoc = ((Player) entity).getBedSpawnLocation();
+            if (this.playername.isEmpty())
+                this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(((Player) entity).getBedSpawnLocation());
+            else
+                this.knownBedLoc = this.plugin.getBlockSafety().getSafeBedSpawn(Bukkit.getOfflinePlayer(this.playername).getBedSpawnLocation());
+
+            if (this.knownBedLoc == null) {
+                ((Player) entity).sendMessage("The bed was " + ChatColor.RED + "invalid or blocked" + ChatColor.RESET + ". Sorry.");
+            }
            return this.knownBedLoc;
        }
        return null;
@@ -65,7 +87,7 @@ public class BedDestination implements MVDestination {
     */
    @Override
    public void setDestination(JavaPlugin plugin, String destination) {
-        // Not needed.
+        this.plugin = (MultiverseCore) plugin;
    }

    /**
@@ -114,6 +136,6 @@ public class BedDestination implements MVDestination {

    @Override
    public String toString() {
-        return "b:playerbed";
+        return "b:" + (playername.isEmpty() ? OWN_BED_STRING : playername);
    }
 }
@@ -0,0 +1,29 @@
+package com.onarandombox.MultiverseCore.destination;
+
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.util.Vector;
+
+public abstract class CustomTeleporterDestination implements MVDestination {
+    @Override
+    public final Location getLocation(final Entity entity) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final Vector getVelocity() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final boolean useSafeTeleporter() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public abstract String toString();
+
+    public abstract Teleporter getTeleporter();
+}
@@ -54,7 +54,7 @@ public class DestinationFactory {
            Class<? extends MVDestination> myClass = this.destList.get(idenChar);
            try {
                MVDestination mydest = myClass.newInstance();
-                if (!mydest.isThisType((MultiverseCore) this.plugin, destination)) {
+                if (!mydest.isThisType(this.plugin, destination)) {
                    return new InvalidDestination();
                }
                mydest.setDestination(this.plugin, destination);
@@ -21,9 +21,10 @@ import java.util.List;
 * An exact {@link MVDestination}.
 */
 public class ExactDestination implements MVDestination {
-    private final String coordRegex = "(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*)";
+    private final String coordRegex = "(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~),(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~),(-?[\\d]+\\.?[\\d]*|~-?[\\d]+\\.?[\\d]*|~)";
    private boolean isValid;
    private Location location;
+    private boolean relativeX, relativeY, relativeZ;

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

    /**
@@ -134,11 +148,42 @@ public class ExactDestination implements MVDestination {
        double[] coords = new double[3];
        String[] coordString = parsed.get(2).split(",");
        for (int i = 0; i < 3; i++) {
-            try {
-                coords[i] = Double.parseDouble(coordString[i]);
-            } catch (NumberFormatException e) {
-                this.isValid = false;
-                return;
+            String[] relSplit = coordString[i].split("~");
+            boolean relative = false;
+            if (relSplit.length == 0) {
+                // coord is "~" form
+                relative = true;
+                coords[i] = 0;
+            } else if (relSplit.length == 1) {
+                // coord is "123" form
+                try {
+                    coords[i] = Double.parseDouble(relSplit[0]);
+                } catch (NumberFormatException e) {
+                    this.isValid = false;
+                    return;
+                }
+            } else {
+                // coord is "~123" form
+                relative = true;
+                try {
+                    coords[i] = Double.parseDouble(relSplit[1]);
+                } catch (NumberFormatException e) {
+                    this.isValid = false;
+                    return;
+                }
+            }
+            if (relative) {
+                switch (i) {
+                    case 0:
+                        relativeX = true;
+                        break;
+                    case 1:
+                        relativeY = true;
+                        break;
+                    case 2:
+                        relativeZ = true;
+                        break;
+                }
            }
        }
        this.location.setX(coords[0]);
@@ -184,11 +229,7 @@ public class ExactDestination implements MVDestination {
     * @param location The {@link Location}.
     */
    public void setDestination(Location location) {
-        if (location != null) {
-            this.location = location;
-            this.isValid = true;
-        }
-        this.isValid = false;
+        this.isValid = (this.location = location) != null;
    }

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

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Core;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.LocationManipulation;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -70,7 +70,7 @@ public class WorldDestination implements MVDestination {
        return spawnLoc;
    }

-    private Location getAcurateSpawnLocation(Entity e, MultiverseWorld world) {
+    private static Location getAcurateSpawnLocation(Entity e, MultiverseWorld world) {
        if (world != null) {
            return world.getSpawnLocation();
        } else {
@@ -93,6 +93,9 @@ public class WorldDestination implements MVDestination {
     */
    @Override
    public void setDestination(JavaPlugin plugin, String destination) {
+        // TODO Taking a JavaPlugin here is rather useless, if we keep casting it up to MultiverseCore.
+        // We should change that.
+        Core core = (Core) plugin;
        String[] items = destination.split(":");
        if (items.length > 3) {
            isValid = false;
@@ -100,19 +103,19 @@ public class WorldDestination implements MVDestination {
        }
        if (items.length == 1 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
            isValid = true;
-            this.world = ((MultiverseCore) plugin).getMVWorldManager().getMVWorld(items[0]);
+            this.world = core.getMVWorldManager().getMVWorld(items[0]);
            return;
        }
        if (items.length == 2 && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[0])) {
-            this.world = ((MultiverseCore) plugin).getMVWorldManager().getMVWorld(items[0]);
-            this.yaw = LocationManipulation.getYaw(items[1]);
+            this.world = core.getMVWorldManager().getMVWorld(items[0]);
+            this.yaw = core.getLocationManipulation().getYaw(items[1]);
            return;
        }
        if (items[0].equalsIgnoreCase("w") && ((MultiverseCore) plugin).getMVWorldManager().isMVWorld(items[1])) {
            this.world = ((MultiverseCore) plugin).getMVWorldManager().getMVWorld(items[1]);
            isValid = true;
            if (items.length == 3) {
-                this.yaw = LocationManipulation.getYaw(items[2]);
+                this.yaw = core.getLocationManipulation().getYaw(items[2]);
            }
        }
    }
@@ -0,0 +1,50 @@
+/******************************************************************************
+ * 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.enums;
+
+import org.bukkit.PortalType;
+
+/**
+ * Custom enum that adds all/none for allowing portal creation.
+ */
+public enum AllowedPortalType {
+    /**
+     * No portals are allowed.
+     */
+    NONE(PortalType.CUSTOM),
+    /**
+     * All portal types are allowed.
+     */
+    ALL(PortalType.CUSTOM),
+    /**
+     * Only Nether style portals are allowed.
+     */
+    NETHER(PortalType.NETHER),
+    /**
+     * Only Ender style portals are allowed.
+     */
+    END(PortalType.ENDER);
+
+    private PortalType type;
+
+    AllowedPortalType(PortalType type) {
+        this.type = type;
+    }
+
+    /**
+     * Gets the text.
+     * @return The text.
+     */
+    public PortalType getActualPortalType() {
+        return this.type;
+    }
+
+    public boolean isPortalAllowed(PortalType portalType) {
+        return this != NONE && (getActualPortalType() == portalType || this == ALL);
+    }
+}
@@ -1,64 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.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;
-    }
-}
@@ -11,49 +11,33 @@ import org.bukkit.ChatColor;

 /**
 * A regular {@link ChatColor} represented by an english string.
+ * @see ChatColor
 */
 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;
+    // BEGIN CHECKSTYLE-SUPPRESSION: JavadocVariable
+    AQUA(ChatColor.AQUA),
+    BLACK(ChatColor.BLACK),
+    BLUE(ChatColor.BLUE),
+    DARKAQUA(ChatColor.DARK_AQUA),
+    DARKBLUE(ChatColor.DARK_BLUE),
+    DARKGRAY(ChatColor.DARK_GRAY),
+    DARKGREEN(ChatColor.DARK_GREEN),
+    DARKPURPLE(ChatColor.DARK_PURPLE),
+    DARKRED(ChatColor.DARK_RED),
+    GOLD(ChatColor.GOLD),
+    GRAY(ChatColor.GRAY),
+    GREEN(ChatColor.GREEN),
+    LIGHTPURPLE(ChatColor.LIGHT_PURPLE),
+    RED(ChatColor.RED),
+    YELLOW(ChatColor.YELLOW),
+    WHITE(ChatColor.WHITE);
+    // END CHECKSTYLE-SUPPRESSION: JavadocVariable

-    EnglishChatColor(String name, ChatColor color) {
+    private final ChatColor color;
+    //private final String text;
+
+    EnglishChatColor(ChatColor color) {
        this.color = color;
-        this.text = name;
    }

    /**
@@ -61,7 +45,7 @@ public enum EnglishChatColor {
     * @return The text.
     */
    public String getText() {
-        return this.text;
+        return this.name();
    }

    /**
@@ -92,11 +76,20 @@ public enum EnglishChatColor {
    public static EnglishChatColor fromString(String text) {
        if (text != null) {
            for (EnglishChatColor c : EnglishChatColor.values()) {
-                if (text.equalsIgnoreCase(c.text)) {
+                if (text.equalsIgnoreCase(c.name())) {
                    return c;
                }
            }
        }
        return null;
    }
+
+    /**
+     * Looks if the given-color name is a valid color.
+     * @param aliasColor A color-name.
+     * @return True if the name is a valid color, false if it isn't.
+     */
+    public static boolean isValidAliasColor(String aliasColor) {
+        return (EnglishChatColor.fromString(aliasColor) != null);
+    }
 }
@@ -0,0 +1,49 @@
+package com.onarandombox.MultiverseCore.enums;
+
+import org.bukkit.ChatColor;
+
+/**
+ * A regular {@link ChatColor} represented by an english string.
+ * @see ChatColor
+ */
+public enum EnglishChatStyle {
+    // BEGIN CHECKSTYLE-SUPPRESSION: JavadocVariable
+    /** No style. */
+    NORMAL(null),
+    MAGIC(ChatColor.MAGIC),
+    BOLD(ChatColor.BOLD),
+    STRIKETHROUGH(ChatColor.STRIKETHROUGH),
+    UNDERLINE(ChatColor.UNDERLINE),
+    ITALIC(ChatColor.ITALIC);
+    // END CHECKSTYLE-SUPPRESSION: JavadocVariable
+
+    private final ChatColor color;
+
+    EnglishChatStyle(ChatColor color) {
+        this.color = color;
+    }
+
+    /**
+     * Gets the color.
+     * @return The color as {@link ChatColor}.
+     */
+    public ChatColor getColor() {
+        return color;
+    }
+
+    /**
+     * Constructs an {@link EnglishChatStyle} from a {@link String}.
+     * @param text The {@link String}.
+     * @return The {@link EnglishChatStyle}.
+     */
+    public static EnglishChatStyle fromString(String text) {
+        if (text != null) {
+            for (EnglishChatStyle c : EnglishChatStyle.values()) {
+                if (text.equalsIgnoreCase(c.name())) {
+                    return c;
+                }
+            }
+        }
+        return null;
+    }
+}
@@ -8,6 +8,7 @@
 package com.onarandombox.MultiverseCore.event;

 import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;

 import java.util.List;

@@ -15,14 +16,30 @@ 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;
+    private final List<String> configsLoaded;

    public MVConfigReloadEvent(List<String> configsLoaded) {
-        super("MVConfigReload");
        this.configsLoaded = configsLoaded;
    }

+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Gets the handler list. This is required by the event system.
+     * @return A list of HANDLERS.
+     */
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+
    /**
     * Adds a config to this event.
     * @param config The config to add.
@@ -0,0 +1,43 @@
+package com.onarandombox.MultiverseCore.event;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+/**
+ * Called when Core's debug level is changed.
+ */
+public class MVDebugModeEvent extends Event {
+
+    private static final HandlerList HANDLERS = new HandlerList();
+
+    private final int level;
+
+    public MVDebugModeEvent(int level) {
+        this.level = level;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Gets the handler list. This is required by the event system.
+     * @return A list of HANDLERS.
+     */
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+
+    /**
+     * Returns the current debug level of Core.
+     *
+     * @return the current debug level of Core.
+     */
+    public int getLevel() {
+        return level;
+    }
+}
@@ -11,21 +11,40 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;

 /**
 * This event is thrown when a portal is touched.
 */
 public class MVPlayerTouchedPortalEvent extends Event implements Cancellable {
-    private Player p;
-    private Location l;
+    private final Player p;
+    private final Location l;
    private boolean isCancelled;
+    private boolean canUse = true;

    public MVPlayerTouchedPortalEvent(Player p, Location l) {
-        super("MVPlayerTouchedPortalEvent");
        this.p = p;
        this.l = l;
    }

+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Gets the handler list. This is required by the event system.
+     * @return A list of HANDLERS.
+     */
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+
    /**
     * Gets the {@link Location} of the portal-block that was touched.
     * @return The {@link Location} of the portal-block that was touched.
@@ -42,6 +61,26 @@ public class MVPlayerTouchedPortalEvent extends Event implements Cancellable {
        return this.p;
    }

+    /**
+     * Gets whether or not the player in this event can use this portal.
+     *
+     * @return True if the player can use this portal.
+     */
+    public boolean canUseThisPortal() {
+        return this.canUse;
+    }
+
+    /**
+     * Sets whether or not the player in this event can use this portal.
+     * <p>
+     * Setting this to false will cause the player to bounce back!
+     *
+     * @param canUse Whether or not the user can go through this portal.
+     */
+    public void setCanUseThisPortal(boolean canUse) {
+        this.canUse = canUse;
+    }
+
    @Override
    public boolean isCancelled() {
        return this.isCancelled;
@@ -10,23 +10,40 @@ package com.onarandombox.MultiverseCore.event;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;

 /**
 * Called when a player is respawning.
 */
 public class MVRespawnEvent extends Event {
-    private Player player;
+    private final Player player;
+    private final String respawnMethod;
    private Location location;
-    private String respawnMethod;
-

    public MVRespawnEvent(Location spawningAt, Player p, String respawnMethod) {
-        super("MVRespawn");
        this.player = p;
        this.location = spawningAt;
        this.respawnMethod = respawnMethod;
    }

+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Gets the handler list. This is required by the event system.
+     * @return A list of HANDLERS.
+     */
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+
    /**
     * Gets the {@link Player} that's respawning.
     * @return The {@link Player} that's respawning.
@@ -8,31 +8,50 @@
 package com.onarandombox.MultiverseCore.event;

 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.api.SafeTTeleporter;

 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 org.bukkit.event.HandlerList;

 /**
 * 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 boolean useSafeTeleport;
+    private final Player teleportee;
+    private final CommandSender teleporter;
+    private final MVDestination dest;
+    private final boolean useSafeTeleport;
    private boolean isCancelled;

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

+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Gets the handler list. This is required by the event system.
+     * @return A list of HANDLERS.
+     */
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+
    /**
     * Returns the player who will be teleported by this event.
     *
@@ -1,6 +1,17 @@
 package com.onarandombox.MultiverseCore.event;

+import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;

 /**
 * Called when somebody requests version information about Multiverse.
@@ -8,10 +19,29 @@ import org.bukkit.event.Event;
 public class MVVersionEvent extends Event {

    private final StringBuilder versionInfoBuilder;
+    private final Map<String, String> detailedVersionInfo;

-    public MVVersionEvent(String versionInfo) {
-        super("MVVersionEvent");
-        versionInfoBuilder = new StringBuilder(versionInfo);
+    public MVVersionEvent() {
+        versionInfoBuilder = new StringBuilder();
+        detailedVersionInfo = new HashMap<>();
+    }
+
+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Gets the handler list. This is required by the event system.
+     * @return A list of HANDLERS.
+     */
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
    }

    /**
@@ -19,7 +49,22 @@ public class MVVersionEvent extends Event {
     * @return The version-info.
     */
    public String getVersionInfo() {
-        return versionInfoBuilder.toString();
+        return this.versionInfoBuilder.toString();
+    }
+
+    /**
+     * Gets the key/value pair of the detailed version info.
+     *
+     * This information is used for advanced paste services that would prefer
+     * to get the information as several files. Examples include config.yml or
+     * portals.yml. Note that the map returned is immutable.
+     *
+     * The keys are filenames, the values are the contents of the files.
+     *
+     * @return The immutable key value mapping of files and the contents of those files.
+     */
+    public Map<String, String> getDetailedVersionInfo() {
+        return Collections.unmodifiableMap(this.detailedVersionInfo);
    }

    /**
@@ -27,6 +72,48 @@ public class MVVersionEvent extends Event {
     * @param moreVersionInfo The version-info to add. Should end with '\n'.
     */
    public void appendVersionInfo(String moreVersionInfo) {
-        versionInfoBuilder.append(moreVersionInfo);
+        this.versionInfoBuilder.append(moreVersionInfo);
+    }
+
+    private String readFile(final String filename) {
+        StringBuilder result;
+
+        try {
+            FileReader reader = new FileReader(filename);
+            BufferedReader bufferedReader = new BufferedReader(reader);
+            String line;
+            result = new StringBuilder();
+            while ((line = bufferedReader.readLine()) != null) {
+                result.append(line).append("\n");
+            }
+        } catch (FileNotFoundException e) {
+            Logging.severe("Unable to find %s. Here's the traceback: %s", filename, e.getMessage());
+            e.printStackTrace();
+            result = new StringBuilder(String.format("ERROR: Could not load: %s", filename));
+        } catch (IOException e) {
+            Logging.severe("Something bad happend when reading %s. Here's the traceback: %s", filename, e.getMessage());
+            e.printStackTrace();
+            result = new StringBuilder(String.format("ERROR: Could not load: %s", filename));
+        }
+
+        return result.toString();
+    }
+
+    /**
+     * Adds a file to to the detailed version-info currently saved in this event.
+     * @param fileName The name of the file.
+     * @param contents The contents of the file.
+     */
+    public void putDetailedVersionInfo(String fileName, String contents) {
+        this.detailedVersionInfo.put(fileName, contents);
+    }
+
+    /**
+     * Adds a file to to the detailed version-info currently saved in this event.
+     * @param filename The name of the file.
+     * @param file     The file.
+     */
+    public void putDetailedVersionInfo(String filename, File file) {
+        this.putDetailedVersionInfo(filename, readFile(file.getAbsolutePath()));
    }
 }
@@ -1,45 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.event;
-
-import org.bukkit.event.Event;
-
-/**
- * Called when somebody requests version information about Multiverse.
- * @deprecated Use {@link MVVersionEvent} instead.
- */
-@Deprecated
-public class MVVersionRequestEvent extends Event {
-
-    private String pasteBinBuffer;
-
-    public MVVersionRequestEvent(String pasteBinBuffer) {
-        super("MVVersion");
-        this.pasteBinBuffer = pasteBinBuffer;
-    }
-
-    /**
-     * Gets the pasteBinBuffer.
-     * @return The pasteBinBuffer.
-     * @deprecated Use {@link MVVersionEvent} instead.
-     */
-    @Deprecated
-    public String getPasteBinBuffer() {
-        return this.pasteBinBuffer;
-    }
-
-    /**
-     * Sets the pasteBinBuffer.
-     * @param buffer The new pasteBinBuffer.
-     * @deprecated Use {@link MVVersionEvent} instead.
-     */
-    @Deprecated
-    public void setPasteBinBuffer(String buffer) {
-        this.pasteBinBuffer = buffer;
-    }
-}
@@ -4,6 +4,7 @@ import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;

 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import org.bukkit.event.HandlerList;

 /**
 * Called when a world is about to be deleted by Multiverse.
@@ -15,8 +16,6 @@ public class MVWorldDeleteEvent extends Event implements Cancellable {
    private final boolean removeFromConfig;

    public MVWorldDeleteEvent(MultiverseWorld world, boolean removeFromConfig) {
-        super("MVWorldDeleteEvent");
-
        if (world == null)
            throw new IllegalArgumentException("world can't be null!");

@@ -24,6 +23,24 @@ public class MVWorldDeleteEvent extends Event implements Cancellable {
        this.removeFromConfig = removeFromConfig;
    }

+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Gets the handler list. This is required by the event system.
+     * @return A list of HANDLERS.
+     */
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+
    /**
     * {@inheritDoc}
     */
@@ -11,6 +11,7 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;

 /**
 * This event is fired *before* the property is actually changed.
@@ -18,24 +19,42 @@ import org.bukkit.event.Event;
 * If it is cancelled, no change will happen.
 * <p>
 * If you want to get the values of the world before the change, query the world.
- * If you want to get the value being changed, use getProperty()
+ * To get the name of the property that was changed, use {@link #getPropertyName()}.
+ * To get the new value, use {@link #getTheNewValue()}. To change it, use {@link #setTheNewValue(Object)}.
+ * @param <T> The type of the property that was set.
 */
-public class MVWorldPropertyChangeEvent extends Event implements Cancellable {
-    private MultiverseWorld world;
-    private CommandSender changer;
+public class MVWorldPropertyChangeEvent<T> extends Event implements Cancellable {
+    private final MultiverseWorld world;
+    private final CommandSender changer;
+    private final String name;
+    private T value;
    private boolean isCancelled = false;
-    private String value;
-    private String name;

-
-    public MVWorldPropertyChangeEvent(MultiverseWorld world, CommandSender changer, String name, String value) {
-        super("MVWorldPropertyChange");
+    public MVWorldPropertyChangeEvent(MultiverseWorld world, CommandSender changer, String name, T value) {
        this.world = world;
        this.changer = changer;
        this.name = name;
        this.value = value;
    }

+    private static final HandlerList HANDLERS = new HandlerList();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    /**
+     * Gets the handler list. This is required by the event system.
+     * @return A list of handlers.
+     */
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+
    /**
     * Gets the changed world property's name.
     * @return The changed world property's name.
@@ -47,16 +66,38 @@ public class MVWorldPropertyChangeEvent extends Event implements Cancellable {
    /**
     * Gets the new value.
     * @return The new value.
+     * @deprecated Use {@link #getTheNewValue()} instead.
     */
+    @Deprecated
    public String getNewValue() {
+        return this.value.toString();
+    }
+
+    /**
+     * Gets the new value.
+     * @return The new value.
+     */
+    public T getTheNewValue() {
        return this.value;
    }

    /**
     * Sets the new value.
+     * <p>
+     * This method is only a stub, it'll <b>always</b> throw an {@link UnsupportedOperationException}!
     * @param value The new new value.
+     * @deprecated Use {@link #setTheNewValue(Object)} instead.
     */
+    @Deprecated
    public void setNewValue(String value) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Sets the new value.
+     * @param value The new value.
+     */
+    public void setTheNewValue(T value) {
        this.value = value;
    }

@@ -71,6 +112,8 @@ public class MVWorldPropertyChangeEvent extends Event implements Cancellable {

    /**
     * Gets the person (or console) who was responsible for the change.
+     * <p>
+     * This may be null!
     *
     * @return The person (or console) who was responsible for the change.
     */
@@ -14,4 +14,8 @@ public class PropertyDoesNotExistException extends Exception {
    public PropertyDoesNotExistException(String name) {
        super(name);
    }
+
+    public PropertyDoesNotExistException(String name, Throwable cause) {
+        super(name, cause);
+    }
 }
@@ -0,0 +1,35 @@
+package com.onarandombox.MultiverseCore.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+
+/**
+ * A wrapper for the {@link AsyncPlayerChatEvent}.
+ */
+public class AsyncChatEvent implements ChatEvent {
+    private final AsyncPlayerChatEvent event;
+
+    public AsyncChatEvent(AsyncPlayerChatEvent event) {
+        this.event = event;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return event.isCancelled();
+    }
+
+    @Override
+    public String getFormat() {
+        return event.getFormat();
+    }
+
+    @Override
+    public void setFormat(String s) {
+        event.setFormat(s);
+    }
+
+    @Override
+    public Player getPlayer() {
+        return event.getPlayer();
+    }
+}
@@ -0,0 +1,29 @@
+package com.onarandombox.MultiverseCore.listeners;
+
+import org.bukkit.entity.Player;
+
+/**
+ * A wrapper for the two chat-events in Bukkit.
+ */
+public interface ChatEvent {
+    /**
+     * @return Whether this event is cancelled.
+     */
+    boolean isCancelled();
+
+    /**
+     * @return The format.
+     */
+    String getFormat();
+
+    /**
+     * Sets the format.
+     * @param s The new format.
+     */
+    void setFormat(String s);
+
+    /**
+     * @return The player.
+     */
+    Player getPlayer();
+}