build: Relocate commentedconfiguration

build: Make MV5 build with gradle
Merge branch 'main' into update-gradle
2023-02-20 12:11:27 +08:00 · 2023-02-20 11:58:03 +08:00 · 2023-02-20 11:56:32 +08:00 · 2023-02-19 22:55:44 -05:00 · 2023-02-19 22:51:30 -05:00 · 2023-02-20 11:23:57 +08:00
235 changed files with 12715 additions and 11390 deletions
@@ -0,0 +1,77 @@
+name: 🐛 Report a Bug
+description: Report a problem with Multiverse-Core.
+title: "[Bug]: "
+labels: ["Bug: Unconfirmed"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+        If you are having issues with other submodules of Multiverse, please go to their respective git repo:
+            Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues/new/choose
+            Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues/new/choose
+            Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues/new/choose
+            Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues/new/choose
+
+        Not sure if this is a bug with Multiverse-Core? Feel free to ask on our Discord server: https://discord.gg/NZtfKky
+
+        When completing the report, please ensure all fields are filled with the correct details requested. Failure to do so will result in your issue being closed.
+  - type: input
+    id: mutliverse-version-info
+    attributes:
+      label: '`/mv version -p` output'
+      description: Run `/mv version -p` in the console, then copy and paste the link from the output of the command into this box.
+    validations:
+      required: true
+  - type: input
+    id: server-logs
+    attributes:
+      label: Server logs
+      description: >
+        Include full startup log and console error (if any). upload all relevant logs to either https://paste.gg
+        or https://gist.github.com, save and the paste the link in this box.
+    validations:
+      required: true
+  - type: textarea
+    id: server-version
+    attributes:
+      label: Server Version
+      description: Output of `/version` command.
+      placeholder: server version info
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: Bug Description
+      description: Describe in detail what the bug is about. Include the expected behaviour and actual behaviour.
+      placeholder: "Example: When running `/mv` it cause the server to crash..."
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce-steps
+    attributes:
+      label: Steps to reproduce
+      description: Provide detailed intructions to trigger the bug.
+      placeholder: |
+        Example:
+          1. Start a server with only multiverse installed.
+          2. Run `/mv` command.
+          3. Players all get kicked with a "server closed" message.
+          ...
+    validations:
+      required: true
+  - type: checkboxes
+    id: agreements
+    attributes:
+      label: Agreements
+      description: Ensure you have done the following being submitting this issue.
+      options:
+        - label: I have searched for and ensured there isn't already an open or resolved issue(s) regarding this.
+          required: true
+        - label: >
+            I was 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.
+          required: true
@@ -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,41 @@
+name: 💡 Request a Feature
+description: Suggest a feature you want to see in Multiverse-Core!
+title: "[Idea]: "
+labels: ["Type: Idea"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to share your ideas!
+
+        If you are look for other submodules of Multiverse, go to their respective git repo:
+            Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues/new/choose
+            Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues/new/choose
+            Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues/new/choose
+            Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues/new/choose
+
+        Not sure if your feature fits in Multiverse-Core? Feel free to ask on our Discord server: https://discord.gg/NZtfKky
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Describe the feature
+      description: What feature are you suggesting?
+      placeholder: "Example: I hope multiverse can implement random teleport feature..."
+    validations:
+      required: true
+  - type: textarea
+    id: feature-reasoning
+    attributes:
+      label: How is the feature useful to all Multiverse users?
+      description: How is the feature useful to all players, server owners and/or developers?
+      placeholder: "Example: Random teleporting can be integrated into many multiverse modules such as mv-portals..."
+    validations:
+      required: true
+  - type: checkboxes
+    id: agreements
+    attributes:
+      label: Agreements
+      description: Ensure you have done the following being submitting this issue.
+      options:
+        - label: I have searched for and ensured there isn't already an open issue regarding this.
+          required: true
@@ -0,0 +1,61 @@
+name: Create Release Version
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  release_on_push:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Test & Build
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: clean build -x assemble -x shadowJar
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create release
+        uses: rymndhng/release-on-push-action@v0.27.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          bump_version_scheme: norelease
+          tag_prefix: v
+          release_name: "Release <RELEASE_VERSION>"
+          use_github_release_notes: true
+
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@v1.3.2
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Publish package
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publish
+        env:
+          GITHUB_VERSION: ${{ steps.get_release.outputs.tag }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload release artifact
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: build/libs/Multiverse-Core-${{ steps.get_release.outputs.tag }}.jar
+          asset_name: Multiverse-Core-${{ steps.get_release.outputs.tag }}.jar
+          asset_content_type: application/java-archive
@@ -0,0 +1,18 @@
+name: Require PR Labels
+
+on:
+  pull_request:
+    types: [opened, labeled, unlabeled, synchronize]
+    branches: [main]
+
+jobs:
+  require_label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mheap/github-action-required-labels@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          mode: exactly
+          count: 1
+          labels: "release:major, release:minor, release:patch, no release"
@@ -0,0 +1,29 @@
+name: Run unit tests against all PRs
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Run unit tests
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -12,6 +12,7 @@

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

 # vim
 .*.sw[a-p]
@@ -42,3 +43,6 @@ debug.log
 # Doxygen
 /docs/html
 debug.txt
+
+# Gradle
+.gradle
@@ -0,0 +1,6 @@
+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.
+
@@ -1,15 +1,44 @@
+![Multiverse 2](config/multiverse2-long.png)
+
+[![Maven CI/CD](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml/badge.svg)](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml)
+[![Release](https://img.shields.io/nexus/r/com.onarandombox.multiversecore/Multiverse-Core?label=release&server=https%3A%2F%2Frepo.onarandombox.com%2F)](https://dev.bukkit.org/projects/multiverse-core)
+[![Dev builds](https://img.shields.io/nexus/s/com.onarandombox.multiversecore/Multiverse-Core?label=dev%20builds&server=http%3A%2F%2Frepo.onarandombox.com%2F)](https://ci.onarandombox.com/job/Multiverse-Core/)
+[![Discord](https://img.shields.io/discord/325459248047980545?label=discord&logo=discord)](https://discord.gg/NZtfKky)
+[![Support me on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Ddumptruckman%26type%3Dpatrons&style=flat)](https://patreon.com/dumptruckman)
+[![License](https://img.shields.io/github/license/Multiverse/Multiverse-Core)](LICENSE.md)
+
+About
+========
+[Multiverse](https://dev.bukkit.org/projects/multiverse-core) was created at the dawn of Bukkit multiworld support. It has since then grown into a **complete world management solution!** Multiverse provides the easiest to use world management solution for your Minecraft server, big or small, and with great addons like [Portals](https://dev.bukkit.org/projects/multiverse-portals) and [NetherPortals](https://dev.bukkit.org/projects/multiverse-netherportals/), what's not to love!
+<br><br>
+Now it's time to create your very own Multiverse server, do check out our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) and [Usage Guide](https://github.com/Multiverse/Multiverse-Core/wiki/Basics) to get started. Feel free to hop onto our [Discord](https://discord.gg/NZtfKky) if you have any question or just want to have a chat with us!
+
+### Amazing sub-modules available:
+* [Multiverse-NetherPortals](https://github.com/Multiverse/Multiverse-NetherPortals) -> Have separate nether and end worlds for each of your overworlds!
+* [Multiverse-Portals](https://github.com/Multiverse/Multiverse-Portals) -> Make custom portals to go to any destination!
+* [Multiverse-Inventories](https://github.com/Multiverse/Multiverse-Inventories) -> Have separated players stats and inventories per world or per group of worlds.
+* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleprompters!
+
 Building
 ========
-Simply build the source with maven:
-
-    $ mvn install
-
+Simply build the source with Gradle:
+```
+./gradlew build
+```
 More details are available on the [build instructions wiki page](https://github.com/Multiverse/Multiverse-Core/wiki/Building).

+
+Contributing
+=======
+**Want to help improve Multiverse?** There are several ways you can support and contribute to the project.
+* Take a look at our "Bug: Unconfirmed" issues, where you can find issues that need extra testing and investigation.
+* Want others to love Multiverse too? You can join the [Multiverse Discord community](https://discord.gg/NZtfKky) and help others with issues and setup!
+* A Multiverse guru? You can update our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) with your latest tip, tricks and guides! The wiki open for all to edit and improve.
+* Love coding? You could look at ["State: Open to PR"](https://github.com/Multiverse/Multiverse-Core/labels/State%3A%20Open%20to%20PR) and ["Resolution: Accepted"](https://github.com/Multiverse/Multiverse-Core/labels/Resolution%3A%20Accepted) issues. We're always happy to receive bug fixes and feature additions as [pull requests](https://www.freecodecamp.org/news/how-to-make-your-first-pull-request-on-github-3/).
+* If you'd like to make a financial contribution to the project, do consider joining our [patreon](https://www.patreon.com/dumptruckman) or make a one-time donation [here](https://paypal.me/dumptruckman)!
+
+Additionally, we would like to give a big thanks to everyone that has supported Multiverse over the years, as well as those in the years to come. Thank you!
+
 License
 =======
-Copyright (c) 2011, The Multiverse Team All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the The Multiverse Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Multiverse-Core is licensed under BSD-3-Clause License. Please see [LICENSE.md](LICENSE.md) for more info.
@@ -0,0 +1,196 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+plugins {
+    id 'java-library'
+    id 'maven-publish'
+    id 'checkstyle'
+    id 'com.github.johnrengelman.shadow' version '7.1.2'
+}
+
+version = System.getenv('GITHUB_VERSION')?.substring(1) ?: 'local'
+group = 'com.onarandombox.multiversecore'
+description = 'Multiverse-Core'
+
+java.sourceCompatibility = JavaVersion.VERSION_11
+
+repositories {
+    mavenLocal()
+    maven {
+        url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
+    }
+
+    maven {
+        url = uri('https://repo.onarandombox.com/content/groups/public')
+    }
+
+    maven {
+        url = uri('https://hub.spigotmc.org/nexus/content/groups/public/')
+    }
+
+    maven {
+        url = uri('https://jitpack.io')
+    }
+
+    maven {
+        url = uri('https://repo.minebench.de/')
+    }
+
+    maven {
+        url = uri('https://repo.maven.apache.org/maven2/')
+    }
+
+    maven {
+        name = 'aikar repo'
+        url = uri('https://repo.aikar.co/content/groups/aikar/')
+    }
+
+    maven {
+        name = 'glaremasters repo'
+        url = 'https://repo.glaremasters.me/repository/towny/'
+    }
+}
+
+dependencies {
+    // Spigot
+    implementation('org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT') {
+        exclude group: 'junit', module: 'junit'
+    }
+
+    // Economy
+    implementation('com.github.MilkBowl:VaultAPI:1.7.1') {
+        exclude group: 'org.bukkit', module: 'bukkit'
+    }
+
+    // Command Framework
+    api 'co.aikar:acf-paper:0.5.1-SNAPSHOT'
+
+    // Config
+    api('me.main__.util:SerializationConfig:1.7') {
+        exclude group: 'org.bukkit', module: 'bukkit'
+    }
+    api('io.github.townyadvanced.commentedconfiguration:CommentedConfiguration:1.0.0') {
+        exclude group: 'org.spigotmc', module: 'spigot-api'
+    }
+
+    // Utils
+    api('com.dumptruckman.minecraft:Logging:1.1.1') {
+        exclude group: 'junit', module: 'junit'
+    }
+    api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
+    api 'org.bstats:bstats-bukkit:2.2.1'
+    api 'net.minidev:json-smart:2.4.8'
+    api 'org.jetbrains:annotations:22.0.0'
+
+    // Tests
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.mockito:mockito-core:3.11.2'
+    testImplementation 'commons-io:commons-io:2.7'
+}
+
+
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
+tasks.withType(Javadoc) {
+    options.encoding = 'UTF-8'
+}
+
+
+configurations {
+    [apiElements, runtimeElements].each {
+        it.outgoing.artifacts.removeIf { it.buildDependencies.getDependencies(null).contains(jar) }
+        it.outgoing.artifact(shadowJar)
+    }
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+        }
+    }
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = "https://maven.pkg.github.com/Multiverse/Multiverse-Core"
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}
+
+
+ext.bitlyAccessToken = System.getenv('BITLY_ACCESS_TOKEN') ?: 'bitly-access-token'
+
+task prepareSource(type: Sync) {
+    inputs.property 'bitlyAccessToken', bitlyAccessToken
+    from sourceSets.main.java
+    into "$buildDir/src"
+    filter(ReplaceTokens, tokens: [
+            'bitly-access-token': bitlyAccessToken,
+    ])
+}
+
+compileJava {
+    source = prepareSource.outputs
+}
+
+processResources {
+    def props = [version: "${project.version}"]
+    inputs.properties props
+    filteringCharset 'UTF-8'
+    filesMatching('plugin.yml') {
+        expand props
+    }
+
+    // This task should never be skipped. The tests depend on this having been run but we want the new version number
+    // that is created after tests are run and before we run again to publish.
+    outputs.upToDateWhen { false }
+}
+
+
+checkstyle {
+    toolVersion = '6.1.1'
+    configFile file('config/mv_checks.xml')
+    ignoreFailures = true
+}
+
+
+javadoc {
+    source = sourceSets.main.allJava
+    classpath = configurations.compileClasspath
+}
+
+
+project.configurations.api.canBeResolved = true
+
+shadowJar {
+    relocate 'co.alkar.commands', 'com.onarandombox.acf'
+    relocate 'com.dumptruckman.minecraft.util.Logging', 'com.onarandombox.MultiverseCore.utils.CoreLogging'
+    relocate 'com.dumptruckman.minecraft.util.DebugLog', 'com.onarandombox.MultiverseCore.utils.DebugFileLogger'
+    relocate 'de.themoep.idconverter', 'com.onarandombox.idconverter'
+    relocate 'io.github.townyadvanced.commentedconfiguration', 'com.onarandombox.commentedconfiguration'
+    relocate 'me.main__.util', 'com.onarandombox.serializationconfig'
+    relocate 'org.bstats', 'com.onarandombox.bstats'
+
+    configurations = [project.configurations.api]
+
+    archiveFileName = "$baseName-$version.$extension"
+}
+
+build.dependsOn shadowJar
+
+
+// Excludes all test
+// TODO: Remove this when we have tests for MV5
+test {
+    exclude '**/*'
+}
@@ -69,7 +69,7 @@
        <module name="TypeName"/>
        <module name="AvoidStarImport">
            <property name="severity" value="warning"/>
-            <property name="excludes" value="com.onarandombox.MultiverseCore.utils,com.onarandombox.MultiverseCore.configuration,com.onarandombox.MultiverseCore.commands,com.onarandombox.MultiverseCore.destination"/>
+            <property name="excludes" value="com.onarandombox.MultiverseCore.utils,com.onarandombox.MultiverseCore.configuration,com.onarandombox.MultiverseCore.commandsold,com.onarandombox.MultiverseCore.destination"/>
        </module>
        <module name="IllegalImport"/>
        <module name="RedundantImport"/>
@@ -104,7 +104,6 @@
        </module>
        <module name="LeftCurly"/>
        <module name="RightCurly"/>
-        <module name="DoubleCheckedLocking"/>
        <module name="EmptyStatement"/>
        <module name="EqualsHashCode"/>
        <module name="HiddenField">
@@ -116,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
@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
@@ -0,0 +1,244 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
@@ -1,265 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.onarandombox.multiversecore</groupId>
-    <artifactId>Multiverse-Core</artifactId>
-    <version>2.4</version>
-    <name>Multiverse-Core</name>
-    <description>World Management Plugin</description>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.build.number>UNKNOWN</project.build.number>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>onarandombox</id>
-            <url>http://repo.onarandombox.com/content/groups/public</url>
-        </repository>
-        <repository>
-            <id>Bukkit Official</id>
-            <url>http://repo.bukkit.org/content/repositories/public</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>doodleproject-repo</id>
-            <name>DoodleProject Maven 2 Repository</name>
-            <url>http://doodleproject.sourceforge.net/maven2/release</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <ciManagement>
-        <system>jenkins</system>
-        <url>http://ci.onarandombox.com</url>
-    </ciManagement>
-
-    <!-- Profiles are used to detect whether this is a local or Jenkins build
-         and adjust the build number accordingly -->
-    <profiles>
-        <profile>
-            <id>jenkins</id>
-            <activation>
-                <property>
-                    <name>env.BUILD_NUMBER</name>
-                </property>
-            </activation>
-            <properties>
-                <project.build.number>${env.BUILD_NUMBER}</project.build.number>
-            </properties>
-        </profile>
-    </profiles>
-
-    <build>
-        <defaultGoal>clean package</defaultGoal>
-        <plugins>
-            <!-- Compiler -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>maven-replacer-plugin</artifactId>
-                <version>1.3.8</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <file>target/classes/plugin.yml</file>
-                    <replacements>
-                        <replacement>
-                            <token>maven-version-number</token>
-                            <value>${project.version}-b${project.build.number}</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
-            <!-- Jar Plugin -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            <!-- Maven Source Plugin -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.11</version>
-                <configuration>
-                    <parallel>methods</parallel>
-                    <threadCount>10</threadCount>
-                    <excludes>
-                        <exclude>**/TestCommandSender.java</exclude>
-                        <exclude>**/TestInstanceCreator.java</exclude>
-                    </excludes>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit47</artifactId>
-                        <version>2.11</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <enableRulesSummary>true</enableRulesSummary>
-                    <configLocation>${project.basedir}/config/mv_checks.xml</configLocation>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>1.5</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>me.main__.util:SerializationConfig</include>
-                                    <include>com.fernferret.allpay:AllPay</include>
-                                    <include>com.pneumaticraft.commandhandler:CommandHandler</include>
-                                </includes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>com.fernferret.allpay</pattern>
-                                    <shadedPattern>com.fernferret.allpay.multiverse</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>me.main__.util</pattern>
-                                    <shadedPattern>me.main__.util.multiverse</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.pneumaticraft.commandhandler</pattern>
-                                    <shadedPattern>com.pneumaticraft.commandhandler.multiverse</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <!-- Bukkit Dependency -->
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.2.5-R1.0</version>
-            <!-- If you want the lates, use this -->
-            <!-- <version>LATEST</version> -->
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- Bukkit Dependency -->
-        <!-- Start of Spout (disabled because we aren't using it)
-        <dependency>
-            <groupId>org.getspout</groupId>
-            <artifactId>spoutpluginapi</artifactId>
-            <version>dev-SNAPSHOT</version>
-        </dependency>
-             End of Spout -->
-        <!-- SerializationConfig Dependency -->
-        <dependency>
-            <groupId>me.main__.util</groupId>
-            <artifactId>SerializationConfig</artifactId>
-            <version>1.6</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of SerializationConfig Dependency -->
-        <!-- Start of AllPay Dependency -->
-        <dependency>
-            <groupId>com.fernferret.allpay</groupId>
-            <artifactId>AllPay</artifactId>
-            <version>10</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of AllPay Dependency -->
-        <!-- Start of CommandHandler Dependency -->
-        <dependency>
-            <groupId>com.pneumaticraft.commandhandler</groupId>
-            <artifactId>CommandHandler</artifactId>
-            <version>7</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- End of CommandHandler Dependency -->
-        <!-- Start of Test Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>1.4.9</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-easymock</artifactId>
-            <version>1.4.9</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.4.9</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>3.0</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- End of Test Dependencies -->
-    </dependencies>
-    <distributionManagement>
-        <repository>
-            <id>OnARandomBox</id>
-            <url>http://repo.onarandombox.com/content/repositories/multiverse</url>
-        </repository>
-    </distributionManagement>
-</project>
@@ -0,0 +1,5 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+rootProject.name = 'Multiverse-Core'
@@ -2,16 +2,18 @@ package com.onarandombox.MultiverseCore;

 import java.util.Map;

-import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
-
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.api.MVConfig;
+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 {
+public class MultiverseCoreConfiguration extends SerializationConfig implements MVConfig {
    private static MultiverseCoreConfiguration instance;

    /**
@@ -22,10 +24,18 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        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.
     */
+    @Deprecated
    public static MultiverseCoreConfiguration getInstance() {
        if (instance == null)
            throw new IllegalStateException("The instance wasn't set!");
@@ -33,25 +43,33 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    }

    @Property
-    private boolean enforceaccess;
+    private volatile boolean enforceaccess;
    @Property
-    private boolean prefixchat;
+    private volatile boolean prefixchat;
    @Property
-    private boolean teleportintercept;
+    private volatile String prefixchatformat;
    @Property
-    private boolean firstspawnoverride;
+    private volatile boolean teleportintercept;
    @Property
-    private boolean displaypermerrors;
+    private volatile boolean firstspawnoverride;
    @Property
-    private int globaldebug;
+    private volatile boolean displaypermerrors;
    @Property
-    private int messagecooldown;
+    private volatile int globaldebug;
    @Property
-    private double version;
+    private volatile boolean silentstart;
    @Property
-    private String firstspawnworld;
+    private volatile double version;
    @Property
-    private int teleportcooldown;
+    private volatile String firstspawnworld;
+    @Property
+    private volatile boolean defaultportalsearch;
+    @Property
+    private volatile int portalsearchradius;
+    @Property
+    private volatile boolean autopurge;
+    @Property
+    private volatile boolean idonotwanttodonate;

    public MultiverseCoreConfiguration() {
        super();
@@ -67,17 +85,21 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     * {@inheritDoc}
     */
    @Override
-    public void setDefaults() {
+    protected void setDefaults() {
        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
        enforceaccess = false;
-        prefixchat = true;
+        prefixchat = false;
+        prefixchatformat = "[%world%]%chat%";
        teleportintercept = true;
        firstspawnoverride = true;
        displaypermerrors = true;
        globaldebug = 0;
-        messagecooldown = 5000;
-        teleportcooldown = 1000;
        this.version = 2.9;
+        silentstart = false;
+        defaultportalsearch = true;
+        portalsearchradius = 128;
+        autopurge = true;
+        idonotwanttodonate = false;
        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
    }

@@ -126,6 +148,22 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    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}
@@ -189,22 +227,8 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    @Override
    public void setGlobalDebug(int globalDebug) {
        this.globaldebug = globalDebug;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getMessageCooldown() {
-        return this.messagecooldown;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setMessageCooldown(int messageCooldown) {
-        this.messagecooldown = messageCooldown;
+        Logging.setDebugLevel(globalDebug);
+        Bukkit.getPluginManager().callEvent(new MVDebugModeEvent(globalDebug));
    }

    /**
@@ -239,19 +263,54 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        this.firstspawnworld = firstSpawnWorld;
    }

-    /**
-     * {@inheritDoc}
-     */
    @Override
-    public int getTeleportCooldown() {
-        return this.teleportcooldown;
+    public void setSilentStart(boolean silentStart) {
+        Logging.setShowingConfig(!silentStart);
+        this.silentstart = silentStart;
    }

-    /**
-     * {@inheritDoc}
-     */
    @Override
-    public void setTeleportCooldown(int teleportCooldown) {
-        this.teleportcooldown = teleportCooldown;
+    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;
    }
 }
@@ -5,8 +5,9 @@
 * with this project.                                                         *
 ******************************************************************************/

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

+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
@@ -16,7 +17,6 @@ import org.bukkit.entity.Player;

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

        }
@@ -74,7 +74,7 @@ public class AnchorManager {
            this.anchorConfig.save(new File(this.plugin.getDataFolder(), "anchors.yml"));
            return true;
        } catch (IOException e) {
-            this.plugin.log(Level.SEVERE, "Failed to save anchors.yml. Please check your file permissions.");
+            Logging.severe("Failed to save anchors.yml. Please check your file permissions.");
            return false;
        }
    }
@@ -140,8 +140,17 @@ public class AnchorManager {
            if (ancLoc == null) {
                continue;
            }
-            if (p.hasPermission("multiverse.access." + ancLoc.getWorld().getName())) {
+            String worldPerm = "multiverse.access." + ancLoc.getWorld().getName();
+            // Add to the list if we're not enforcing access
+            // OR
+            // We are enforcing access and the user has the permission.
+            if (!this.plugin.getMVConfig().getEnforceAccess() ||
+                    (this.plugin.getMVConfig().getEnforceAccess() && p.hasPermission(worldPerm))) {
                myAnchors.add(anchor);
+            } else {
+                Logging.finer(String.format("Not adding anchor %s to the list, user %s doesn't have the %s " +
+                        "permission and 'enforceaccess' is enabled!",
+                        anchor, p.getName(), worldPerm));
            }
        }
        return Collections.unmodifiableSet(myAnchors);
@@ -0,0 +1,4 @@
+/**
+ * this package contains the classes that are used for the anchor system.
+ */
+package com.onarandombox.MultiverseCore.anchor;
@@ -35,6 +35,13 @@ public interface BlockSafety {
     */
    boolean playerCanSpawnHereSafely(Location l);

+    /**
+     * Gets a safe bed spawn location OR null if the bed is invalid.
+     * @param l The location of the bead head (block with the pillow on it).
+     * @return Safe location around the bed or null if no location was found.
+     */
+    Location getSafeBedSpawn(Location l);
+
    /**
     * Gets the location of the top block at the specified {@link Location}.
     * @param l Any {@link Location}.
@@ -1,225 +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.api;
-
-import com.fernferret.allpay.AllPay;
-import com.fernferret.allpay.GenericBank;
-import com.onarandombox.MultiverseCore.destination.DestinationFactory;
-import com.onarandombox.MultiverseCore.utils.*;
-import com.pneumaticraft.commandhandler.CommandHandler;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.entity.Player;
-
-/**
- * Multiverse 2 Core API
- * <p>
- * This API contains a bunch of useful things you can get out of Multiverse in general!
- */
-public interface Core {
-
-    /**
-     * Gets the Multiverse config file.
-     *
-     * @return The Multiverse config file.
-     * @deprecated Don't modify the config-file manually!
-     */
-    @Deprecated
-    FileConfiguration getMVConfiguration();
-
-    /**
-     * Gets the Banking system that Multiverse-Core has hooked into.
-     *
-     * @return A {@link GenericBank} that can be used for payments.
-     */
-    GenericBank getBank();
-
-    /**
-     * Reloads the Multiverse Configuration files:
-     * worlds.yml and config.yml.
-     */
-    void loadConfigs();
-
-    /**
-     * Gets the Multiverse message system. This allows you to send messages
-     * to users at specified intervals.
-     *
-     * @return The loaded {@link MultiverseMessaging}.
-     */
-    MultiverseMessaging getMessaging();
-
-    /**
-     * Gets the {@link MVPlayerSession} for the given player.
-     * This will also create a player session if one does not exist
-     * for a player.
-     *
-     * @param player The player's session to grab.
-     *
-     * @return The corresponding {@link MVPlayerSession}.
-     */
-    MVPlayerSession getPlayerSession(Player player);
-
-    /**
-     * Gets the instantiated Safe-T-Teleporter for performing
-     * safe teleports.
-     *
-     * @return A non-null {@link SafeTTeleporter}.
-     *
-     * @deprecated Use {@link #getSafeTTeleporter()} instead.
-     */
-    @Deprecated
-    com.onarandombox.MultiverseCore.utils.SafeTTeleporter getTeleporter();
-
-    /**
-     * Multiverse uses an advanced permissions setup, this object
-     * simplifies getting/setting permissions.
-     *
-     * @return A non-null {@link MVPermissions}.
-     */
-    MVPermissions getMVPerms();
-
-    /**
-     * Multiverse uses {@link CommandHandler} to make adding and using commands
-     * a piece of cake.
-     *
-     * @return A non-null {@link CommandHandler}.
-     */
-    CommandHandler getCommandHandler();
-
-    /**
-     * Gets the factory class responsible for loading many different destinations
-     * on demand.
-     *
-     * @return A valid {@link DestinationFactory}.
-     */
-    DestinationFactory getDestFactory();
-
-    /**
-     * Gets the primary class responsible for managing Multiverse Worlds.
-     *
-     * @return {@link WorldManager}.
-     */
-    MVWorldManager getMVWorldManager();
-
-    /**
-     * Saves all configs.
-     *
-     * @return Whether the config was successfully saved
-     */
-    boolean saveMVConfigs();
-
-    /**
-     * Gets the {@link AnchorManager}.
-     *
-     * @return The {@link AnchorManager}
-     */
-    AnchorManager getAnchorManager();
-
-    /**
-     * Used by queued commands to regenerate a world on a delay.
-     *
-     * @param name Name of the world to regenerate
-     * @param useNewSeed If a new seed should be used
-     * @param randomSeed IF the new seed should be random
-     * @param seed The seed of the world.
-     *
-     * @return True if success, false if fail.
-     */
-    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed);
-
-    /**
-     * Sets the {@link GenericBank}-Bank AllPay is using.
-     *
-     * @param bank The new {@link GenericBank}
-     */
-    void setBank(GenericBank bank);
-
-    /**
-     * Gets this plugin's {@link AllPay}-Banker.
-     *
-     * @return An {@link AllPay}-Banker
-     */
-    AllPay getBanker();
-
-    /**
-     * Decrements the number of plugins that have specifically hooked into core.
-     */
-    void decrementPluginCount();
-
-    /**
-     * Increments the number of plugins that have specifically hooked into core.
-     */
-    void incrementPluginCount();
-
-    /**
-     * Returns the number of plugins that have specifically hooked into core.
-     *
-     * @return The number if plugins that have hooked into core.
-     */
-    int getPluginCount();
-
-    /**
-     * Parse the Authors Array into a readable String with ',' and 'and'.
-     *
-     * @return The readable authors-{@link String}
-     */
-    String getAuthors();
-
-    /**
-     * 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();
-}
@@ -0,0 +1,56 @@
+package com.onarandombox.MultiverseCore.api;
+
+import java.util.Collection;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface Destination<T extends DestinationInstance> {
+    /**
+     * Returns the identifier or prefix that is required for this destination.
+     *
+     * <p>Portals have a prefix of "p" for example and OpenWarp (third party plugin) uses "ow". This is derived from a
+     * hash and cannot have duplicate values. Read that as your plugin cannot use 'p' because it's already used.
+     * Please check the wiki when adding a custom destination!</p>
+     *
+     * @return The identifier or prefix that is required for this destination.
+     */
+    @NotNull String getIdentifier();
+
+    /**
+     * Returns the destination instance for the given destination parameters.
+     *
+     * @param destinationParams The destination parameters. ex: p:MyPortal:nw
+     * @return The destination instance, or null if the destination parameters are invalid.
+     */
+    @Nullable T getDestinationInstance(@Nullable String destinationParams);
+
+    /**
+     * Returns a list of possible destinations for the given destination parameters.
+     *
+     * @param issuer            The command issuer.
+     * @param destinationParams The destination parameters. ex: p:MyPortal:nw
+     * @return A list of possible destinations.
+     */
+    @NotNull Collection<String> suggestDestinations(@NotNull BukkitCommandIssuer issuer, @Nullable String destinationParams);
+
+    /**
+     * Should the Multiverse SafeTeleporter be used?
+     *
+     * <p>If not, MV will blindly take people to the location specified.</p>
+     *
+     * @return True if the SafeTeleporter will be used, false if not.
+     */
+    boolean checkTeleportSafety();
+
+    /**
+     * Returns the teleporter to use for this destination.
+     *
+     * <p>By default, Multiverse will automatically use SafeTeleporter. If you want to use a different teleporter, you can
+     * override this method.</p>
+     *
+     * @return The custom teleporter to use for this destination. Return null to use the default teleporter.
+     */
+    @Nullable Teleporter getTeleporter();
+}
@@ -0,0 +1,45 @@
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface DestinationInstance {
+    /**
+     * Gets the exact location to teleport an entity to.
+     *
+     * @param teleportee The entity to teleport.
+     * @return The location to teleport to.
+     */
+    @Nullable Location getLocation(@NotNull Entity teleportee);
+
+    /**
+     * Gets the velocity to apply to an entity after teleporting.
+     *
+     * @param teleportee The entity to teleport.
+     * @return A vector representing the speed/direction the player should travel when arriving at the destination.
+     */
+    @Nullable Vector getVelocity(@NotNull Entity teleportee);
+
+    /**
+     * Gets the permission suffix to check for when teleporting to this destination.
+     * This is used for finer per world/player permissions, such as "multiverse.teleport.self.worldname".
+     *
+     * <p>For example, if the destination is "w:world", the permission suffix is "world".</p>
+     *
+     * @return The permission suffix.
+     */
+    @Nullable String getFinerPermissionSuffix();
+
+    /**
+     * Serialises the destination instance to a savable string.
+     *
+     * <p>This is used when plugins save destinations to configuration,
+     * and when the destination is displayed to the user.</p>
+     *
+     * @return The serialised destination instance.
+     */
+    @NotNull String serialise();
+}
@@ -1,20 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.api;
-
-/**
- * A fancy text.
- */
-public interface FancyText {
-    /**
-     * Gets the {@link String}-representation of this {@link FancyText}.
-     *
-     * @return The {@link String}-representation of this {@link FancyText}.
-     */
-    String getFancyText();
-}
@@ -1,30 +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.api;
-
-import org.bukkit.Server;
-
-import java.util.logging.Level;
-
-/** A simple API to require plugins to have a log method. */
-public interface LoggablePlugin {
-    /**
-     * Logs a message at the specified level.
-     *
-     * @param level The Log-{@link Level}.
-     * @param msg   The message to log.
-     */
-    void log(Level level, String msg);
-
-    /**
-     * Gets the server instance that this plugin is attached to.
-     *
-     * @return A {@link Server} instance.
-     */
-    Server getServer();
-}
@@ -5,7 +5,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerializable;
 /**
 * The configuration of MultiverseCore.
 */
-public interface MultiverseCoreConfig extends ConfigurationSerializable {
+public interface MVConfig extends ConfigurationSerializable {
    /**
     * Sets a property using a {@link String}.
     * @param property The name of the property.
@@ -14,18 +14,6 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
     */
    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.
@@ -50,18 +38,6 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
     */
    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.
@@ -121,6 +97,18 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
     * @return prefixChat.
     */
    boolean getPrefixChat();
+    
+    /**
+     * Sets prefixChatFormat.
+     * @param prefixChatFormat The new value.
+     */
+    void setPrefixChatFormat(String prefixChatFormat);
+
+    /**
+     * Gets prefixChatFormat.
+     * @return prefixChatFormat.
+     */
+    String getPrefixChatFormat();

    /**
     * Sets enforceAccess.
@@ -133,4 +121,74 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
     * @return enforceAccess.
     */
    boolean getEnforceAccess();
+
+    /**
+     * 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,169 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.api;
+
+import com.onarandombox.MultiverseCore.anchor.AnchorManager;
+import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
+import com.onarandombox.MultiverseCore.destination.DestinationsProvider;
+import com.onarandombox.MultiverseCore.economy.MVEconomist;
+import com.onarandombox.MultiverseCore.teleportation.SimpleBlockSafety;
+import com.onarandombox.MultiverseCore.teleportation.SimpleLocationManipulation;
+import com.onarandombox.MultiverseCore.teleportation.SimpleSafeTTeleporter;
+import com.onarandombox.MultiverseCore.utils.MVPermissions;
+import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper;
+
+/**
+ * Multiverse 2 Core API
+ * <p>
+ * This API contains a bunch of useful things you can get out of Multiverse in general!
+ */
+public interface MVCore extends MVPlugin {
+    /**
+     * Retrieves Multiverse's friendly economist. The economist can be used for dealing with economies without
+     * worrying about any of the messy details.
+     *
+     * @return the economy manager for Multiverse.
+     */
+    MVEconomist getEconomist();
+
+    /**
+     * Reloads the Multiverse Configuration files:
+     * worlds.yml and config.yml.
+     */
+    void loadConfigs();
+
+    /**
+     * Gets the {@link UnsafeCallWrapper} class.
+     *
+     * @return A non-null {@link UnsafeCallWrapper}.
+     */
+    UnsafeCallWrapper getUnsafeCallWrapper();
+
+    /**
+     * Multiverse uses an advanced permissions setup, this object
+     * simplifies getting/setting permissions.
+     *
+     * @return A non-null {@link MVPermissions}.
+     */
+    MVPermissions getMVPerms();
+
+    /**
+     * Multiverse uses {@link MVCommandManager} to make adding and using commands
+     * a piece of cake.
+     *
+     * @return A non-null {@link MVCommandManager}.
+     */
+    MVCommandManager getMVCommandManager();
+
+    /**
+     * Gets the class responsible for loading many different destinations
+     * on demand.
+     *
+     * @return A valid {@link DestinationsProvider}.
+     */
+    DestinationsProvider getDestinationsProvider();
+
+    /**
+     * Gets the primary class responsible for managing Multiverse Worlds.
+     *
+     * @return {@link MVWorldManager}.
+     */
+    MVWorldManager getMVWorldManager();
+
+    /**
+     * Saves the Multiverse-Config.
+     *
+     * @return Whether the Multiverse-Config was successfully saved
+     */
+    boolean saveMVConfig();
+
+    /**
+     * Saves all configs.
+     *
+     * @return Whether the config was successfully saved
+     */
+    boolean saveAllConfigs();
+
+    /**
+     * Gets the {@link AnchorManager}.
+     *
+     * @return The {@link AnchorManager}
+     */
+    AnchorManager getAnchorManager();
+
+    /**
+     * Decrements the number of plugins that have specifically hooked into core.
+     */
+    void decrementPluginCount();
+
+    /**
+     * Increments the number of plugins that have specifically hooked into core.
+     */
+    void incrementPluginCount();
+
+    /**
+     * Returns the number of plugins that have specifically hooked into core.
+     *
+     * @return The number if plugins that have hooked into core.
+     */
+    int getPluginCount();
+
+    /**
+     * Gets the {@link BlockSafety} this {@link MVCore} is using.
+     * @return The {@link BlockSafety} this {@link MVCore} is using.
+     * @see BlockSafety
+     * @see SimpleBlockSafety
+     */
+    BlockSafety getBlockSafety();
+
+    /**
+     * Sets the {@link BlockSafety} this {@link MVCore} is using.
+     * @param blockSafety The new {@link BlockSafety}.
+     * @see BlockSafety
+     * @see SimpleBlockSafety
+     */
+    void setBlockSafety(BlockSafety blockSafety);
+
+    /**
+     * Gets the {@link LocationManipulation} this {@link MVCore} is using.
+     * @return The {@link LocationManipulation} this {@link MVCore} is using.
+     * @see LocationManipulation
+     * @see SimpleLocationManipulation
+     */
+    LocationManipulation getLocationManipulation();
+
+    /**
+     * Sets the {@link LocationManipulation} this {@link MVCore} is using.
+     * @param locationManipulation The new {@link LocationManipulation}.
+     * @see LocationManipulation
+     * @see SimpleLocationManipulation
+     */
+    void setLocationManipulation(LocationManipulation locationManipulation);
+
+    /**
+     * Gets the {@link SafeTTeleporter} this {@link MVCore} is using.
+     * @return The {@link SafeTTeleporter} this {@link MVCore} is using.
+     * @see SafeTTeleporter
+     * @see SimpleSafeTTeleporter
+     */
+    SafeTTeleporter getSafeTTeleporter();
+
+    /**
+     * Sets the {@link SafeTTeleporter} this {@link MVCore} is using.
+     * @param safeTTeleporter The new {@link SafeTTeleporter}.
+     * @see SafeTTeleporter
+     * @see SimpleSafeTTeleporter
+     */
+    void setSafeTTeleporter(SafeTTeleporter safeTTeleporter);
+
+    /**
+     * Gets the {@link MVConfig}.
+     * @return The configuration.
+     */
+    MVConfig getMVConfig();
+}
@@ -16,6 +16,7 @@ import org.bukkit.util.Vector;
 * A destination API for Multiverse
 * Any plugin can add these to MV and when they are, any action that uses them (portals, MVTP, etc.) can use them!
 */
+@Deprecated
 public interface MVDestination {
    /**
     * Returns the identifier or prefix that is required for this destination.
@@ -7,39 +7,16 @@

 package com.onarandombox.MultiverseCore.api;

-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.event.MVVersionEvent;
-
 /**
 * This interface is implemented by every official Multiverse-plugin.
 */
-public interface MVPlugin extends LoggablePlugin {
-    /**
-     * Adds This plugin's version information to the buffer and returns the new string.
-     *
-     * @param buffer The string that contains Core and all other MV plugins' versions.
-     *
-     * @return A modified buffer that contains this MVPlugin's version information.
-     *
-     * @deprecated This is now deprecated, nobody needs it any longer.
-     * All version info-dumping is now done with {@link MVVersionEvent}.
-     */
-    @Deprecated
-    String dumpVersionInfo(String buffer);
-
+public interface MVPlugin {
    /**
     * 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}.
-     */
-    void setCore(MultiverseCore core);
+    MVCore getCore();

    /**
     * Allows Multiverse or a plugin to query another Multiverse plugin to see what version its protocol is. This
@@ -49,4 +26,11 @@ public interface MVPlugin extends LoggablePlugin {
     * @return The Integer protocol version.
     */
    int getProtocolVersion();
+
+    /**
+     * Parse the Authors Array into a readable String with ',' and 'and'.
+     *
+     * @return The readable authors-{@link String}
+     */
+    String getAuthors();
 }
@@ -7,24 +7,26 @@

 package com.onarandombox.MultiverseCore.api;

-import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
-import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
+import java.util.List;

+import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
+import com.onarandombox.MultiverseCore.world.configuration.AddProperties;
+import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType;
+import com.onarandombox.MultiverseCore.world.configuration.EnglishChatColor;
 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 java.util.List;
+import org.jetbrains.annotations.Nullable;

 /**
 * The API for a Multiverse Handled World.
 */
-public interface MultiverseWorld {
+public interface MVWorld {
    /**
     * Returns the Bukkit world object that this world describes.
     *
@@ -155,40 +157,9 @@ public interface MultiverseWorld {
    boolean setPropertyValue(String property, String value) throws PropertyDoesNotExistException;

    /**
-     * Gets the actual MVConfigProperty from this world.
-     * It will throw a PropertyDoesNotExistException if the property is not found.
+     * Adds a value to the given property. The property must be a {@link AddProperties}.
     *
-     * @param property The name of a world property to get.
-     * @param expected The type of the expected property. Use Object.class if this doesn't matter for you.
-     * @param <T> The type of the expected property.
-     *
-     * @return A valid MVWorldProperty.
-     *
-     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
-     * @deprecated We don't use {@link com.onarandombox.MultiverseCore.configuration.MVConfigProperty} any longer!
-     */
-    @Deprecated
-    <T> com.onarandombox.MultiverseCore.configuration.MVConfigProperty<T> getProperty(String property, Class<T> expected) throws PropertyDoesNotExistException;
-
-    // old config
-    /**
-     * Adds the property to the given value.
-     * It will throw a PropertyDoesNotExistException if the property is not found.
-     *
-     * @param property The name of a world property to set.
-     * @param value    A value in string representation, it will be parsed to the correct type.
-     * @param sender   The sender who wants this value to be set.
-     * @return True if the value was set, false if not.
-     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
-     * @deprecated Use {@link #setPropertyValue(String, String)} instead.
-     */
-    @Deprecated
-    boolean setProperty(String property, String value, CommandSender sender) throws PropertyDoesNotExistException;
-
-    /**
-     * Adds a value to the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
-     *
-     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to add a value to.
+     * @param property The name of a {@link 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.
@@ -197,9 +168,9 @@ public interface MultiverseWorld {
    boolean addToVariable(String property, String value);

    /**
-     * Removes a value from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     * Removes a value from the given property. The property must be a {@link AddProperties}.
     *
-     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to remove a value
+     * @param property The name of a {@link 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.
@@ -209,9 +180,9 @@ public interface MultiverseWorld {
    boolean removeFromVariable(String property, String value);

    /**
-     * Removes all values from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     * Removes all values from the given property. The property must be a {@link AddProperties}.
     *
-     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to clear.
+     * @param property The name of a {@link 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.
     */
@@ -288,13 +259,28 @@ public interface MultiverseWorld {
     */
    boolean setColor(String color);

+    /**
+     * Gets the style that this world's name/alias will display as.
+     *
+     * @return The style of this world. {@code null} for "normal" style.
+     */
+    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 This has been moved: {@link EnglishChatColor#isValidAliasColor(String)}
     */
    @Deprecated
    boolean isValidAliasColor(String color);
@@ -490,26 +476,28 @@ public interface MultiverseWorld {
    /**
     * 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)}
+     * 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.
+     * 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.
+     * @return The type of currency that will be used when users enter this world.
     */
-    int getCurrency();
+    @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 world players will respawn in if they die in this one.
@@ -606,6 +594,22 @@ public interface MultiverseWorld {
     */
    void setBedRespawn(boolean autoLoad);

+    /**
+     * Sets the player limit for this world after which players without an override
+     * permission node will not be allowed in. A value of -1 or less signifies no limit
+     *
+     * @param limit The new limit
+     */
+    void setPlayerLimit(int limit);
+
+    /**
+     * Gets the player limit for this world after which players without an override
+     * permission node will not be allowed in. A value of -1 or less signifies no limit
+     *
+     * @return The player limit
+     */
+    int getPlayerLimit();
+
    /**
     * Same as {@link #getTime()}, but returns a string.
     * @return The time as a short string: 12:34pm
@@ -656,23 +660,16 @@ public interface MultiverseWorld {
    String getAllPropertyNames();

    /**
-     * Gets whether or not flight is allowed in this world.
-     * <p>
-     * It should be noted that this refers to clientside flying. Creative
-     * mode will always allow server based flying.
+     * Whether or not players are allowed to fly in this world.
     *
-     * @return True if flight is allowed.
+     * @return True if players allowed to fly in this world.
     */
-    boolean isFlightAllowed();
+    boolean getAllowFlight();

    /**
-     * Sets whether or not flight is allowed in this world.
-     * <p>
-     * It should be noted that this refers to clientside flying. Creative
-     * mode will always allow server based flying.
+     * Sets whether or not players are allowed to fly in this world.
     *
-     * @param flightAllowed Wheter or not flight is allowed in this world.
+     * @param allowFlight True to allow flight in this world.
     */
-    void setFlightAllowed(boolean flightAllowed);
-
+    void setAllowFlight(final boolean allowFlight);
 }
@@ -7,19 +7,17 @@

 package com.onarandombox.MultiverseCore.api;

-import com.onarandombox.MultiverseCore.utils.PurgeWorlds;
-import com.onarandombox.MultiverseCore.utils.SimpleWorldPurger;
+import java.io.File;
+import java.util.Collection;
+import java.util.List;

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

-import java.io.File;
-import java.util.Collection;
-import java.util.List;
-
 /**
 * Multiverse 2 World Manager API
 * <p>
@@ -61,10 +59,22 @@ public interface MVWorldManager {
                     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
+     * @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);
@@ -80,6 +90,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.
     *
@@ -88,6 +109,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)}.
@@ -117,30 +147,41 @@ public interface MVWorldManager {
    /**
     * Returns a list of all the worlds Multiverse knows about.
     *
-     * @return A list of {@link MultiverseWorld}.
+     * @return A list of {@link MVWorld}.
     */
-    Collection<MultiverseWorld> getMVWorlds();
+    Collection<MVWorld> getMVWorlds();


    /**
-     * Returns a {@link MultiverseWorld} if it exists, and null if it does not.
+     * Returns a {@link MVWorld} if it exists, and null if it does not.
     * This will search name AND alias.
     *
     * @param name The name or alias of the world to get.
-     * @return A {@link MultiverseWorld} or null.
+     * @return A {@link MVWorld} or null.
     */
-    MultiverseWorld getMVWorld(String name);
+    MVWorld getMVWorld(String name);

    /**
-     * Returns a {@link MultiverseWorld} if it exists, and null if it does not.
+     * Returns a {@link MVWorld} if the world with name given exists, and null if it does not.
+     * This will search optionally for alias names.
+     *
+     * @param name          The name or optionally the alias of the world to get.
+     * @param checkAliases  Indicates whether to check for world alias name.
+     * @return A {@link MVWorld} or null.
+     */
+    MVWorld getMVWorld(String name, boolean checkAliases);
+
+    /**
+     * Returns a {@link MVWorld} if it exists, and null if it does not.
     *
     * @param world The Bukkit world to check.
-     * @return A {@link MultiverseWorld} or null.
+     * @return A {@link MVWorld} or null.
     */
-    MultiverseWorld getMVWorld(World world);
+    MVWorld getMVWorld(World world);

    /**
-     * Checks to see if the given name is a valid {@link MultiverseWorld}.
+     * Checks to see if the given name is a valid {@link MVWorld}
+     * Searches based on world name AND alias.
     *
     * @param name The name or alias of the world to check.
     * @return True if the world exists, false if not.
@@ -148,7 +189,17 @@ public interface MVWorldManager {
    boolean isMVWorld(String name);

    /**
-     * Checks to see if the given world is a valid {@link MultiverseWorld}.
+     * Checks to see if the given name is a valid {@link MVWorld}.
+     * Optionally searches by alias is specified.
+     *
+     * @param name          The name or alias of the world to check.
+     * @param checkAliases  Indicates whether to check for world alias name.
+     * @return True if the world exists, false if not.
+     */
+    boolean isMVWorld(String name, boolean checkAliases);
+
+    /**
+     * Checks to see if the given world is a valid {@link MVWorld}.
     *
     * @param world The Bukkit world to check.
     * @return True if the world has been loaded into MV2, false if not.
@@ -156,7 +207,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.
@@ -164,25 +215,15 @@ 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.
     */
    void loadDefaultWorlds();

-    /**
-     * 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
@@ -195,7 +236,7 @@ public interface MVWorldManager {
     *
     * @return A Multiverse world that players will spawn in or null if no MV world has been set.
     */
-    MultiverseWorld getSpawnWorld();
+    MVWorld getSpawnWorld();

    /**
     * Gets the list of worlds in the config, but unloaded.
@@ -242,7 +283,53 @@ public interface MVWorldManager {
    /**
     * Gets the world players should spawn in first.
     *
-     * @return The {@link MultiverseWorld} new players should spawn in.
+     * @return The {@link MVWorld} new players should spawn in.
     */
-    MultiverseWorld getFirstSpawnWorld();
+    MVWorld 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);
+
+    /**
+     * 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.
+     * @param keepGameRules If GameRules should be kept on world regen.
+     *
+     * @return True if success, false if fail.
+     */
+    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed, boolean keepGameRules);
+
+    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);
+
+    /**
+     * Get all the possible worlds that Multiverse has detected to be importable.
+     *
+     * @return A collection of world names that are deemed importable.
+     */
+    Collection<String> getPotentialWorlds();
 }
@@ -1,56 +0,0 @@
-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();
-}
@@ -1,15 +1,16 @@
 package com.onarandombox.MultiverseCore.api;

+import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import com.onarandombox.MultiverseCore.teleportation.TeleportResult;
 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 {
+public interface SafeTTeleporter extends Teleporter {

    /**
     * Gets the next safe location around the given location.
@@ -31,12 +32,12 @@ public interface SafeTTeleporter {
     * 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
+     * @param teleporter    Person who performed the teleport command.
+     * @param teleportee    Entity to teleport
+     * @param destination   Destination to teleport them to
     * @return true for success, false for failure
     */
-    TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, MVDestination d);
+    TeleportResult safelyTeleport(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination<?> destination);

    /**
     * Safely teleport the entity to the Location. This may perform checks to
@@ -55,11 +56,11 @@ public interface SafeTTeleporter {
    /**
     * 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.
+     * @param entity        The entity to spawn
+     * @param destination   The MVDestination to take the entity to.
     * @return A new location to spawn the entity at.
     */
-    Location getSafeLocation(Entity e, MVDestination d);
+    Location getSafeLocation(Entity entity, DestinationInstance destination);

    /**
     * Finds a portal-block next to the specified {@link Location}.
@@ -0,0 +1,18 @@
+package com.onarandombox.MultiverseCore.api;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import com.onarandombox.MultiverseCore.teleportation.TeleportResult;
+import org.bukkit.entity.Entity;
+
+public interface Teleporter {
+    /**
+     * Teleport the entity to the Multiverse Destination.
+     *
+     * @param teleporter    Person who performed the teleport command.
+     * @param teleportee    Entity to teleport
+     * @param destination   Destination to teleport them to
+     * @return true for success, false for failure
+     */
+    TeleportResult teleport(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination<?> destination);
+}
@@ -3,47 +3,66 @@ 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 MVWorld}
+     */
+    void purgeWorlds(List<MVWorld> worlds);

    /**
-     * Synchronizes the given world with it's settings.
+     * Convenience method for {@link #purgeWorld(MVWorld, java.util.List, boolean, boolean)} that takes the settings from the world-config.
     *
-     * @param worlds A list of {@link MultiverseWorld}
+     * @param world The {@link MVWorld}.
     */
-    void purgeWorlds(List<MultiverseWorld> worlds);
-
-    /**
-     * Convenience method for {@link #purgeWorld(CommandSender, MultiverseWorld, List, boolean, boolean)} that takes the settings from the world-config.
-     *
-     * @param world The {@link MultiverseWorld}.
-     */
-    void purgeWorld(MultiverseWorld world);
+    void purgeWorld(MVWorld world);

    /**
     * Clear all animals/monsters that do not belong to a world according to the config.
     *
-     * @param mvworld The {@link MultiverseWorld}.
+     * @param mvworld The {@link MVWorld}.
     * @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);
+    void purgeWorld(MVWorld 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 mvworld The {@link MVWorld}.
     * @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);
+    void purgeWorld(MVWorld 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(MVWorld w, Entity e);
 }
@@ -1,145 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Allows management of Anchor Destinations.
- */
-public class AnchorCommand extends PaginatedCoreCommand<String> {
-
-    public AnchorCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Create, Delete and Manage Anchor Destinations.");
-        this.setCommandUsage("/mv anchor " + ChatColor.GREEN + "{name}" + ChatColor.GOLD + " [-d]");
-        this.setArgRange(0, 2);
-        this.addKey("mv anchor");
-        this.addKey("mv anchors");
-        this.addKey("mvanchor");
-        this.addKey("mvanchors");
-        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "awesomething");
-        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "otherthing");
-        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "awesomething " + ChatColor.RED + "-d");
-        this.addCommandExample("/mv anchors ");
-        this.setPermission("multiverse.core.anchor", "Allows management of Anchor Destinations.", PermissionDefault.OP);
-        this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-    }
-
-    private List<String> getFancyAnchorList(Player p) {
-        List<String> anchorList = new ArrayList<String>();
-        ChatColor color = ChatColor.GREEN;
-        for (String anchor : this.plugin.getAnchorManager().getAnchors(p)) {
-            anchorList.add(color + anchor);
-            color = (color == ChatColor.GREEN) ? ChatColor.GOLD : ChatColor.GREEN;
-        }
-        return anchorList;
-    }
-
-    private void showList(CommandSender sender, List<String> args) {
-        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse Anchor List ]====");
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-
-
-        FilterObject filterObject = this.getPageAndFilter(args);
-
-        List<String> availableAnchors = new ArrayList<String>(this.getFancyAnchorList(p));
-        if (filterObject.getFilter().length() > 0) {
-            availableAnchors = this.getFilteredItems(availableAnchors, filterObject.getFilter());
-            if (availableAnchors.size() == 0) {
-                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
-                        + "No anchors matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
-                return;
-            }
-        } else {
-            if (availableAnchors.size() == 0) {
-                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE + "No anchors were defined.");
-                return;
-            }
-        }
-
-
-        if (!(sender instanceof Player)) {
-            for (String c : availableAnchors) {
-                sender.sendMessage(c);
-            }
-            return;
-        }
-
-        int totalPages = (int) Math.ceil(availableAnchors.size() / (this.itemsPerPage + 0.0));
-
-        if (filterObject.getPage() > totalPages) {
-            filterObject.setPage(totalPages);
-        } else if (filterObject.getPage() < 1) {
-            filterObject.setPage(1);
-        }
-
-        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
-
-        this.showPage(filterObject.getPage(), sender, availableAnchors);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (args.size() == 0) {
-            this.showList(sender, args);
-            return;
-        }
-        if (args.size() == 1 && (this.getPageAndFilter(args).getPage() != 1 || args.get(0).equals("1"))) {
-            this.showList(sender, args);
-            return;
-        }
-        if (args.size() == 2 && args.get(1).equalsIgnoreCase("-d")) {
-            if (this.plugin.getAnchorManager().deleteAnchor(args.get(0))) {
-                sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.RED + "deleted!");
-            } else {
-                sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "deleted!");
-            }
-            return;
-        }
-
-        if (!(sender instanceof Player)) {
-            sender.sendMessage("You must be a player to create Anchors.");
-            return;
-        }
-
-        Player player = (Player) sender;
-        if (this.plugin.getAnchorManager().saveAnchorLocation(args.get(0), player.getLocation())) {
-            sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.GREEN + "created!");
-        } else {
-            sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "created!");
-        }
-
-    }
-
-    @Override
-    protected List<String> getFilteredItems(List<String> availableItems, String filter) {
-        List<String> filtered = new ArrayList<String>();
-        for (String s : availableItems) {
-            if (s.matches("(?i).*" + filter + ".*")) {
-                filtered.add(s);
-            }
-        }
-        return filtered;
-    }
-
-    @Override
-    protected String getItemText(String item) {
-        return item;
-    }
-}
@@ -1,57 +1,40 @@
-/******************************************************************************
- * 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 co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.destination.InvalidDestination;
-import com.onarandombox.MultiverseCore.utils.MVPermissions;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
 import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;

-import java.util.List;
-/**
- * Checks to see if a player can go to a destination.
- */
-public class CheckCommand extends MultiverseCommand {
-
-    public CheckCommand(MultiverseCore plugin) {
+@CommandAlias("mv")
+public class CheckCommand extends MultiverseCoreCommand {
+    public CheckCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setName("Help you validate your multiverse settings");
-        this.setCommandUsage("/mv check " + ChatColor.GREEN + "{PLAYER} {DESTINATION}");
-        this.setArgRange(2, 2);
-        this.addKey("mv check");
-        this.addKey("mvcheck");
-        this.addCommandExample("/mv check " + ChatColor.GREEN + "fernferret " + ChatColor.LIGHT_PURPLE + "w:MyWorld");
-        this.addCommandExample("/mv check " + ChatColor.GREEN + "Rigby90 " + ChatColor.LIGHT_PURPLE + "p:MyPortal");
-        this.addCommandExample("/mv check " + ChatColor.GREEN + "lithium3141 " + ChatColor.LIGHT_PURPLE + "ow:WarpName");
-        this.setPermission("multiverse.core.debug", "Checks to see if a player can go to a destination. Prints debug if false.", PermissionDefault.OP);
    }

-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Player p = this.plugin.getServer().getPlayer(args.get(0));
-        if (p == null) {
-            sender.sendMessage("Could not find player " + ChatColor.GREEN + args.get(0));
-            sender.sendMessage("Are they online?");
-            return;
-        }
-        MVDestination dest = this.plugin.getDestFactory().getDestination(args.get(1));
-        if (dest instanceof InvalidDestination) {
-            sender.sendMessage(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;
-        }
+    @Subcommand("check")
+    @CommandPermission("multiverse.core.check")
+    @CommandCompletion("@players @destinations|@mvworlds")
+    @Syntax("<player> <destination>")
+    @Description("Checks if a player can teleport to a destination.")
+    public void onCheckCommand(BukkitCommandIssuer issuer,

-        MVPermissions perms = this.plugin.getMVPerms();
-        perms.tellMeWhyICantDoThis(sender, p, dest);
+                               @Syntax("<player>")
+                               @Description("Player to check destination on.")
+                               Player player,
+
+                               @Syntax("<destination>")
+                               @Description("A destination location, e.g. a world name.")
+                               ParsedDestination<?> destination
+    ) {
+        issuer.sendMessage("Checking " + player + " to " + destination + "...");
+        //TODO More detailed output on permissions required.
+        this.plugin.getDestinationsProvider().checkTeleportPermissions(issuer, player, destination);
    }
 }
@@ -0,0 +1,48 @@
+package com.onarandombox.MultiverseCore.commands;
+
+import co.aikar.commands.CommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Conditions;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Single;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.ChatColor;
+import org.jetbrains.annotations.NotNull;
+
+@CommandAlias("mv")
+public class CloneCommand extends MultiverseCoreCommand {
+    public CloneCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+    }
+
+    @Subcommand("clone")
+    @CommandPermission("multiverse.core.clone")
+    @CommandCompletion("@mvworlds:scope=both @empty")
+    @Syntax("<world> <new world name>")
+    @Description("Clones a world.")
+    public void onCloneCommand(CommandIssuer issuer,
+
+                               @Conditions("validWorldName:scope=both")
+                               @Syntax("<world>")
+                               @Description("The target world to clone.")
+                               String worldName,
+
+                               @Single
+                               @Conditions("validWorldName:scope=new")
+                               @Syntax("<new world name>")
+                               @Description("The new cloned world name.")
+                               String newWorldName
+    ) {
+        issuer.sendMessage(String.format("Cloning world '%s' to '%s'...", worldName, newWorldName));
+
+        if (!this.plugin.getMVWorldManager().cloneWorld(worldName, newWorldName)) {
+            issuer.sendMessage(String.format("%sWorld could not be cloned! See console for more details.", ChatColor.RED));
+            return;
+        }
+        issuer.sendMessage(String.format("%sCloned world '%s'!", ChatColor.GREEN, newWorldName));
+    }
+}
@@ -1,72 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-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");
-        this.setCommandUsage("/mv config " + ChatColor.GREEN + "{PROPERTY} {VALUE}");
-        this.setArgRange(1, 2);
-        this.addKey("mv config");
-        this.addKey("mvconfig");
-        this.addKey("mv conf");
-        this.addKey("mvconf");
-        this.addCommandExample("/mv config show");
-        this.addCommandExample("/mv config " + ChatColor.GREEN + "debug" + ChatColor.AQUA + " 3");
-        this.addCommandExample("/mv config " + ChatColor.GREEN + "enforceaccess" + ChatColor.AQUA + " false");
-        this.setPermission("multiverse.core.config", "Allows you to set Global MV Variables.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (args.size() <= 1) {
-            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(", ");
-            }
-            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")) {
-            // Don't forget to set the world!
-            this.plugin.getMVWorldManager().setFirstSpawnWorld(args.get(1));
-        }
-
-        if (this.plugin.saveMVConfigs()) {
-            sender.sendMessage(ChatColor.GREEN + "SUCCESS!" + ChatColor.WHITE + " Values were updated successfully!");
-            this.plugin.loadConfigs();
-        } else {
-            sender.sendMessage(ChatColor.RED + "FAIL!" + ChatColor.WHITE + " Check your console for details!");
-        }
-    }
-}
@@ -1,39 +1,23 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
 package com.onarandombox.MultiverseCore.commands;

+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Subcommand;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;

-import java.util.List;
-
-/**
- * Confirms actions.
- */
-public class ConfirmCommand extends MultiverseCommand {
-
-    public ConfirmCommand(MultiverseCore plugin) {
+@CommandAlias("mv")
+public class ConfirmCommand extends MultiverseCoreCommand {
+    public ConfirmCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        // Any command that is dangerous should require op
-        this.setName("Confirms a command that could destroy life, the universe and everything.");
-        this.setCommandUsage("/mv confirm");
-        this.setArgRange(0, 0);
-        this.addKey("mvconfirm");
-        this.addKey("mv confirm");
-        this.addCommandExample("/mv confirm");
-        this.setPermission("multiverse.core.confirm", "If you have not been prompted to use this, it will not do anything.", PermissionDefault.OP);
-
    }

-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        this.plugin.getCommandHandler().confirmQueuedCommand(sender);
+    @Subcommand("confirm")
+    @CommandPermission("multiverse.core.confirm")
+    @Description("Confirms dangerous commands before executing them.")
+    public void onConfirmCommand(@NotNull BukkitCommandIssuer issuer) {
+        this.plugin.getMVCommandManager().getCommandQueueManager().runQueuedCommand(issuer.getIssuer());
    }
-
 }
@@ -1,70 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.text.DecimalFormat;
-import java.util.List;
-
-/**
- * Returns detailed information on the Players where abouts.
- */
-public class CoordCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
-
-    public CoordCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Coordinates");
-        this.setCommandUsage("/mv coord");
-        this.setArgRange(0, 0);
-        this.addKey("mv coord");
-        this.addKey("mvcoord");
-        this.addKey("mvco");
-        this.addCommandExample("/mv coord");
-        this.setPermission("multiverse.core.coord", "Returns detailed information on the Players where abouts.", PermissionDefault.OP);
-        this.worldManager = this.plugin.getMVWorldManager();
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // Check if the command was sent from a Player.
-        if (sender instanceof Player) {
-            Player p = (Player) sender;
-            World world = p.getWorld();
-
-            if (!this.worldManager.isMVWorld(world.getName())) {
-                this.plugin.showNotMVWorldMessage(sender, world.getName());
-                return;
-            }
-
-            MultiverseWorld mvworld = this.worldManager.getMVWorld(world.getName());
-
-            p.sendMessage(ChatColor.AQUA + "--- Location Information ---");
-            p.sendMessage(ChatColor.AQUA + "World: " + ChatColor.WHITE + world.getName());
-            p.sendMessage(ChatColor.AQUA + "Alias: " + mvworld.getColoredWorldString());
-            p.sendMessage(ChatColor.AQUA + "World Scale: " + ChatColor.WHITE + mvworld.getScaling());
-            DecimalFormat df = new DecimalFormat();
-            df.setMinimumFractionDigits(0);
-            df.setMaximumFractionDigits(2);
-            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 + Material.getMaterial(world.getBlockTypeIdAt(p.getLocation())));
-        } else {
-            sender.sendMessage("This command needs to be used from a Player.");
-        }
-    }
-}
@@ -1,100 +1,127 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
 package com.onarandombox.MultiverseCore.commands;

-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.pneumaticraft.commandhandler.CommandHandler;
-import org.bukkit.ChatColor;
-import org.bukkit.World.Environment;
-import org.bukkit.WorldType;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Random;
+import java.util.stream.Collectors;

-/**
- * Creates a new world and loads it.
- */
-public class CreateCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.InvalidCommandArgument;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Conditions;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Optional;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag;
+import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
+import com.onarandombox.MultiverseCore.locale.MVCorei18n;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.WorldType;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;

-    public CreateCommand(MultiverseCore plugin) {
+@CommandAlias("mv")
+public class CreateCommand extends MultiverseCoreCommand {
+    public CreateCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setName("Create World");
-        this.setCommandUsage(String.format("/mv create %s{NAME} {ENV} %s-s [SEED] -g [GENERATOR[:ID]] -t [WORLDTYPE] [-n] -a [true|false]",
-                ChatColor.GREEN, ChatColor.GOLD));
-        this.setArgRange(2, 11); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-        this.addKey("mvcreate");
-        this.addKey("mvc");
-        this.addKey("mv create");
-        this.setPermission("multiverse.core.create", "Creates a new world and loads it.", PermissionDefault.OP);
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "world" + ChatColor.GREEN + " normal");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "lavaland" + ChatColor.RED + " nether");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "starwars" + ChatColor.AQUA + " end");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "flatroom" + ChatColor.GREEN + " normal" + ChatColor.AQUA + " -t flat");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "gargamel" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -s gargamel");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "moonworld" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -g BukkitFullOfMoon");
-        this.worldManager = this.plugin.getMVWorldManager();
+
+        registerFlagGroup(CommandFlagGroup.builder("mvcreate")
+                .add(CommandValueFlag.builder("--seed", String.class)
+                        .addAlias("-s")
+                        .completion(() -> Collections.singleton(String.valueOf(new Random().nextLong())))
+                        .build())
+                .add(CommandValueFlag.builder("--generator", String.class)
+                        .addAlias("-g")
+                        .completion(() -> Arrays.stream(Bukkit.getServer().getPluginManager().getPlugins())
+                                .filter(Plugin::isEnabled)
+                                .filter(genplugin -> this.plugin.getUnsafeCallWrapper().wrap(
+                                        () -> genplugin.getDefaultWorldGenerator("world", ""),
+                                        genplugin.getName(),
+                                        "Get generator"
+                                ) != null)
+                                .map(genplugin -> genplugin.getDescription().getName())
+                                .collect(Collectors.toList()))
+                        .build())
+                .add(CommandValueFlag.builder("--world-type", WorldType.class)
+                        .addAlias("-t")
+                        .context((value) -> {
+                            try {
+                                return WorldType.valueOf(value.toUpperCase());
+                            } catch (IllegalArgumentException e) {
+                                throw new InvalidCommandArgument("Invalid world type: " + value);
+                            }
+                        })
+                        .completion(() -> {
+                            List<String> types = new ArrayList<>();
+                            for (WorldType type : WorldType.values()) {
+                                types.add(type.name().toLowerCase());
+                            }
+                            return types;
+                        })
+                        .build())
+                .add(CommandFlag.builder("--adjust-spawn")
+                        .addAlias("-n")
+                        .build())
+                .add(CommandFlag.builder("--no-structures")
+                        .addAlias("-a")
+                        .build())
+                .build());
    }

-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        String worldName = args.get(0);
-        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
-        String env = args.get(1);
-        String seed = CommandHandler.getFlag("-s", args);
-        String generator = CommandHandler.getFlag("-g", args);
-        boolean allowStructures = true;
-        String structureString = CommandHandler.getFlag("-a", args);
-        if (structureString != null) {
-            allowStructures = Boolean.parseBoolean(structureString);
-        }
-        String typeString = CommandHandler.getFlag("-t", args);
-        boolean useSpawnAdjust = true;
-        for (String s : args) {
-            if (s.equalsIgnoreCase("-n")) {
-                useSpawnAdjust = false;
-            }
-        }
+    @Subcommand("create")
+    @CommandPermission("multiverse.core.create")
+    @CommandCompletion("@empty  @flags:groupName=mvcreate")
+    @Syntax("<name> <environment> --seed [seed] --generator [generator[:id]] --world-type [worldtype] --adjust-spawn --no-structures")
+    @Description("{@@mv-core.create.description}")
+    public void onCreateCommand(BukkitCommandIssuer issuer,

-        if (worldFile.exists() || this.worldManager.isMVWorld(worldName)) {
-            sender.sendMessage(ChatColor.RED + "A Folder/World already exists with this name!");
-            sender.sendMessage(ChatColor.RED + "If you are confident it is a world you can import with /mvimport");
+                                @Conditions("validWorldName:scope=new")
+                                @Syntax("<name>")
+                                @Description("{@@mv-core.create.name.description}")
+                                String worldName,
+
+                                @Syntax("<environment>")
+                                @Description("{@@mv-core.create.environment.description}")
+                                World.Environment environment,
+
+                                @Optional
+                                @Syntax("--seed [seed] --generator [generator[:id]] --world-type [worldtype] --adjust-spawn --no-structures")
+                                @Description("{@@mv-core.create.flags.description}")
+                                String[] flags
+    ) {
+        ParsedCommandFlags parsedFlags = parseFlags(flags);
+
+        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES, "{worldName}", worldName);
+        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES_ENVIRONMENT, "{environment}", environment.name());
+        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES_SEED, "{seed}", parsedFlags.flagValue("--seed", "RANDOM", String.class));
+        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES_WORLDTYPE, "{worldType}", parsedFlags.flagValue("--world-type", WorldType.NORMAL, WorldType.class).name());
+        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES_ADJUSTSPAWN, "{adjustSpawn}", String.valueOf(parsedFlags.hasFlag("--adjust-spawn")));
+        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES_GENERATOR, "{generator}", parsedFlags.flagValue("--generator", "null", String.class));
+        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES_STRUCTURES, "{structures}", String.valueOf(!parsedFlags.hasFlag("--no-structures")));
+
+        issuer.sendInfo(MVCorei18n.CREATE_LOADING);
+
+        if (!worldManager.addWorld(
+                worldName,
+                environment,
+                parsedFlags.flagValue("--seed", String.class),
+                parsedFlags.flagValue("--world-type", WorldType.NORMAL, WorldType.class),
+                parsedFlags.hasFlag("--adjust-spawn"),
+                parsedFlags.flagValue("--generator", String.class),
+                parsedFlags.hasFlag("--no-structures")
+        )) {
+            issuer.sendError(MVCorei18n.CREATE_FAILED, "{worldName}", worldName);
            return;
        }
-
-        Environment environment = EnvironmentCommand.getEnvFromString(env);
-        if (environment == null) {
-            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
-            EnvironmentCommand.showEnvironments(sender);
-            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;
-        }
-
-        Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'...");
-
-        if (this.worldManager.addWorld(worldName, environment, seed, type, allowStructures, generator, useSpawnAdjust)) {
-            Command.broadcastCommandMessage(sender, "Complete!");
-        } else {
-            Command.broadcastCommandMessage(sender, "FAILED.");
-        }
+        issuer.sendInfo(MVCorei18n.CREATE_SUCCESS, "{worldName}", worldName);
    }
 }
@@ -1,65 +1,53 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
 package com.onarandombox.MultiverseCore.commands;

+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
+import com.onarandombox.MultiverseCore.locale.MVCorei18n;
+import org.jetbrains.annotations.NotNull;

-import java.util.List;
-import java.util.logging.Level;
-
-/**
- * Enables debug-information.
- */
-public class DebugCommand extends MultiverseCommand {
-
-    public DebugCommand(MultiverseCore plugin) {
+@CommandAlias("mv")
+public class DebugCommand extends MultiverseCoreCommand {
+    public DebugCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setName("Turn Debug on/off?");
-        this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off]");
-        this.setArgRange(0, 1);
-        this.addKey("mv debug");
-        this.addKey("mv d");
-        this.addKey("mvdebug");
-        this.addCommandExample("/mv debug " + ChatColor.GOLD + "2");
-        this.setPermission("multiverse.core.debug", "Spams the console a bunch.", PermissionDefault.OP);
    }

-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (args.size() == 1) {
-            if (args.get(0).equalsIgnoreCase("off")) {
-                plugin.getMVConfig().setGlobalDebug(0);
-            } else {
-                try {
-                    int debugLevel = Integer.parseInt(args.get(0));
-                    if (debugLevel > 3 || debugLevel < 0) {
-                        throw new NumberFormatException();
-                    }
-                    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!)");
-                }
-
-            }
-        }
-        this.displayDebugMode(sender);
+    @Subcommand("debug")
+    @CommandPermission("multiverse.core.debug")
+    @Description("{@@mv-core.debug.info.description}")
+    public void onShowDebugCommand(BukkitCommandIssuer issuer) {
+        this.displayDebugMode(issuer);
    }

-    private void displayDebugMode(CommandSender sender) {
-        if (plugin.getMVConfig().getGlobalDebug() == 0) {
-            sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
-        } else {
-            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + plugin.getMVConfig().getGlobalDebug());
-            this.plugin.log(Level.FINE, "Multiverse Debug ENABLED");
+    @Subcommand("debug")
+    @CommandPermission("multiverse.core.debug")
+    @CommandCompletion("@range:3")
+    @Syntax("<{@@mv-core.debug.change.syntax}>")
+    @Description("{@@mv-core.debug.change.description}")
+    public void onChangeDebugCommand(BukkitCommandIssuer issuer,
+
+                                     @Syntax("<{@@mv-core.debug.change.syntax}>")
+                                     @Description("{@@mv-core.debug.change.level.description}")
+                                     int level) {
+
+        this.plugin.getMVConfig().setGlobalDebug(level);
+        this.plugin.saveAllConfigs();
+        this.displayDebugMode(issuer);
+    }
+
+    private void displayDebugMode(BukkitCommandIssuer issuer) {
+        final int debugLevel = this.plugin.getMVConfig().getGlobalDebug();
+        if (debugLevel == 0) {
+            issuer.sendInfo(MVCorei18n.DEBUG_INFO_OFF);
+            return;
        }
+        issuer.sendInfo(MVCorei18n.DEBUG_INFO_ON, "{level}", String.valueOf(debugLevel));
+        Logging.fine("Multiverse Debug ENABLED.");
    }
 }
@@ -1,41 +1,49 @@
-/******************************************************************************
- * 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 co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Conditions;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Single;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;

-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Deletes worlds.
- */
-public class DeleteCommand extends MultiverseCommand {
-
-    public DeleteCommand(MultiverseCore plugin) {
+@CommandAlias("mv")
+public class DeleteCommand extends MultiverseCoreCommand {
+    public DeleteCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setName("Delete World");
-        this.setCommandUsage("/mv delete" + ChatColor.GREEN + " {WORLD}");
-        this.setArgRange(1, 1);
-        this.addKey("mvdelete");
-        this.addKey("mv delete");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "MyWorld");
-        this.setPermission("multiverse.core.delete", "Deletes a world on your server. " + ChatColor.RED + "PERMANENTLY.", PermissionDefault.OP);
    }

-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Class<?>[] paramTypes = {String.class};
-        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!");
+    @Subcommand("delete")
+    @CommandPermission("multiverse.core.delete")
+    @CommandCompletion("@mvworlds:scope=both")
+    @Syntax("<world>")
+    @Description("Deletes a world on your server PERMANENTLY.")
+    public void onDeleteCommand(BukkitCommandIssuer issuer,
+
+                                @Single
+                                @Conditions("validWorldName:scope=both")
+                                @Syntax("<world>")
+                                @Description("The world you want to delete.")
+                                String worldName
+    ) {
+        this.plugin.getMVCommandManager().getCommandQueueManager().addToQueue(new QueuedCommand(
+                issuer.getIssuer(),
+                () -> {
+                    issuer.sendMessage(String.format("Deleting world '%s'...", worldName));
+                    if (!this.plugin.getMVWorldManager().deleteWorld(worldName)) {
+                        issuer.sendMessage(String.format("%sThere was an issue deleting '%s'! Please check console for errors.", ChatColor.RED, worldName));
+                        return;
+                    }
+                    issuer.sendMessage(String.format("%sWorld %s was deleted!", ChatColor.GREEN, worldName));
+                },
+                "Are you sure you want to delete world '" + worldName + "'?"
+        ));
    }
 }
@@ -1,113 +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.World;
-import org.bukkit.WorldType;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-
-/**
- * Lists valid known environments.
- */
-public class EnvironmentCommand extends MultiverseCommand {
-
-    public EnvironmentCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("List Environments");
-        this.setCommandUsage("/mv env");
-        this.setArgRange(0, 0);
-        this.addKey("mvenv");
-        this.addKey("mv env");
-        this.addKey("mv type");
-        this.addKey("mv environment");
-        this.addKey("mv environments");
-        this.addCommandExample("/mv env");
-        this.setPermission("multiverse.core.list.environments", "Lists valid known environments/world types.", PermissionDefault.OP);
-    }
-
-    /**
-     * Shows all valid known environments to a {@link CommandSender}.
-     *
-     * @param sender The {@link CommandSender}.
-     */
-    public static void showEnvironments(CommandSender sender) {
-        sender.sendMessage(ChatColor.YELLOW + "Valid Environments are:");
-        sender.sendMessage(ChatColor.GREEN + "NORMAL");
-        sender.sendMessage(ChatColor.RED + "NETHER");
-        sender.sendMessage(ChatColor.AQUA + "END");
-    }
-    /**
-     * Shows all valid known world types to a {@link CommandSender}.
-     *
-     * @param sender The {@link CommandSender}.
-     */
-    public static void showWorldTypes(CommandSender sender) {
-        sender.sendMessage(ChatColor.YELLOW + "Valid World Types are:");
-        sender.sendMessage(String.format("%sNORMAL%s, %sFLAT %sor %sVERSION_1_1",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, ChatColor.WHITE, ChatColor.GOLD));
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        EnvironmentCommand.showEnvironments(sender);
-        EnvironmentCommand.showWorldTypes(sender);
-    }
-
-    /**
-     * Converts a {@link String} into a {@link WorldType}.
-     *
-     * @param type The WorldType as a {@link String}
-     * @return The WorldType as a {@link WorldType}
-     */
-    public static WorldType getWorldTypeFromString(String type) {
-        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
-        if (type.equalsIgnoreCase("normal"))
-            type = "NORMAL";
-        if (type.equalsIgnoreCase("flat"))
-            type = "FLAT";
-        try {
-            // Now that we've converted a potentially unfriendly value
-            // to a friendly one, get it from the ENUM!
-            return WorldType.valueOf(type);
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Converts a {@link String} into an {@link org.bukkit.World.Environment}.
-     *
-     * @param env The environment as {@link String}
-     * @return The environment as {@link org.bukkit.World.Environment}
-     */
-    public static World.Environment getEnvFromString(String env) {
-        env = env.toUpperCase();
-        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
-        if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER"))
-            env = "NETHER";
-
-        if (env.equalsIgnoreCase("END") || env.equalsIgnoreCase("THEEND") || env.equalsIgnoreCase("STARWARS"))
-            env = "THE_END";
-
-        if (env.equalsIgnoreCase("NORMAL") || env.equalsIgnoreCase("WORLD"))
-            env = "NORMAL";
-
-        try {
-            // Now that we've converted a potentially unfriendly value
-            // to a friendly one, get it from the ENUM!
-            return World.Environment.valueOf(env);
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
-    }
-}
@@ -0,0 +1,63 @@
+package com.onarandombox.MultiverseCore.commands;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Flags;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorld;
+import com.onarandombox.MultiverseCore.commandtools.context.GameRuleValue;
+import org.bukkit.ChatColor;
+import org.bukkit.GameRule;
+import org.jetbrains.annotations.NotNull;
+
+@CommandAlias("mv")
+public class GameruleCommand extends MultiverseCoreCommand {
+    public GameruleCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+    }
+
+    @Subcommand("gamerule")
+    @CommandPermission("multiverse.core.gamerule")
+    @CommandCompletion("@gamerules true|false|@range:1-10 @mvworlds:multiple|*")
+    @Syntax("<Gamerule> <Gamerule value> [World or *]")
+    @Description("Changes a gamerule in one or more worlds")
+    public void onGameruleCommand(BukkitCommandIssuer issuer,
+
+                                  @Syntax("<Gamerule>")
+                                  @Description("Gamerule to set")
+                                  GameRule gamerule,
+
+                                  @Syntax("<Value>")
+                                  @Description("Value of gamerule")
+                                  GameRuleValue gameRuleValue,
+
+                                  @Flags("resolve=issuerAware")
+                                  @Syntax("[World or *]")
+                                  @Description("World to apply gamerule to, current world by default")
+                                  MVWorld[] worlds
+    ) {
+        Object value = gameRuleValue.getValue();
+        boolean success = true;
+        for(MVWorld world : worlds) {
+            // Set gamerules and add false to list if it fails
+            if (!world.getCBWorld().setGameRule(gamerule, value)) {
+                issuer.sendMessage(ChatColor.RED + "Failed to set gamerule " + gamerule.getName() + " to " + value + " in " + world.getName() + ". It should be a " + gamerule.getType());
+                success = false;
+            }
+        }
+        // Tell user if it was successful
+        if (success) {
+            if (worlds.length == 1) {
+                issuer.sendMessage(ChatColor.GREEN + "Successfully set " + gamerule.getName() + " to " + value + " in " + worlds[0].getName());
+            }
+            else if (worlds.length > 1) {
+                issuer.sendMessage(ChatColor.GREEN + "Successfully set " + gamerule.getName() + " to " + value + " in " + worlds.length + " worlds.");
+            }
+        }
+    }
+}
@@ -1,60 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-import org.bukkit.plugin.Plugin;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-
-/**
- * Returns a list of loaded generator plugins.
- */
-public class GeneratorCommand extends MultiverseCommand {
-
-    public GeneratorCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("World Information");
-        this.setCommandUsage("/mv generators");
-        this.setArgRange(0, 0);
-        this.addKey("mv generators");
-        this.addKey("mvgenerators");
-        this.addKey("mv gens");
-        this.addKey("mvgens");
-        this.addCommandExample("/mv generators");
-        this.setPermission("multiverse.core.generator", "Returns a list of Loaded Generator Plugins.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        this.plugin.log(Level.INFO, "PLEASE IGNORE the 'Plugin X does not contain any generators' message below!");
-        Plugin[] plugins = this.plugin.getServer().getPluginManager().getPlugins();
-        List<String> generators = new ArrayList<String>();
-        for (Plugin p : plugins) {
-            if (p.isEnabled() && p.getDefaultWorldGenerator("world", "") != null) {
-                generators.add(p.getDescription().getName());
-            }
-        }
-        sender.sendMessage(ChatColor.AQUA + "--- Loaded Generator Plugins ---");
-        String loadedGens = "";
-        boolean altColor = false;
-        for (String s : generators) {
-            loadedGens += (altColor ? ChatColor.YELLOW : ChatColor.WHITE) + s + " ";
-            altColor = !altColor;
-        }
-        if (loadedGens.length() == 0) {
-            loadedGens = ChatColor.RED + "No Generator Plugins found.";
-        }
-        sender.sendMessage(loadedGens);
-    }
-}
@@ -1,106 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.pneumaticraft.commandhandler.Command;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Displays a nice help menu.
- */
-public class HelpCommand extends PaginatedCoreCommand<Command> {
-
-    public HelpCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Get Help with Multiverse");
-        this.setCommandUsage("/mv " + ChatColor.GOLD + "[FILTER] [PAGE #]");
-        this.setArgRange(0, 2);
-        this.addKey("mv");
-        this.addKey("mvh");
-        this.addKey("mvhelp");
-        this.addKey("mv help");
-        this.addKey("mvsearch");
-        this.addKey("mv search");
-        this.addCommandExample("/mv help ?");
-        this.setPermission("multiverse.help", "Displays a nice help menu.", PermissionDefault.TRUE);
-        this.setItemsPerPage(7); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-    }
-
-    @Override
-    protected List<Command> getFilteredItems(List<Command> availableItems, String filter) {
-        List<Command> filtered = new ArrayList<Command>();
-
-        for (Command c : availableItems) {
-            if (stitchThisString(c.getKeyStrings()).matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else if (c.getCommandName().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else if (c.getCommandDesc().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else if (c.getCommandUsage().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else {
-                for (String example : c.getCommandExamples()) {
-                    if (example.matches("(?i).*" + filter + ".*")) {
-                        filtered.add(c);
-                        break;
-                    }
-                }
-            }
-        }
-        return filtered;
-    }
-
-    @Override
-    protected String getItemText(Command item) {
-        return ChatColor.AQUA + item.getCommandUsage();
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        sender.sendMessage(ChatColor.AQUA + "====[ Multiverse Help ]====");
-
-        FilterObject filterObject = this.getPageAndFilter(args);
-
-        List<Command> availableCommands = new ArrayList<Command>(this.plugin.getCommandHandler().getCommands(sender));
-        if (filterObject.getFilter().length() > 0) {
-            availableCommands = this.getFilteredItems(availableCommands, filterObject.getFilter());
-            if (availableCommands.size() == 0) {
-                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
-                        + "No commands matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
-                return;
-            }
-        }
-
-        if (!(sender instanceof Player)) {
-            sender.sendMessage(ChatColor.AQUA + " Add a '" + ChatColor.DARK_PURPLE + "?" + ChatColor.AQUA + "' after a command to see more about it.");
-            for (Command c : availableCommands) {
-                sender.sendMessage(ChatColor.AQUA + c.getCommandUsage());
-            }
-            return;
-        }
-
-        int totalPages = (int) Math.ceil(availableCommands.size() / (this.itemsPerPage + 0.0));
-
-        if (filterObject.getPage() > totalPages) {
-            filterObject.setPage(totalPages);
-        }
-
-        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
-        sender.sendMessage(ChatColor.AQUA + " Add a '" + ChatColor.DARK_PURPLE + "?" + ChatColor.AQUA + "' after a command to see more about it.");
-
-        this.showPage(filterObject.getPage(), sender, availableCommands);
-    }
-}
@@ -1,162 +1,88 @@
-/******************************************************************************
- * 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.Arrays;
+import java.util.stream.Collectors;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Conditions;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Optional;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.pneumaticraft.commandhandler.CommandHandler;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag;
+import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.World.Environment;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
+import org.bukkit.World;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;

-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Imports a new world of the specified type.
- */
-public class ImportCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
-
-    public ImportCommand(MultiverseCore plugin) {
+@CommandAlias("mv")
+public class ImportCommand extends MultiverseCoreCommand {
+    public ImportCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setName("Import World");
-        this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV}" + ChatColor.GOLD + " -g [GENERATOR[:ID]] [-n]");
-        this.setArgRange(1, 5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-        this.addKey("mvimport");
-        this.addKey("mvim");
-        this.addKey("mv import");
-        this.addCommandExample("/mv import " + ChatColor.GOLD + "gargamel" + ChatColor.GREEN + " normal");
-        this.addCommandExample("/mv import " + ChatColor.GOLD + "hell_world" + ChatColor.GREEN + " nether");
-        this.addCommandExample("To import a world that uses a generator, you'll need the generator:");
-        this.addCommandExample("/mv import " + ChatColor.GOLD + "CleanRoom" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " CleanRoomGenerator");
-        this.setPermission("multiverse.core.import", "Imports a new world of the specified type.", PermissionDefault.OP);
-        this.worldManager = this.plugin.getMVWorldManager();
+
+        registerFlagGroup(CommandFlagGroup.builder("mvimport")
+                .add(CommandValueFlag.builder("--generator", String.class)
+                        .addAlias("-g")
+                        .completion(() -> Arrays.stream(Bukkit.getServer().getPluginManager().getPlugins())
+                                .filter(Plugin::isEnabled)
+                                .filter(genplugin -> this.plugin.getUnsafeCallWrapper().wrap(
+                                        () -> genplugin.getDefaultWorldGenerator("world", ""),
+                                        genplugin.getName(),
+                                        "Get generator"
+                                ) != null)
+                                .map(genplugin -> genplugin.getDescription().getName())
+                                .collect(Collectors.toList()))
+                        .build())
+                .add(CommandFlag.builder("--adjust-spawn")
+                        .addAlias("-a")
+                        .build())
+                .build());
    }

-    /**
-     * A very basic check to see if a folder has a level.dat file.
-     * If it does, we can safely assume it's a world folder.
-     *
-     * @param worldFolder The File that may be a world.
-     * @return True if it looks like a world, false if not.
-     */
-    private static boolean checkIfIsWorld(File worldFolder) {
-        if (worldFolder.isDirectory()) {
-            File[] files = worldFolder.listFiles(new FilenameFilter() {
-                @Override
-                public boolean accept(File file, String name) {
-                    return name.equalsIgnoreCase("level.dat");
-                }
-            });
-            if (files != null && files.length > 0) {
-                return true;
-            }
-        }
-        return false;
-    }
+    @Subcommand("import")
+    @CommandPermission("multiverse.core.import")
+    @CommandCompletion("@mvworlds:scope=potential  @flags:groupName=mvimport")
+    @Syntax("<name> <env> --generator [generator[:id]] --adjust-spawn")
+    @Description("Imports a existing world folder.")
+    public void onImportCommand(BukkitCommandIssuer issuer,

-    private String getPotentialWorlds() {
-        File worldFolder = this.plugin.getServer().getWorldContainer();
-        if (worldFolder == null) {
-            return "";
-        }
-        File[] files = worldFolder.listFiles();
-        String worldList = "";
-        Collection<MultiverseWorld> worlds = this.worldManager.getMVWorlds();
-        List<String> worldStrings = new ArrayList<String>();
-        for (MultiverseWorld world : worlds) {
-            worldStrings.add(world.getName());
-        }
-        for (String world : this.worldManager.getUnloadedWorlds()) {
-            worldStrings.add(world);
-        }
-        ChatColor currColor = ChatColor.WHITE;
-        for (File file : files) {
-            if (file.isDirectory() && checkIfIsWorld(file) && !worldStrings.contains(file.getName())) {
-                worldList += currColor + file.getName() + " ";
-                if (currColor == ChatColor.WHITE) {
-                    currColor = ChatColor.YELLOW;
-                } else {
-                    currColor = ChatColor.WHITE;
-                }
-            }
-        }
-        return worldList;
-    }
+                                @Conditions("validWorldName:scope=new")
+                                @Syntax("<name>")
+                                @Description("Name of the world folder.")
+                                String worldName,

-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        String worldName = args.get(0);
+                                @Syntax("<env>")
+                                @Description("The world's environment. See: /mv env")
+                                World.Environment environment,

-        if (worldName.toLowerCase().equals("--list") || worldName.toLowerCase().equals("-l")) {
-            String worldList = this.getPotentialWorlds();
-            if (worldList.length() > 2) {
-                sender.sendMessage(ChatColor.AQUA + "====[ These look like worlds ]====");
-                sender.sendMessage(worldList);
-            } else {
-                sender.sendMessage(ChatColor.RED + "No potential worlds found. Sorry!");
-            }
+                                @Optional
+                                @Syntax("--generator [generator[:id]] --adjust-spawn")
+                                @Description("Other world settings. See: https://gg.gg/nn8c2")
+                                String[] flags) {
+
+        ParsedCommandFlags parsedFlags = parseFlags(flags);
+
+        issuer.sendMessage(String.format("Starting import of world '%s'...", worldName));
+
+        if (!this.worldManager.addWorld(
+                worldName, environment,
+                null,
+                null,
+                null,
+                parsedFlags.flagValue("--generator", String.class),
+                parsedFlags.hasFlag("--adjust-spawn"))
+        ) {
+            issuer.sendMessage(String.format("%sFailed! See console for more details.", ChatColor.RED));
            return;
        }
-        // Since we made an exception for the list, we have to make sure they have at least 2 params:
-        // Note the exception is --list, which is covered above.
-        if (args.size() == 1) {
-            this.showHelp(sender);
-            return;
-        }
-
-        // Make sure we don't already know about this world.
-        if (this.worldManager.isMVWorld(worldName)) {
-            sender.sendMessage(ChatColor.GREEN + "Multiverse" + ChatColor.WHITE
-                    + " already knows about '" + ChatColor.AQUA + worldName + ChatColor.WHITE + "'!");
-            return;
-        }
-
-        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
-
-        String generator = CommandHandler.getFlag("-g", args);
-        boolean useSpawnAdjust = true;
-        for (String s : args) {
-            if (s.equalsIgnoreCase("-n")) {
-                useSpawnAdjust = false;
-            }
-        }
-
-        String env = args.get(1);
-        Environment environment = EnvironmentCommand.getEnvFromString(env);
-        if (environment == null) {
-            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
-            EnvironmentCommand.showEnvironments(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, null, null, generator, useSpawnAdjust))
-                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
-            else
-                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
-        } else if (env == null) {
-            sender.sendMessage(ChatColor.RED + "FAILED.");
-            sender.sendMessage("That world 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);
-        }
+        issuer.sendMessage(String.format("%sComplete!", ChatColor.GREEN));
    }
 }
@@ -1,266 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.FancyText;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.FancyColorScheme;
-import com.onarandombox.MultiverseCore.utils.FancyHeader;
-import com.onarandombox.MultiverseCore.utils.FancyMessage;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.ArrayList;
-import java.util.List;
-
-// Will use when we can compile with JDK 6
-//import com.sun.xml.internal.ws.util.StringUtils;
-
-/**
- * Returns detailed information about a world.
- */
-public class InfoCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
-
-    public InfoCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("World Information");
-        this.setCommandUsage("/mv info" + ChatColor.GOLD + " [WORLD] [PAGE]");
-        this.setArgRange(0, 2);
-        this.addKey("mvinfo");
-        this.addKey("mvi");
-        this.addKey("mv info");
-        this.addCommandExample("/mv info " + ChatColor.GOLD + "1");
-        this.addCommandExample("/mv info " + ChatColor.GOLD + "3");
-        this.setPermission("multiverse.core.info", "Returns detailed information on the world.", PermissionDefault.OP);
-        this.worldManager = this.plugin.getMVWorldManager();
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // Check if the command was sent from a Player.
-        String worldName = "";
-        int pageNum = 0;
-
-        if (args.size() == 0) {
-            if (sender instanceof Player) {
-                Player p = (Player) sender;
-                worldName = p.getWorld().getName();
-            } else {
-                sender.sendMessage("You must enter a" + ChatColor.LIGHT_PURPLE + " world" + ChatColor.WHITE + " from the console!");
-                return;
-            }
-        } else if (args.size() == 1) {
-            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;
-                    worldName = p.getWorld().getName();
-                    try {
-                        pageNum = Integer.parseInt(args.get(0)) - 1;
-                    } catch (NumberFormatException e) {
-                        sender.sendMessage("That world does not exist.");
-                        return;
-                    }
-                } else {
-                    sender.sendMessage("You must enter a" + ChatColor.LIGHT_PURPLE + " world" + ChatColor.WHITE + " from the console!");
-                    return;
-                }
-            }
-        } else if (args.size() == 2) {
-            worldName = args.get(0);
-            try {
-                pageNum = Integer.parseInt(args.get(1)) - 1;
-            } catch (NumberFormatException e) {
-                pageNum = 0;
-            }
-        }
-
-        if (this.worldManager.isMVWorld(worldName)) {
-            Player p = null;
-            if (sender instanceof Player) {
-                p = (Player) sender;
-            }
-            showPage(pageNum, sender, this.buildEntireCommand(this.worldManager.getMVWorld(worldName), p));
-        } else if (this.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("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");
-        }
-    }
-
-    private List<List<FancyText>> buildEntireCommand(MultiverseWorld world, Player p) {
-        List<FancyText> message = new ArrayList<FancyText>();
-        List<List<FancyText>> worldInfo = new ArrayList<List<FancyText>>();
-        // Page 1
-        FancyColorScheme colors = new FancyColorScheme(ChatColor.AQUA, ChatColor.AQUA, ChatColor.GOLD, ChatColor.WHITE);
-        message.add(new FancyHeader("General Info", colors));
-        message.add(new FancyMessage("World Name: ", world.getName(), colors));
-        message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
-        message.add(new FancyMessage("Game Mode: ", world.getGameMode().toString(), colors));
-        message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
-
-        //message.add(new FancyMessage("Game Mode: ", StringUtils.capitalize(world.getGameMode().toString()), colors));
-        Location spawn = world.getSpawnLocation();
-        message.add(new FancyMessage("Spawn Location: ", plugin.getLocationManipulation().strCoords(spawn), colors));
-        message.add(new FancyMessage("World Scale: ", world.getScaling() + "", colors));
-        if (world.getPrice() > 0) {
-            message.add(new FancyMessage("Price to enter this world: ",
-                    this.plugin.getBank().getFormattedAmount(p, world.getPrice(), world.getCurrency()), colors));
-        } else {
-            message.add(new FancyMessage("Price to enter this world: ", ChatColor.GREEN + "FREE!", colors));
-        }
-
-        if (world.getRespawnToWorld() != null) {
-            MultiverseWorld respawn = this.worldManager.getMVWorld(world.getRespawnToWorld());
-            if (respawn != null) {
-                message.add(new FancyMessage("Players will respawn in: ", respawn.getColoredWorldString(), colors));
-            } else {
-                message.add(new FancyMessage("Players will respawn in: ", ChatColor.RED + "!!INVALID!!", colors));
-            }
-
-        }
-
-        worldInfo.add(message);
-        // Page 2
-        message = new ArrayList<FancyText>();
-        message.add(new FancyHeader("More World Settings", colors));
-        message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
-        message.add(new FancyMessage("Structures: ", world.getCBWorld().canGenerateStructures() + "", colors));
-        message.add(new FancyMessage("Weather: ", world.isWeatherEnabled() + "", colors));
-        message.add(new FancyMessage("Players will get hungry: ", world.getHunger() + "", colors));
-        message.add(new FancyMessage("Keep spawn in memory: ", world.isKeepingSpawnInMemory() + "", colors));
-        message.add(new FancyHeader("PVP Settings", colors));
-        message.add(new FancyMessage("Multiverse Setting: ", world.isPVPEnabled() + "", colors));
-        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getPVP() + "", colors));
-        worldInfo.add(message);
-        // Page 3
-        message = new ArrayList<FancyText>();
-        message.add(new FancyHeader("Monster Settings", colors));
-        message.add(new FancyMessage("Multiverse Setting: ", world.canMonstersSpawn() + "", colors));
-        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getAllowMonsters() + "", colors));
-        if (world.getMonsterList().size() > 0) {
-            if (world.canMonstersSpawn()) {
-                message.add(new FancyMessage("Monsters that" + ChatColor.RED + " CAN NOT "
-                        + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getMonsterList()), colors));
-            } else {
-                message.add(new FancyMessage("Monsters that" + ChatColor.GREEN + " CAN SPAWN: ", toCommaSeperated(world.getMonsterList()), colors));
-            }
-        } else {
-            message.add(new FancyMessage("Monsters that CAN spawn: ", world.canMonstersSpawn() ? "ALL" : "NONE", colors));
-        }
-        worldInfo.add(message);
-
-        // Page 4
-        message = new ArrayList<FancyText>();
-        message.add(new FancyHeader("Animal Settings", colors));
-        message.add(new FancyMessage("Multiverse Setting: ", world.canAnimalsSpawn() + "", colors));
-        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getAllowAnimals() + "", colors));
-        if (world.getMonsterList().size() > 0) {
-            if (world.canMonstersSpawn()) {
-                message.add(new FancyMessage("Animals that" + ChatColor.RED + " CAN NOT "
-                        + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getAnimalList()), colors));
-            } else {
-                message.add(new FancyMessage("Animals that" + ChatColor.GREEN + " CAN SPAWN: ", toCommaSeperated(world.getAnimalList()), colors));
-            }
-        } else {
-            message.add(new FancyMessage("Animals that CAN spawn: ", world.canAnimalsSpawn() ? "ALL" : "NONE", colors));
-        }
-        worldInfo.add(message);
-
-        return worldInfo;
-    }
-
-    private static String toCommaSeperated(List<String> list) {
-        if (list == null || list.size() == 0) {
-            return "";
-        }
-        if (list.size() == 1) {
-            return list.get(0);
-        }
-        String result = list.get(0);
-
-        for (int i = 1; i < list.size() - 1; i++) {
-            result += ", " + list.get(i);
-        }
-        result += " and " + list.get(list.size() - 1);
-        return result;
-    }
-
-    /**
-     * Gets a "positive" or "negative" {@link ChatColor}.
-     *
-     * @param positive Whether this {@link ChatColor} should be "positive".
-     * @return The {@link ChatColor}.
-     */
-    protected ChatColor getChatColor(boolean positive) {
-        return positive ? ChatColor.GREEN : ChatColor.RED;
-    }
-
-    private 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;
-        boolean appendedPageNum = false;
-        if (sender instanceof Player) {
-            List<FancyText> list = doc.get(page);
-            for (FancyText fancyT : list) {
-                if (fancyT instanceof FancyMessage) {
-                    FancyMessage text = (FancyMessage) fancyT;
-                    text.setAltColor(altColor);
-                    altColor = !altColor;
-                    sender.sendMessage(text.getFancyText());
-                } else if (fancyT instanceof FancyHeader) {
-                    FancyHeader text = (FancyHeader) fancyT;
-                    if (!appendedPageNum) {
-                        text.appendText(ChatColor.DARK_PURPLE + " [ Page " + (page + 1) + " of " + doc.size() + " ]");
-                        appendedPageNum = true;
-                    }
-                    sender.sendMessage(text.getFancyText());
-                    altColor = false;
-                }
-            }
-
-        } else {
-            for (List<FancyText> list : doc) {
-                for (FancyText fancyT : list) {
-                    if (fancyT instanceof FancyMessage) {
-                        FancyMessage text = (FancyMessage) fancyT;
-                        text.setAltColor(altColor);
-                        altColor = !altColor;
-                        sender.sendMessage(text.getFancyText());
-                    } else {
-                        FancyText text = fancyT;
-                        if (appendedPageNum) {
-                            sender.sendMessage(" ");
-                        } else {
-                            appendedPageNum = true;
-                        }
-                        sender.sendMessage(text.getFancyText());
-                        altColor = false;
-                    }
-                }
-            }
-        }
-    }
-
-}
@@ -1,130 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import org.bukkit.ChatColor;
-import org.bukkit.World.Environment;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Displays a listing of all worlds that a player can enter.
- */
-public class ListCommand extends PaginatedCoreCommand<String> {
-
-    public ListCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("World Listing");
-        this.setCommandUsage("/mv list");
-        this.setArgRange(0, 2);
-        this.addKey("mvlist");
-        this.addKey("mvl");
-        this.addKey("mv list");
-        this.setPermission("multiverse.core.list.worlds", "Displays a listing of all worlds that you can enter.", PermissionDefault.OP);
-        this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-    }
-
-    private List<String> getFancyWorldList(Player p) {
-        List<String> worldList = new ArrayList<String>();
-        for (MultiverseWorld world : this.plugin.getMVWorldManager().getMVWorlds()) {
-
-            if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
-                continue;
-            }
-
-            ChatColor color = ChatColor.GOLD;
-            Environment env = world.getEnvironment();
-            if (env == Environment.NETHER) {
-                color = ChatColor.RED;
-            } else if (env == Environment.NORMAL) {
-                color = ChatColor.GREEN;
-            } else if (env == Environment.THE_END) {
-                color = ChatColor.AQUA;
-            }
-            StringBuilder builder = new StringBuilder();
-            builder.append(world.getColoredWorldString()).append(ChatColor.WHITE);
-            builder.append(" - ").append(color).append(world.getEnvironment());
-            if (world.isHidden()) {
-                if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.core.modify", true)) {
-                    // Prefix hidden worlds with an "[H]"
-                    worldList.add(ChatColor.GRAY + "[H]" + builder.toString());
-                }
-            } else {
-                worldList.add(builder.toString());
-            }
-        }
-        for (String name : this.plugin.getMVWorldManager().getUnloadedWorlds()) {
-            if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + name, true)) {
-                worldList.add(ChatColor.GRAY + name + " - UNLOADED");
-            }
-        }
-        return worldList;
-    }
-
-    @Override
-    protected List<String> getFilteredItems(List<String> availableItems, String filter) {
-        List<String> filtered = new ArrayList<String>();
-
-        for (String s : availableItems) {
-            if (s.matches("(?i).*" + filter + ".*")) {
-                filtered.add(s);
-            }
-        }
-        return filtered;
-    }
-
-    @Override
-    protected String getItemText(String item) {
-        return item;
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse World List ]====");
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-
-
-        FilterObject filterObject = this.getPageAndFilter(args);
-
-        List<String> availableWorlds = new ArrayList<String>(this.getFancyWorldList(p));
-        if (filterObject.getFilter().length() > 0) {
-            availableWorlds = this.getFilteredItems(availableWorlds, filterObject.getFilter());
-            if (availableWorlds.size() == 0) {
-                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
-                        + "No worlds matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
-                return;
-            }
-        }
-
-        if (!(sender instanceof Player)) {
-            for (String c : availableWorlds) {
-                sender.sendMessage(c);
-            }
-            return;
-        }
-
-        int totalPages = (int) Math.ceil(availableWorlds.size() / (this.itemsPerPage + 0.0));
-
-        if (filterObject.getPage() > totalPages) {
-            filterObject.setPage(totalPages);
-        }
-
-        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
-
-        this.showPage(filterObject.getPage(), sender, availableWorlds);
-    }
-}
@@ -1,42 +1,42 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
 package com.onarandombox.MultiverseCore.commands;

+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Conditions;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Single;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;

-import java.util.List;
-
-/**
- * Loads a world into Multiverse.
- */
-public class LoadCommand extends MultiverseCommand {
-
-    public LoadCommand(MultiverseCore plugin) {
+@CommandAlias("mv")
+public class LoadCommand extends MultiverseCoreCommand {
+    public LoadCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setName("Load World");
-        this.setCommandUsage("/mv load" + ChatColor.GREEN + " {WORLD}");
-        this.setArgRange(1, 1);
-        this.addKey("mvload");
-        this.addKey("mv load");
-        this.addCommandExample("/mv load " + ChatColor.GREEN + "MyUnloadedWorld");
-        this.setPermission("multiverse.core.load", "Loads a world into Multiverse.", PermissionDefault.OP);
    }

-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (this.plugin.getMVWorldManager().loadWorld(args.get(0))) {
-            Command.broadcastCommandMessage(sender, "Loaded world '" + args.get(0) + "'!");
-        } else {
-            sender.sendMessage("Error trying to load world '" + args.get(0) + "'!");
+    @Subcommand("load")
+    @CommandPermission("multiverse.core.load")
+    @CommandCompletion("@mvworlds:scope=unloaded")
+    @Syntax("<world>")
+    @Description("Loads a world. World must be already in worlds.yml, else please use /mv import.")
+    public void onLoadCommand(BukkitCommandIssuer issuer,
+
+                              @Single
+                              @Conditions("validWorldName:scope=unloaded")
+                              @Syntax("<world>")
+                              @Description("Name of world you want to load.")
+                              String worldName
+    ) {
+        issuer.sendMessage(String.format("Loading world '%s'...", worldName));
+
+        if (!this.plugin.getMVWorldManager().loadWorld(worldName)) {
+            issuer.sendMessage(String.format("Error trying to load world '%s'!", worldName));
+            return;
        }
+        issuer.sendMessage(String.format("Loaded world '%s'!", worldName));
    }
 }
@@ -1,92 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.enums.Action;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-
-// This will contain all the properties that support the ADD/REMOVE
-// Anything not in here will only support the SET action
-
-/**
- * Used to modify various aspects of worlds.
- */
-public class ModifyAddCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
-
-    public ModifyAddCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Modify a World (Add a value)");
-        this.setCommandUsage("/mv modify " + ChatColor.GREEN + "add {VALUE} {PROPERTY}" + ChatColor.GOLD + " [WORLD] ");
-        this.setArgRange(2, 3);
-        this.addKey("mvm add");
-        this.addKey("mvmadd");
-        this.addKey("mv modify add");
-        this.addKey("mvmodify add");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "add " + ChatColor.GREEN + "sheep " + ChatColor.RED + "animals");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "add " + ChatColor.GREEN + "creeper " + ChatColor.RED + "monsters");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "add " + ChatColor.GREEN + "MyWorld " + ChatColor.RED + "worldblacklist");
-        this.setPermission("multiverse.core.modify.add", "Modify various aspects of worlds. See the help wiki for how to use this command properly. "
-                + "If you do not include a world, the current world will be used.", PermissionDefault.OP);
-        this.worldManager = this.plugin.getMVWorldManager();
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // We NEED a world from the command line
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-
-        if (args.size() == 2 && p == null) {
-            sender.sendMessage(ChatColor.RED + "From the console, WORLD is required.");
-            sender.sendMessage(this.getCommandDesc());
-            sender.sendMessage(this.getCommandUsage());
-            sender.sendMessage("Nothing changed.");
-            return;
-        }
-
-        MultiverseWorld world;
-        String value = args.get(0);
-        String property = args.get(1);
-
-        if (args.size() == 2) {
-            world = this.worldManager.getMVWorld(p.getWorld().getName());
-        } else {
-            world = this.worldManager.getMVWorld(args.get(2));
-        }
-
-        if (world == null) {
-            sender.sendMessage("That world does not exist!");
-            return;
-        }
-
-        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");
-            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);
-        } else {
-            sender.sendMessage(value + " could not be added to " + property);
-        }
-    }
-}
@@ -1,89 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.enums.Action;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-
-/**
- * Removes all values from a world-property.
- */
-public class ModifyClearCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
-
-    public ModifyClearCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Modify a World (Clear a property)");
-        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " clear {PROPERTY}" + ChatColor.GOLD + " [WORLD]");
-        this.setArgRange(1, 2);
-        this.addKey("mvm clear");
-        this.addKey("mvmclear");
-        this.addKey("mv modify clear");
-        this.addKey("mvmodify clear");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "clear " + ChatColor.RED + "animals");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "clear " + ChatColor.RED + "monsters");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "clear " + ChatColor.RED + "worldblacklist");
-        this.setPermission("multiverse.core.modify.clear",
-                "Removes all values from a property. This will work on properties that contain lists.", PermissionDefault.OP);
-        this.worldManager = this.plugin.getMVWorldManager();
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // We NEED a world from the command line
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-        if (args.size() == 1 && p == null) {
-            sender.sendMessage(ChatColor.RED + "From the console, WORLD is required.");
-            sender.sendMessage(this.getCommandDesc());
-            sender.sendMessage(this.getCommandUsage());
-            sender.sendMessage("Nothing changed.");
-            return;
-        }
-
-        MultiverseWorld world;
-        String property = args.get(0);
-
-        if (args.size() == 1) {
-            world = this.worldManager.getMVWorld(p.getWorld().getName());
-        } else {
-            world = this.worldManager.getMVWorld(args.get(1));
-        }
-
-        if (world == null) {
-            sender.sendMessage("That world does not exist!");
-            return;
-        }
-
-        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");
-            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.");
-        } else {
-            sender.sendMessage(ChatColor.RED + "Error: " + ChatColor.GOLD + property
-                    + ChatColor.WHITE + " was " + ChatColor.GOLD + "NOT" + ChatColor.WHITE + " cleared.");
-        }
-    }
-
-}
@@ -1,76 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.enums.Action;
-import com.onarandombox.MultiverseCore.enums.AddProperties;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Used to modify various aspects of worlds.
- */
-public class ModifyCommand extends MultiverseCommand {
-
-    public ModifyCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Modify a World");
-        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " {set|add|remove|clear} ...");
-        this.setArgRange(2, 3);
-        this.addKey("mvm");
-        this.addKey("mvmodify");
-        this.addKey("mv modify");
-        Map<String, Boolean> children = new HashMap<String, Boolean>();
-        children.put("multiverse.core.modify.add", true);
-        children.put("multiverse.core.modify.modify", true);
-        children.put("multiverse.core.modify.clear", true);
-        children.put("multiverse.core.modify.remove", true);
-        Permission modify = new Permission("multiverse.core.modify",
-                "Modify various aspects of worlds. It requires add/set/clear/remove. See the examples below", PermissionDefault.OP, children);
-        this.addCommandExample(ChatColor.AQUA + "/mv modify set ?");
-        this.addCommandExample(ChatColor.GREEN + "/mv modify add ?");
-        this.addCommandExample(ChatColor.BLUE + "/mv modify clear ?");
-        this.addCommandExample(ChatColor.RED + "/mv modify remove ?");
-        this.setPermission(modify);
-    }
-
-    /**
-     * Validates the specified action.
-     *
-     * @param action The {@link Action}.
-     * @param property The property.
-     * @return Whether this action is valid.
-     */
-    protected static boolean validateAction(Action action, String property) {
-        if (action != Action.Set) {
-            try {
-                AddProperties.valueOf(property);
-                return true;
-            } catch (IllegalArgumentException e) {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // This is just a place holder. The real commands are in:
-        // ModifyAddCommand
-        // ModifyRemoveCommand
-        // ModifySetCommand
-        // ModifyClearCommand
-    }
-}
@@ -1,94 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.enums.Action;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-
-/**
- * Removes values from a world-property.
- */
-public class ModifyRemoveCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
-
-    public ModifyRemoveCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Modify a World (Remove a value)");
-        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " remove {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
-        this.setArgRange(2, 3);
-        this.addKey("mvm remove");
-        this.addKey("mvmremove");
-        this.addKey("mv modify remove");
-        this.addKey("mvmodify remove");
-        this.addKey("mvm delete");
-        this.addKey("mvmdelete");
-        this.addKey("mv modify delete");
-        this.addKey("mvmodify delete");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "remove " + ChatColor.GREEN + "sheep " + ChatColor.RED + "animals");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "remove " + ChatColor.GREEN + "creeper " + ChatColor.RED + "monsters");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "remove " + ChatColor.GREEN + "MyWorld " + ChatColor.RED + "worldblacklist");
-        this.setPermission("multiverse.core.modify.remove", "Modify various aspects of worlds. See the help wiki for how to use this command properly. "
-                + "If you do not include a world, the current world will be used.", PermissionDefault.OP);
-        this.worldManager = this.plugin.getMVWorldManager();
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // We NEED a world from the command line
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-
-        if (args.size() == 2 && p == null) {
-            sender.sendMessage(ChatColor.RED + "From the console, WORLD is required.");
-            sender.sendMessage(this.getCommandDesc());
-            sender.sendMessage(this.getCommandUsage());
-            sender.sendMessage("Nothing changed.");
-            return;
-        }
-
-        MultiverseWorld world;
-        String value = args.get(0);
-        String property = args.get(1);
-
-        if (args.size() == 2) {
-            world = this.worldManager.getMVWorld(p.getWorld().getName());
-        } else {
-            world = this.worldManager.getMVWorld(args.get(2));
-        }
-
-        if (world == null) {
-            sender.sendMessage("That world does not exist!");
-            return;
-        }
-
-        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");
-            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);
-        } else {
-            sender.sendMessage(ChatColor.RED + "There was an error removing " + ChatColor.GRAY
-                    + value + ChatColor.WHITE + " from " + ChatColor.GOLD + property);
-        }
-    }
-
-}
@@ -1,122 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
-import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-
-/**
- * Used to set world-properties.
- */
-public class ModifySetCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
-
-    public ModifySetCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.worldManager = this.plugin.getMVWorldManager();
-        this.setName("Modify a World (Set a value)");
-        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " set {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
-        this.setArgRange(1, 3);
-        this.addKey("mvm set");
-        this.addKey("mvmset");
-        this.addKey("mv modify set");
-        this.addKey("mvmodify set");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "mode " + ChatColor.RED + "creative");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "animals " + ChatColor.RED + "false");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "monsters " + ChatColor.RED + "false");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "alias " + ChatColor.RED + "MyWorld");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "color " + ChatColor.RED + "green");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "curr " + ChatColor.RED + "3");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "price " + ChatColor.RED + "5");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "scale " + ChatColor.RED + "1.2");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "memory " + ChatColor.RED + "true");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "diff " + ChatColor.RED + "hard");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "hunger " + ChatColor.RED + "false");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "hidden " + ChatColor.RED + "true");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "pvp " + ChatColor.RED + "false");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "heal " + ChatColor.RED + "true");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "adjustspawn " + ChatColor.RED + "false");
-        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "spawn");
-        this.setPermission("multiverse.core.modify.set", "Modify various aspects of worlds. See the help wiki for how to use this command properly. "
-                + "If you do not include a world, the current world will be used.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // Special case for spawn:
-        if (args.size() == 1) {
-            if (!(sender instanceof Player)) {
-                sender.sendMessage("You must be a player to set the" + ChatColor.GREEN + " spawn");
-                return;
-            }
-            if (args.get(0).equalsIgnoreCase("spawn")) {
-                SetSpawnCommand c = new SetSpawnCommand(this.plugin);
-                c.setWorldSpawn(sender);
-
-            } else {
-                sender.sendMessage("Spawn is the only param with no" + ChatColor.GREEN + " VALUE");
-                sender.sendMessage("Type " + ChatColor.GREEN + "/mv modify ?" + ChatColor.WHITE + " For help.");
-            }
-            return;
-        }
-        // We NEED a world from the command line
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-
-        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;
-        }
-
-        MultiverseWorld world;
-        String value = args.get(1);
-        String property = args.get(0);
-
-        if (args.size() == 2) {
-            world = this.worldManager.getMVWorld(p.getWorld().getName());
-        } else {
-            world = this.worldManager.getMVWorld(args.get(2));
-        }
-
-        if (world == null) {
-            sender.sendMessage("That world does not exist!");
-            return;
-        }
-
-        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.setPropertyValue(property, value)) {
-                sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Property " + ChatColor.AQUA + property
-                        + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
-            } else {
-                sender.sendMessage(ChatColor.RED + world.getPropertyHelp(property));
-            }
-        } catch (PropertyDoesNotExistException e) {
-            sender.sendMessage(ChatColor.RED + "Sorry, You can't set: '" + ChatColor.GRAY + property + ChatColor.RED + "'");
-            sender.sendMessage("Valid world-properties: " + world.getAllPropertyNames());
-        }
-    }
-}
@@ -1,40 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
-import com.pneumaticraft.commandhandler.Command;
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
-
-/**
- * A generic Multiverse-command.
- */
-public abstract class MultiverseCommand extends Command {
-
-    /**
-     * The reference to the core.
-     */
-    protected MultiverseCore plugin;
-    /**
-     * The reference to {@link MultiverseMessaging}.
-     */
-    protected MultiverseMessaging messaging;
-
-    public MultiverseCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.plugin = plugin;
-        this.messaging = this.plugin.getMessaging();
-    }
-
-    @Override
-    public abstract void runCommand(CommandSender sender, List<String> args);
-
-}
@@ -0,0 +1,20 @@
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A base command for Multiverse.
+ */
+abstract class MultiverseCoreCommand extends MultiverseCommand {
+    protected final MultiverseCore plugin;
+    protected final MVWorldManager worldManager;
+
+    protected MultiverseCoreCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+        this.plugin = plugin;
+        this.worldManager = plugin.getMVWorldManager();
+    }
+}
@@ -1,164 +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.pneumaticraft.commandhandler.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.util.List;
-
-/**
- * A generic paginated command.
- * @param <T> The type of items on the page.
- */
-public abstract class PaginatedCommand<T> extends Command {
-    private static final int DEFAULT_ITEMS_PER_PAGE = 9;
-    /**
-     * The number of items per page.
-     */
-    protected int itemsPerPage = DEFAULT_ITEMS_PER_PAGE;
-
-    public PaginatedCommand(JavaPlugin plugin) {
-        super(plugin);
-    }
-
-    /**
-     * Set the number of items per page.
-     *
-     * @param items The new number of items per page.
-     */
-    protected void setItemsPerPage(int items) {
-        itemsPerPage = items;
-    }
-
-    /**
-     * Gets filtered items.
-     * @param availableItems All available items.
-     * @param filter The filter-{@link String}.
-     * @return A list of items that match the filter.
-     */
-    protected abstract List<T> getFilteredItems(List<T> availableItems, String filter);
-
-    /**
-     * Constructs a single string from a list of strings.
-     *
-     * @param list The {@link List} of strings.
-     * @return A single {@link String}.
-     */
-    protected String stitchThisString(List<String> list) {
-        StringBuilder builder = new StringBuilder();
-        for (String s : list) {
-            builder.append(s);
-            builder.append(' ');
-        }
-        return builder.toString();
-    }
-
-    /**
-     * Shows a page.
-     *
-     * @param page The number of the page to show.
-     * @param sender The {@link CommandSender} that wants to see the page.
-     * @param cmds The items that should be displayed on the page.
-     */
-    protected void showPage(int page, CommandSender sender, List<T> cmds) {
-        // Ensure the page is at least 1.
-        page = (page <= 0) ? 1 : page;
-        int start = (page - 1) * itemsPerPage;
-        int end = start + itemsPerPage;
-
-        for (int i = start; i < end; i++) {
-            // For consistancy, print some extra lines if it's a player:
-            if (i < cmds.size()) {
-                sender.sendMessage(this.getItemText(cmds.get(i)));
-            } else if (sender instanceof Player) {
-                sender.sendMessage(" ");
-            }
-        }
-    }
-
-    /**
-     * Converts an item into a string.
-     *
-     * @param item The item.
-     * @return A {@link String}.
-     */
-    protected abstract String getItemText(T item);
-
-    /**
-     * Constructs a {@link FilterObject} from a {@link List} of arguments.
-     *
-     * @param args The {@link List} of arguments.
-     * @return The {@link FilterObject}.
-     */
-    protected FilterObject getPageAndFilter(List<String> args) {
-        int page = 1;
-
-        String filter = "";
-
-        if (args.size() == 0) {
-            filter = "";
-            page = 1;
-        } else if (args.size() == 1) {
-            try {
-                page = Integer.parseInt(args.get(0));
-            } catch (NumberFormatException ex) {
-                filter = args.get(0);
-                page = 1;
-            }
-        } else if (args.size() == 2) {
-            filter = args.get(0);
-            try {
-                page = Integer.parseInt(args.get(1));
-            } catch (NumberFormatException ex) {
-                page = 1;
-            }
-        }
-        return new FilterObject(page, filter);
-    }
-
-    /**
-     * "Key-Object" containing information about the page and the filter that were requested.
-     */
-    protected class FilterObject {
-        private Integer page;
-        private String filter;
-
-        public FilterObject(Integer page, String filter) {
-            this.page = page;
-            this.filter = filter;
-        }
-
-        /**
-         * Gets the page.
-         * @return The page.
-         */
-        public Integer getPage() {
-            return this.page;
-        }
-
-        /**
-         * Sets the page.
-         *
-         * @param page The new page.
-         */
-        public void setPage(int page) {
-            this.page = page;
-        }
-
-        /**
-         * Gets the filter.
-         * @return The filter.
-         */
-        public String getFilter() {
-            return this.filter;
-        }
-    }
-}
@@ -1,92 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.api.WorldPurger;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Removes a type of mob from a world.
- */
-public class PurgeCommand extends MultiverseCommand {
-    private MVWorldManager worldManager;
-
-    public PurgeCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Purge World of Creatures");
-        this.setCommandUsage("/mv purge" + ChatColor.GOLD + " [WORLD|all] " + ChatColor.GREEN + "{all|animals|monsters|MOBNAME}");
-        this.setArgRange(1, 2);
-        this.addKey("mvpurge");
-        this.addKey("mv purge");
-        this.addCommandExample("/mv purge " + ChatColor.GREEN + "all");
-        this.addCommandExample("/mv purge " + ChatColor.GOLD + "all " + ChatColor.GREEN + "all");
-        this.addCommandExample("/mv purge " + ChatColor.GREEN + "monsters");
-        this.addCommandExample("/mv purge " + ChatColor.GOLD + "all " + ChatColor.GREEN + "animals");
-        this.addCommandExample("/mv purge " + ChatColor.GOLD + "MyWorld " + ChatColor.GREEN + "squid");
-        this.addCommandExample("/mv purge " + ChatColor.GOLD + "MyWorld_nether " + ChatColor.GREEN + "ghast");
-        this.setPermission("multiverse.core.purge", "Removed the specified type of mob from the specified world.", PermissionDefault.OP);
-        this.worldManager = this.plugin.getMVWorldManager();
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-        if (args.size() == 1 && p == null) {
-            sender.sendMessage("This command requires a WORLD when being run from the console!");
-            sender.sendMessage(this.getCommandUsage());
-            return;
-        }
-        String worldName = null;
-        String deathName = null;
-        if (args.size() == 1) {
-            worldName = p.getWorld().getName();
-            deathName = args.get(0);
-        } else {
-            worldName = args.get(0);
-            deathName = args.get(1);
-        }
-
-        if (!worldName.equalsIgnoreCase("all") && !this.worldManager.isMVWorld(worldName)) {
-            this.plugin.showNotMVWorldMessage(sender, worldName);
-            sender.sendMessage("It cannot be purged.");
-            return;
-        }
-
-        List<MultiverseWorld> worldsToRemoveEntitiesFrom = new ArrayList<MultiverseWorld>();
-        // Handle all case any user who names a world "all" should know better...
-        if (worldName.equalsIgnoreCase("all")) {
-            worldsToRemoveEntitiesFrom.addAll(this.worldManager.getMVWorlds());
-        } else {
-            worldsToRemoveEntitiesFrom.add(this.worldManager.getMVWorld(worldName));
-        }
-
-        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());
-        } else {
-            Collections.addAll(thingsToKill, deathName.toUpperCase().split(","));
-        }
-        for (MultiverseWorld w : worldsToRemoveEntitiesFrom) {
-            purger.purgeWorld(w, thingsToKill, false, false, sender);
-        }
-    }
-}
@@ -1,53 +1,79 @@
-/******************************************************************************
- * 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.Collections;
+import java.util.Random;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Conditions;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Optional;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag;
+import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
+import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;

-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Regenerates a world.
- */
-public class RegenCommand extends MultiverseCommand {
-
-    public RegenCommand(MultiverseCore plugin) {
+@CommandAlias("mv")
+public class RegenCommand extends MultiverseCoreCommand {
+    public RegenCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setName("Regenerates a World");
-        this.setCommandUsage("/mv regen" + ChatColor.GREEN + " {WORLD}" + ChatColor.GOLD + " [-s [SEED]]");
-        this.setArgRange(1, 3);
-        this.addKey("mvregen");
-        this.addKey("mv regen");
-        this.addCommandExample("You can use the -s with no args to get a new seed:");
-        this.addCommandExample("/mv regen " + ChatColor.GREEN + "MyWorld" + ChatColor.GOLD + " -s");
-        this.addCommandExample("or specifiy a seed to get that one:");
-        this.addCommandExample("/mv regen " + ChatColor.GREEN + "MyWorld" + ChatColor.GOLD + " -s" + ChatColor.AQUA + " gargamel");
-        this.setPermission("multiverse.core.regen", "Regenerates a world on your server. The previous state will be lost "
-                + ChatColor.RED + "PERMANENTLY.", PermissionDefault.OP);
+
+        registerFlagGroup(CommandFlagGroup.builder("mvregen")
+                .add(CommandValueFlag.builder("--seed", String.class)
+                        .addAlias("-s")
+                        .completion(() -> Collections.singleton(String.valueOf(new Random().nextLong())))
+                        .optional()
+                        .build())
+                .add(CommandFlag.builder("--keep-gamerules")
+                        .addAlias("-k")
+                        .build())
+                .build());
    }

-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Boolean useseed = (!(args.size() == 1));
-        Boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s"));
-        String seed = (args.size() == 3) ? args.get(2) : "";
+    @Subcommand("regen")
+    @CommandPermission("multiverse.core.regen")
+    @CommandCompletion("@mvworlds:scope=both @flags:groupName=mvregen")
+    @Syntax("<world> --seed [seed] --keep-gamerules")
+    @Description("Regenerates a world on your server. The previous state will be lost PERMANENTLY.")
+    public void onRegenCommand(BukkitCommandIssuer issuer,

-        Class<?>[] paramTypes = {String.class, Boolean.class, Boolean.class, String.class};
-        List<Object> objectArgs = new ArrayList<Object>();
-        objectArgs.add(args.get(0));
-        objectArgs.add(useseed);
-        objectArgs.add(randomseed);
-        objectArgs.add(seed);
-        this.plugin.getCommandHandler().queueCommand(sender, "mvregen", "regenWorld", objectArgs,
-                paramTypes, ChatColor.GREEN + "World Regenerated!", ChatColor.RED + "World could NOT be regenerated!");
+                               @Conditions("validWorldName:scope=both")
+                               @Syntax("<world>")
+                               @Description("World that you want to regen.")
+                               String worldName,
+
+                               @Optional
+                               @Syntax("--seed [seed] --keep-gamerules")
+                               @Description("Other world settings. See: http://gg.gg/nn8lk")
+                               String[] flags
+    ) {
+        ParsedCommandFlags parsedFlags = parseFlags(flags);
+
+        this.plugin.getMVCommandManager().getCommandQueueManager().addToQueue(new QueuedCommand(
+                issuer.getIssuer(),
+                () -> {
+                    issuer.sendMessage(String.format("Regenerating world '%s'...", worldName));
+                    if (!this.plugin.getMVWorldManager().regenWorld(
+                            worldName,
+                            parsedFlags.hasFlag("--seed"),
+                            !parsedFlags.hasFlagValue("--seed"),
+                            parsedFlags.flagValue("--seed", String.class),
+                            parsedFlags.hasFlag("--keep-gamerules")
+                    )) {
+                        issuer.sendMessage(String.format("%sThere was an issue regenerating '%s'! Please check console for errors.", ChatColor.RED, worldName));
+                        return;
+                    }
+                    issuer.sendMessage(String.format("%sWorld %s was regenerated!", ChatColor.GREEN, worldName));
+                },
+                "Are you sure you want to regenerate world '" + worldName + "'?"
+        ));
    }
 }
@@ -1,57 +1,42 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
 package com.onarandombox.MultiverseCore.commands;

-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
 import java.util.ArrayList;
 import java.util.List;

-/**
- * Reloads worlds.yml and config.yml.
- */
-public class ReloadCommand extends MultiverseCommand {
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Subcommand;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent;
+import org.bukkit.ChatColor;
+import org.jetbrains.annotations.NotNull;

-    public ReloadCommand(MultiverseCore plugin) {
+@CommandAlias("mv")
+public class ReloadCommand extends MultiverseCoreCommand {
+    public ReloadCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setName("Reload Configs");
-        this.setCommandUsage("/mv reload");
-        this.setArgRange(0, 0);
-        this.addKey("mvreload");
-        this.addKey("mv reload");
-        this.addCommandExample("/mv reload");
-        this.setPermission("multiverse.core.reload", "Reloads worlds.yml and config.yml.", PermissionDefault.OP);
    }

-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        sender.sendMessage(ChatColor.GOLD + "Reloading all Multiverse Plugin configs...");
+    @Subcommand("reload")
+    @CommandPermission("multiverse.core.reload")
+    @Description("Reloads config files for all multiverse modules.")
+    public void onReloadCommand(@NotNull BukkitCommandIssuer issuer) {
+        issuer.sendMessage(ChatColor.GOLD + "Reloading all Multiverse Plugin configs...");
        this.plugin.loadConfigs();
        this.plugin.getAnchorManager().loadAnchors();
        this.plugin.getMVWorldManager().loadWorlds(true);

-        List<String> configsLoaded = new ArrayList<String>();
+        List<String> configsLoaded = new ArrayList<>();
        configsLoaded.add("Multiverse-Core - config.yml");
        configsLoaded.add("Multiverse-Core - worlds.yml");
        configsLoaded.add("Multiverse-Core - anchors.yml");
-        // Create the event
+
        MVConfigReloadEvent configReload = new MVConfigReloadEvent(configsLoaded);
-        // Fire it off
        this.plugin.getServer().getPluginManager().callEvent(configReload);
-        for (String s : configReload.getAllConfigsLoaded()) {
-            sender.sendMessage(s);
-        }

-        sender.sendMessage(ChatColor.GREEN + "Reload Complete!");
+        configReload.getAllConfigsLoaded().forEach(issuer::sendMessage);
+        issuer.sendMessage(String.format("%sReload Complete!", ChatColor.GREEN));
    }
-
 }
@@ -1,42 +1,41 @@
-/******************************************************************************
- * 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 co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Conditions;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Single;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;

-import java.util.List;
-
-/**
- * Unloads a world and removes it from the config.
- */
-public class RemoveCommand extends MultiverseCommand {
-
-    public RemoveCommand(MultiverseCore plugin) {
+@CommandAlias("mv")
+public class RemoveCommand extends MultiverseCoreCommand {
+    public RemoveCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setName("Remove World");
-        this.setCommandUsage("/mv remove" + ChatColor.GREEN + " {WORLD}");
-        this.setArgRange(1, 1);
-        this.addKey("mvremove");
-        this.addKey("mv remove");
-        this.addCommandExample("/mv remove " + ChatColor.GREEN + "MyWorld");
-        this.setPermission("multiverse.core.remove",
-                "Unloads a world from Multiverse and removes it from worlds.yml, this does NOT DELETE the world folder.", PermissionDefault.OP);
    }

-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (this.plugin.getMVWorldManager().removeWorldFromConfig(args.get(0))) {
-            sender.sendMessage("World removed from config!");
-        } else {
-            sender.sendMessage("Error trying to remove world from config!");
+    @Subcommand("remove")
+    @CommandPermission("multiverse.core.remove")
+    @CommandCompletion("@mvworlds:scope=both")
+    @Syntax("<world>")
+    @Description("Unloads a world from Multiverse and removes it from worlds.yml, this does NOT DELETE the world folder.")
+    public void onRemoveCommand(BukkitCommandIssuer issuer,
+
+                                @Single
+                                @Conditions("mvworlds:scope=both")
+                                @Syntax("<world>")
+                                @Description("World you want to remove from mv's knowledge.")
+                                String worldName
+    ) {
+        if (!this.plugin.getMVWorldManager().removeWorldFromConfig(worldName)) {
+            issuer.sendMessage(String.format("%sError trying to remove world from config!", ChatColor.RED));
+            return;
        }
+        issuer.sendMessage(String.format("World '%s' is removed from config!", worldName));
    }
 }
@@ -1,76 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.BlockSafety;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-
-/**
- * Sets the spawn for a world.
- */
-public class SetSpawnCommand extends MultiverseCommand {
-    public SetSpawnCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Set World Spawn");
-        this.setCommandUsage("/mv setspawn");
-        this.setArgRange(0, 0);
-        this.addKey("mvsetspawn");
-        this.addKey("mvss");
-        this.addKey("mv set spawn");
-        this.addKey("mv setspawn");
-        this.addKey("mvset spawn");
-        this.addCommandExample("/mv set spawn");
-        this.setPermission("multiverse.core.spawn.set", "Sets the spawn for the current world.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        setWorldSpawn(sender);
-    }
-
-    /**
-     * Does the actual spawn-setting-work.
-     *
-     * @param sender The {@link CommandSender} that's setting the spawn.
-     */
-    protected void setWorldSpawn(CommandSender sender) {
-        if (sender instanceof Player) {
-            Player p = (Player) sender;
-            Location l = p.getLocation();
-            World w = p.getWorld();
-            MultiverseWorld foundWorld = this.plugin.getMVWorldManager().getMVWorld(w.getName());
-            if (foundWorld != null) {
-                foundWorld.setSpawnLocation(p.getLocation());
-                BlockSafety bs = this.plugin.getBlockSafety();
-                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: " + plugin.getLocationManipulation().strCoords(p.getLocation()));
-            } else {
-                w.setSpawnLocation(l.getBlockX(), l.getBlockY(), l.getBlockZ());
-                sender.sendMessage("Multiverse does not know about this world, only X,Y and Z set. Please import it to set the spawn fully (Pitch/Yaws).");
-            }
-
-        } else {
-            sender.sendMessage("You cannot use this command from the console.");
-        }
-    }
-}
@@ -1,42 +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.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-
-/**
- * Takes the player to the latest bed he's slept in.
- */
-public class SleepCommand extends MultiverseCommand {
-
-    public SleepCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Go to Sleep");
-        this.setCommandUsage("/mv sleep");
-        this.setArgRange(0, 0);
-        this.addKey("mv sleep");
-        this.setPermission("multiverse.core.sleep", "Takes you the latest bed you've slept in (Currently BROKEN).", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-
-        if (p == null) {
-            return;
-        }
-    }
-}
@@ -1,90 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-
-/**
- * Teleports a player to the spawn.
- */
-public class SpawnCommand extends MultiverseCommand {
-
-    public SpawnCommand(MultiverseCore plugin) {
-        super(plugin);
-        Permission otherPerm = new Permission("multiverse.core.spawn.other",
-                "Teleports another player to the spawn of the world they are in.", PermissionDefault.OP);
-        this.setName("Spawn");
-        this.setCommandUsage("/mv spawn" + ChatColor.GOLD + " [PLAYER]");
-        this.setArgRange(0, 1);
-        this.addKey("mvspawn");
-        this.addKey("mv spawn");
-        this.addKey("mvs");
-        this.setPermission("multiverse.core.spawn.self", "Teleports you to the Spawn Point of the world you are in.", PermissionDefault.OP);
-        this.addAdditonalPermission(otherPerm);
-
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-        // If a persons name was passed in, you must be A. the console, or B have permissions
-        if (args.size() == 1) {
-            if (player != null && !this.plugin.getMVPerms().hasPermission(player, "multiverse.core.spawn.other", true)) {
-                sender.sendMessage("You don't have permission to teleport another player to spawn. (multiverse.core.spawn.other)");
-                return;
-            }
-            Player target = this.plugin.getServer().getPlayer(args.get(0));
-            if (target != null) {
-                target.sendMessage("Teleporting to this world's spawn...");
-                spawnAccurately(target);
-
-                if (player != null) {
-                    target.sendMessage("You were teleported by: " + ChatColor.YELLOW + player.getName());
-                } else {
-                    target.sendMessage("You were teleported by: " + ChatColor.LIGHT_PURPLE + "the console");
-                }
-            } else {
-                sender.sendMessage(args.get(0) + " is not logged on right now!");
-            }
-        } else {
-            if (player != null && !this.plugin.getMVPerms().hasPermission(player, "multiverse.core.spawn.self", true)) {
-                sender.sendMessage("You don't have permission to teleport yourself to spawn. (multiverse.core.spawn.self)");
-                return;
-            }
-            if (player != null) {
-                player.sendMessage("Teleporting to this world's spawn...");
-                spawnAccurately(player);
-            } else {
-                sender.sendMessage("From the console, you must provide a PLAYER.");
-            }
-        }
-    }
-
-    private void spawnAccurately(Player player) {
-        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(player.getWorld().getName());
-        Location spawnLocation;
-        if (world != null) {
-            spawnLocation = world.getSpawnLocation();
-        } else {
-            spawnLocation = player.getWorld().getSpawnLocation();
-        }
-        this.plugin.getSafeTTeleporter().safelyTeleport(player, player, spawnLocation, false);
-    }
-}
@@ -1,66 +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");
-        // TO-DO maybe use constants for these
-        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-        button.setX(50);
-        button.setY(50);
-        button.setWidth(100);
-        button.setHeight(40);
-        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-        pop.attachWidget(this.plugin, button);
-        sender.sendMessage(ChatColor.GREEN + "YAY!");
-        p.getMainScreen().attachPopupScreen(pop);
-    }
-}
-*/
@@ -1,203 +1,49 @@
-/******************************************************************************
- * 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 co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.CommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Flags;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.destination.DestinationFactory;
-import com.onarandombox.MultiverseCore.destination.InvalidDestination;
-import com.onarandombox.MultiverseCore.destination.WorldDestination;
-import com.onarandombox.MultiverseCore.enums.TeleportResult;
-import com.onarandombox.MultiverseCore.event.MVTeleportEvent;
-import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
 import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-
-/**
- * Used to teleport players.
- */
-public class TeleportCommand extends MultiverseCommand {
-    private SafeTTeleporter playerTeleporter;

+@CommandAlias("mv")
+public class TeleportCommand extends MultiverseCoreCommand {
    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.setArgRange(1, 2);
-        this.addKey("mvtp");
-        this.addKey("mv tp");
-        this.playerTeleporter = this.plugin.getSafeTTeleporter();
-        this.setPermission(menu);
    }

-    private static final int UNSAFE_TELEPORT_EXPIRE_DELAY = 15;
+    @Subcommand("teleport|tp")
+    @CommandCompletion("@players|@mvworlds:playerOnly|@destinations:playerOnly @mvworlds|@destinations")
+    @Syntax("[player] <destination>")
+    @Description("Allows you to the teleport to a location on your server!")
+    public void onTeleportCommand(BukkitCommandIssuer issuer,
+
+                                  @Flags("resolve=issuerAware")
+                                  @Syntax("[player]")
+                                  @Description("Target player to teleport.")
+                                  Player[] players,
+
+                                  @Syntax("<destination>")
+                                  @Description("Location, can be a world name.")
+                                  ParsedDestination<?> destination
+    ) {
+        // TODO Add warning if teleporting too many players at once.
+        for (Player player : players) {
+            issuer.sendMessage("Teleporting "
+                    + (issuer.getPlayer() == player ? "you" : player.getName())
+                    + " to " + destination + "...");
+            this.plugin.getDestinationsProvider().playerTeleport(issuer, player, destination);
+        }
+    }

    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        CommandSender teleporter = sender;
-        Player teleportee = null;
-
-        String destinationName;
-
-        if (args.size() == 2) {
-            teleportee = this.plugin.getServer().getPlayer(args.get(0));
-            if (teleportee == null) {
-                this.messaging.sendMessage(sender, String.format("Sorry, I couldn't find player: %s%s",
-                        ChatColor.GOLD, args.get(0)), false);
-                return;
-            }
-            destinationName = args.get(1);
-
-        } else {
-            destinationName = args.get(0);
-            if (!(sender instanceof Player)) {
-                this.messaging.sendMessage(sender, String.format("From the console, you must specify a player to teleport"), false);
-                return;
-            }
-            teleportee = (Player) sender;
-        }
-        // Special case for cannons:
-        if (destinationName.matches("(?i)cannon-[\\d]+(\\.[\\d]+)?")) {
-            String[] cannonSpeed = destinationName.split("-");
-            try {
-                double speed = Double.parseDouble(cannonSpeed[1]);
-                destinationName = "ca:" + teleportee.getWorld().getName() + ":" + teleportee.getLocation().getX()
-                        + "," + teleportee.getLocation().getY() + "," + teleportee.getLocation().getZ() + ":"
-                        + teleportee.getLocation().getPitch() + ":" + teleportee.getLocation().getYaw() + ":" + speed;
-            } catch (Exception e) {
-                destinationName = "i:invalid";
-            }
-
-        }
-        DestinationFactory df = this.plugin.getDestFactory();
-        MVDestination d = df.getDestination(destinationName);
-
-
-        MVTeleportEvent teleportEvent = new MVTeleportEvent(d, teleportee, teleporter, true);
-        this.plugin.getServer().getPluginManager().callEvent(teleportEvent);
-        if (teleportEvent.isCancelled()) {
-            this.plugin.log(Level.FINE, "Someone else cancelled the MVTeleport Event!!!");
-            return;
-        }
-
-        if (d != null && d instanceof InvalidDestination) {
-            this.messaging.sendMessage(sender, String.format("Multiverse does not know how to take you to %s%s",
-                    ChatColor.RED, destinationName), false);
-            return;
-        }
-
-        if (!this.checkSendPermissions(teleporter, teleportee, d)) {
-            return;
-        }
-
-        if (plugin.getMVConfig().getEnforceAccess() && teleporter != null && !this.plugin.getMVPerms().canEnterDestination(teleporter, d)) {
-            if (teleportee.equals(teleporter)) {
-                teleporter.sendMessage("Doesn't look like you're allowed to go " + ChatColor.RED + "there...");
-            } else {
-                teleporter.sendMessage("Doesn't look like you're allowed to send " + ChatColor.GOLD
-                        + teleportee.getName() + ChatColor.WHITE + " to " + ChatColor.RED + "there...");
-            }
-            return;
-        } else if (teleporter != null && !this.plugin.getMVPerms().canTravelFromLocation(teleporter, d.getLocation(teleportee))) {
-            if (teleportee.equals(teleporter)) {
-                this.messaging.sendMessage(teleporter, String.format("DOH! Doesn't look like you can get to %s%s %sfrom where you are...",
-                        ChatColor.GREEN, d.toString(), ChatColor.WHITE), false);
-            } else {
-                this.messaging.sendMessage(teleporter, String.format("DOH! Doesn't look like %s%s %scan get to %sTHERE from where they are...",
-                        ChatColor.GREEN, ((Player) teleporter).getWorld().getName(), ChatColor.WHITE, ChatColor.RED), false);
-            }
-            return;
-        }
-
-        // Special check to verify if players are tryint to teleport to the same
-        // WORLDDestination as the world they're in, that they ALSO have multiverse.core.spawn.self
-
-        if (d instanceof WorldDestination) {
-            World w = d.getLocation(teleportee).getWorld();
-            if (teleportee.getWorld().equals(w)) {
-                if (teleporter.equals(teleportee)) {
-                    if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.self", true)) {
-                        this.messaging.sendMessages(teleporter, new String[]{
-                                String.format("Sorry you don't have permission to go to the world spawn!"),
-                                String.format("%s  (multiverse.core.spawn.self)",
-                                        ChatColor.RED) }, false);
-                        return;
-                    }
-                } else {
-                    if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.other", true)) {
-                        this.messaging.sendMessages(teleporter, new String[]{
-                                String.format("Sorry you don't have permission to send %s to the world spawn!",
-                                        teleportee.getDisplayName()),
-                                String.format("%s  (multiverse.core.spawn.other)",
-                                        ChatColor.RED) }, false);
-                        return;
-                    }
-                }
-            }
-        }
-
-        if (d.getLocation(teleportee) == null) {
-            this.messaging.sendMessage(teleporter, "Sorry Boss, I tried everything, but just couldn't teleport ya there!", false);
-            return;
-        }
-        TeleportResult result = this.playerTeleporter.safelyTeleport(teleporter, teleportee, d);
-        if (result == TeleportResult.FAIL_UNSAFE) {
-            this.plugin.log(Level.FINE, "Could not teleport " + teleportee.getName()
-                    + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
-            this.plugin.log(Level.FINE, "Queueing Command");
-            Class<?>[] paramTypes = { CommandSender.class, Player.class, Location.class };
-            List<Object> items = new ArrayList<Object>();
-            items.add(teleporter);
-            items.add(teleportee);
-            items.add(d.getLocation(teleportee));
-            String player = "you";
-            if (!teleportee.equals(teleporter)) {
-                player = teleportee.getName();
-            }
-            String message = String.format("%sMultiverse %sdid not teleport %s%s%sto %s%s%sbecause it was unsafe.",
-                    ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE);
-            this.plugin.getCommandHandler().queueCommand(sender, "mvteleport", "teleportPlayer", items,
-                    paramTypes, message, "Would you like to try anyway?", "", "", UNSAFE_TELEPORT_EXPIRE_DELAY);
-        }
-        // else: Player was teleported successfully (or the tp event was fired I should say)
-    }
-
-    private boolean checkSendPermissions(CommandSender teleporter, Player teleportee, MVDestination destination) {
-        if (teleporter.equals(teleportee)) {
-            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.self." + destination.getIdentifier(), true)) {
-                this.messaging.sendMessages(teleporter, new String[]{
-                        String.format("%sYou don't have permission to teleport %syourself %sto a %s%s %sDestination",
-                                ChatColor.WHITE, ChatColor.AQUA, ChatColor.WHITE, ChatColor.RED, destination.getType(), ChatColor.WHITE),
-                        String.format("%s   (multiverse.teleport.self.%s)",
-                                ChatColor.RED, destination.getIdentifier()) }, false);
-                return false;
-            }
-        } else {
-            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.other." + destination.getIdentifier(), true)) {
-                this.messaging.sendMessages(teleporter, new String[]{
-                        String.format("You don't have permission to teleport another player to a %s%s Destination.",
-                                ChatColor.GREEN, destination.getType()),
-                        String.format("%s(multiverse.teleport.other.%s)",
-                                ChatColor.RED, destination.getIdentifier()) }, false);
-                return false;
-            }
-        }
-        return true;
+    public boolean hasPermission(CommandIssuer issuer) {
+        return this.plugin.getDestinationsProvider().hasAnyTeleportPermission(issuer);
    }
 }
@@ -1,42 +1,40 @@
-/******************************************************************************
- * 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 co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
+import com.onarandombox.MultiverseCore.api.MVWorld;
+import org.jetbrains.annotations.NotNull;

-import java.util.List;
-
-/**
- * Unloads worlds from Multiverse.
- */
-public class UnloadCommand extends MultiverseCommand {
-
-    public UnloadCommand(MultiverseCore plugin) {
+@CommandAlias("mv")
+public class UnloadCommand extends MultiverseCoreCommand {
+    public UnloadCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setName("Unload World");
-        this.setCommandUsage("/mv unload" + ChatColor.GREEN + " {WORLD}");
-        this.setArgRange(1, 1);
-        this.addKey("mvunload");
-        this.addKey("mv unload");
-        this.setPermission("multiverse.core.unload",
-                "Unloads a world from Multiverse. This does NOT remove the world folder. This does NOT remove it from the config file.", PermissionDefault.OP);
    }

-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (this.plugin.getMVWorldManager().unloadWorld(args.get(0))) {
-            Command.broadcastCommandMessage(sender, "Unloaded world '" + args.get(0) + "'!");
-        } else {
-            sender.sendMessage("Error trying to unload world '" + args.get(0) + "'!");
+    @Subcommand("unload")
+    @CommandPermission("multiverse.core.unload")
+    @CommandCompletion("@mvworlds")
+    @Syntax("<world>")
+    @Description("Unloads a world from Multiverse. This does NOT remove the world folder. This does NOT remove it from the config file.")
+    public void onUnloadCommand(BukkitCommandIssuer issuer,
+
+                                @Syntax("<world>")
+                                @Description("Name of the world you want to unload.")
+                                MVWorld world
+    ) {
+        issuer.sendMessage(String.format("Unloading world '%s'...", world.getColoredWorldString()));
+
+        //TODO API: Should be able to use MVWorld object directly
+        if (!this.plugin.getMVWorldManager().unloadWorld(world.getName())) {
+            issuer.sendMessage(String.format("Error unloading world '%s'! See console for more details.", world.getColoredWorldString()));
+            return;
        }
+        issuer.sendMessage(String.format("Unloaded world '%s'!", world.getColoredWorldString()));
    }
 }
@@ -1,118 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.event.MVVersionEvent;
-import com.onarandombox.MultiverseCore.utils.webpaste.BitlyURLShortener;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteFailedException;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteService;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
-import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-import java.util.logging.Level;
-
-/**
- * Dumps version info to the console.
- */
-public class VersionCommand extends MultiverseCommand {
-    private static final URLShortener SHORTENER = new BitlyURLShortener();
-
-    public VersionCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Multiverse Version");
-        this.setCommandUsage("/mv version " + ChatColor.GOLD + "-[pb]");
-        this.setArgRange(0, 1);
-        this.addKey("mv version");
-        this.addKey("mvv");
-        this.addKey("mvversion");
-        this.setPermission("multiverse.core.version",
-                "Dumps version info to the console, optionally to pastie.org with -p or pastebin.com with a -b.", PermissionDefault.TRUE);
-    }
-
-    @Override
-    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.getMVConfig().getVersion()).append(")").append('\n');
-        buffer.append("[Multiverse-Core]  messagecooldown: ").append(plugin.getMessaging().getCooldown()).append('\n');
-        buffer.append("[Multiverse-Core]  teleportcooldown: ").append(plugin.getMVConfig().getTeleportCooldown()).append('\n');
-        buffer.append("[Multiverse-Core]  worldnameprefix: ").append(plugin.getMVConfig().getPrefixChat()).append('\n');
-        buffer.append("[Multiverse-Core]  enforceaccess: ").append(plugin.getMVConfig().getEnforceAccess()).append('\n');
-        buffer.append("[Multiverse-Core]  displaypermerrors: ").append(plugin.getMVConfig().getDisplayPermErrors()).append('\n');
-        buffer.append("[Multiverse-Core]  teleportintercept: ").append(plugin.getMVConfig().getTeleportIntercept()).append('\n');
-        buffer.append("[Multiverse-Core]  firstspawnoverride: ").append(plugin.getMVConfig().getFirstSpawnOverride()).append('\n');
-        buffer.append("[Multiverse-Core]  firstspawnworld: ").append(plugin.getMVConfig().getFirstSpawnWorld()).append('\n');
-        buffer.append("[Multiverse-Core]  debug: ").append(plugin.getMVConfig().getGlobalDebug()).append('\n');
-        buffer.append("[Multiverse-Core] Special Code: FRN002").append('\n');
-
-        MVVersionEvent versionEvent = new MVVersionEvent(buffer.toString());
-        this.plugin.getServer().getPluginManager().callEvent(versionEvent);
-
-        // log to console
-        final String data = versionEvent.getVersionInfo();
-        String[] lines = data.split("\n");
-        for (String line : lines) {
-            this.plugin.log(Level.INFO, line);
-        }
-
-        this.plugin.getServer().getScheduler().scheduleAsyncDelayedTask(this.plugin, new Runnable() {
-            @Override
-            public void run() {
-                if (args.size() == 1) {
-                    String pasteUrl;
-                    if (args.get(0).equalsIgnoreCase("-p")) {
-                        pasteUrl = postToService(PasteServiceType.PASTIE, true, data); // private post to pastie
-                    } else if (args.get(0).equalsIgnoreCase("-b")) {
-                        pasteUrl = postToService(PasteServiceType.PASTEBIN, true, data); // private post to pastie
-                    } else {
-                        return;
-                    }
-
-                    sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
-                    plugin.log(Level.INFO, "Version info dumped here: " + pasteUrl);
-                }
-            }
-        });
-    }
-
-    /**
-     * Send the current contents of this.pasteBinBuffer to a web service.
-     *
-     * @param type      Service type to send to
-     * @param isPrivate Should the paste be marked as private.
-     * @return URL of visible paste
-     */
-    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData) {
-        PasteService ps = PasteServiceFactory.getService(type, isPrivate);
-        try {
-            return SHORTENER.shorten(ps.postData(ps.encodeData(pasteData), ps.getPostURL()));
-        } catch (PasteFailedException e) {
-            System.out.print(e);
-            return "Error posting to service";
-        }
-    }
-}
@@ -1,106 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import java.util.List;
-
-/**
- * States who is in what world.
- */
-public class WhoCommand extends MultiverseCommand {
-
-    private MVWorldManager worldManager;
-
-    public WhoCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Who?");
-        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();
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // If this command was sent from a Player then we need to check Permissions
-        Player p = null;
-        // By default, show all from the console
-        boolean showAll = true;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-            showAll = false;
-        }
-
-        if (args.size()  == 1) {
-            if (args.get(0).equalsIgnoreCase("--all") || args.get(0).equalsIgnoreCase("-a")) {
-                showAll = true;
-            } else {
-                // 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(buildPlayerString(world));
-                return;
-            }
-        }
-
-        // multiworld mode
-        sender.sendMessage(ChatColor.AQUA + "--- Worlds and their players ---");
-        boolean shownOne = false;
-        for (MultiverseWorld world : this.worldManager.getMVWorlds()) {
-            if (this.plugin.getMVPerms().canEnterWorld(p, world)) { // only show world if the player can access it
-                if (showAll || !world.getCBWorld().getPlayers().isEmpty()) { // either show all or show if the world is not empty
-                    sender.sendMessage(String.format("%s%s - %s", world.getColoredWorldString(), ChatColor.WHITE, buildPlayerString(world)));
-                    shownOne = true;
-                }
-            }
-        }
-        if (!shownOne) {
-            sender.sendMessage("No worlds found.");
-        }
-        return;
-    }
-
-    private static String buildPlayerString(MultiverseWorld world) {
-        List<Player> players = world.getCBWorld().getPlayers();
-        if (players.size() == 0) {
-            return "No players found.";
-        } else {
-            StringBuilder playerBuilder = new StringBuilder();
-            for (Player player : players) {
-                playerBuilder.append(player.getDisplayName()).append(", ");
-            }
-            String bString = playerBuilder.toString();
-            return bString.substring(0, bString.length() - 2);
-        }
-    }
-}
@@ -1,4 +1,4 @@
 /**
- * This package contains all Commands.
+ * This package contains all the commands for Multiverse-Core.
 */
 package com.onarandombox.MultiverseCore.commands;
@@ -0,0 +1,102 @@
+package com.onarandombox.MultiverseCore.commandtools;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import co.aikar.commands.BukkitCommandCompletionContext;
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.PaperCommandCompletions;
+import com.google.common.collect.Sets;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorld;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import org.bukkit.GameRule;
+import org.jetbrains.annotations.NotNull;
+
+public class MVCommandCompletions extends PaperCommandCompletions {
+    protected final MVCommandManager commandManager;
+    private final MultiverseCore plugin;
+    private final MVWorldManager worldManager;
+
+    public MVCommandCompletions(MVCommandManager mvCommandManager, MultiverseCore plugin) {
+        super(mvCommandManager);
+        this.commandManager = mvCommandManager;
+        this.plugin = plugin;
+        this.worldManager = plugin.getMVWorldManager();
+
+        registerAsyncCompletion("destinations", this::suggestDestinations);
+        registerAsyncCompletion("flags", this::suggestFlags);
+        registerStaticCompletion("gamerules", this::suggestGamerules);
+        registerAsyncCompletion("mvworlds", this::suggestMVWorlds);
+
+        setDefaultCompletion("destinations", ParsedDestination.class);
+        setDefaultCompletion("flags", String[].class);
+        setDefaultCompletion("gamerules", GameRule.class);
+        setDefaultCompletion("mvworlds", MVWorld.class);
+    }
+
+    private Collection<String> suggestDestinations(BukkitCommandCompletionContext context) {
+        if (context.hasConfig("playerOnly") && !context.getIssuer().isPlayer()) {
+            return Collections.emptyList();
+        }
+
+        return this.plugin.getDestinationsProvider()
+                .suggestDestinations((BukkitCommandIssuer)context.getIssuer(), context.getInput());
+    }
+
+    private Collection<String> suggestFlags(@NotNull BukkitCommandCompletionContext context) {
+        return this.commandManager.getFlagsManager().suggest(
+                context.getConfig("groupName", ""), context.getContextValue(String[].class));
+    }
+
+    private Collection<String> suggestGamerules() {
+        return Arrays.stream(GameRule.values()).map(GameRule::getName).collect(Collectors.toList());
+    }
+
+    private Collection<String> suggestMVWorlds(BukkitCommandCompletionContext context) {
+        if (context.hasConfig("playerOnly") && !context.getIssuer().isPlayer()) {
+            return Collections.emptyList();
+        }
+
+        if (!context.hasConfig("multiple")) {
+            return getMVWorldNames(context);
+        }
+
+        String input = context.getInput();
+        int lastComma = input.lastIndexOf(',');
+        String currentWorldsString = input.substring(0, lastComma + 1);
+        Set<String> currentWorlds = Sets.newHashSet(input.split(","));
+        return getMVWorldNames(context).stream()
+                .filter(world -> !currentWorlds.contains(world))
+                .map(world -> currentWorldsString + world)
+                .collect(Collectors.toList());
+    }
+
+    private List<String> getMVWorldNames(BukkitCommandCompletionContext context) {
+        String scope = context.getConfig("scope", "loaded");
+        List<String> worlds = new ArrayList<>();
+        switch (scope) {
+            case "both":
+                worlds.addAll(worldManager.getUnloadedWorlds());
+            case "loaded":
+                worldManager.getMVWorlds()
+                        .stream()
+                        .map(MVWorld::getName)
+                        .forEach(worlds::add);
+                break;
+            case "unloaded":
+                worlds.addAll(worldManager.getUnloadedWorlds());
+                break;
+            case "potential":
+                worlds.addAll(worldManager.getPotentialWorlds());
+                break;
+        }
+        return worlds;
+    }
+}
@@ -0,0 +1,75 @@
+package com.onarandombox.MultiverseCore.commandtools;
+
+import co.aikar.commands.BukkitCommandExecutionContext;
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.BukkitConditionContext;
+import co.aikar.commands.CommandConditions;
+import co.aikar.commands.ConditionContext;
+import co.aikar.commands.ConditionFailedException;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.world.WorldNameChecker;
+
+public class MVCommandConditions {
+    static void load(MVCommandManager commandManager, MultiverseCore plugin) {
+        new MVCommandConditions(commandManager, plugin);
+    }
+
+    private final MVCommandManager commandManager;
+    private final MultiverseCore plugin;
+
+    public MVCommandConditions(MVCommandManager commandManager, MultiverseCore plugin) {
+        this.commandManager = commandManager;
+        this.plugin = plugin;
+
+        CommandConditions<BukkitCommandIssuer, BukkitCommandExecutionContext, BukkitConditionContext> conditions
+                = commandManager.getCommandConditions();
+
+        conditions.addCondition(String.class, "validWorldName", this::checkValidWorldName);
+    }
+
+    private void checkValidWorldName(ConditionContext<BukkitCommandIssuer> context,
+                                     BukkitCommandExecutionContext executionContext,
+                                     String worldName
+    ) {
+        String scope = context.getConfigValue("scope", "loaded");
+
+        switch (scope) {
+            // Worlds that are loaded
+            case "loaded":
+                if (!this.plugin.getMVWorldManager().isMVWorld(worldName)) {
+                    throw new ConditionFailedException("World with name '" + worldName + "' does not exist or is not loaded!");
+                }
+                break;
+            // Worlds that are unloaded
+            case "unloaded":
+                if (!this.plugin.getMVWorldManager().hasUnloadedWorld(worldName, false)) {
+                    if (this.plugin.getMVWorldManager().isMVWorld(worldName)) {
+                        throw new ConditionFailedException("World with name '" + worldName + "' is loaded already!");
+                    }
+                    throw new ConditionFailedException("World with name '" + worldName + "' does not exist!");
+                }
+                break;
+            // World that are loaded or unloaded
+            case "both":
+                if (!this.plugin.getMVWorldManager().hasUnloadedWorld(worldName, true)) {
+                    throw new ConditionFailedException("World with name '" + worldName + "' does not exist!");
+                }
+                break;
+            // World that are does not exist
+            case "new":
+                if (this.plugin.getMVWorldManager().hasUnloadedWorld(worldName, true)) {
+                    throw new ConditionFailedException("World with name '" + worldName + "' already exists!");
+                }
+                switch (WorldNameChecker.checkName(worldName)) {
+                    case INVALID_CHARS:
+                        throw new ConditionFailedException("World name '" + worldName + "' contains invalid characters!");
+                    case BLACKLISTED:
+                        throw new ConditionFailedException("World name '" + worldName + "' is used for critical server operations and is blacklisted!");
+                }
+                break;
+            // Probably a typo happened here
+            default:
+                throw new ConditionFailedException("Unknown scope '" + scope + "'!");
+        }
+    }
+}
@@ -0,0 +1,291 @@
+package com.onarandombox.MultiverseCore.commandtools;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import co.aikar.commands.BukkitCommandExecutionContext;
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.InvalidCommandArgument;
+import co.aikar.commands.PaperCommandContexts;
+import co.aikar.commands.contexts.ContextResolver;
+import com.google.common.base.Strings;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorld;
+import com.onarandombox.MultiverseCore.commandtools.context.GameRuleValue;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import com.onarandombox.MultiverseCore.display.filters.ContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.RegexContentFilter;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
+import org.bukkit.GameRule;
+import org.bukkit.entity.Player;
+
+public class MVCommandContexts extends PaperCommandContexts {
+    private final MultiverseCore plugin;
+
+    public MVCommandContexts(MVCommandManager mvCommandManager, MultiverseCore plugin) {
+        super(mvCommandManager);
+        this.plugin = plugin;
+
+        registerIssuerOnlyContext(BukkitCommandIssuer.class, BukkitCommandExecutionContext::getIssuer);
+        registerOptionalContext(ContentFilter.class, this::parseContentFilter);
+        registerContext(ParsedDestination.class, this::parseDestination);
+        registerContext(GameRule.class, this::parseGameRule);
+        registerContext(GameRuleValue.class, this::parseGameRuleValue);
+        registerIssuerAwareContext(MVWorld.class, this::parseMVWorld);
+        registerIssuerAwareContext(MVWorld[].class, this::parseMVWorldArray);
+        registerIssuerAwareContext(Player.class, this::parsePlayer);
+        registerIssuerAwareContext(Player[].class, this::parsePlayerArray);
+    }
+
+    private ContentFilter parseContentFilter(BukkitCommandExecutionContext context) {
+        if (Strings.isNullOrEmpty(context.getFirstArg())) {
+            return DefaultContentFilter.get();
+        }
+        String filterString = context.popFirstArg();
+        return RegexContentFilter.fromString(filterString);
+    }
+
+    private ParsedDestination<?> parseDestination(BukkitCommandExecutionContext context) {
+        String destination = context.popFirstArg();
+        if (Strings.isNullOrEmpty(destination)) {
+            throw new InvalidCommandArgument("No destination specified.");
+        }
+
+        ParsedDestination<?> parsedDestination = plugin.getDestinationsProvider().parseDestination(destination);
+        if (parsedDestination == null) {
+            throw new InvalidCommandArgument("The destination " + destination + " is not valid.");
+        }
+
+        return parsedDestination;
+    }
+
+    private GameRule<?> parseGameRule(BukkitCommandExecutionContext context) {
+        String gameRuleName = context.popFirstArg();
+        if (Strings.isNullOrEmpty(gameRuleName)) {
+            throw new InvalidCommandArgument("No game rule specified.");
+        }
+
+        GameRule<?> gameRule = GameRule.getByName(gameRuleName);
+        if (gameRule == null) {
+            throw new InvalidCommandArgument("The game rule " + gameRuleName + " is not valid.");
+        }
+
+        return gameRule;
+    }
+
+    private GameRuleValue parseGameRuleValue(BukkitCommandExecutionContext context) {
+        GameRule<?> gameRule = (GameRule<?>) context.getResolvedArg(GameRule.class);
+        if (gameRule == null) {
+            throw new InvalidCommandArgument("No game rule specified.");
+        }
+        String valueString = context.getFirstArg();
+        if (Strings.isNullOrEmpty(valueString)) {
+            throw new InvalidCommandArgument("No game rule value specified.");
+        }
+
+        ContextResolver<?, BukkitCommandExecutionContext> resolver = getResolver(gameRule.getType());
+        if (resolver == null) {
+            return new GameRuleValue(valueString);
+        }
+
+        Object resolvedValue = resolver.getContext(context);
+        if (resolvedValue == null) {
+            throw new InvalidCommandArgument("The game rule value " + valueString + " is not valid for game rule " + gameRule.getName() + ".");
+        }
+
+        return new GameRuleValue(resolvedValue);
+    }
+
+    private MVWorld parseMVWorld(BukkitCommandExecutionContext context) {
+        String resolve = context.getFlagValue("resolve", "");
+
+        // Get world based on sender only
+        if (resolve.equals("issuerOnly")) {
+            if (context.getIssuer().isPlayer()) {
+                return plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
+            }
+            if (context.isOptional()) {
+                return null;
+            }
+            throw new InvalidCommandArgument("This command can only be used by a player in a Multiverse World.");
+        }
+
+        String worldName = context.getFirstArg();
+        MVWorld world = plugin.getMVWorldManager().getMVWorld(worldName);
+
+        // Get world based on input, fallback to sender if input is not a world
+        if (resolve.equals("issuerAware")) {
+            if (world != null) {
+                context.popFirstArg();
+                return world;
+            }
+            if (context.getIssuer().isPlayer()) {
+                return plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
+            }
+            if (context.isOptional()) {
+                return null;
+            }
+            throw new InvalidCommandArgument("Player is not in a Multiverse World.");
+        }
+
+        // Get world based on input only
+        if (world != null) {
+            context.popFirstArg();
+            return world;
+        }
+        if (!context.isOptional()) {
+            return null;
+        }
+        throw new InvalidCommandArgument("World " + worldName + " is not a loaded multiverse world.");
+    }
+
+    private MVWorld[] parseMVWorldArray(BukkitCommandExecutionContext context) {
+        String resolve = context.getFlagValue("resolve", "");
+
+        MVWorld playerWorld = null;
+        if (context.getIssuer().isPlayer()) {
+            playerWorld = plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
+        }
+
+        // Get world based on sender only
+        if (resolve.equals("issuerOnly")) {
+            if (playerWorld != null) {
+                return new MVWorld[]{playerWorld};
+            }
+            if (context.isOptional()) {
+                return null;
+            }
+            throw new InvalidCommandArgument("This command can only be used by a player in a Multiverse World.");
+        }
+
+        String worldStrings = context.getFirstArg();
+        String[] worldNames = worldStrings.split(",");
+        Set<MVWorld> worlds = new HashSet<>(worldNames.length);
+        for (String worldName : worldNames) {
+            if ("*".equals(worldName)) {
+                worlds.addAll(plugin.getMVWorldManager().getMVWorlds());
+                break;
+            }
+            MVWorld world = plugin.getMVWorldManager().getMVWorld(worldName);
+            if (world == null) {
+                throw new InvalidCommandArgument("World " + worldName + " is not a loaded multiverse world.");
+            }
+            worlds.add(world);
+        }
+
+        // Get world based on input, fallback to sender if input is not a world
+        if (resolve.equals("issuerAware")) {
+            if (!worlds.isEmpty()) {
+                context.popFirstArg();
+                return worlds.toArray(new MVWorld[0]);
+            }
+            if (playerWorld != null) {
+                return new MVWorld[]{playerWorld};
+            }
+            if (context.isOptional()) {
+                return null;
+            }
+            throw new InvalidCommandArgument("Player is not in a Multiverse World.");
+        }
+
+        // Get world based on input only
+        if (!worlds.isEmpty()) {
+            context.popFirstArg();
+            return worlds.toArray(new MVWorld[0]);
+        }
+        if (!context.isOptional()) {
+            return null;
+        }
+        throw new InvalidCommandArgument("World " + worldStrings + " is not a loaded multiverse world.");
+    }
+
+    private Player parsePlayer(BukkitCommandExecutionContext context) {
+        String resolve = context.getFlagValue("resolve", "");
+
+        // Get player based on sender only
+        if (resolve.equals("issuerOnly")) {
+            if (context.getIssuer().isPlayer()) {
+                return context.getIssuer().getPlayer();
+            }
+            if (context.isOptional()) {
+                return null;
+            }
+            throw new InvalidCommandArgument("This command can only be used by a player.");
+        }
+
+        String playerIdentifier = context.getFirstArg();
+        Player player = PlayerFinder.get(playerIdentifier, context.getSender());
+
+        // Get player based on input, fallback to sender if input is not a player
+        if (resolve.equals("issuerAware")) {
+            if (player != null) {
+                context.popFirstArg();
+                return player;
+            }
+            if (context.getIssuer().isPlayer()) {
+                return context.getIssuer().getPlayer();
+            }
+            if (context.isOptional()) {
+                return null;
+            }
+            throw new InvalidCommandArgument("Invalid player: " + playerIdentifier
+                    + ". Either specify an online player or use this command as a player.");
+        }
+
+        // Get player based on input only
+        if (player != null) {
+            context.popFirstArg();
+            return player;
+        }
+        if (!context.isOptional()) {
+            return null;
+        }
+        throw new InvalidCommandArgument("Player " + playerIdentifier + " not found.");
+    }
+
+
+    private Player[] parsePlayerArray(BukkitCommandExecutionContext context) {
+        String resolve = context.getFlagValue("resolve", "");
+
+        // Get player based on sender only
+        if (resolve.equals("issuerOnly")) {
+            if (context.getIssuer().isPlayer()) {
+                return new Player[]{context.getIssuer().getPlayer()};
+            }
+            if (context.isOptional()) {
+                return null;
+            }
+            throw new InvalidCommandArgument("This command can only be used by a player.");
+        }
+
+        String playerIdentifier = context.getFirstArg();
+        Player[] players = PlayerFinder.getMulti(playerIdentifier, context.getSender()).toArray(new Player[0]);
+
+        // Get player based on input, fallback to sender if input is not a player
+        if (resolve.equals("issuerAware")) {
+            if (players.length > 0) {
+                context.popFirstArg();
+                return players;
+            }
+            if (context.getIssuer().isPlayer()) {
+                return new Player[]{context.getIssuer().getPlayer()};
+            }
+            if (context.isOptional()) {
+                return null;
+            }
+            throw new InvalidCommandArgument("Invalid player: " + playerIdentifier
+                    + ". Either specify an online player or use this command as a player.");
+        }
+
+        // Get player based on input only
+        if (players.length > 0) {
+            context.popFirstArg();
+            return players;
+        }
+        if (!context.isOptional()) {
+            return null;
+        }
+        throw new InvalidCommandArgument("Player " + playerIdentifier + " not found.");
+    }
+}
@@ -0,0 +1,86 @@
+package com.onarandombox.MultiverseCore.commandtools;
+
+import java.util.Locale;
+
+import co.aikar.commands.BukkitCommandCompletionContext;
+import co.aikar.commands.BukkitCommandExecutionContext;
+import co.aikar.commands.CommandCompletions;
+import co.aikar.commands.CommandContexts;
+import co.aikar.commands.PaperCommandManager;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagsManager;
+import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Main class to manage permissions.
+ */
+public class MVCommandManager extends PaperCommandManager {
+
+    private final MultiverseCore plugin;
+    private CommandFlagsManager flagsManager;
+    private CommandQueueManager commandQueueManager;
+
+    public MVCommandManager(@NotNull MultiverseCore plugin) {
+        super(plugin);
+        this.plugin = plugin;
+
+        // Setup conditions
+        MVCommandConditions.load(this, plugin);
+
+        // Setup locale
+        this.addSupportedLanguage(Locale.ENGLISH);
+        this.locales.addMessageBundles("multiverse-core");
+        this.locales.loadLanguages();
+    }
+
+    /**
+     * Gets class responsible for flag handling.
+     *
+     * @return A not-null {@link CommandFlagsManager}.
+     */
+    public synchronized @NotNull CommandFlagsManager getFlagsManager() {
+        if (this.flagsManager == null) {
+            this.flagsManager = new CommandFlagsManager();
+        }
+        return flagsManager;
+    }
+
+    /**
+     * Manager for command that requires /mv confirm before execution.
+     *
+     * @return A non-null {@link CommandQueueManager}.
+     */
+    public synchronized @NotNull CommandQueueManager getCommandQueueManager() {
+        if (this.commandQueueManager == null) {
+            this.commandQueueManager = new CommandQueueManager(this.plugin);
+        }
+        return commandQueueManager;
+    }
+
+    /**
+     * Gets class responsible for parsing string args into objects.
+     *
+     * @return A not-null {@link CommandContexts}.
+     */
+    @Override
+    public synchronized @NotNull CommandContexts<BukkitCommandExecutionContext> getCommandContexts() {
+        if (this.contexts == null) {
+            this.contexts = new MVCommandContexts(this, plugin);
+        }
+        return this.contexts;
+    }
+
+    /**
+     * Gets class responsible for tab-completion handling.
+     *
+     * @return A not-null {@link CommandCompletions}.
+     */
+    @Override
+    public synchronized @NotNull CommandCompletions<BukkitCommandCompletionContext> getCommandCompletions() {
+        if (this.completions == null) {
+            this.completions = new MVCommandCompletions(this, plugin);
+        }
+        return this.completions;
+    }
+}
@@ -0,0 +1,29 @@
+package com.onarandombox.MultiverseCore.commandtools;
+
+import co.aikar.commands.BaseCommand;
+import com.onarandombox.MultiverseCore.api.MVPlugin;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagsManager;
+import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class MultiverseCommand extends BaseCommand {
+    protected final CommandFlagsManager flagsManager;
+    private String flagGroupName;
+
+    protected MultiverseCommand(@NotNull MVPlugin plugin) {
+        this.flagsManager = plugin.getCore().getMVCommandManager().getFlagsManager();
+    }
+
+    protected void registerFlagGroup(@NotNull CommandFlagGroup flagGroup) {
+        if (flagGroupName != null) {
+            throw new IllegalStateException("Flag group already registered! (name: " + flagGroupName + ")");
+        }
+        flagsManager.registerFlagGroup(flagGroup);
+        flagGroupName = flagGroup.getName();
+    }
+
+    protected @NotNull ParsedCommandFlags parseFlags(@NotNull String[] flags) {
+        return flagsManager.parse(flagGroupName, flags);
+    }
+}
@@ -0,0 +1,13 @@
+package com.onarandombox.MultiverseCore.commandtools.context;
+
+public class GameRuleValue {
+    private final Object value;
+
+    public GameRuleValue(Object value) {
+        this.value = value;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+}
@@ -0,0 +1,93 @@
+package com.onarandombox.MultiverseCore.commandtools.flags;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a flag.
+ */
+public class CommandFlag {
+    /**
+     * A builder for a flag.
+     *
+     * @param key The key for the new flag.
+     * @return The builder.
+     */
+    public static @NotNull Builder<?> builder(@NotNull String key){
+        return new Builder<>(key);
+    }
+
+    private final String key;
+    private final List<String> aliases;
+
+    /**
+     * Creates a new flag.
+     *
+     * @param builder The builder.
+     */
+    protected CommandFlag(@NotNull Builder<?> builder) {
+        key = builder.key;
+        aliases = builder.aliases;
+    }
+
+    /**
+     * Get the key of this flag.
+     *
+     * @return The key of this flag.
+     */
+    public @NotNull String getKey() {
+        return key;
+    }
+
+    /**
+     * Get the aliases of this flag.
+     *
+     * @return The aliases of this flag.
+     */
+    public @NotNull List<String> getAliases() {
+        return aliases;
+    }
+
+    /**
+     * A builder for a flag.
+     *
+     * @param <S> The type of the builder.
+     */
+    public static class Builder<S extends Builder<?>> {
+        private final String key;
+        private final List<String> aliases;
+
+        /**
+         * Create a new builder.
+         *
+         * @param key The key for the new flag.
+         */
+        public Builder(@NotNull String key) {
+            this.key = key;
+            aliases = new ArrayList<>();
+        }
+
+        /**
+         * Add one or more alias to the flag.
+         *
+         * @param alias The alias to add.
+         * @return The builder.
+         */
+        public @NotNull S addAlias(@NotNull String...alias){
+            Collections.addAll(this.aliases, alias);
+            return (S) this;
+        }
+
+        /**
+         * Build the flag.
+         *
+         * @return The flag.
+         */
+        public @NotNull CommandFlag build(){
+            return new CommandFlag(this);
+        }
+    }
+}
@@ -0,0 +1,129 @@
+package com.onarandombox.MultiverseCore.commandtools.flags;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A group of flags.
+ */
+public class CommandFlagGroup {
+    /**
+     * A builder for a flag group.
+     *
+     * @param name The name of the group.
+     * @return The builder.
+     */
+    public static @NotNull Builder builder(@NotNull String name) {
+        return new Builder(name);
+    }
+
+    private final String name;
+    private final List<String> keys;
+    private final Map<String, CommandFlag> keysFlagMap;
+
+    /**
+     * Creates a new flag group.
+     *
+     * @param builder The builder.
+     */
+    protected CommandFlagGroup(@NotNull Builder builder) {
+        name = builder.name;
+        keys = builder.keys;
+        keysFlagMap = builder.keysFlagMap;
+    }
+
+    /**
+     * Get the name of this group.
+     *
+     * @return The name of this group.
+     */
+    public @NotNull String getName() {
+        return name;
+    }
+
+    /**
+     * Check if this group contains a flag with the given key. Works with alias keys.
+     *
+     * @param key The key to check.
+     * @return True if the group contains a flag with the given key, false otherwise.
+     */
+    public boolean hasKey(@Nullable String key) {
+        return keysFlagMap.containsKey(key);
+    }
+
+    /**
+     * Get the remaining keys after the given flags have been removed. Works with alias keys.
+     *
+     * @param flags The flags to remove.
+     * @return The remaining keys.
+     */
+    public @NotNull Set<String> getRemainingKeys(@NotNull String[] flags) {
+        Set<String> keysRemaining = new HashSet<>(this.keys);
+        for (String flag : flags) {
+            CommandFlag mvFlag = this.getFlagByKey(flag);
+            if (mvFlag != null) {
+                keysRemaining.remove(mvFlag.getKey());
+            }
+        }
+        return keysRemaining;
+    }
+
+    /**
+     * Get a flag by its key. Alias keys are supported as well.
+     *
+     * @param key The key of the flag.
+     * @return The flag if found, null otherwise.
+     */
+    public @Nullable CommandFlag getFlagByKey(String key) {
+        return keysFlagMap.get(key);
+    }
+
+    /**
+     * A builder for {@link CommandFlagGroup}.
+     */
+    public static class Builder {
+        private final String name;
+        private final List<String> keys;
+        private final Map<String, CommandFlag> keysFlagMap;
+
+        /**
+         * Creates a new builder.
+         *
+         * @param name The name of the flag group.
+         */
+        public Builder(@NotNull String name) {
+            this.name = name;
+            this.keys = new ArrayList<>();
+            this.keysFlagMap = new HashMap<>();
+        }
+
+        /**
+         * Adds a flag to the group.
+         *
+         * @param flag The flag to add.
+         * @return The builder.
+         */
+        public @NotNull Builder add(CommandFlag flag) {
+            keys.add(flag.getKey());
+            keysFlagMap.put(flag.getKey(), flag);
+            flag.getAliases().forEach((alias) -> keysFlagMap.put(alias, flag));
+            return this;
+        }
+
+        /**
+         * Builds the flag group.
+         *
+         * @return The flag group.
+         */
+        public @NotNull CommandFlagGroup build() {
+            return new CommandFlagGroup(this);
+        }
+    }
+}
@@ -0,0 +1,93 @@
+package com.onarandombox.MultiverseCore.commandtools.flags;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import co.aikar.commands.InvalidCommandArgument;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Manages all the flag groups and parsing.
+ */
+public class CommandFlagsManager {
+    private final Map<String, CommandFlagGroup> flagGroupMap;
+
+    /**
+     * Creates a new FlagsManager.
+     */
+    public CommandFlagsManager() {
+        flagGroupMap = new HashMap<>();
+    }
+
+    /**
+     * Registers a flag group.
+     *
+     * @param flagGroup The target flag group to register.
+     */
+    public void registerFlagGroup(@NotNull CommandFlagGroup flagGroup) {
+        flagGroupMap.put(flagGroup.getName(), flagGroup);
+    }
+
+    /**
+     *  Get a flag group by name.
+     *
+     * @param groupName The target flag group name.
+     * @return The flag group if found, null otherwise.
+     */
+    public @Nullable CommandFlagGroup getFlagGroup(@Nullable String groupName) {
+        return this.flagGroupMap.get(groupName);
+    }
+
+    /**
+     * Autocompletes suggestions for flags.
+     *
+     * @param groupName The target flag group name.
+     * @param flags The current flags so far.
+     * @return The list of suggestions.
+     */
+    public @NotNull Collection<String> suggest(@Nullable String groupName, @NotNull String[] flags) {
+        CommandFlagGroup flagGroup = this.getFlagGroup(groupName);
+        if (flagGroup == null) {
+            return Collections.emptyList();
+        }
+
+        Collection<String> suggestions = new ArrayList<>();
+        CommandFlag currentFlag = (flags.length <= 1) ? null : flagGroup.getFlagByKey(flags[flags.length - 2]);
+
+        if (currentFlag instanceof CommandValueFlag) {
+            CommandValueFlag<?> valueFlag = (CommandValueFlag<?>) currentFlag;
+            if (valueFlag.getCompletion() != null) {
+                suggestions.addAll(valueFlag.getCompletion().get());
+            }
+            if (valueFlag.isOptional()) {
+                suggestions.addAll(flagGroup.getRemainingKeys(flags));
+            }
+        } else {
+            suggestions.addAll(flagGroup.getRemainingKeys(flags));
+        }
+
+        return suggestions;
+    }
+
+    /**
+     * Parses the flags.
+     *
+     * @param groupName The target flag group name.
+     * @param flags The flags to parse.
+     * @return The parsed flags.
+     *
+     * @throws InvalidCommandArgument If the flags are invalid.
+     */
+    public @NotNull ParsedCommandFlags parse(@Nullable String groupName, @NotNull String[] flags) {
+        CommandFlagGroup flagGroup = this.getFlagGroup(groupName);
+        if (flagGroup == null) {
+            return ParsedCommandFlags.EMPTY;
+        }
+
+        return new CommandFlagsParser(this.getFlagGroup(groupName), flags).parse();
+    }
+}
@@ -0,0 +1,118 @@
+package com.onarandombox.MultiverseCore.commandtools.flags;
+
+import co.aikar.commands.InvalidCommandArgument;
+
+/**
+ * Parses flags from a string array. Each parser should only be used once.
+ */
+public class CommandFlagsParser {
+    private final CommandFlagGroup flagGroup;
+    private final String[] flags;
+
+    private ParsedCommandFlags parsedFlags;
+    private boolean nextArgMayBeKey;
+    private boolean nextArgMayBeValue;
+    private CommandFlag currentFlag;
+
+    /**
+     * Creates a new CommandFlagsParser.
+     *
+     * @param flagGroup The flag group to parse flags for.
+     * @param flags The flags to parse.
+     */
+    public CommandFlagsParser(CommandFlagGroup flagGroup, String[] flags) {
+        this.flagGroup = flagGroup;
+        this.flags = flags;
+    }
+
+    /**
+     * Parses the flags.
+     *
+     * @return The parsed flags.
+     */
+    public ParsedCommandFlags parse() {
+        parsedFlags = new ParsedCommandFlags();
+
+        // First argument is always a key
+        this.nextArgMayBeKey = true;
+        this.nextArgMayBeValue = false;
+
+        for (String flag : flags) {
+            if (this.nextArgMayBeKey) {
+                if (parseKey(flag)) continue;
+            }
+            if (this.nextArgMayBeValue) {
+                if (parseValue(flag)) continue;
+            }
+            throw new InvalidCommandArgument(flag + " is not a valid flag.");
+        }
+
+        if (!this.nextArgMayBeKey && this.nextArgMayBeValue) {
+            throw new InvalidCommandArgument(currentFlag.getKey() + " requires a value!");
+        }
+
+        return parsedFlags;
+    }
+
+    /**
+     * Parses a key.
+     *
+     * @param flag The flag to parse.
+     * @return True if the flag was parsed as a key, false otherwise.
+     */
+    private boolean parseKey(String flag) {
+        CommandFlag potentialFlag = flagGroup.getFlagByKey(flag);
+        if (potentialFlag == null) {
+            return false;
+        }
+
+        this.currentFlag = potentialFlag;
+
+        if (this.currentFlag instanceof CommandValueFlag) {
+            CommandValueFlag<?> valueFlag = (CommandValueFlag<?>) this.currentFlag;
+
+            if (valueFlag.isOptional()) {
+                parsedFlags.addFlagResult(valueFlag.getKey(), valueFlag.getDefaultValue());
+                this.nextArgMayBeKey = true;
+                this.nextArgMayBeValue = true;
+                return true;
+            }
+
+            this.nextArgMayBeKey = false;
+            this.nextArgMayBeValue = true;
+            return true;
+        }
+
+        parsedFlags.addFlagResult(this.currentFlag.getKey(), null);
+        this.nextArgMayBeKey = true;
+        this.nextArgMayBeValue = false;
+
+        return true;
+    }
+
+    /**
+     * Parses a value.
+     *
+     * @param flag The flag to parse.
+     * @return True if the flag was parsed as a value, false otherwise.
+     */
+    private boolean parseValue(String flag) {
+        if (this.currentFlag == null) {
+            throw new InvalidCommandArgument("Some flag logic error occurred at " + flag + "");
+        }
+        if (flagGroup.hasKey(flag)) {
+            throw new InvalidCommandArgument(currentFlag.getKey() + " requires a value!");
+        }
+
+        Object flagValue;
+        CommandValueFlag<?> valueFlag = (CommandValueFlag<?>) this.currentFlag;
+        flagValue = valueFlag.getContext() != null ? valueFlag.getContext().apply(flag) : flag;
+        parsedFlags.addFlagResult(valueFlag.getKey(), flagValue);
+
+        // After a value, the next argument must be a key
+        this.nextArgMayBeKey = true;
+        this.nextArgMayBeValue = false;
+        this.currentFlag = null;
+        return true;
+    }
+}
@@ -0,0 +1,172 @@
+package com.onarandombox.MultiverseCore.commandtools.flags;
+
+import java.util.Collection;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Represents a flag with a value.
+ *
+ * @param <T> The type of the value.
+ */
+public class CommandValueFlag<T> extends CommandFlag {
+    /**
+     * A builder for a flag.
+     *
+     * @param key  The key for the new flag.
+     * @param type The type of the value.
+     * @return The builder.
+     */
+    public static @NotNull <T> Builder<T, ?> builder(@NotNull String key, @NotNull Class<T> type) {
+        return new Builder<>(key, type);
+    }
+
+    private final Class<T> type;
+    private final boolean optional;
+    private final T defaultValue;
+    private final Function<String, T> context;
+    private final Supplier<Collection<String>> completion;
+
+    /**
+     * Creates a new flag.
+     *
+     * @param builder The builder.
+     */
+    protected CommandValueFlag(@NotNull Builder<T, ?> builder) {
+        super(builder);
+        type = builder.type;
+        optional = builder.optional;
+        defaultValue = builder.defaultValue;
+        context = builder.context;
+        completion = builder.completion;
+    }
+
+    /**
+     * Get the type of the value.
+     *
+     * @return The type of the value.
+     */
+    public @NotNull Class<T> getType() {
+        return type;
+    }
+
+    /**
+     * Check if it is optional for users to specify a value.
+     *
+     * @return True if the value is optional, false otherwise.
+     */
+    public boolean isOptional() {
+        return optional;
+    }
+
+    /**
+     * Get the default value. May be null.
+     *
+     * @return The default value.
+     */
+    public @Nullable T getDefaultValue() {
+        return defaultValue;
+    }
+
+    /**
+     * Get the context. May be null for {@link String} value type.
+     *
+     * @return The context.
+     */
+    public @Nullable Function<String, T> getContext() {
+        return context;
+    }
+
+    /**
+     * Get the completion. May be null.
+     *
+     * @return The completion.
+     */
+    public @Nullable Supplier<Collection<String>> getCompletion() {
+        return completion;
+    }
+
+    /**
+     * A builder for a flag.
+     *
+     * @param <T> The type of the value.
+     * @param <S> The type of the builder.
+     */
+    public static class Builder<T, S extends Builder<T, S>> extends CommandFlag.Builder<S> {
+        private final Class<T> type;
+        private boolean optional = false;
+        private T defaultValue = null;
+        private Function<String, T> context = null;
+        private Supplier<Collection<String>> completion = null;
+
+        /**
+         * Create a new builder.
+         *
+         * @param key  The key for the new flag.
+         * @param type The type of the value.
+         */
+        public Builder(@NotNull String key, @NotNull Class<T> type) {
+            super(key);
+            this.type = type;
+        }
+
+        /**
+         * Set the flag as optional for users to specify a value.
+         *
+         * @return The builder.
+         */
+        public @NotNull S optional() {
+            this.optional = true;
+            return (S) this;
+        }
+
+        /**
+         * Set the default value. Used if optional is true and user does not specify a value.
+         *
+         * @param defaultValue The default value.
+         * @return The builder.
+         */
+        public @NotNull S defaultValue(@NotNull T defaultValue) {
+            this.defaultValue = defaultValue;
+            return (S) this;
+        }
+
+        /**
+         * Set the context callback for parsing string into value type.
+         *
+         * @param context The context.
+         * @return The builder.
+         */
+        public @NotNull S context(@NotNull Function<String, T> context) {
+            this.context = context;
+            return (S) this;
+        }
+
+        /**
+         * Set the completion callback for autocomplete.
+         *
+         * @param completion The completion.
+         * @return The builder.
+         */
+        public @NotNull S completion(@NotNull Supplier<Collection<String>> completion) {
+            this.completion = completion;
+            return (S) this;
+        }
+
+        /**
+         * Build the flag.
+         *
+         * @return The flag.
+         */
+        @Override
+        public @NotNull CommandFlag build() {
+            if (context == null && !String.class.equals(type)) {
+                throw new IllegalStateException("Context is required for none-string value flags");
+            }
+            return new CommandValueFlag<>(this);
+        }
+    }
+}
@@ -0,0 +1,61 @@
+package com.onarandombox.MultiverseCore.commandtools.flags;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Object to contain the results of the flags present and its values.
+ */
+public class ParsedCommandFlags
+{
+    public static final ParsedCommandFlags EMPTY = new ParsedCommandFlags();
+
+    private final Map<String, Object> flagValues;
+
+    public ParsedCommandFlags() {
+        flagValues = new HashMap<>();
+    }
+
+    /**
+     * Add a flag result to the parsed flags.
+     *
+     * @param key   The key of the flag.
+     * @param value The value of the flag.
+     */
+    void addFlagResult(@NotNull String key, @Nullable Object value) {
+        flagValues.put(key, value);
+    }
+
+    /**
+     * Check if a flag is present.
+     *
+     * @param key The key of the flag.
+     * @return True if the flag is present, false otherwise.
+     */
+    public boolean hasFlag(@Nullable String key) {
+        return this.flagValues.containsKey(key);
+    }
+
+    public boolean hasFlagValue(@Nullable String key) {
+        return flagValue(key, Object.class) != null;
+    }
+
+    /**
+     * Get the value of a flag.
+     *
+     * @param key The key of the flag.
+     * @return The value of the flag, null if flag does not exist or no value.
+     */
+    public @Nullable <T> T flagValue(@Nullable String key, @NotNull Class<T> type) {
+        Object value = this.flagValues.get(key);
+        return (T) value;
+    }
+
+    public @NotNull <T> T flagValue(@Nullable String key, @NotNull T defaultValue, @NotNull Class<T> type) {
+        T value = flagValue(key, type);
+        return value != null ? value : defaultValue;
+    }
+}
@@ -0,0 +1,5 @@
+/**
+ * This package contains all the flags parsing classes.
+ *
+ */
+package com.onarandombox.MultiverseCore.commandtools.flags;
@@ -0,0 +1,4 @@
+/**
+ * This package contains the classes that manages command handling.
+ */
+package com.onarandombox.MultiverseCore.commandtools;
@@ -0,0 +1,161 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * 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.commandtools.queue;
+
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.block.data.type.CommandBlock;
+import org.bukkit.command.BlockCommandSender;
+import org.bukkit.command.CommandSender;
+import org.bukkit.scheduler.BukkitTask;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * <p>Manages the queuing of dangerous commands that require {@code /mv confirm} before executing.</p>
+ *
+ * <p>Each sender can only have one command in queue at any given time. When a queued command is added
+ * for a sender that already has a command in queue, it will replace the old queued command.</p>
+ */
+public class CommandQueueManager {
+
+    private static final long TICKS_PER_SECOND = 20;
+    private static final DummyCommandBlockSender COMMAND_BLOCK = new DummyCommandBlockSender();
+
+    private final MultiverseCore plugin;
+    private final Map<CommandSender, QueuedCommand> queuedCommandMap;
+
+    public CommandQueueManager(@NotNull MultiverseCore plugin) {
+        this.plugin = plugin;
+        this.queuedCommandMap = new WeakHashMap<>();
+    }
+
+    /**
+     * Adds a {@link QueuedCommand} into queue.
+     *
+     * @param queuedCommand The queued command to add.
+     */
+    public void addToQueue(QueuedCommand queuedCommand) {
+        CommandSender targetSender = parseSender(queuedCommand.getSender());
+
+        // Since only one command is stored in queue per sender, we remove the old one.
+        this.removeFromQueue(targetSender);
+
+        Logging.finer("Add new command to queue for sender %s.", targetSender.getName());
+        this.queuedCommandMap.put(targetSender, queuedCommand);
+        queuedCommand.setExpireTask(runExpireLater(queuedCommand));
+
+        queuedCommand.getSender().sendMessage(queuedCommand.getPrompt());
+        queuedCommand.getSender().sendMessage(String.format("Run %s/mv confirm %sto continue. This will expire in %s seconds.",
+                ChatColor.GREEN, ChatColor.WHITE, queuedCommand.getValidDuration()));
+    }
+
+    /**
+     * Expire task that removes a {@link QueuedCommand} from queue after valid duration defined.
+     *
+     * @param queuedCommand Command to run the expire task on.
+     * @return The expire {@link BukkitTask}.
+     */
+    @NotNull
+    private BukkitTask runExpireLater(@NotNull QueuedCommand queuedCommand) {
+        return Bukkit.getScheduler().runTaskLater(
+                this.plugin,
+                expireRunnable(queuedCommand),
+                queuedCommand.getValidDuration() * TICKS_PER_SECOND
+        );
+    }
+
+    /**
+     * Runnable responsible for expiring the queued command.
+     *
+     * @param queuedCommand Command to create the expire task on.
+     * @return The expire runnable.
+     */
+    @NotNull
+    private Runnable expireRunnable(@NotNull QueuedCommand queuedCommand) {
+        return () -> {
+            CommandSender targetSender = parseSender(queuedCommand.getSender());
+            QueuedCommand matchingQueuedCommand = this.queuedCommandMap.get(targetSender);
+            if (!queuedCommand.equals(matchingQueuedCommand) || queuedCommand.getExpireTask().isCancelled()) {
+                // To be safe, but this shouldn't happen since we cancel old commands before add new once.
+                Logging.finer("This is an old queue command already.");
+                return;
+            }
+            queuedCommand.getSender().sendMessage("Your queued command has expired.");
+            this.queuedCommandMap.remove(queuedCommand.getSender());
+        };
+    }
+
+    /**
+     * Runs the command in queue for the given sender, if any.
+     *
+     * @param sender    {@link CommandSender} that confirmed the command.
+     * @return True if queued command ran successfully, else false.
+     */
+    public boolean runQueuedCommand(@NotNull CommandSender sender) {
+        CommandSender targetSender = parseSender(sender);
+        QueuedCommand queuedCommand = this.queuedCommandMap.get(targetSender);
+        if (queuedCommand == null) {
+            sender.sendMessage(ChatColor.RED + "You do not have any commands in queue.");
+            return false;
+        }
+        Logging.finer("Running queued command...");
+        queuedCommand.getAction().run();
+        return removeFromQueue(targetSender);
+    }
+
+    /**
+     * Since only one command is stored in queue per sender, we remove the old one.
+     *
+     * @param sender    The {@link CommandSender} that executed the command.
+     * @return True if queue command is removed from sender successfully, else false.
+     */
+    public boolean removeFromQueue(@NotNull CommandSender sender) {
+        CommandSender targetSender = parseSender(sender);
+        QueuedCommand previousCommand = this.queuedCommandMap.remove(targetSender);
+        if (previousCommand == null) {
+            Logging.finer("No queue command to remove for sender %s.", targetSender.getName());
+            return false;
+        }
+        previousCommand.getExpireTask().cancel();
+        Logging.finer("Removed queue command for sender %s.", targetSender.getName());
+        return true;
+    }
+
+    /**
+     * To allow all CommandBlocks to be a common sender with use of {@link DummyCommandBlockSender}.
+     * So confirm command can be used for a queued command on another command block.
+     *
+     * @param sender    The sender to parse.
+     * @return The sender, or if its a command block, a {@link DummyCommandBlockSender}.
+     */
+    @NotNull
+    private CommandSender parseSender(@NotNull CommandSender sender) {
+        Logging.finer("Sender is of class %s.", sender.getClass().getName());
+        if (isCommandBlock(sender)) {
+            Logging.finer("Is command block.");
+            return COMMAND_BLOCK;
+        }
+        return sender;
+    }
+
+    /**
+     * Checks if the sender is a command block.
+     *
+     * @param sender    The sender to check.
+     * @return True if sender is a command block, else false.
+     */
+    private boolean isCommandBlock(@NotNull CommandSender sender) {
+        return sender instanceof BlockCommandSender
+                && ((BlockCommandSender) sender).getBlock().getBlockData() instanceof CommandBlock;
+    }
+}
@@ -0,0 +1,121 @@
+package com.onarandombox.MultiverseCore.commandtools.queue;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionAttachment;
+import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * Used by {@link CommandQueueManager}, so different commands block can be recognised as one.
+ */
+class DummyCommandBlockSender implements CommandSender {
+
+    @Override
+    public void sendMessage(@NotNull String message) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void sendMessage(@NotNull String[] messages) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void sendMessage(@Nullable UUID uuid, @NotNull String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void sendMessage(@Nullable UUID uuid, @NotNull String[] strings) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull Server getServer() {
+        return Bukkit.getServer();
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return "DummyCommandBlockSender";
+    }
+
+    @NotNull
+    @Override
+    public Spigot spigot() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isPermissionSet(@NotNull String name) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isPermissionSet(@NotNull Permission perm) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull String name) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull Permission perm) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void removeAttachment(@NotNull PermissionAttachment attachment) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void recalculatePermissions() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public @NotNull Set<PermissionAttachmentInfo> getEffectivePermissions() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isOp() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setOp(boolean value) {
+        throw new UnsupportedOperationException();
+    }
+}
@@ -0,0 +1,99 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
+ * 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.commandtools.queue;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.scheduler.BukkitTask;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a single command used in {@link CommandQueueManager} for confirming before running potentially
+ * dangerous action.
+ */
+public class QueuedCommand {
+
+    private static final String DEFAULT_PROMPT_MESSAGE = "The command you are trying to run is deemed dangerous.";
+    private static final int DEFAULT_VALID_TIME = 10;
+
+    private final CommandSender sender;
+    private final Runnable action;
+    private final String prompt;
+    private final int validDuration;
+    private BukkitTask expireTask;
+
+    public QueuedCommand(BukkitCommandIssuer issuer, Runnable action) {
+        this(issuer.getIssuer(), action, DEFAULT_PROMPT_MESSAGE, DEFAULT_VALID_TIME);
+    }
+
+    public QueuedCommand(BukkitCommandIssuer issuer, Runnable action, String prompt) {
+        this(issuer.getIssuer(), action, prompt, DEFAULT_VALID_TIME);
+    }
+
+    public QueuedCommand(BukkitCommandIssuer issuer, Runnable action, int validDuration) {
+        this(issuer.getIssuer(), action, DEFAULT_PROMPT_MESSAGE, validDuration);
+    }
+
+    public QueuedCommand(CommandSender sender, Runnable action) {
+        this(sender, action, DEFAULT_PROMPT_MESSAGE, DEFAULT_VALID_TIME);
+    }
+
+    public QueuedCommand(CommandSender sender, Runnable action, String prompt) {
+        this(sender, action, prompt, DEFAULT_VALID_TIME);
+    }
+
+    public QueuedCommand(CommandSender sender, Runnable action, int validDuration) {
+        this(sender, action, DEFAULT_PROMPT_MESSAGE, validDuration);
+    }
+
+    /**
+     * Creates a new queue command, to be registered at {@link CommandQueueManager#addToQueue(QueuedCommand)}.
+     *
+     * @param sender        The sender that ran the command needed for confirmation.
+     * @param action        The logic to execute upon confirming.
+     * @param prompt        Question to ask sender to confirm.
+     * @param validDuration Duration in which the command is valid for confirm in seconds.
+     */
+    public QueuedCommand(CommandSender sender, Runnable action, String prompt, int validDuration) {
+        this.sender = sender;
+        this.action = action;
+        this.prompt = prompt;
+        this.validDuration = validDuration;
+    }
+
+    @NotNull
+    CommandSender getSender() {
+        return sender;
+    }
+
+    @NotNull
+    String getPrompt() {
+        return prompt;
+    }
+
+    int getValidDuration() {
+        return validDuration;
+    }
+
+    @NotNull
+    Runnable getAction() {
+        return action;
+    }
+
+    @NotNull
+    BukkitTask getExpireTask() {
+        return expireTask;
+    }
+
+    void setExpireTask(@NotNull BukkitTask expireTask) {
+        if (this.expireTask != null) {
+            throw new IllegalStateException("This queue command already has an expire task. You can't register twice!");
+        }
+        this.expireTask = expireTask;
+    }
+}
@@ -0,0 +1,4 @@
+/**
+ * Manager queuing of dangerous commands in need of confirmation.
+ */
+package com.onarandombox.MultiverseCore.commandtools.queue;
@@ -1,37 +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.
- * @deprecated This is deprecated.
- * @see MVConfigProperty
- */
-@Deprecated
-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,69 +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.
- * @deprecated This is deprecated.
- */
-@Deprecated
-public interface MVConfigProperty<T> {
-    /**
-     * Gets the name of this property.
-     *
-     * @return The name of this property.
-     */
-    String getName();
-
-    /**
-     * Gets the value of this property.
-     *
-     * @return The value of this property.
-     */
-    T getValue();
-
-    /**
-     * Gets the string representation of this value.
-     *
-     * @return The value of this property as a string.
-     */
-    String toString();
-
-    /**
-     * Gets the help string for this.
-     *
-     * @return The value of this property as a string.
-     */
-    String getHelp();
-
-    /**
-     * Sets the value of this property.
-     *
-     * @param value The T representation of this value.
-     * @return True the value was successfully set.
-     */
-    boolean setValue(T value);
-
-    /**
-     * This parseValue should be used with strings.
-     *
-     * @param value The string representation of the value to set.
-     *
-     * @return True if the value was set, false if not.
-     */
-    boolean parseValue(String value);
-
-    /**
-     * Gets the name of the config-node that this {@link MVConfigProperty} is saved as.
-     *
-     * @return The name of the config-node that this {@link MVConfigProperty} is saved as.
-     */
-    String getConfigNode();
-}
@@ -1,4 +0,0 @@
-/**
- * This package contains the Multiverse-configuration.
- */
-package com.onarandombox.MultiverseCore.configuration;
@@ -1,148 +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.destination;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * An anchor-{@link MVDestination}.
- */
-public class AnchorDestination implements MVDestination {
-    private boolean isValid;
-    private Location location;
-    private MultiverseCore plugin;
-    private String name;
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getIdentifier() {
-        return "a";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Vector getVelocity() {
-        return new Vector(0, 0, 0);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isThisType(JavaPlugin plugin, String destination) {
-        if (!(plugin instanceof MultiverseCore)) {
-            return false;
-        }
-        this.plugin = (MultiverseCore) plugin;
-        List<String> parsed = Arrays.asList(destination.split(":"));
-        // Need at least: a:name
-        if (!(parsed.size() == 2)) {
-            return false;
-        }
-        // If it's not an Anchor type
-        return parsed.get(0).equalsIgnoreCase("a");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Location getLocation(Entity e) {
-        return this.location;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isValid() {
-        return this.isValid;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setDestination(JavaPlugin plugin, String destination) {
-        if (!(plugin instanceof MultiverseCore)) {
-            return;
-        }
-        this.plugin = (MultiverseCore) plugin;
-        List<String> parsed = Arrays.asList(destination.split(":"));
-        // Need at least: e:world:x,y,z
-        // OR e:world:x,y,z:pitch:yaw
-        // so basically 3 or 5
-        if (!(parsed.size() == 2)) {
-            this.isValid = false;
-            return;
-        }
-        this.name = parsed.get(1);
-        this.location = this.plugin.getAnchorManager().getAnchorLocation(parsed.get(1));
-        if (this.location == null) {
-            this.isValid = false;
-            return;
-        }
-        if (!parsed.get(0).equalsIgnoreCase(this.getIdentifier())) {
-            this.isValid = false;
-        }
-        this.isValid = true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getType() {
-        return "Anchor";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return "Anchor: " + this.name;
-    }
-
-    @Override
-    public String toString() {
-        if (isValid) {
-            return "a:" + this.name;
-        }
-        return "i:Invalid Destination";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getRequiredPermission() {
-        return "multiverse.access." + this.location.getWorld().getName();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean useSafeTeleporter() {
-        // This is an ANCHOR destination, don't safely teleport here.
-        return false;
-    }
-}
@@ -1,119 +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.destination;
-
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-/**
- * A bed-{@link MVDestination}.
- */
-public class BedDestination implements MVDestination {
-
-    private boolean isValid;
-    private Location knownBedLoc;
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getIdentifier() {
-        return "b";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isThisType(JavaPlugin plugin, String destination) {
-        String[] split = destination.split(":");
-        this.isValid = split.length >= 1 && split.length <= 2 && split[0].equals(this.getIdentifier());
-        return this.isValid;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Location getLocation(Entity entity) {
-        if (entity instanceof Player) {
-            this.knownBedLoc = ((Player) entity).getBedSpawnLocation();
-            return this.knownBedLoc;
-        }
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Vector getVelocity() {
-        return new Vector();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setDestination(JavaPlugin plugin, String destination) {
-        // Not needed.
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isValid() {
-        return this.isValid;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getType() {
-        return "Bed";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return "Bed";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getRequiredPermission() {
-        if (knownBedLoc != null) {
-            return "multiverse.access." + knownBedLoc.getWorld().getName();
-        }
-        return "";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean useSafeTeleporter() {
-        // Bukkit should have already checked this.
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        return "b:playerbed";
-    }
-}
@@ -1,227 +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.destination;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * A cannon-{@link MVDestination}.
- */
-public class CannonDestination implements MVDestination {
-    private final String coordRegex = "(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*)";
-    private boolean isValid;
-    private Location location;
-    private double speed;
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Vector getVelocity() {
-        double pitchRadians = Math.toRadians(location.getPitch());
-        double yawRadians = Math.toRadians(location.getYaw());
-        double x = Math.sin(yawRadians) * speed * -1;
-        double y = Math.sin(pitchRadians) * speed * -1;
-        double z = Math.cos(yawRadians) * speed;
-        // Account for the angle they were pointed, and take away velocity
-        x = Math.cos(pitchRadians) * x;
-        z = Math.cos(pitchRadians) * z;
-        return new Vector(x, y, z);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getIdentifier() {
-        return "ca";
-    }
-
-    // NEED ca:world:x,y,z:pitch:yaw:speed
-    // so basically 6
-    private static final int SPLIT_SIZE = 6;
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isThisType(JavaPlugin plugin, String destination) {
-        if (!(plugin instanceof MultiverseCore)) {
-            return false;
-        }
-        List<String> parsed = Arrays.asList(destination.split(":"));
-        if (parsed.size() != SPLIT_SIZE) {
-            return false;
-        }
-        // If it's not an Cannon type
-        if (!parsed.get(0).equalsIgnoreCase("ca")) {
-            return false;
-        }
-
-        // If it's not a MV world
-        if (!((MultiverseCore) plugin).getMVWorldManager().isMVWorld(parsed.get(1))) {
-            return false;
-        }
-        // Verify X,Y,Z are numbers
-        if (!parsed.get(2).matches(coordRegex)) {
-            return false;
-        }
-
-        try {
-            // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-            Float.parseFloat(parsed.get(3));
-            Float.parseFloat(parsed.get(4));
-            Float.parseFloat(parsed.get(5));
-            // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-        } catch (NumberFormatException e) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Location getLocation(Entity e) {
-        return this.location;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isValid() {
-        return this.isValid;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setDestination(JavaPlugin plugin, String destination) {
-        if (!(plugin instanceof MultiverseCore)) {
-            return;
-        }
-        List<String> parsed = Arrays.asList(destination.split(":"));
-
-        if (parsed.size() != SPLIT_SIZE) {
-            this.isValid = false;
-            return;
-        }
-        if (!parsed.get(0).equalsIgnoreCase(this.getIdentifier())) {
-            this.isValid = false;
-            return;
-        }
-
-        if (!((MultiverseCore) plugin).getMVWorldManager().isMVWorld(parsed.get(1))) {
-            this.isValid = false;
-            return;
-        }
-
-        this.location = new Location(((MultiverseCore) plugin).getMVWorldManager().getMVWorld(parsed.get(1)).getCBWorld(), 0, 0, 0);
-
-        if (!parsed.get(2).matches(this.coordRegex)) {
-            this.isValid = false;
-            return;
-        }
-        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;
-            }
-        }
-        this.location.setX(coords[0]);
-        this.location.setY(coords[1]);
-        this.location.setZ(coords[2]);
-
-        try {
-            // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-            this.location.setPitch(Float.parseFloat(parsed.get(3)));
-            this.location.setYaw(Float.parseFloat(parsed.get(4)));
-            this.speed = Math.abs(Float.parseFloat(parsed.get(5)));
-            // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-        } catch (NumberFormatException e) {
-            this.isValid = false;
-            return;
-        }
-
-        this.isValid = true;
-
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getType() {
-        return "Cannon!";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return "Cannon (" + this.location.getX() + ", " + this.location.getY() + ", " + this.location.getZ() + ":"
-                + this.location.getPitch() + ":" + this.location.getYaw() + ":" + this.speed + ")";
-
-    }
-
-    /**
-     * Sets this {@link CannonDestination}.
-     *
-     * @param location The {@link Location}.
-     * @param speed The speed.
-     */
-    public void setDestination(Location location, double speed) {
-        if (location != null) {
-            this.location = location;
-            this.speed = Math.abs(speed);
-            this.isValid = true;
-        }
-        this.isValid = false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getRequiredPermission() {
-        return "multiverse.access." + this.location.getWorld().getName();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean useSafeTeleporter() {
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        if (isValid) {
-            return "ca:" + location.getWorld().getName() + ":" + location.getX() + "," + location.getY()
-                    + "," + location.getZ() + ":" + location.getPitch() + ":" + location.getYaw() + ":" + this.speed;
-        }
-        return "i:Invalid Destination";
-    }
-}