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
240 changed files with 6425 additions and 10734 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
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 💬 Multiverse Discord Server
+  - 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
@@ -1,56 +0,0 @@
---
-name: ❓ Help!
-about: Encountered a problem with Multiverse-Core? Not sure how to fix it?
-title: ''
-labels: 'Type: Assistance'
-assignees: ''
-
---
-
-<!-- Multiverse-Core help guide
-
-Don't write inside the arrows as they will be hidden when you post your issue.
-
-Get latest build from: http://ci.onarandombox.com/view/Multiverse/
-
-If you need help other submodules of Multiverse, go to their respective git repo:
-    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
-    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
-    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
-    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
-
-Or come join our Discord server to get help sooner: https://discord.gg/NZtfKky
-
-If you're happy to wait (or you were sent here from Discord), read on:
-
-1.  Check the Usage and FAQ pages to see if it answers your queries:
-      https://github.com/Multiverse/Multiverse-Core/wiki/Basics
-      https://github.com/Multiverse/Multiverse-Core/wiki/FAQ
-
-2.  Fill out the template.
-      This will help us understand what problem you've encountered and help us
-      find a solution.
-
-3.  When linking files, do not attach them to the post!
-      Copy and paste any logs into https://gist.github.com/ or other similar service.
-
-4.  Delete this line and all above lines before posting your issue!       -->
-
-### Information
-
-* **Server version:** <!-- Insert output of `/version` command -->
-
-* **Full output of `/mv version -p`:** <!-- Replace this with the command output's https://paste.gg/ link -->
-
-* **Server log:** <!-- Upload `logs/latest.log` to https://gist.github.com/ -->
-
-### Help request
-
-**Problem**
-<!-- What problem did you encounter? -->
-
-**What I have tried**
-<!-- What have you tried so far? -->
-
-**Screenshots**
-<!-- If relevant, include any screenshots here. -->
@@ -1,59 +0,0 @@
---
-name: 🐛 Report a Bug
-about: Report a Multiverse-Core bug. Only use this if you're 100% sure it's something wrong with Multiverse-Core - otherwise, try "Help!".
-title: ''
-labels: 'Bug: Unconfirmed'
-assignees: ''
-
---
-
-<!-- Multiverse-Core bug reporting guide
-
-Don't put anything inside this block, as it won't be included in the issue.
-
-Get latest build from: http://ci.onarandombox.com/view/Multiverse/
-
-If you are having issues with other submodules of Multiverse, go to their respective git repo:
-    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
-    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
-    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
-    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
-
-If you are reporting a bug, please follow the following steps:
-
-1.  Fill out the template in full.
-      Run the commands in the console. Don't just put "latest" as a version,
-      or we will ignore it.
-
-2.  When linking files, do not attach them to the post!
-      Copy and paste any logs into https://gist.github.com/, then paste a
-      link to them in the relevant parts of the template.
-      **DO NOT drag files into this box!**
-
-3.  Make sure not to write between the arrows, as anything there will be
-    hidden.
-
-4.  Delete this line and all above lines before posting your issue!       -->
-
-### Information
-
-* **Server version:** <!-- Insert output of `/version` command -->
-
-* **Full output of `/mv version -p`:** <!-- Replace this with the command output's https://paste.gg/ link -->
-
-* **Server log:** <!-- Upload `logs/latest.log` to https://gist.github.com/ -->
-
-### Details
-I was **`<able / not able>`** to reproduce my issue on a freshly setup and up-to-date server with the latest version of Multiverse plugins with no other plugins and with no kinds of other server or client mods.
-
-**Description**  
-<!-- Replace this with a brief summary of the bug. -->
-
-**Steps to reproduce**  
-<!-- Replace this with exactly what you did to cause the bug. -->
-
-**Expected behavior**  
-<!-- Replace this with what you expected to happen. -->
-
-**Screenshots**  
-<!-- Replace this with screenshots, if necessary. -->
@@ -1,54 +0,0 @@
---
-name: 💡 Request a Feature
-about: Suggest a feature you want to see in Multiverse-Core!
-title: ''
-labels: 'Type: Idea'
-assignees: ''
-
---
-
-<!-- Multiverse-Core feature request guide
-
-Fill out the template. Don't write inside the arrows as they will be hidden
-when you post your issue.
-
-Get latest build from: http://ci.onarandombox.com/view/Multiverse/
-
-If you are look for other submodules of Multiverse, go to their respective git repo:
-    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
-    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
-    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
-    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
-
-Not sure if your feature fits in Multiverse-Core? Feel free to ask on our Discord
-server: https://discord.gg/NZtfKky
-
-If you have a feature suggestion for Multiverse-Core, read the following tips:
-
-1.  Fill out the template.
-      This will help us understand what you're requesting and why you want us
-      to add it.
-
-2.  Keep it simple.
-      Make sure it's easy to understand what you're requesting. A good way is
-      to keep it to one request per GitHub issue, as we can then easily track
-      feature requests.
-
-3.  Check whether it has already been asked or added.
-      You can search the issue tracker to see if your feature has already been
-      requested at https://github.com/Multiverse/Multiverse-Core/issues.
-
-4.  Ask yourself: "Does this belong in Multiverse-Core?"
-      There are lots of features that we reject because most servers won't
-      need or use them. If your feature is very specific or already exists in
-      another plugin, it might not be a good fit for Multiverse-Core.
-
-5.  Delete this line and all above lines before posting your issue!       -->
-
-### Feature request
-
-**Feature description**
-<!-- What feature are you suggesting? -->
-
-**How the feature is useful**
-<!-- How is the feature useful to players, server owners and/or developers? -->
@@ -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 }}
@@ -43,3 +43,6 @@ debug.log
 # Doxygen
 /docs/html
 debug.txt
+
+# Gradle
+.gradle
@@ -1,6 +0,0 @@
-language: java
-jdk:
-  - oraclejdk8
-notifications:
-  email: false
-dist: trusty
@@ -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,16 +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"/>
@@ -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,411 +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>5.0.0-SNAPSHOT</version>
-    <name>Multiverse-Core</name>
-    <description>World Management Plugin</description>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.build.number>UNKNOWN</project.build.number>
-        <project.bitly-access-token>bitly-access-token</project.bitly-access-token>
-    </properties>
-
-    <repositories>
-        <!-- Spigot -->
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <id>onarandombox</id>
-            <url>http://repo.onarandombox.com/content/groups/public</url>
-        </repository>
-        <repository>
-            <id>spigot</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>
-        <repository>
-            <id>vault-repo</id>
-            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
-        </repository>
-        <repository>
-            <id>minebench-repo</id>
-            <url>https://repo.minebench.de/</url>
-        </repository>
-        <repository>
-            <id>CodeMC</id>
-            <url>https://repo.codemc.org/repository/maven-public</url>
-        </repository>
-        <repository>
-            <id>aikar</id>
-            <url>https://repo.aikar.co/content/groups/aikar/</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>
-        <profile>
-            <id>bitly</id>
-            <activation>
-                <property>
-                    <name>env.BITLY_ACCESS_TOKEN</name>
-                </property>
-            </activation>
-            <properties>
-                <project.bitly-access-token>${env.BITLY_ACCESS_TOKEN}</project.bitly-access-token>
-            </properties>
-        </profile>
-    </profiles>
-
-    <build>
-        <defaultGoal>clean package</defaultGoal>
-        <plugins>
-            <!-- Compiler -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>maven-replacer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>replace-bitly-access-token</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                        <configuration>
-                            <basedir>${project.build.sourceDirectory}</basedir>
-                            <includes>
-                                <include>com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java</include>
-                            </includes>
-                            <replacements>
-                                <replacement>
-                                    <token>bitly-access-token</token>
-                                    <value>${project.bitly-access-token}</value>
-                                </replacement>
-                            </replacements>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>replace-maven-version-number</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                        <configuration>
-                            <basedir>${project.build.directory}/classes</basedir>
-                            <includes>
-                                <include>plugin.yml</include>
-                            </includes>
-                            <replacements>
-                                <replacement>
-                                    <token>maven-version-number</token>
-                                    <value>${project.version}-b${project.build.number}</value>
-                                </replacement>
-                            </replacements>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- Jar Plugin -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M3</version>
-                <configuration>
-                    <parallel>methods</parallel>
-                    <threadCount>10</threadCount>
-                    <excludes>
-                        <exclude>**/TestCommandSender.java</exclude>
-                        <exclude>**/TestInstanceCreator.java</exclude>
-                    </excludes>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit47</artifactId>
-                        <version>3.0.0-M3</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.17</version>
-                <configuration>
-                    <enableRulesSummary>true</enableRulesSummary>
-                    <configLocation>${project.basedir}/config/mv_checks.xml</configLocation>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <executions>
-                    <execution>
-                        <id>javadoc-jar</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <failOnError>false</failOnError>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <relocations>
-                                <relocation>
-                                    <pattern>me.main__.util</pattern>
-                                    <shadedPattern>com.onarandombox.serializationconfig</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>buscript</pattern>
-                                    <shadedPattern>com.onarandombox.buscript</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bstats</pattern>
-                                    <shadedPattern>com.onarandombox.bstats</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.dumptruckman.minecraft.util.Logging</pattern>
-                                    <shadedPattern>com.onarandombox.MultiverseCore.utils.CoreLogging</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.dumptruckman.minecraft.util.DebugLog</pattern>
-                                    <shadedPattern>com.onarandombox.MultiverseCore.utils.DebugFileLogger</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.codehaus.jettison</pattern>
-                                    <shadedPattern>com.onarandombox.jettison</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>de.themoep.idconverter</pattern>
-                                    <shadedPattern>com.onarandombox.idconverter</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>co.aikar.commands</pattern>
-                                    <shadedPattern>com.onarandombox.acf</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>co.aikar.locales</pattern>
-                                    <shadedPattern>com.onarandombox.locales</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>se.eris</groupId>
-                <artifactId>notnull-instrumenter-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>instrument</goal>
-                            <goal>tests-instrument</goal>
-                        </goals>
-                        <configuration>
-                            <notNull>
-                                <param>org.jetbrains.annotations.NotNull</param>
-                                <param>javax.validation.constraints.NotNull</param>
-                            </notNull>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-           <groupId>org.bukkit</groupId>
-           <artifactId>bukkit</artifactId>
-           <version>1.13.2-R0.1-SNAPSHOT</version>
-           <scope>provided</scope>
-        </dependency>
-        <!-- SerializationConfig Dependency -->
-        <dependency>
-            <groupId>me.main__.util</groupId>
-            <artifactId>SerializationConfig</artifactId>
-            <version>1.7</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bukkit</groupId>
-                    <artifactId>bukkit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- End of SerializationConfig Dependency -->
-        <!-- Start of Economy Dependency -->
-        <dependency>
-            <groupId>net.milkbowl.vault</groupId>
-            <artifactId>VaultAPI</artifactId>
-            <version>1.7</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- End of Economy Dependency -->
-        <!-- Start of CommandHandler Dependency -->
-        <dependency>
-            <groupId>co.aikar</groupId>
-            <artifactId>acf-paper</artifactId>
-            <version>0.5.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.dumptruckman.minecraft</groupId>
-            <artifactId>buscript</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bstats</groupId>
-            <artifactId>bstats-bukkit</artifactId>
-            <version>1.8</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bukkit</groupId>
-                    <artifactId>bukkit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.dumptruckman.minecraft</groupId>
-            <artifactId>Logging</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>16.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>de.themoep.idconverter</groupId>
-            <artifactId>mappings</artifactId>
-            <version>1.2-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Start of Test Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>2.0.9</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-easymock</artifactId>
-            <version>2.0.9</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <version>2.0.9</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>4.0.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.4</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <distributionManagement>
-        <repository>
-            <id>benergy10</id>
-            <url>http://repo.benergy10.dev/repository/minecraft/</url>
-        </repository>
-        <snapshotRepository>
-            <id>benergy10</id>
-            <url>http://repo.benergy10.dev/repository/minecraft-snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
-</project>
@@ -0,0 +1,5 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+rootProject.name = 'Multiverse-Core'
@@ -3,7 +3,7 @@ package com.onarandombox.MultiverseCore;
 import java.util.Map;

 import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
+import com.onarandombox.MultiverseCore.api.MVConfig;
 import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
 import me.main__.util.SerializationConfig.NoSuchPropertyException;
 import me.main__.util.SerializationConfig.Property;
@@ -13,7 +13,7 @@ import org.bukkit.Bukkit;
 /**
 * Our configuration.
 */
-public class MultiverseCoreConfiguration extends SerializationConfig implements MultiverseCoreConfig {
+public class MultiverseCoreConfiguration extends SerializationConfig implements MVConfig {
    private static MultiverseCoreConfiguration instance;

    /**
@@ -35,6 +35,7 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     * 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!");
@@ -48,28 +49,20 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    @Property
    private volatile String prefixchatformat;
    @Property
-    private volatile boolean useasyncchat;
-    @Property
    private volatile boolean teleportintercept;
    @Property
    private volatile boolean firstspawnoverride;
    @Property
    private volatile boolean displaypermerrors;
    @Property
-    private volatile boolean enablebuscript;
-    @Property
    private volatile int globaldebug;
    @Property
    private volatile boolean silentstart;
    @Property
-    private volatile int messagecooldown;
-    @Property
    private volatile double version;
    @Property
    private volatile String firstspawnworld;
    @Property
-    private volatile int teleportcooldown;
-    @Property
    private volatile boolean defaultportalsearch;
    @Property
    private volatile int portalsearchradius;
@@ -95,19 +88,15 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    protected void setDefaults() {
        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
        enforceaccess = false;
-        useasyncchat = true;
-        prefixchat = true;
+        prefixchat = false;
        prefixchatformat = "[%world%]%chat%";
        teleportintercept = true;
        firstspawnoverride = true;
        displaypermerrors = true;
-        enablebuscript = true;
        globaldebug = 0;
-        messagecooldown = 5000;
-        teleportcooldown = 1000;
        this.version = 2.9;
        silentstart = false;
-        defaultportalsearch = false;
+        defaultportalsearch = true;
        portalsearchradius = 128;
        autopurge = true;
        idonotwanttodonate = false;
@@ -216,22 +205,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        return this.displaypermerrors;
    }

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getEnableBuscript() {
-        return this.enablebuscript;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setEnableBuscript(boolean enableBuscript) {
-        this.enablebuscript = enableBuscript;
-    }
-
    /**
     * {@inheritDoc}
     */
@@ -258,22 +231,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        Bukkit.getPluginManager().callEvent(new MVDebugModeEvent(globalDebug));
    }

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getMessageCooldown() {
-        return this.messagecooldown;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setMessageCooldown(int messageCooldown) {
-        this.messagecooldown = messageCooldown;
-    }
-
    /**
     * {@inheritDoc}
     */
@@ -306,32 +263,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        this.firstspawnworld = firstSpawnWorld;
    }

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getTeleportCooldown() {
-        return this.teleportcooldown;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setTeleportCooldown(int teleportCooldown) {
-        this.teleportcooldown = teleportCooldown;
-    }
-
-    @Override
-    public void setUseAsyncChat(boolean useAsyncChat) {
-        this.useasyncchat = useAsyncChat;
-    }
-
-    @Override
-    public boolean getUseAsyncChat() {
-        return this.useasyncchat;
-    }
-
    @Override
    public void setSilentStart(boolean silentStart) {
        Logging.setShowingConfig(!silentStart);
@@ -5,7 +5,7 @@
 * with this project.                                                         *
 ******************************************************************************/

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

 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
@@ -22,6 +22,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Level;

 /**
 * Manages anchors.
@@ -0,0 +1,4 @@
+/**
+ * this package contains the classes that are used for the anchor system.
+ */
+package com.onarandombox.MultiverseCore.anchor;
@@ -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();
+}
@@ -40,14 +40,6 @@ public interface LocationManipulation {
     */
    Location stringToLocation(String locationString);

-    /**
-     * Returns a colored string with x, y, z axis.
-     *
-     * @param l The {@link Location}
-     * @return The {@link String}
-     */
-    String strAxis(Location l);
-
    /**
     * Returns a colored string with the coords.
     *
@@ -1,36 +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.dumptruckman.minecraft.util.Logging;
-import org.bukkit.Server;
-
-import java.util.logging.Level;
-
-/**
- * A simple API to require plugins to have a log method.
- *
- * @deprecated Replaced by {@link Logging}.
- * */
-@Deprecated
-public interface LoggablePlugin {
-    /**
-     * Logs a message at the specified level.
-     *
-     * @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.
@@ -86,18 +62,6 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
     */
    boolean getDisplayPermErrors();

-    /**
-     * Sets enableBuscript.
-     * @param enableBuscript The new value.
-     */
-    void setEnableBuscript(boolean enableBuscript);
-
-    /**
-     * Gets enableBuscript.
-     * @return enableBuscript.
-     */
-    boolean getEnableBuscript();
-
    /**
     * Sets firstSpawnOverride.
     * @param firstSpawnOverride The new value.
@@ -158,18 +122,6 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
     */
    boolean getEnforceAccess();

-    /**
-     * Sets useasyncchat.
-     * @param useAsyncChat The new value.
-     */
-    void setUseAsyncChat(boolean useAsyncChat);
-
-    /**
-     * Gets useasyncchat.
-     * @return useasyncchat.
-     */
-    boolean getUseAsyncChat();
-
    /**
     * Sets whether to suppress startup messages.
     *
@@ -7,36 +7,22 @@

 package com.onarandombox.MultiverseCore.api;

-import buscript.Buscript;
+import com.onarandombox.MultiverseCore.anchor.AnchorManager;
 import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
-import com.onarandombox.MultiverseCore.destination.DestinationFactory;
-import com.onarandombox.MultiverseCore.utils.AnchorManager;
-import com.onarandombox.MultiverseCore.utils.MVEconomist;
+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.MVPlayerSession;
-import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety;
-import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
-import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
-import com.onarandombox.MultiverseCore.utils.VaultHandler;
-import org.bukkit.entity.Player;
+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 Core {
-
-    /**
-     * Returns the Vault handler used by Multiverse.  The returned object will have all methods necessary for
-     * interfacing with Vault.
-     *
-     * @return the Vault handler for Multiverse.
-     * @deprecated we are now using {@link #getEconomist()} for all economy needs.
-     */
-    @Deprecated
-    VaultHandler getVaultHandler();
-
+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.
@@ -52,23 +38,11 @@ public interface Core {
    void loadConfigs();

    /**
-     * Gets the Multiverse message system. This allows you to send messages
-     * to users at specified intervals.
+     * Gets the {@link UnsafeCallWrapper} class.
     *
-     * @return The loaded {@link MultiverseMessaging}.
+     * @return A non-null {@link UnsafeCallWrapper}.
     */
-    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);
+    UnsafeCallWrapper getUnsafeCallWrapper();

    /**
     * Multiverse uses an advanced permissions setup, this object
@@ -87,12 +61,12 @@ public interface Core {
    MVCommandManager getMVCommandManager();

    /**
-     * Gets the factory class responsible for loading many different destinations
+     * Gets the class responsible for loading many different destinations
     * on demand.
     *
-     * @return A valid {@link DestinationFactory}.
+     * @return A valid {@link DestinationsProvider}.
     */
-    DestinationFactory getDestFactory();
+    DestinationsProvider getDestinationsProvider();

    /**
     * Gets the primary class responsible for managing Multiverse Worlds.
@@ -101,12 +75,19 @@ public interface Core {
     */
    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 saveMVConfigs();
+    boolean saveAllConfigs();

    /**
     * Gets the {@link AnchorManager}.
@@ -133,22 +114,15 @@ public interface 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.
+     * 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 Core} is using.
+     * Sets the {@link BlockSafety} this {@link MVCore} is using.
     * @param blockSafety The new {@link BlockSafety}.
     * @see BlockSafety
     * @see SimpleBlockSafety
@@ -156,15 +130,15 @@ public interface Core {
    void setBlockSafety(BlockSafety blockSafety);

    /**
-     * Gets the {@link LocationManipulation} this {@link Core} is using.
-     * @return The {@link LocationManipulation} this {@link Core} is using.
+     * 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 Core} is using.
+     * Sets the {@link LocationManipulation} this {@link MVCore} is using.
     * @param locationManipulation The new {@link LocationManipulation}.
     * @see LocationManipulation
     * @see SimpleLocationManipulation
@@ -172,15 +146,15 @@ public interface Core {
    void setLocationManipulation(LocationManipulation locationManipulation);

    /**
-     * Gets the {@link SafeTTeleporter} this {@link Core} is using.
-     * @return The {@link SafeTTeleporter} this {@link Core} is using.
+     * 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 Core} is using.
+     * Sets the {@link SafeTTeleporter} this {@link MVCore} is using.
     * @param safeTTeleporter The new {@link SafeTTeleporter}.
     * @see SafeTTeleporter
     * @see SimpleSafeTTeleporter
@@ -188,15 +162,8 @@ public interface Core {
    void setSafeTTeleporter(SafeTTeleporter safeTTeleporter);

    /**
-     * Gets the {@link MultiverseCoreConfig}.
+     * Gets the {@link MVConfig}.
     * @return The configuration.
     */
-    MultiverseCoreConfig getMVConfig();
-
-    /**
-     * Gets the buscript object for Multiverse.  This is what handles Javascript processing.
-     *
-     * @return The Multiverse buscript object.
-     */
-    Buscript getScriptAPI();
+    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 com.onarandombox.MultiverseCore}.
     */
-    MultiverseCore getCore();
-
-    /**
-     * Sets the reference to MultiverseCore.
-     *
-     * @param core A valid {@link com.onarandombox.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,8 +7,12 @@

 package com.onarandombox.MultiverseCore.api;

-import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
+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;
@@ -19,13 +23,10 @@ import org.bukkit.WorldType;
 import org.bukkit.permissions.Permission;
 import org.jetbrains.annotations.Nullable;

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

    /**
-     * Adds a value to the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
+     * Adds a value to the given property. The property must be a {@link 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.
@@ -167,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.
@@ -179,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.
     */
@@ -279,7 +280,7 @@ public interface MultiverseWorld {
     * @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);
@@ -651,13 +652,6 @@ public interface MultiverseWorld {
     */
    List<String> getWorldBlacklist();

-    /**
-     * Gets all the names of all properties that can be SET.
-     *
-     * @return All property names in list.
-     */
-    Collection<String> getAllPropertyTypes();
-
    /**
     * Gets all the names of all properties that can be SET.
     *
@@ -7,19 +7,17 @@

 package com.onarandombox.MultiverseCore.api;

-import com.onarandombox.MultiverseCore.enums.WorldValidationResult;
-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>
@@ -60,18 +58,6 @@ public interface MVWorldManager {
    boolean addWorld(String name, Environment env, String seedString, WorldType type, Boolean generateStructures,
                     String generator, boolean useSpawnAdjust);

-    /**
-     * Make a copy of a world.
-     *
-     * @param oldName            Name of world to be copied
-     * @param newName            Name of world to be created
-     * @param generator          The Custom generator plugin to use. Ignored.
-     * @return True if the world is copied successfully, false if not.
-     * @deprecated Use {@link #cloneWorld(String, String)} instead.
-     */
-    @Deprecated
-    boolean cloneWorld(String oldName, String newName, String generator);
-
    /**
     * Make a copy of a world.
     *
@@ -161,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.
@@ -192,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.
@@ -214,19 +221,9 @@ public interface MVWorldManager {
     */
    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
@@ -239,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.
@@ -286,22 +283,35 @@ 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.
+     * @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);
    
    /**
@@ -317,18 +327,9 @@ public interface MVWorldManager {
    boolean hasUnloadedWorld(String name, boolean includeLoaded);

    /**
-     * Check if a world name is a possible importable world folder.
+     * Get all the possible worlds that Multiverse has detected to be importable.
     *
-     * @param worldName Name of the world you want to check.
-     * @return True if world is valid, false otherwise.
+     * @return A collection of world names that are deemed importable.
     */
-    boolean isValidWorld(String worldName);
-
-    /**
-     * Check if a world name is a possible importable world folder.
-     *
-     * @param worldName Name of the world you want to check.
-     * @return WorldValidationResult.VALID if world is valid, else the reason why its not valid.
-     */
-    WorldValidationResult validateWorld(String worldName);
+    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,136 +0,0 @@
-package com.onarandombox.MultiverseCore.api;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.utils.DebugLog;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.logging.Level;
-
-/**
- * Make things easier for MV-Plugins!
- */
-public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
-    private MultiverseCore core;
-    /**
-     * Prefix for standard log entrys.
-     */
-    protected String logTag;
-    private DebugLog debugLog;
-
-    /**
-     * {@inheritDoc}
-     *
-     * Note: You can't override this, use {@link #onPluginEnable()} instead!
-     * @see #onPluginEnable()
-     */
-    @Override
-    public final void onEnable() {
-        MultiverseCore theCore = (MultiverseCore) this.getServer().getPluginManager().getPlugin("Multiverse-Core");
-        if (theCore == null) {
-            this.getLogger().severe("Core not found! The plugin dev needs to add a dependency!");
-            this.getLogger().severe("Disabling!");
-            this.getServer().getPluginManager().disablePlugin(this);
-            return;
-        }
-        if (theCore.getProtocolVersion() < this.getProtocolVersion()) {
-            this.getLogger().severe("You need a newer version of Multiverse-Core!");
-            this.getLogger().severe("Disabling!");
-            this.getServer().getPluginManager().disablePlugin(this);
-            return;
-        }
-        this.setCore(theCore);
-
-        this.getServer().getLogger().info(String.format("%s - Version %s enabled - By %s",
-                this.getDescription().getName(), this.getDescription().getVersion(), getAuthors()));
-        getDataFolder().mkdirs();
-        File debugLogFile = new File(getDataFolder(), "debug.log");
-        try {
-            debugLogFile.createNewFile();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        debugLog = new DebugLog(this.getDescription().getName(), getDataFolder() + File.separator + "debug.log");
-        debugLog.setTag(String.format("[%s-Debug]", this.getDescription().getName()));
-
-        this.onPluginEnable();
-    }
-
-    /**
-     * Parse the Authors Array into a readable String with ',' and 'and'.
-     *
-     * @return The readable authors-{@link String}
-     */
-    protected String getAuthors() {
-        String authors = "";
-        List<String> auths = this.getDescription().getAuthors();
-        if (auths.size() == 0) {
-            return "";
-        }
-
-        if (auths.size() == 1) {
-            return auths.get(0);
-        }
-
-        for (int i = 0; i < auths.size(); i++) {
-            if (i == this.getDescription().getAuthors().size() - 1) {
-                authors += " and " + this.getDescription().getAuthors().get(i);
-            } else {
-                authors += ", " + this.getDescription().getAuthors().get(i);
-            }
-        }
-        return authors.substring(2);
-    }
-
-    /**
-     * Called when the plugin is enabled.
-     * @see #onEnable()
-     */
-    protected abstract void onPluginEnable();
-
-    @Override
-    public void log(Level level, String msg) {
-        int debugLevel = this.getCore().getMVConfig().getGlobalDebug();
-        if ((level == Level.FINE && debugLevel >= 1) || (level == Level.FINER && debugLevel >= 2)
-                || (level == Level.FINEST && debugLevel >= 3)) {
-            debugLog.log(level, msg);
-        } else if (level != Level.FINE && level != Level.FINER && level != Level.FINEST) {
-            String message = new StringBuilder(getLogTag()).append(msg).toString();
-            this.getServer().getLogger().log(level, message);
-            debugLog.log(level, message);
-        }
-    }
-
-    private String getLogTag() {
-        if (logTag == null)
-            logTag = String.format("[%s]", this.getDescription().getName());
-        return logTag;
-    }
-
-    /**
-     * Sets the debug log-tag.
-     * @param tag The new tag.
-     */
-    protected final void setDebugLogTag(String tag) {
-        this.debugLog.setTag(tag);
-    }
-
-    @Override
-    public final String dumpVersionInfo(String buffer) {
-        throw new UnsupportedOperationException("This is gone.");
-    }
-
-    @Override
-    public final MultiverseCore getCore() {
-        if (this.core == null)
-            throw new IllegalStateException("Core is null!");
-        return this.core;
-    }
-
-    @Override
-    public final void setCore(MultiverseCore core) {
-        this.core = core;
-    }
-}
@@ -1,13 +0,0 @@
-package com.onarandombox.MultiverseCore.api;
-
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
-
-public interface PermissionsInterface {
-    public boolean hasPermission(CommandSender sender, String node, boolean isOpRequired);
-
-    public boolean hasAnyPermission(CommandSender sender, List<String> allPermissionStrings, boolean opRequired);
-
-    public boolean hasAllPermission(CommandSender sender, List<String> allPermissionStrings, boolean opRequired);
-}
@@ -1,11 +1,12 @@
 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.
 */
@@ -31,12 +32,12 @@ public interface SafeTTeleporter extends Teleporter {
     * 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 extends Teleporter {
    /**
     * 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}.
@@ -1,10 +1,18 @@
 package com.onarandombox.MultiverseCore.api;

-import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.enums.TeleportResult;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+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 {
-    TeleportResult teleport(CommandSender teleporter, Player teleportee, MVDestination destination);
+    /**
+     * 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);
 }
@@ -12,39 +12,39 @@ public interface WorldPurger {
    /**
     * Synchronizes the given worlds with their settings.
     *
-     * @param worlds A list of {@link MultiverseWorld}
+     * @param worlds A list of {@link MVWorld}
     */
-    void purgeWorlds(List<MultiverseWorld> worlds);
+    void purgeWorlds(List<MVWorld> worlds);

    /**
-     * Convenience method for {@link #purgeWorld(MultiverseWorld, java.util.List, boolean, boolean)} that takes the settings from the world-config.
+     * Convenience method for {@link #purgeWorld(MVWorld, java.util.List, boolean, boolean)} that takes the settings from the world-config.
     *
-     * @param world The {@link MultiverseWorld}.
+     * @param world The {@link MVWorld}.
     */
-    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.
@@ -64,5 +64,5 @@ public interface WorldPurger {
     * @param e The creature.
     * @return {@code true} if the creature should be killed, otherwise {@code false}.
     */
-    boolean shouldWeKillThisCreature(MultiverseWorld w, Entity e);
+    boolean shouldWeKillThisCreature(MVWorld w, Entity e);
 }
@@ -1,133 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.Single;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.PageFilter;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import com.onarandombox.MultiverseCore.displaytools.DisplaySettings;
-import com.onarandombox.MultiverseCore.utils.AnchorManager;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-@CommandAlias("mv")
-@Subcommand("anchors")
-public class AnchorCommand extends MultiverseCoreCommand {
-
-    private final AnchorManager anchorManager;
-
-    public AnchorCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.anchorManager = plugin.getAnchorManager();
-    }
-
-    @Subcommand("create")
-    @CommandPermission("multiverse.core.anchor.create")
-    @Syntax("<name>")
-    @Description("Create a new anchor point.")
-    public void onCreateAnchorCommand(@NotNull Player player,
-
-                                      @NotNull
-                                      @Syntax("<name>")
-                                      @Description("Name of your new anchor.")
-                                      @Flags("type=anchor name")
-                                      @Single String anchorName) {
-
-        player.sendMessage((this.plugin.getAnchorManager().saveAnchorLocation(anchorName, player.getLocation()))
-
-                ? String.format("Anchor '%s%s%s' was successfully %s created!",
-                ChatColor.AQUA, anchorName, ChatColor.WHITE, ChatColor.GREEN)
-
-                : String.format("%sThere was an error creating anchor '%s'! Check console for errors.",
-                ChatColor.RED, anchorName));
-
-    }
-
-    @Subcommand("delete")
-    @CommandPermission("multiverse.core.anchor.delete")
-    @Syntax("<anchor>")
-    @CommandCompletion("@anchors")
-    @Description("Delete an existing anchor point.")
-    public void onDeleteAnchorCommand(@NotNull CommandSender sender,
-
-                                      @NotNull
-                                      @Syntax("<name>")
-                                      @Description("Name of anchor you want to delete.")
-                                      @Flags("type=anchor name")
-                                      @Single String anchorName) {
-
-        sender.sendMessage((this.plugin.getAnchorManager().deleteAnchor(anchorName))
-
-                ? String.format("Anchor '%s%s%s' was successfully %s deleted!",
-                ChatColor.AQUA, anchorName, ChatColor.WHITE, ChatColor.RED)
-
-                : String.format("%sThere was an error deleting anchor '%s'! Check console for errors.",
-                ChatColor.RED, anchorName));
-    }
-
-    @Subcommand("list")
-    @CommandPermission("multiverse.core.anchor.list")
-    @Syntax("[filter] [page]")
-    @Description("View a list of current anchors.")
-    public void onListAnchorCommand(@NotNull CommandSender sender,
-                                    @NotNull PageFilter pageFilter) {
-
-        new ContentDisplay.Builder<Collection<String>>()
-                .sender(sender)
-                .header("%s====[ Multiverse Anchor List ]====", ChatColor.LIGHT_PURPLE)
-                .contents(buildAnchorList(sender))
-                .emptyMessage("You do not any anchors set. See /mv anchors create to get started!")
-                .displayHandler(DisplayHandlers.PAGE_LIST)
-                .colorTool(ColorAlternator.with(ChatColor.YELLOW, ChatColor.DARK_AQUA))
-                .setting(DisplaySettings.SHOW_PAGE, pageFilter.getPage())
-                .display();
-    }
-
-    private List<String> buildAnchorList(@NotNull CommandSender sender) {
-        Set<String> anchors = (sender instanceof Player)
-                ? this.anchorManager.getAnchors((Player) sender)
-                : this.anchorManager.getAllAnchors();
-
-        List<String> anchorContent = new ArrayList<>();
-        for (String anchor : anchors) {
-            Location anchorLocation = this.anchorManager.getAnchorLocation(anchor);
-            World world = anchorLocation.getWorld(); // this.plugin.getMVWorldManager().getMVWorld();
-
-            String locationString = ChatColor.RED + "!!INVALID!!";
-            if (world != null) {
-                MultiverseWorld mvWorld = this.plugin.getMVWorldManager().getMVWorld(world);
-                locationString = (mvWorld == null)
-                        ? String.format("%s%s !!NOT MULTIVERSE WORLD!!", ChatColor.RED, world.getName())
-                        : String.format("%s - %s", mvWorld.getColoredWorldString(), this.plugin.getLocationManipulation().strAxis(anchorLocation));
-            }
-            anchorContent.add(String.format("%s: %s", anchor, locationString));
-        }
-
-        return anchorContent;
-    }
-}
@@ -1,64 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.commandtools.context.RequiredPlayer;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-@CommandAlias("mv")
-public class BedCommand extends MultiverseCoreCommand {
-
-    public BedCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("bed")
-    @CommandPermission("multiverse.core.bed.self")
-    @Description("Takes your current respawn point.")
-    public void onBedCommand(@NotNull Player player) {
-        doBedRespawn(player, player);
-    }
-
-    @Subcommand("bed")
-    @CommandPermission("multiverse.core.bed.other")
-    @Syntax("[player]")
-    @CommandCompletion("@players")
-    @Description("Takes another player to their respawn location.")
-    public void onOtherBedCommand(@NotNull CommandSender sender,
-
-                                  @Syntax("[player]")
-                                  @Description("Target player to teleport to respawn location.")
-                                  @NotNull RequiredPlayer player) {
-
-        doBedRespawn(sender, player.get());
-    }
-
-    private void doBedRespawn(@NotNull CommandSender sender,
-                              @NotNull Player player) {
-
-        Location bedLocation = player.getBedSpawnLocation();
-        if (bedLocation == null) {
-            sender.sendMessage(String.format("%sYou do not have a respawn point set!", ChatColor.RED));
-            return;
-        }
-        sender.sendMessage((player.teleport(bedLocation))
-                ? "You have been teleported to your respawn point!"
-                : String.format("%sThere was an error teleporting you to your respawn point.", ChatColor.RED));
-    }
-}
@@ -1,12 +1,6 @@
-/******************************************************************************
- * 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.commands;

+import co.aikar.commands.BukkitCommandIssuer;
 import co.aikar.commands.annotation.CommandAlias;
 import co.aikar.commands.annotation.CommandCompletion;
 import co.aikar.commands.annotation.CommandPermission;
@@ -14,35 +8,33 @@ 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.commandtools.context.RequiredPlayer;
-import org.bukkit.command.CommandSender;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

@CommandAlias("mv")
 public class CheckCommand extends MultiverseCoreCommand {
-
-    public CheckCommand(MultiverseCore plugin) {
+    public CheckCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
    }

    @Subcommand("check")
-    @CommandPermission("multiverse.core.debug")
+    @CommandPermission("multiverse.core.check")
+    @CommandCompletion("@players @destinations|@mvworlds")
    @Syntax("<player> <destination>")
-    @CommandCompletion("@players @destinations|@MVWorlds")
-    @Description("Checks to see if a player can go to a destination. Prints debug if false.")
-    public void onCheckCommand(@NotNull CommandSender sender,
+    @Description("Checks if a player can teleport to a destination.")
+    public void onCheckCommand(BukkitCommandIssuer issuer,

-                               @NotNull
                               @Syntax("<player>")
                               @Description("Player to check destination on.")
-                               RequiredPlayer player,
+                               Player player,

-                               @NotNull
                               @Syntax("<destination>")
                               @Description("A destination location, e.g. a world name.")
-                               MVDestination destination) {
-
-        this.plugin.getMVPerms().tellMeWhyICantDoThis(sender, player.get(), destination);
+                               ParsedDestination<?> destination
+    ) {
+        issuer.sendMessage("Checking " + player + " to " + destination + "...");
+        //TODO More detailed output on permissions required.
+        this.plugin.getDestinationsProvider().checkTeleportPermissions(issuer, player, destination);
    }
 }
@@ -1,52 +1,48 @@
-/******************************************************************************
- * 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.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.Flags;
 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.jetbrains.annotations.NotNull;

@CommandAlias("mv")
 public class CloneCommand extends MultiverseCoreCommand {
-
-    public CloneCommand(MultiverseCore plugin) {
+    public CloneCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
    }

    @Subcommand("clone")
    @CommandPermission("multiverse.core.clone")
-    @Syntax("<world> <name>")
-    @CommandCompletion("@MVWorlds|@unloadedWorlds @empty")
+    @CommandCompletion("@mvworlds:scope=both @empty")
+    @Syntax("<world> <new world name>")
    @Description("Clones a world.")
-    public void onCloneCommand(@NotNull CommandSender sender,
+    public void onCloneCommand(CommandIssuer issuer,

-                               @NotNull
+                               @Conditions("validWorldName:scope=both")
                               @Syntax("<world>")
-                               @Description("Current multiverse world.")
-                               @Conditions("isWorldInConfig") String worldName,
+                               @Description("The target world to clone.")
+                               String worldName,

-                               @NotNull
-                               @Syntax("<name>")
-                               @Description("New cloned world name.")
-                               @Single @Flags("trim") @Conditions("creatableWorldName") String newWorldName) {
+                               @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));

-        sender.sendMessage((this.plugin.getMVWorldManager().cloneWorld(worldName, newWorldName))
-                ? String.format("%sWorld cloned!", ChatColor.GREEN)
-                : String.format("%sWorld could not be cloned! See console for more details.", ChatColor.RED));
+        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,94 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.Single;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import co.aikar.commands.annotation.Values;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.ContentFilter;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Map;
-
-@CommandAlias("mv")
-@Subcommand("config")
-@CommandPermission("multiverse.core.config")
-public class ConfigCommand extends MultiverseCoreCommand {
-
-    public ConfigCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("list")
-    @Syntax("[filter]")
-    @Description("Show multiverse config values.")
-    public void onShowCommand(@NotNull CommandSender sender,
-                              @NotNull ContentFilter filter) {
-
-        new ContentDisplay.Builder<Map<String, Object>>()
-                .sender(sender)
-                .header("%s===[ Multiverse Config ]===", ChatColor.LIGHT_PURPLE)
-                .contents(this.plugin.getMVConfig().serialize())
-                .emptyMessage("No config values found.")
-                .displayHandler(DisplayHandlers.INLINE_MAP)
-                .colorTool(ColorAlternator.with(ChatColor.GREEN, ChatColor.GOLD))
-                .filter(filter)
-                .display();
-    }
-
-    @Subcommand("set")
-    @Syntax("<property> <value>")
-    @CommandCompletion("@MVConfigs")
-    @Description("Set Global MV Variables.")
-    public void onSetCommand(@NotNull CommandSender sender,
-
-                             @NotNull
-                             @Syntax("<property>")
-                             @Description("Config option.")
-                             @Values("@MVConfigs") String property,
-
-                             @NotNull
-                             @Syntax("<value>")
-                             @Description("New value for the given config option.")
-                             @Single String value) {
-
-        property = property.toLowerCase();
-
-        if (!this.plugin.getMVConfig().setConfigProperty(property, value)) {
-            sender.sendMessage(String.format("%sSetting '%s' to '%s' failed!", ChatColor.RED, property, value));
-            return;
-        }
-
-        if (!this.plugin.saveMVConfigs()) {
-            sender.sendMessage(String.format("%sFailed to save config! Check your console for details.", ChatColor.RED));
-            return;
-        }
-
-        // special rule, don't forget to set the world!
-        //TODO API: Potentially should move to MultiverseCore#loadConfigs method
-        if (property.equalsIgnoreCase("firstspawnworld")) {
-            this.plugin.getMVWorldManager().setFirstSpawnWorld(value);
-        }
-
-        sender.sendMessage(String.format("%sSuccess! %sConfig option %s%s %sis now set to %s%s%s.",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, property, ChatColor.WHITE, ChatColor.GREEN, value, ChatColor.WHITE));
-
-        this.plugin.loadConfigs();
-    }
-}
@@ -1,31 +1,23 @@
-/******************************************************************************
- * 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.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.jetbrains.annotations.NotNull;

@CommandAlias("mv")
 public class ConfirmCommand extends MultiverseCoreCommand {
-
-    public ConfirmCommand(MultiverseCore plugin) {
+    public ConfirmCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
    }

    @Subcommand("confirm")
    @CommandPermission("multiverse.core.confirm")
    @Description("Confirms dangerous commands before executing them.")
-    public void onConfirmCommand(@NotNull CommandSender sender) {
-        this.plugin.getMVCommandManager().getQueueManager().runQueuedCommand(sender);
+    public void onConfirmCommand(@NotNull BukkitCommandIssuer issuer) {
+        this.plugin.getMVCommandManager().getCommandQueueManager().runQueuedCommand(issuer.getIssuer());
    }
 }
@@ -1,75 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-@CommandAlias("mv")
-public class CoordCommand extends MultiverseCoreCommand {
-
-    public CoordCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("coord|coordinate")
-    @CommandPermission("multiverse.core.coord.self")
-    @Description("Detailed information on your own where abouts.")
-    public void onCoordCommand(@NotNull Player player) {
-        showCoordInfo(player, player);
-    }
-
-    @Subcommand("coord|coordinate")
-    @CommandPermission("multiverse.core.coord.other")
-    @Syntax("[player]")
-    @CommandCompletion("@players")
-    @Description("Detailed information on the player's where abouts.")
-    public void onOtherCoordCommand(@NotNull CommandSender sender,
-
-                                    @NotNull
-                                    @Syntax("[player]")
-                                    @Description("Player you want coordinate info of.")
-                                    RequiredPlayer player) {
-
-        showCoordInfo(sender, player.get());
-    }
-
-    private void showCoordInfo(@NotNull CommandSender sender,
-                               @NotNull Player player) {
-
-        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(player.getWorld());
-        if (world == null) {
-            throw new InvalidCommandArgument("Player is not in a multiverse world.");
-        }
-
-        String name = player.equals(sender)
-                ? ""
-                : String.format("for %s%s%s",ChatColor.YELLOW, player.getName(), ChatColor.AQUA);
-
-        sender.sendMessage(String.format("%s--- Location Information %s---", ChatColor.AQUA, name));
-        sender.sendMessage(String.format("%sWorld: %s%s", ChatColor.AQUA, ChatColor.WHITE,  world.getName()));
-        sender.sendMessage(String.format("%sAlias: %s%s", ChatColor.AQUA, ChatColor.WHITE,  world.getColoredWorldString()));
-        sender.sendMessage(String.format("%sWorld Scale: %s%s", ChatColor.AQUA, ChatColor.WHITE, world.getScaling()));
-        sender.sendMessage(String.format("%sCoordinates: %s%s", ChatColor.AQUA, ChatColor.WHITE, this.plugin.getLocationManipulation().strCoords(player.getLocation())));
-        sender.sendMessage(String.format("%sWorld Scale: %s%s", ChatColor.AQUA, ChatColor.WHITE, world.getScaling()));
-        sender.sendMessage(String.format("%sDirection: %s%s", ChatColor.AQUA, ChatColor.WHITE, this.plugin.getLocationManipulation().getDirection(player.getLocation())));
-        sender.sendMessage(String.format("%sBlock: %s%s", ChatColor.AQUA, ChatColor.WHITE, world.getCBWorld().getBlockAt(player.getLocation()).getType()));
-    }
-}
@@ -1,83 +1,127 @@
-/******************************************************************************
- * 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.commands;

+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;
+
+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.Flags;
+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.flag.FlagGroup;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult;
-import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
+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;
-import org.jetbrains.annotations.Nullable;
-
-import static org.bukkit.World.*;

@CommandAlias("mv")
 public class CreateCommand extends MultiverseCoreCommand {
-
-    public CreateCommand(MultiverseCore plugin) {
+    public CreateCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setFlagGroup(FlagGroup.of(
-                CoreFlags.WORLD_TYPE,
-                CoreFlags.SEED,
-                CoreFlags.GENERATOR,
-                CoreFlags.GENERATE_STRUCTURES,
-                CoreFlags.SPAWN_ADJUST
-        ));
+
+        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());
    }

    @Subcommand("create")
    @CommandPermission("multiverse.core.create")
-    @Syntax("<name> <env> -s [seed] -g [generator[:id]] -t [worldtype] [-n] -a [true|false]")
-    @CommandCompletion("@empty @environments @flags")
-    @Description("Creates a new world and loads it.")
-    public void onCreateCommand(@NotNull CommandSender sender,
+    @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,

-                                @NotNull
+                                @Conditions("validWorldName:scope=new")
                                @Syntax("<name>")
-                                @Description("New world name.")
-                                @Flags("trim")
-                                @Conditions("creatableWorldName") String worldName,
+                                @Description("{@@mv-core.create.name.description}")
+                                String worldName,

-                                @NotNull
-                                @Syntax("<env>")
-                                @Description("The world's environment. See: /mv env")
-                                Environment environment,
+                                @Syntax("<environment>")
+                                @Description("{@@mv-core.create.environment.description}")
+                                World.Environment environment,

-                                @Nullable
-                                @Syntax("[world-flags]")
-                                @Description("Other world settings. See: http://gg.gg/nn8bl")
-                                String[] flagsArray) {
+                                @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);

-        FlagResult flags = this.getFlagGroup().calculateResult(flagsArray);
+        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")));

-        Command.broadcastCommandMessage(sender, String.format("Starting creation of world '%s'...", worldName));
-        Command.broadcastCommandMessage(sender, (this.plugin.getMVWorldManager().addWorld(
+        issuer.sendInfo(MVCorei18n.CREATE_LOADING);
+
+        if (!worldManager.addWorld(
                worldName,
                environment,
-                // TODO API: Should Allow FlagResult object to be passed directly
-                flags.getValue(CoreFlags.SEED),
-                flags.getValue(CoreFlags.WORLD_TYPE),
-                flags.getValue(CoreFlags.GENERATE_STRUCTURES),
-                flags.getValue(CoreFlags.GENERATOR),
-                flags.getValue(CoreFlags.SPAWN_ADJUST))
-        )
-                ? String.format("%sComplete!", ChatColor.GREEN)
-                : String.format("%sFailed! See console for errors.", ChatColor.RED));
+                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;
+        }
+        issuer.sendInfo(MVCorei18n.CREATE_SUCCESS, "{worldName}", worldName);
    }
 }
@@ -1,91 +1,53 @@
-/******************************************************************************
- * 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.commands;

-import co.aikar.commands.InvalidCommandArgument;
+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.Single;
 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 com.onarandombox.MultiverseCore.locale.MVCorei18n;
 import org.jetbrains.annotations.NotNull;

@CommandAlias("mv")
-@CommandPermission("multiverse.core.debug")
 public class DebugCommand extends MultiverseCoreCommand {
-
-    public DebugCommand(MultiverseCore plugin) {
+    public DebugCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
    }

    @Subcommand("debug")
    @CommandPermission("multiverse.core.debug")
-    @Description("Show the current debug level.")
-    public void onShowDebugCommand(@NotNull CommandSender sender) {
-        displayDebugMode(sender);
+    @Description("{@@mv-core.debug.info.description}")
+    public void onShowDebugCommand(BukkitCommandIssuer issuer) {
+        this.displayDebugMode(issuer);
    }

    @Subcommand("debug")
    @CommandPermission("multiverse.core.debug")
-    @Syntax("<level>")
-    @CommandCompletion("@toggles|@range:3")
-    @Description("Change debug level.")
-    public void onChangeDebugCommand(@NotNull CommandSender sender,
+    @CommandCompletion("@range:3")
+    @Syntax("<{@@mv-core.debug.change.syntax}>")
+    @Description("{@@mv-core.debug.change.description}")
+    public void onChangeDebugCommand(BukkitCommandIssuer issuer,

-                                     @NotNull
-                                     @Syntax("<level>")
-                                     @Description("Set debug mode level, 0 to 3.")
-                                     @Single String debugLevel) {
+                                     @Syntax("<{@@mv-core.debug.change.syntax}>")
+                                     @Description("{@@mv-core.debug.change.level.description}")
+                                     int level) {

-        int parsedLevel = parseDebugLevel(debugLevel);
-        if (parsedLevel == -1) {
-            throw new InvalidCommandArgument("No such debug level. Please use a number from 0 to 3.");
-        }
-
-        this.plugin.getMVConfig().setGlobalDebug(parsedLevel);
-        if (!this.plugin.saveMVConfigs()) {
-            sender.sendMessage(String.format("%sError saving changes to config! See console for more info.", ChatColor.RED));
-        }
-
-        displayDebugMode(sender);
+        this.plugin.getMVConfig().setGlobalDebug(level);
+        this.plugin.saveAllConfigs();
+        this.displayDebugMode(issuer);
    }

-    private int parseDebugLevel(@NotNull String debugLevel) {
-        if (debugLevel.equalsIgnoreCase("off")) {
-            return 0;
-        }
-        if (debugLevel.equalsIgnoreCase("on")) {
-            return 1;
-        }
-
-        try {
-            int parsedLevel = Integer.parseInt(debugLevel);
-            return (parsedLevel > 3 || parsedLevel < 0) ? -1 : parsedLevel;
-        }
-        catch (NumberFormatException ignored) {
-            return -1;
-        }
-    }
-
-    private void displayDebugMode(@NotNull CommandSender sender) {
-        int debugLevel = this.plugin.getMVConfig().getGlobalDebug();
+    private void displayDebugMode(BukkitCommandIssuer issuer) {
+        final int debugLevel = this.plugin.getMVConfig().getGlobalDebug();
        if (debugLevel == 0) {
-            sender.sendMessage(String.format("Multiverse Debug mode is %soff", ChatColor.RED));
-        }
-        else {
-            sender.sendMessage(String.format("Multiverse Debug mode at level %s%s", ChatColor.GREEN, debugLevel));
-            Logging.fine("Multiverse debug mode enabled!");
+            issuer.sendInfo(MVCorei18n.DEBUG_INFO_OFF);
+            return;
        }
+        issuer.sendInfo(MVCorei18n.DEBUG_INFO_ON, "{level}", String.valueOf(debugLevel));
+        Logging.fine("Multiverse Debug ENABLED.");
    }
 }
@@ -1,64 +1,49 @@
-/******************************************************************************
- * 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.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.Flags;
 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.jetbrains.annotations.NotNull;

@CommandAlias("mv")
 public class DeleteCommand extends MultiverseCoreCommand {
-
-    public DeleteCommand(MultiverseCore plugin) {
+    public DeleteCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
    }

    @Subcommand("delete")
    @CommandPermission("multiverse.core.delete")
+    @CommandCompletion("@mvworlds:scope=both")
    @Syntax("<world>")
-    @CommandCompletion("@MVWorlds|@unloadedWorlds")
    @Description("Deletes a world on your server PERMANENTLY.")
-    public void onDeleteCommand(@NotNull CommandSender sender,
+    public void onDeleteCommand(BukkitCommandIssuer issuer,

-                                @NotNull
+                                @Single
+                                @Conditions("validWorldName:scope=both")
                                @Syntax("<world>")
-                                @Description("Multiverse world you want to delete.")
-                                @Flags("trim")
-                                @Conditions("isWorldInConfig|validWorldFolder")
-                                @Single String worldName) {
-
-        this.plugin.getMVCommandManager().getQueueManager().addToQueue(new QueuedCommand.Builder()
-                .sender(sender)
-                .action(deleteRunnable(sender, worldName))
-                .prompt("Are you sure you want to delete world '%s'?", worldName)
-                .build()
-        );
-    }
-
-    private Runnable deleteRunnable(@NotNull CommandSender sender,
-                                    @NotNull String worldName) {
-
-        return () -> {
-            sender.sendMessage(String.format("Deleting world '%s'...", worldName));
-            sender.sendMessage((this.plugin.getMVWorldManager().deleteWorld(worldName))
-                    ? String.format("%sWorld %s was deleted!", ChatColor.GREEN, worldName)
-                    : String.format("%sThere was an issue deleting '%s'! Please check console for errors.", ChatColor.RED, worldName));
-        };
+                                @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,55 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.ChatColor;
-import org.bukkit.command.CommandSender;
-
-@CommandAlias("mv")
-public class EnvironmentCommand extends MultiverseCoreCommand {
-
-    public EnvironmentCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("env|environments")
-    @CommandPermission("multiverse.core.list.environments")
-    @Description("Lists valid known environments and world types.")
-    public void onEnvironmentCommand(CommandSender sender) {
-        showEnvironments(sender);
-        sender.sendMessage("");
-        showWorldTypes(sender);
-    }
-
-    /**
-     * Shows all valid known environments to a {@link CommandSender}.
-     *
-     * @param sender The {@link CommandSender}.
-     */
-    public static void showEnvironments(CommandSender sender) {
-        sender.sendMessage(String.format("%sValid Environments are:", ChatColor.YELLOW));
-        sender.sendMessage(String.format("%sNORMAL%s, %sNETHER %sor %sEND",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE, ChatColor.AQUA));
-    }
-
-    /**
-     * Shows all valid known world types to a {@link CommandSender}.
-     *
-     * @param sender The {@link CommandSender}.
-     */
-    public static void showWorldTypes(CommandSender sender) {
-        sender.sendMessage(String.format("%sValid World Types are:", ChatColor.YELLOW));
-        sender.sendMessage(String.format("%sNORMAL%s, %sFLAT%s, %sLARGEBIOMES %sor %sAMPLIFIED",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE, ChatColor.GOLD));
-    }
-}
@@ -1,106 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.GameRuleProperty;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.ContentFilter;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import com.onarandombox.MultiverseCore.displaytools.DisplaySettings;
-import org.bukkit.ChatColor;
-import org.bukkit.GameRule;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-@CommandAlias("mv")
-@Subcommand("gamerule")
-public class GameRuleCommand extends MultiverseCoreCommand {
-
-    public GameRuleCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("list")
-    @CommandPermission("multiverse.core.gamerule.list")
-    @Syntax("[world] [filter]")
-    @CommandCompletion("@MVWorlds")
-    @Description("See the list gamerules values for a given world.")
-    public void onGameRulesCommand(@NotNull CommandSender sender,
-
-                                   @NotNull
-                                   @Syntax("[world]")
-                                   @Description("World you want to see game rule info.")
-                                   @Flags("other,defaultself, fallbackself") MultiverseWorld world,
-
-                                   @NotNull ContentFilter filter) {
-
-        new ContentDisplay.Builder<Map<String, Object>>()
-                .sender(sender)
-                .header("=== Gamerules for %s%s%s ===", ChatColor.AQUA, world.getName(), ChatColor.WHITE)
-                .contents(getGameRuleMap(world))
-                .displayHandler(DisplayHandlers.INLINE_MAP)
-                .colorTool(ColorAlternator.with(ChatColor.GREEN, ChatColor.GOLD))
-                .setting(DisplaySettings.OPERATOR, ": ")
-                .filter(filter)
-                .display();
-    }
-
-    private Map<String, Object> getGameRuleMap(MultiverseWorld world) {
-        return new HashMap<String, Object>() {{
-            Arrays.stream(GameRule.values())
-                    .forEach(gr -> {
-                        Object value = world.getCBWorld().getGameRuleValue(gr);
-                        if (value != null) {
-                            put(gr.getName(), value.toString());
-                        }
-                    });
-        }};
-    }
-
-    @Subcommand("set")
-    @CommandPermission("multiverse.core.gamerule.set")
-    @Syntax("<rule> <value> [world]")
-    @CommandCompletion("@gameRules @empty @MVWorlds")
-    @Description("Allows a player to set a gamerule for a given world.")
-    public <T> void onGameRuleChangeCommand(@NotNull CommandSender sender,
-                                            @NotNull Player player,
-
-                                            @Syntax("<rule> <value>")
-                                            @Description("Game rule property and value you want to change to.")
-                                            @NotNull GameRuleProperty<T> property,
-
-                                            @Syntax("[world]")
-                                            @Description("World you want to set this game rule.")
-                                            @NotNull @Flags("other,defaultself") MultiverseWorld world) {
-
-        sender.sendMessage((world.getCBWorld().setGameRule(property.getGameRule(), property.getValue()))
-
-                ? String.format("%sSuccess! %sGamerule %s%s%s was set to %s%s%s.",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, property.getGameRule().getName(),
-                ChatColor.WHITE, ChatColor.GREEN, property.getValue(), ChatColor.WHITE)
-
-                : String.format("%sFailure! Gamerule %s%s%s could not be set to %s%s%s.",
-                ChatColor.RED, ChatColor.AQUA, property.getGameRule().getName(),
-                ChatColor.RED, ChatColor.DARK_RED, property.getValue(), ChatColor.RED));
-    }
-}
@@ -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,45 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.commandtools.flag.CoreFlags;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-
-@CommandAlias("mv")
-public class GeneratorCommand extends MultiverseCoreCommand {
-
-    public GeneratorCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("gens|generators")
-    @CommandPermission("multiverse.core.generator")
-    @Description("Shows a list of Loaded Generator Plugins.")
-    public void onGeneratorCommand(@NotNull CommandSender sender) {
-        new ContentDisplay.Builder<Collection<String>>()
-                .sender(sender)
-                .header("%s--- Available Generator Plugins ---", ChatColor.GOLD)
-                .contents(CoreFlags.GENERATOR.suggestValue())
-                .emptyMessage("%sYou do not have any generator plugins installed.", ChatColor.RED)
-                .displayHandler(DisplayHandlers.INLINE_LIST)
-                .colorTool(ColorAlternator.with(ChatColor.AQUA, ChatColor.WHITE))
-                .display();
-    }
-}
@@ -1,72 +1,88 @@
-/******************************************************************************
- * 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.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.commandtools.flag.FlagGroup;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult;
-import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags;
+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.command.Command;
-import org.bukkit.command.CommandSender;
+import org.bukkit.World;
+import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import static org.bukkit.World.*;

@CommandAlias("mv")
 public class ImportCommand extends MultiverseCoreCommand {
-
-    public ImportCommand(MultiverseCore plugin) {
+    public ImportCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setFlagGroup(FlagGroup.of(CoreFlags.GENERATOR, CoreFlags.SPAWN_ADJUST));
+
+        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());
    }

    @Subcommand("import")
    @CommandPermission("multiverse.core.import")
-    @Syntax("<name> <env> -g [generator[:id]] [-n]")
-    @CommandCompletion("@potentialWorlds @environments @flags")
-    @Description("Imports a new world into multiverse.")
-    public void onImportCommand(@NotNull CommandSender sender,
+    @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,

+                                @Conditions("validWorldName:scope=new")
                                @Syntax("<name>")
-                                @Description("Folder name of the world.")
-                                @NotNull @co.aikar.commands.annotation.Flags("trim") @Conditions("importableWorldName") String worldName,
+                                @Description("Name of the world folder.")
+                                String worldName,

-                                @NotNull
                                @Syntax("<env>")
                                @Description("The world's environment. See: /mv env")
-                                Environment environment,
+                                World.Environment environment,

-                                @Nullable
-                                @Syntax("-g [generator[:id]] [-n]")
-                                @Description("Other world settings. See: http://gg.gg/nn8c2")
-                                String[] flagsArray) {
+                                @Optional
+                                @Syntax("--generator [generator[:id]] --adjust-spawn")
+                                @Description("Other world settings. See: https://gg.gg/nn8c2")
+                                String[] flags) {

-        FlagResult flags = this.getFlagGroup().calculateResult(flagsArray);
+        ParsedCommandFlags parsedFlags = parseFlags(flags);

-        Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
-        Command.broadcastCommandMessage(sender, (this.plugin.getMVWorldManager().addWorld(worldName,
-                environment,
+        issuer.sendMessage(String.format("Starting import of world '%s'...", worldName));
+
+        if (!this.worldManager.addWorld(
+                worldName, environment,
                null,
                null,
                null,
-                flags.getValue(CoreFlags.GENERATOR),
-                flags.getValue(CoreFlags.SPAWN_ADJUST))
-        )
-                ? String.format("%sComplete!", ChatColor.GREEN)
-                : String.format("%sFailed! See console for more details.", ChatColor.RED));
+                parsedFlags.flagValue("--generator", String.class),
+                parsedFlags.hasFlag("--adjust-spawn"))
+        ) {
+            issuer.sendMessage(String.format("%sFailed! See console for more details.", ChatColor.RED));
+            return;
+        }
+        issuer.sendMessage(String.format("%sComplete!", ChatColor.GREEN));
    }
 }
@@ -1,147 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Default;
-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.MultiverseWorld;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import com.onarandombox.MultiverseCore.displaytools.DisplaySettings;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-@CommandAlias("mv")
-public class InfoCommand extends MultiverseCoreCommand {
-
-    public InfoCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("info")
-    @CommandPermission("multiverse.core.info")
-    @Syntax("[world] [page]")
-    @CommandCompletion("@MVWorlds @range:1-5")
-    @Description("Display detailed information of the world.")
-    public void onInfoCommand(@NotNull CommandSender sender,
-
-                              @NotNull
-                              @Syntax("[world]")
-                              @Description("World you want to see info.")
-                              @Flags("other,defaultself,fallbackself") MultiverseWorld world,
-
-                              @Syntax("[page]")
-                              @Description("Info page to display.")
-                              @Default("1") int page) {
-
-        new ContentDisplay.Builder<Collection<String>>()
-                .sender(sender)
-                .contents(buildWorldInfoContent(world))
-                .displayHandler(DisplayHandlers.PAGE_LIST)
-                .colorTool(ColorAlternator.with(ChatColor.YELLOW, ChatColor.AQUA)).setting(DisplaySettings.SHOW_PAGE, page)
-                .display();
-    }
-
-    private List<String> buildWorldInfoContent(MultiverseWorld world) {
-        List<String> contents = new ArrayList<>(38);
-
-        // Page 1
-        contents.add(parseHeader("General Info"));
-        contents.add(String.format("World Name: %s%s", ChatColor.WHITE, world.getName()));
-        contents.add(String.format("World Alias: %s%s", ChatColor.WHITE,  world.getColoredWorldString()));
-        contents.add(String.format("Game Mode: %s%s", ChatColor.WHITE, world.getGameMode().toString()));
-        contents.add(String.format("Difficulty: %s%s", ChatColor.WHITE, world.getDifficulty().toString()));
-        contents.add(String.format("Spawn Location: %s%s", ChatColor.WHITE, this.plugin.getLocationManipulation().strCoords(world.getSpawnLocation())));
-        contents.add(String.format("World Seed: %s%s", ChatColor.WHITE, world.getSeed()));
-        String priceString = (world.getPrice() == 0)
-                ? String.format("%sFREE!", ChatColor.GREEN)
-                : plugin.getEconomist().formatPrice(-world.getPrice(), world.getCurrency());
-        contents.add(String.format((world.getPrice() >= 0)
-                ? "Price to enter this world: %s%s"
-                : "Reward for entering this world: %s%s", ChatColor.WHITE, priceString));
-        World respawnWorld = world.getRespawnToWorld();
-        MultiverseWorld respawn = this.plugin.getMVWorldManager().getMVWorld(respawnWorld);
-        String respawnWorldString = (respawn != null)
-                ? respawn.getColoredWorldString()
-                : ChatColor.RED + "!!INVALID!!";
-        contents.add(String.format("Players will respawn in: %s%s", ChatColor.WHITE, respawnWorldString));
-        contents.add(ContentDisplay.LINE_BREAK);
-
-        // Page 2
-        contents.add(parseHeader("More World Settings"));
-        contents.add(String.format("World UID: %s%s", ChatColor.WHITE, world.getCBWorld().getUID()));
-        contents.add(String.format("World Type: %s%s", ChatColor.WHITE, world.getWorldType().toString()));
-        contents.add(String.format("World Scale: %s%s", ChatColor.WHITE, world.getScaling()));
-        contents.add(String.format("Generator: %s%s", ChatColor.WHITE, world.getGenerator()));
-        contents.add(String.format("Structures: %s%s", ChatColor.WHITE, world.getCBWorld().canGenerateStructures()));
-        contents.add(String.format("Weather: %s%s", ChatColor.WHITE, world.isWeatherEnabled()));
-        contents.add(String.format("Players will get hungry: %s%s", ChatColor.WHITE, world.getHunger()));
-        contents.add(String.format("Keep spawn in memory: %s%s", ChatColor.WHITE, world.isKeepingSpawnInMemory()));
-        contents.add(ContentDisplay.LINE_BREAK);
-
-        // Page 3
-        contents.add(parseHeader("PVP Settings"));
-        contents.add(String.format("Multiverse Setting: %s%s", ChatColor.WHITE, world.isPVPEnabled()));
-        contents.add(String.format("Bukkit Setting: %s%s", ChatColor.WHITE, world.getCBWorld().getPVP()));
-        contents.add(ContentDisplay.LINE_BREAK);
-
-        // Page 4
-        contents.add(parseHeader("Monster Settings"));
-        contents.add(String.format("Multiverse Setting: %s%s", ChatColor.WHITE, world.canMonstersSpawn()));
-        contents.add(String.format("Bukkit Setting: %s%s", ChatColor.WHITE, world.getCBWorld().getAllowMonsters()));
-        contents.add((world.canMonstersSpawn())
-                ? String.format("Monsters that %scannot spawn: %s%s", ChatColor.RED, ChatColor.WHITE, toCommaSeparated(world.getMonsterList()))
-                : String.format("Monsters that %scan spawn: %s%s", ChatColor.GREEN, ChatColor.WHITE, toCommaSeparated(world.getMonsterList())));
-        contents.add(ContentDisplay.LINE_BREAK);
-
-        // Page 5
-        contents.add(parseHeader("Animal Settings"));
-        contents.add(String.format("Multiverse Setting: %s%s", ChatColor.WHITE, world.canAnimalsSpawn()));
-        contents.add(String.format("Bukkit Setting: %s%s", ChatColor.WHITE, world.getCBWorld().getAllowAnimals()));
-        contents.add((world.canAnimalsSpawn())
-                ? String.format("Animals that %scannot spawn: %s%s", ChatColor.RED, ChatColor.WHITE, toCommaSeparated(world.getAnimalList()))
-                : String.format("Animals that %scan spawn: %s%s", ChatColor.GREEN, ChatColor.WHITE, toCommaSeparated(world.getAnimalList())));
-
-        return contents;
-    }
-
-    private String parseHeader(String header) {
-        return String.format("%s===[ %s %s]===", ChatColor.AQUA, header, ChatColor.AQUA);
-    }
-
-    private static String toCommaSeparated(List<String> list) {
-        if (list == null || list.size() == 0) {
-            return ChatColor.GRAY + ChatColor.ITALIC.toString() + "none";
-        }
-        if (list.size() == 1) {
-            return list.get(0);
-        }
-
-        StringBuilder result = new StringBuilder(list.get(0));
-        for (int i = 1; i < list.size() - 1; i++) {
-            result.append(", ").append(list.get(i));
-        }
-        result.append(" and ").append(list.get(list.size() - 1));
-
-        return result.toString();
-    }
-}
@@ -1,102 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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 co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.PageFilter;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import com.onarandombox.MultiverseCore.displaytools.DisplaySettings;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-@CommandAlias("mv")
-public class ListCommand extends MultiverseCoreCommand {
-
-    public ListCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("list")
-    @CommandPermission("multiverse.core.list.worlds")
-    @Syntax("[filter] [page]")
-    @Description("Displays a listing of all worlds that you can enter.")
-    public void onListCommand(@NotNull CommandSender sender,
-
-                              @NotNull PageFilter pageFilter) {
-
-        new ContentDisplay.Builder<Collection<String>>()
-                .sender(sender)
-                .header("%s====[ Multiverse World List ]====", ChatColor.GOLD)
-                .contents(getListContents(sender))
-                .displayHandler(DisplayHandlers.PAGE_LIST)
-                .colorTool(ColorAlternator.with(ChatColor.AQUA, ChatColor.GOLD))
-                .setting(DisplaySettings.SHOW_PAGE, pageFilter.getPage())
-                .display();
-    }
-
-    private List<String> getListContents(@NotNull CommandSender sender) {
-        Player player = (sender instanceof Player) ? (Player) sender : null;
-        List<String> worldList =  new ArrayList<>();
-
-        this.plugin.getMVWorldManager().getMVWorlds().stream()
-                .filter(world -> player == null || plugin.getMVPerms().canEnterWorld(player, world))
-                .filter(world -> canSeeWorld(player, world))
-                .map(world -> hiddenText(world) + world.getColoredWorldString() + " - " + parseColouredEnvironment(world.getEnvironment()))
-                .sorted()
-                .forEach(worldList::add);
-
-        this.plugin.getMVWorldManager().getUnloadedWorlds().stream()
-                .filter(world -> plugin.getMVPerms().hasPermission(sender, "multiverse.access." + world, true))
-                .map(world -> ChatColor.GRAY + world + " - UNLOADED")
-                .sorted()
-                .forEach(worldList::add);
-
-        return worldList;
-    }
-
-    private boolean canSeeWorld(Player player, MultiverseWorld world) {
-        return !world.isHidden()
-                || player == null
-                || this.plugin.getMVPerms().hasPermission(player, "multiverse.core.modify", true);
-    }
-
-    private String hiddenText(MultiverseWorld world) {
-        return (world.isHidden()) ? String.format("%s[H] ", ChatColor.GRAY) : "";
-    }
-
-    private String parseColouredEnvironment(World.Environment env) {
-        ChatColor color = ChatColor.GOLD;
-        switch (env) {
-            case NETHER:
-                color = ChatColor.RED;
-                break;
-            case NORMAL:
-                color = ChatColor.GREEN;
-                break;
-            case THE_END:
-                color = ChatColor.AQUA;
-                break;
-        }
-        return color + env.toString();
-    }
-}
@@ -1,49 +1,42 @@
-/******************************************************************************
- * 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.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.Flags;
+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.command.Command;
-import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

@CommandAlias("mv")
 public class LoadCommand extends MultiverseCoreCommand {
-
-    public LoadCommand(MultiverseCore plugin) {
+    public LoadCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
    }

    @Subcommand("load")
    @CommandPermission("multiverse.core.load")
+    @CommandCompletion("@mvworlds:scope=unloaded")
    @Syntax("<world>")
-    @CommandCompletion("@unloadedWorlds")
    @Description("Loads a world. World must be already in worlds.yml, else please use /mv import.")
-    public void onLoadCommand(@NotNull CommandSender sender,
+    public void onLoadCommand(BukkitCommandIssuer issuer,

-                              @NotNull
+                              @Single
+                              @Conditions("validWorldName:scope=unloaded")
                              @Syntax("<world>")
                              @Description("Name of world you want to load.")
-                              @Flags("type=world name")
-                              @Conditions("isUnloadedWorld") String worldName) {
+                              String worldName
+    ) {
+        issuer.sendMessage(String.format("Loading world '%s'...", worldName));

        if (!this.plugin.getMVWorldManager().loadWorld(worldName)) {
-            sender.sendMessage(String.format("Error trying to load world '%s'!", worldName));
+            issuer.sendMessage(String.format("Error trying to load world '%s'!", worldName));
            return;
        }
-        Command.broadcastCommandMessage(sender, String.format("Loaded world '%s'!", worldName));
+        issuer.sendMessage(String.format("Loaded world '%s'!", worldName));
    }
 }
@@ -1,234 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.Flags;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.ContentFilter;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
-import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-@CommandAlias("mv")
-@Subcommand("modify")
-//TODO API: Think why properties method for MultiverseWorld is deprecated.
-public class ModifyCommand extends MultiverseCoreCommand {
-
-    public ModifyCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("set")
-    @CommandPermission("multiverse.core.modify.set")
-    @Syntax("<property> <value> [world]")
-    @CommandCompletion("@setProperties @empty @MVWorlds")
-    @Description("Modify various aspects of worlds by setting a property. For more info; https://tinyurl.com/nehhzp6")
-    public void onModifySetCommand(@NotNull CommandSender sender,
-
-                                   @NotNull
-                                   @Syntax("<property>")
-                                   @Description("Property option key.")
-                                   @Flags("type=property")
-                                   @Conditions("validAddProperty:set") String property,
-
-                                   @NotNull
-                                   @Syntax("<value>")
-                                   @Description("New property value.")
-                                   @Flags("type=property value") String value,
-
-                                   @NotNull
-                                   @Syntax("[world]")
-                                   @Description("World that you want property change to apply.")
-                                   @Flags("other,defaultself") MultiverseWorld world) {
-
-        if ((property.equalsIgnoreCase("aliascolor")
-                || property.equalsIgnoreCase("color"))
-                && !EnglishChatColor.isValidAliasColor(value)) {
-            sender.sendMessage(String.format("%s'%s' is not a valid color. Please pick one of the following:",
-                    ChatColor.RED, value));
-            sender.sendMessage(EnglishChatColor.getAllColors());
-            return;
-        }
-
-        try {
-            if (!world.setPropertyValue(property, value)) {
-                sender.sendMessage(ChatColor.RED + world.getPropertyHelp(property));
-                return;
-            }
-        }
-        catch (PropertyDoesNotExistException e) {
-            sender.sendMessage(String.format("%sSorry, You can't set '%s%s%s'!", ChatColor.RED, ChatColor.GRAY, property, ChatColor.RED));
-            sender.sendMessage(String.format("Valid world-properties: %s", world.getAllPropertyNames()));
-            return;
-        }
-
-        sender.sendMessage(String.format("%sSuccess! %sProperty %s%s %swas set to %s%s%s.",
-                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, property, ChatColor.WHITE, ChatColor.GREEN, value, ChatColor.WHITE));
-        saveWorldConfig();
-    }
-
-    @Subcommand("add")
-    @CommandPermission("multiverse.core.modify.add")
-    @Syntax("<property> <value> [world]")
-    @CommandCompletion("@addProperties @empty @MVWorlds")
-    @Description("Modify various aspects of worlds by adding a property. For more info: https://tinyurl.com/nehhzp6")
-    public void onModifyAddCommand(@NotNull CommandSender sender,
-
-                                   @NotNull
-                                   @Syntax("<property>")
-                                   @Description("Property option key.")
-                                   @Flags("type=property")
-                                   @Conditions("validAddProperty:add") String property,
-
-                                   @NotNull
-                                   @Syntax("<value>")
-                                   @Description("Property value to add.")
-                                   @Flags("type=property value") String value,
-
-                                   @NotNull
-                                   @Syntax("[world]")
-                                   @Description("World that you want property change to apply.")
-                                   @Flags("other,defaultself") MultiverseWorld world) {
-
-        if (!world.addToVariable(property, value)) {
-            sender.sendMessage(String.format("%s %scould not be added to %s%s%s.",
-                    value, ChatColor.RED, ChatColor.AQUA, property, ChatColor.RED));
-            return;
-        }
-
-        sender.sendMessage(String.format("%sSuccess! %s%s%s was added to %s%s%s.",
-                ChatColor.GREEN, ChatColor.AQUA, value, ChatColor.WHITE, ChatColor.GREEN, property, ChatColor.WHITE));
-
-        saveWorldConfig();
-    }
-
-    @Subcommand("remove")
-    @CommandPermission("multiverse.core.modify.remove")
-    @Syntax("<property> <value> [world]")
-    @CommandCompletion("@addProperties @empty @MVWorlds")
-    @Description("Modify various aspects of worlds by removing a property. For more info: https://tinyurl.com/nehhzp6")
-    public void onModifyRemoveCommand(@NotNull CommandSender sender,
-
-                                      @NotNull
-                                      @Syntax("<property>")
-                                      @Description("Property option key.")
-                                      @Flags("type=property")
-                                      @Conditions("validAddProperty:remove") String property,
-
-                                      @NotNull
-                                      @Syntax("<value>")
-                                      @Description("Property value to remove.")
-                                      @Flags("type=property value") String value,
-
-                                      @NotNull
-                                      @Syntax("[world]")
-                                      @Description("World that you want property change to apply.")
-                                      @Flags("other,defaultself") MultiverseWorld world) {
-
-        if (!world.removeFromVariable(property, value)) {
-            sender.sendMessage(String.format("%sThere was an error removing %s%s%s from %s%s%s!",
-                    ChatColor.RED, ChatColor.GRAY, value, ChatColor.RED, ChatColor.GRAY, property, ChatColor.RED));
-            return;
-        }
-
-        sender.sendMessage(String.format("%sSuccess! %s%s%s was %sremoved %sfrom %s%s%s.",
-                ChatColor.GREEN, ChatColor.AQUA, value, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE, ChatColor.GREEN, property, ChatColor.WHITE));
-
-        saveWorldConfig();
-    }
-
-    @Subcommand("clear")
-    @CommandPermission("multiverse.core.modify.clear")
-    @Syntax("<property> <value> [world]")
-    @CommandCompletion("@addProperties @empty @MVWorlds")
-    @Description("Modify various aspects of worlds by clearing a property. For more info: https://tinyurl.com/nehhzp6")
-    public void onModifyClearCommand(@NotNull CommandSender sender,
-
-                                     @NotNull
-                                     @Syntax("<property>")
-                                     @Description("Property option key.")
-                                     @Flags("type=property") @Conditions("validAddProperty:clear") String property,
-
-                                     @NotNull
-                                     @Syntax("[world]")
-                                     @Description("World that you want property be cleared.")
-                                     @Flags("other,defaultself") MultiverseWorld world) {
-
-        if (!world.clearList(property)) {
-            sender.sendMessage(String.format("%sThere was an error clearing %s%s%s.",
-                    ChatColor.RED, ChatColor.GOLD, property, ChatColor.RED));
-        }
-
-        sender.sendMessage(String.format("%s%s%s was cleared. It contains 0 values now.",
-                ChatColor.GOLD, property, ChatColor.WHITE));
-
-        saveWorldConfig();
-    }
-
-    @Subcommand("list")
-    @CommandPermission("multiverse.core.modify.list")
-    @Syntax("[world] [filter]")
-    @CommandCompletion("@MVWorlds")
-    @Description("Show properties available to set.")
-    public void onModifyListCommand(@NotNull CommandSender sender,
-
-                                     @NotNull
-                                     @Syntax("[world]")
-                                     @Description("World that you want to see current property values set.")
-                                     @Flags("other,defaultself,fallbackself") MultiverseWorld world,
-
-                                     @NotNull ContentFilter filter) {
-
-        new ContentDisplay.Builder<Map<String, Object>>()
-                .sender(sender)
-                .header("%s===[ Property Values for %s%s ]===", ChatColor.GOLD, world.getColoredWorldString(), ChatColor.GOLD)
-                .contents(generateModifyList(world))
-                .emptyMessage("No properties found.")
-                .displayHandler(DisplayHandlers.INLINE_MAP)
-                .filter(filter)
-                .display();
-    }
-
-    private Map<String, Object> generateModifyList(MultiverseWorld world) {
-        Collection<String> properties = world.getAllPropertyTypes();
-        Map<String, Object> propMap = new HashMap<>(properties.size());
-        for (String property : properties) {
-            String value;
-            try {
-                value = world.getPropertyValue(property);
-            } catch (PropertyDoesNotExistException ignored) {
-                value = String.format("%s!!INAVLID!!", ChatColor.RED);
-            }
-            propMap.put(property, value);
-        }
-        return propMap;
-    }
-
-    private void saveWorldConfig() {
-        if (!this.plugin.saveWorldConfig()) {
-            throw new InvalidCommandArgument("There was an issue saving worlds.yml! Your changes will only be temporary.", false);
-        }
-    }
-}
@@ -1,20 +1,20 @@
-/******************************************************************************
- * 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.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand;
+import org.jetbrains.annotations.NotNull;

-public abstract class MultiverseCoreCommand extends MultiverseCommand {
-
+/**
+ * A base command for Multiverse.
+ */
+abstract class MultiverseCoreCommand extends MultiverseCommand {
    protected final MultiverseCore plugin;
+    protected final MVWorldManager worldManager;

-    protected MultiverseCoreCommand(MultiverseCore plugin) {
+    protected MultiverseCoreCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
        this.plugin = plugin;
+        this.worldManager = plugin.getMVWorldManager();
    }
 }
@@ -1,83 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.Split;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@CommandAlias("mv")
-public class PurgeCommand extends MultiverseCoreCommand {
-
-    public PurgeCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("purgeall")
-    @CommandPermission("multiverse.core.purge.all")
-    @Syntax("<all|animals|monsters|mobname>")
-    @CommandCompletion("all|animals|monsters|@livingEntities")
-    @Description("Removed the specified type of mob from all worlds.")
-    public void onPurgeAllCommand(@NotNull CommandSender sender,
-
-                                  @NotNull
-                                  @Syntax("<entities>")
-                                  @Description("Entity types that you want to remove from all worlds.")
-                                  @Split(",") String[] targetEntities) {
-
-        doPurge(sender, this.plugin.getMVWorldManager().getMVWorlds(), targetEntities);
-    }
-
-    @Subcommand("purge")
-    @CommandPermission("multiverse.core.purge")
-    @Syntax("<all|animals|monsters|mobname>")
-    @CommandCompletion("@MVWorlds|all|animals|monsters|@livingEntities all|animals|monsters|@livingEntities")
-    @Description("Removed the specified type of mob from the specified world.")
-    public void onPurgeCommand(@NotNull CommandSender sender,
-
-                               @NotNull
-                               @Syntax("[world]")
-                               @Description("World that you want to remove entities.")
-                               @Flags("other,defaultself,fallbackself") MultiverseWorld world,
-
-                               @NotNull
-                               @Syntax("<entities>")
-                               @Description("Entity types that you want to remove from a world.")
-                               @Split(",") String[] targetEntities) {
-
-        doPurge(sender, Collections.singleton(world), targetEntities);
-    }
-
-    private void doPurge(@NotNull CommandSender sender,
-                         @NotNull Collection<MultiverseWorld> targetWorlds,
-                         @NotNull String[] targetEntities) {
-
-        List<String> thingsToKill = Arrays.stream(targetEntities)
-                .map(String::toUpperCase)
-                .collect(Collectors.toList());
-
-        targetWorlds.forEach(w -> this.plugin.getMVWorldManager()
-                .getTheWorldPurger()
-                .purgeWorld(w, thingsToKill, false, false, sender));
-    }
-}
@@ -1,81 +1,79 @@
-/******************************************************************************
- * 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.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.Flags;
+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.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult;
-import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags;
+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.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;

@CommandAlias("mv")
 public class RegenCommand extends MultiverseCoreCommand {
-
-    public RegenCommand(MultiverseCore plugin) {
+    public RegenCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
-        this.setFlagGroup(FlagGroup.of(CoreFlags.RANDOM_SEED));
+
+        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());
    }

    @Subcommand("regen")
    @CommandPermission("multiverse.core.regen")
-    @Syntax("<world> [-s [seed]]")
-    @CommandCompletion("@MVWorlds @worldFlags:-s")
+    @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(@NotNull CommandSender sender,
+    public void onRegenCommand(BukkitCommandIssuer issuer,

-                               @NotNull
+                               @Conditions("validWorldName:scope=both")
                               @Syntax("<world>")
                               @Description("World that you want to regen.")
-                               @Flags("other") MultiverseWorld world,
+                               String worldName,

-                               @Nullable
-                               @Syntax("[-s [seed]]")
+                               @Optional
+                               @Syntax("--seed [seed] --keep-gamerules")
                               @Description("Other world settings. See: http://gg.gg/nn8lk")
-                               String[] flagsArray) {
+                               String[] flags
+    ) {
+        ParsedCommandFlags parsedFlags = parseFlags(flags);

-        FlagResult flags = this.getFlagGroup().calculateResult(flagsArray);
-
-        this.plugin.getMVCommandManager().getQueueManager().addToQueue(new QueuedCommand.Builder()
-                .sender(sender)
-                .action(regenRunnable(sender, world, flags))
-                .prompt("Are you sure you want to regen world '%s'?", world.getColoredWorldString())
-                .build()
-        );
-    }
-
-    private Runnable regenRunnable(@NotNull CommandSender sender,
-                                   @NotNull MultiverseWorld world,
-                                   @NotNull FlagResult flags) {
-
-        return () -> {
-            sender.sendMessage(String.format("Regening world '%s'...", world.getName()));
-
-            //TODO: API should allow regen of unloaded worlds.
-            sender.sendMessage((this.plugin.getMVWorldManager().regenWorld(
-                    world.getName(),
-                    !flags.isDefaulted(CoreFlags.RANDOM_SEED),
-                    !flags.isByUserInput(CoreFlags.RANDOM_SEED),
-                    flags.getValue(CoreFlags.RANDOM_SEED))
-            )
-                    ? String.format("%sWorld Regenerated!", ChatColor.GREEN)
-                    : String.format("%sWorld could not be regenerated!", ChatColor.RED));
-        };
+        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,12 +1,9 @@
-/******************************************************************************
- * 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.commands;

+import java.util.ArrayList;
+import java.util.List;
+
+import co.aikar.commands.BukkitCommandIssuer;
 import co.aikar.commands.annotation.CommandAlias;
 import co.aikar.commands.annotation.CommandPermission;
 import co.aikar.commands.annotation.Description;
@@ -14,15 +11,10 @@ import co.aikar.commands.annotation.Subcommand;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent;
 import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

-import java.util.ArrayList;
-import java.util.List;
-
@CommandAlias("mv")
 public class ReloadCommand extends MultiverseCoreCommand {
-
    public ReloadCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
    }
@@ -30,8 +22,8 @@ public class ReloadCommand extends MultiverseCoreCommand {
    @Subcommand("reload")
    @CommandPermission("multiverse.core.reload")
    @Description("Reloads config files for all multiverse modules.")
-    public void onReloadCommand(@NotNull CommandSender sender) {
-        sender.sendMessage(ChatColor.GOLD + "Reloading all Multiverse Plugin configs...");
+    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);
@@ -44,7 +36,7 @@ public class ReloadCommand extends MultiverseCoreCommand {
        MVConfigReloadEvent configReload = new MVConfigReloadEvent(configsLoaded);
        this.plugin.getServer().getPluginManager().callEvent(configReload);

-        configReload.getAllConfigsLoaded().forEach(sender::sendMessage);
-        sender.sendMessage(String.format("%sReload Complete!", ChatColor.GREEN));
+        configReload.getAllConfigsLoaded().forEach(issuer::sendMessage);
+        issuer.sendMessage(String.format("%sReload Complete!", ChatColor.GREEN));
    }
 }
@@ -1,49 +1,41 @@
-/******************************************************************************
- * 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.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.Flags;
 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.jetbrains.annotations.NotNull;

@CommandAlias("mv")
 public class RemoveCommand extends MultiverseCoreCommand {
-
-    public RemoveCommand(MultiverseCore plugin) {
+    public RemoveCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
    }

    @Subcommand("remove")
    @CommandPermission("multiverse.core.remove")
-    @CommandCompletion("@MVWorlds|@unloadedWorlds")
+    @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(@NotNull CommandSender sender,
+    public void onRemoveCommand(BukkitCommandIssuer issuer,

-                                @NotNull
+                                @Single
+                                @Conditions("mvworlds:scope=both")
                                @Syntax("<world>")
                                @Description("World you want to remove from mv's knowledge.")
-                                @Flags("type=world name")
-                                @Conditions("isWorldInConfig")
-                                @Single String worldName) {
-
-        sender.sendMessage((this.plugin.getMVWorldManager().removeWorldFromConfig(worldName))
-                ? String.format("World '%s' is removed from config!", worldName)
-                : String.format("%sError trying to remove world from config!", ChatColor.RED));
+                                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,25 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import co.aikar.commands.annotation.CommandAlias;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-public class RootCommand extends MultiverseCoreCommand {
-
-    public RootCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @CommandAlias("mv")
-    public void onRootCommand(@NotNull CommandSender sender) {
-        this.plugin.getMVCommandManager().showPluginInfo(
-                sender,
-                this.plugin.getDescription(),
-                ColorAlternator.with(ChatColor.GOLD, ChatColor.YELLOW),
-                "mv"
-        );
-    }
-}
@@ -1,63 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-import buscript.Buscript;
-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.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-
-@CommandAlias("mv")
-public class ScriptCommand extends MultiverseCoreCommand {
-
-    public ScriptCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("script")
-    @CommandPermission("multiverse.core.script")
-    @Syntax("<script> <player>")
-    @CommandCompletion("@scripts @players")
-    @Description("Runs a script.")
-    public void onScriptCommand(@NotNull CommandSender sender,
-
-                                @NotNull
-                                @Syntax("<script>")
-                                @Description("Script name that you want to run.")
-                                String targetScript,
-
-                                @NotNull
-                                @Syntax("<player>")
-                                @Description("Player that you want to execute the script on.")
-                                RequiredPlayer player) {
-
-        Buscript scriptAPI = this.plugin.getScriptAPI();
-        if (scriptAPI == null) {
-            throw new InvalidCommandArgument("Buscript failed to load while server was starting! Scripts cannot be run.", false);
-        }
-
-        File file = new File(scriptAPI.getScriptFolder(), targetScript);
-        if (!file.exists()) {
-            throw new InvalidCommandArgument("That script file does not exist in the Multiverse-Core scripts directory!");
-        }
-
-        scriptAPI.executeScript(file, targetScript, player.get());
-        sender.sendMessage(String.format("Script '%s%s%s' finished!", ChatColor.GOLD, file.getName(), ChatColor.WHITE));
-    }
-}
@@ -1,170 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-import co.aikar.commands.BaseCommand;
-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.Description;
-import co.aikar.commands.annotation.Flags;
-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.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.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class SetSpawnCommand extends MultiverseCoreCommand {
-
-    public SetSpawnCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @CommandAlias("mv")
-    public class SetSpawn extends BaseCommand {
-
-        @Subcommand("setspawn")
-        @CommandPermission("multiverse.core.spawn.set")
-        @Syntax("[world x y z [yaw pitch]]")
-        @CommandCompletion("@MVWorlds @location:x @location:y @location:z @location:yaw @location:pitch")
-        @Description("Sets the spawn for the current world.")
-        public void onSetSpawnCommand(@NotNull CommandSender sender,
-                                      @Nullable @Optional Player player,
-
-                                      @NotNull
-                                      @Syntax("[world x y z [yaw pitch]]")
-                                      @Description("New location of spawn.")
-                                      @Flags("other,defaultself") MultiverseWorld world,
-
-                                      @Nullable @Optional Double x,
-                                      @Nullable @Optional Double y,
-                                      @Nullable @Optional Double z,
-                                      @Nullable @Optional Float yaw,
-                                      @Nullable @Optional Float pitch) {
-
-            doSpawnSet(sender, world, parseLocation(player, world, x, y, z, yaw, pitch));
-        }
-
-        @Subcommand("modify set spawn")
-        @CommandPermission("multiverse.core.spawn.set")
-        @Syntax("[world x y z [yaw pitch]]")
-        @CommandCompletion("@MVWorlds @location:x @location:y @location:z @location:yaw @location:pitch")
-        @Description("Sets the spawn for the current world.")
-        public void onModifySetSpawnCommand(@NotNull CommandSender sender,
-                                            @Nullable @Optional Player player,
-
-                                            @NotNull
-                                            @Syntax("[world x y z [yaw pitch]]")
-                                            @Description("New location of spawn.")
-                                            @Flags("other,defaultself") MultiverseWorld world,
-
-                                            @Nullable @Optional Double x,
-                                            @Nullable @Optional Double y,
-                                            @Nullable @Optional Double z,
-                                            @Nullable @Optional Float yaw,
-                                            @Nullable @Optional Float pitch) {
-
-            doSpawnSet(sender, world, parseLocation(player, world, x, y, z, yaw, pitch));
-        }
-    }
-
-    @CommandAlias("mvsetspawn")
-    public class AliasSetSpawn extends BaseCommand {
-
-        @CommandAlias("mvsetspawn")
-        @CommandPermission("multiverse.core.spawn.set")
-        @Syntax("[world x y z [yaw pitch]]")
-        @CommandCompletion("@MVWorlds @location:x @location:y @location:z @location:yaw @location:pitch @empty")
-        @Description("Sets the spawn for the current world.")
-        public void onAliasSetSpawnCommand(@NotNull CommandSender sender,
-                                           @Nullable @Optional Player player,
-
-                                           @NotNull
-                                           @Syntax("[world x y z [yaw pitch]]")
-                                           @Description("New location of spawn.")
-                                           @Flags("other,defaultself") MultiverseWorld world,
-
-                                           @Nullable @Optional Double x,
-                                           @Nullable @Optional Double y,
-                                           @Nullable @Optional Double z,
-                                           @Nullable @Optional Float yaw,
-                                           @Nullable @Optional Float pitch) {
-            doSpawnSet(sender, world, parseLocation(player, world, x, y, z, yaw, pitch));
-        }
-    }
-
-    @NotNull
-    private Location parseLocation(@Nullable Player player,
-                                   @NotNull MultiverseWorld world,
-                                   @Nullable Double x,
-                                   @Nullable Double y,
-                                   @Nullable Double z,
-                                   @Nullable Float yaw,
-                                   @Nullable Float pitch) {
-
-        if (x == null) {
-            if (player == null) {
-                throw new InvalidCommandArgument("You need to specify a location from console.");
-            }
-            return player.getLocation();
-        }
-        if (y == null) {
-            throw new InvalidCommandArgument("You need to specify y and z axis as well.");
-        }
-        if (z == null) {
-            throw new InvalidCommandArgument("You need to specify z axis as well.");
-        }
-        if (yaw == null) {
-            return new Location(world.getCBWorld(), x, y, z);
-        }
-        if (pitch == null) {
-            throw new InvalidCommandArgument("You need to specify pitch as well.");
-        }
-
-        return new Location(world.getCBWorld(), x, y, z, yaw, pitch);
-    }
-
-    private void doSpawnSet(@NotNull CommandSender sender,
-                            @NotNull MultiverseWorld world,
-                            @NotNull Location location) {
-
-        World bukkitWorld = location.getWorld();
-        if (bukkitWorld == null) {
-            sender.sendMessage("No world found for the spawn location your tried to set.");
-            return;
-        }
-
-        world.setSpawnLocation(location);
-        BlockSafety blockSafety = this.plugin.getBlockSafety();
-        if (!blockSafety.playerCanSpawnHereSafely(location) && world.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(String.format("If you want turn this back on, just do %s/mv modify set adjustspawn true %s", ChatColor.AQUA, world.getName()));
-            world.setAdjustSpawn(false);
-        }
-
-        sender.sendMessage((sender instanceof Player && ((Player) sender).getWorld().equals(world.getCBWorld()))
-                ? "Spawn of this world is set to:"
-                : String.format("Spawn for %s is set to:",  world.getColoredWorldString()));
-
-        sender.sendMessage(plugin.getLocationManipulation().strCoords(location));
-
-        if (!plugin.saveWorldConfig()) {
-            sender.sendMessage(String.format("%sThere was an issue saving worlds.yml!  Your changes will only be temporary!", ChatColor.RED));
-        }
-    }
-}
@@ -1,56 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-@CommandAlias("mv")
-public class SilentCommand extends MultiverseCoreCommand {
-
-    public SilentCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("silent")
-    @CommandPermission("multiverse.core.silent")
-    @Description("Show current state of silent mode.")
-    public void onShowSilentCommand(@NotNull CommandSender sender) {
-        displaySilentMode(sender);
-    }
-
-    @Subcommand("silent")
-    @CommandPermission("multiverse.core.silent")
-    @Syntax("<true|false>")
-    @CommandCompletion("true|false")
-    @Description("Reduces the amount of startup messages.")
-    public void onChangeSilentCommand(@NotNull CommandSender sender,
-                                      boolean silent) {
-
-        plugin.getMVConfig().setSilentStart(silent);
-        if (!plugin.saveMVConfigs()) {
-            sender.sendMessage(String.format("%sFailed to save config! Check your console for details.", ChatColor.RED));
-        }
-
-        displaySilentMode(sender);
-    }
-
-    private void displaySilentMode(CommandSender sender) {
-        sender.sendMessage((plugin.getMVConfig().getSilentStart())
-                ? String.format("Multiverse Silent Start mode is %sOn", ChatColor.GREEN)
-                : String.format("Multiverse Silent Start mode is %sOff", ChatColor.RED));
-    }
-}
@@ -1,74 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-@CommandAlias("mv")
-public class SpawnCommand extends MultiverseCoreCommand {
-
-    public SpawnCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("spawn")
-    @CommandPermission("multiverse.core.spawn.self")
-    @Description("Teleport yourself to the spawn of the world.")
-    public void onSpawnCommand(@NotNull Player player) {
-        doSpawn(player, player);
-    }
-
-    @CommandAlias("spawn")
-    @CommandPermission("multiverse.core.spawn.other")
-    @Syntax("[player]")
-    @CommandCompletion("@players")
-    @Description("Teleport another player to the spawn of the world they are in.")
-    public void onSpawnCommand(@NotNull CommandSender sender,
-
-                               @NotNull
-                               @Syntax("[player]")
-                               @Description("Target player to teleport to spawn.")
-                               RequiredPlayer player) {
-
-        doSpawn(sender, player.get());
-    }
-
-    private void doSpawn(@NotNull CommandSender sender,
-                         @NotNull Player player) {
-
-        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(player.getWorld());
-        Location spawnLocation = (world == null) ? player.getWorld().getSpawnLocation() : world.getSpawnLocation();
-
-        this.plugin.getSafeTTeleporter().safelyTeleport(player, player, spawnLocation, false);
-
-        if (sender.equals(player)) {
-            player.sendMessage("Teleported to this world's spawn.");
-            return;
-        }
-
-        String senderName = (sender instanceof ConsoleCommandSender)
-                ? String.format("%sconsole%s", ChatColor.LIGHT_PURPLE, ChatColor.RESET)
-                : String.format("%s%s%s", ChatColor.YELLOW, sender.getName(), ChatColor.RESET);
-
-        player.sendMessage("You were teleported by " + senderName + "to spawn.");
-    }
-}
@@ -1,79 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import co.aikar.commands.BaseCommand;
-import co.aikar.commands.CommandHelp;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.HelpCommand;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-public class SubModulesCommand {
-
-    public static class NetherPortals extends BaseCommand {
-
-        @HelpCommand
-        @CommandAlias("mvnp")
-        @CommandPermission("multiverse.core.submodules")
-        @Description("Suggest download for Multiverse-NetherPortals.")
-        public void onSuggestCommand(@NotNull CommandSender sender,
-                                     @NotNull CommandHelp help) {
-
-            suggestDownload(
-                    sender,
-                    "Multiverse-NetherPortals",
-                    ColorAlternator.with(ChatColor.DARK_PURPLE, ChatColor.LIGHT_PURPLE),
-                    "https://dev.bukkit.org/projects/multiverse-netherportals"
-            );
-        }
-    }
-
-    public static class Portals extends BaseCommand {
-
-        @HelpCommand
-        @CommandAlias("mvp")
-        @CommandPermission("multiverse.core.submodules")
-        @Description("Suggest download for Multiverse-Portals.")
-        public void onSuggestCommand(@NotNull CommandSender sender,
-                                     @NotNull CommandHelp help) {
-
-            suggestDownload(
-                    sender,
-                    "Multiverse-Portals",
-                    ColorAlternator.with(ChatColor.DARK_RED, ChatColor.RED),
-                    "https://dev.bukkit.org/projects/multiverse-portals"
-            );
-        }
-    }
-
-    public static class Inventories extends BaseCommand {
-
-        @HelpCommand
-        @CommandAlias("mvinv")
-        @CommandPermission("multiverse.core.submodules")
-        @Description("Suggest download for Multiverse-Inventories.")
-        public void onSuggestCommand(@NotNull CommandSender sender,
-                                     @NotNull CommandHelp help) {
-
-            suggestDownload(
-                    sender,
-                    "Multiverse-Inventories",
-                    ColorAlternator.with(ChatColor.DARK_AQUA, ChatColor.AQUA),
-                    "https://dev.bukkit.org/projects/multiverse-inventories"
-            );
-        }
-    }
-
-    private static void suggestDownload(@NotNull CommandSender sender,
-                                        @NotNull String pluginName,
-                                        @NotNull ColorAlternator colours,
-                                        @NotNull String downloadLink) {
-
-        sender.sendMessage(String.format("%s%s%s is not installed on this server. You can learn more and download it at:",
-                colours.getThisColor(), pluginName, ChatColor.WHITE));
-        sender.sendMessage(String.format("%s%s", colours.getThatColor(), downloadLink));
-    }
-}
@@ -1,221 +1,49 @@
-/******************************************************************************
- * 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.commands;

-import co.aikar.commands.BaseCommand;
+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.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.api.Teleporter;
-import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
-import com.onarandombox.MultiverseCore.destination.CustomTeleporterDestination;
-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 org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Set;

+@CommandAlias("mv")
 public class TeleportCommand extends MultiverseCoreCommand {
-
-    private final SafeTTeleporter playerTeleporter;
-
-    private static final int UNSAFE_TELEPORT_EXPIRE_DELAY = 300; // In ticks
-
    public TeleportCommand(MultiverseCore plugin) {
        super(plugin);
-        this.playerTeleporter = this.plugin.getSafeTTeleporter();
    }

-    @CommandAlias("mv")
-    public class Teleport extends BaseCommand {
+    @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,

-        @Subcommand("tp|teleport")
-        @Syntax("[player] <destination>")
-        @CommandCompletion("@players|@MVWorlds:playerOnly|@destinations:playerOnly @players|@MVWorlds|@destinations")
-        @Description("Allows you to the teleport to a location on your server!")
-        public void doTeleportCommand(@NotNull CommandSender sender,
+                                  @Flags("resolve=issuerAware")
+                                  @Syntax("[player]")
+                                  @Description("Target player to teleport.")
+                                  Player[] players,

-                                      @Syntax("[player]")
-                                      @Description("Target player to teleport.")
-                                      @NotNull @Flags("other,defaultself,fallbackself") Player player,
-
-                                      @Syntax("<destination>")
-                                      @Description("Location, can be a world name.")
-                                      @NotNull @Flags("type=destination") String destinationName) {
-
-            doTeleport(sender, player, destinationName);
-        }
-
-        @Override
-        public Set<String> getRequiredPermissions() {
-            return destPerms();
+                                  @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);
        }
    }

-    public class AliasTeleport extends BaseCommand {
-
-        @CommandAlias("mvtp")
-        @Syntax("[player] <destination>")
-        @CommandCompletion("@players|@MVWorlds:playerOnly|@destinations:playerOnly @MVWorlds|@destinations")
-        @Description("Alias for /mv tp")
-        public void doTeleportCommand(@NotNull CommandSender sender,
-
-                                      @Syntax("[player]")
-                                      @Description("Target player to teleport.")
-                                      @NotNull @Flags("other,defaultself,fallbackself") Player player,
-
-                                      @Syntax("<destination>")
-                                      @Description("Location, can be a world name.")
-                                      @NotNull @Flags("type=destination") String destinationName) {
-
-            doTeleport(sender, player, destinationName);
-        }
-
-        @Override
-        public Set<String> getRequiredPermissions() {
-            return destPerms();
-        }
-    }
-
-    private Set<String> destPerms() {
-        return this.plugin.getDestFactory().getPermissions();
-    }
-
-    private void doTeleport(@NotNull CommandSender teleporter,
-                            @NotNull Player teleportee,
-                            @NotNull String destinationName) {
-
-        MVDestination destination = this.plugin.getDestFactory().getPlayerAwareDestination(teleportee, destinationName);
-
-        MVTeleportEvent teleportEvent = new MVTeleportEvent(destination, teleportee, teleporter, true);
-        this.plugin.getServer().getPluginManager().callEvent(teleportEvent);
-        if (teleportEvent.isCancelled()) {
-            Logging.fine("Someone else cancelled the MVTeleport Event!!!");
-            return;
-        }
-
-        if (destination instanceof InvalidDestination) {
-            teleporter.sendMessage(String.format("Multiverse does not know how to take you to %s%s", ChatColor.RED, destinationName));
-            return;
-        }
-
-        if (!this.checkSendPermissions(teleporter, teleportee, destination)) {
-            return;
-        }
-
-        if (this.plugin.getMVConfig().getEnforceAccess() && !this.plugin.getMVPerms().canEnterDestination(teleportee, destination)) {
-            teleporter.sendMessage((teleportee.equals(teleporter))
-                    ? "Doesn't look like you're allowed to go " + ChatColor.RED + "there..."
-                    : "Doesn't look like you're allowed to send " + ChatColor.GOLD + teleportee.getName() + ChatColor.WHITE + " to " + ChatColor.RED + "there...");
-            return;
-        }
-
-        if (!this.plugin.getMVPerms().canTravelFromLocation(teleporter, destination.getLocation(teleportee))) {
-            teleporter.sendMessage((teleportee.equals(teleporter))
-                    ? String.format("Doh! Doesn't look like you can get to %s%s %sfrom where you are...",
-                    ChatColor.GREEN, destination.toString(), ChatColor.WHITE)
-                    : 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));
-            return;
-        }
-
-        // Special check to verify if players are trying to teleport to the same WORLD Destination
-        // as the world they're in, that they ALSO have multiverse.core.spawn.self
-        if (destination instanceof WorldDestination
-                && teleportee.getWorld().equals(destination.getLocation(teleportee).getWorld())
-                && !checkSpawnPermissions(teleporter, teleportee)) {
-            return;
-        }
-
-        if (destination.getLocation(teleportee) == null) {
-            teleporter.sendMessage("Sorry Boss, I tried everything, but just couldn't teleport ya there!");
-            return;
-        }
-
-        Teleporter teleportObject = (destination instanceof CustomTeleporterDestination)
-                ? ((CustomTeleporterDestination) destination).getTeleporter()
-                : this.playerTeleporter;
-
-        TeleportResult result = teleportObject.teleport(teleporter, teleportee, destination);
-        if (result == TeleportResult.FAIL_UNSAFE) {
-            Logging.fine("Could not teleport %s to %s.",
-                    teleportee.getName(), this.plugin.getLocationManipulation().strCoordsRaw(destination.getLocation(teleportee)));
-
-            this.plugin.getMVCommandManager().getQueueManager().addToQueue(new QueuedCommand.Builder()
-                    .sender(teleporter)
-                    .action(unsafeTeleportRunnable(teleporter, teleportee, destination.getLocation(teleportee)))
-                    .prompt("The location you are trying to teleport to is deemed unsafe, do you still want to try?")
-                    .validDuration(UNSAFE_TELEPORT_EXPIRE_DELAY)
-                    .build()
-            );
-        }
-
-        // else: Player was teleported successfully (or the tp event was fired I should say)
-    }
-
-    private boolean checkSendPermissions(@NotNull CommandSender teleporter,
-                                         @NotNull Player teleportee,
-                                         @NotNull MVDestination destination) {
-
-        if (teleporter.equals(teleportee)) {
-            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.self." + destination.getIdentifier(), true)) {
-                teleporter.sendMessage(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));
-                teleporter.sendMessage(String.format("%s   (multiverse.teleport.self.%s)", ChatColor.RED, destination.getIdentifier()));
-                return false;
-            }
-            return true;
-        }
-        if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.other." + destination.getIdentifier(), true)) {
-            teleporter.sendMessage(String.format("You don't have permission to teleport another player to a %s%s Destination.", ChatColor.GREEN, destination.getType()));
-            teleporter.sendMessage(String.format("%s(multiverse.teleport.other.%s)", ChatColor.RED, destination.getIdentifier()));
-            return false;
-        }
-        return true;
-    }
-
-    private boolean checkSpawnPermissions(@NotNull CommandSender teleporter,
-                                          @NotNull Player teleportee) {
-
-        if (teleporter.equals(teleportee)) {
-            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.self", true)) {
-                teleporter.sendMessage(String.format("Sorry you don't have permission to go to the world spawn!"));
-                teleporter.sendMessage(String.format("%s  (multiverse.core.spawn.self)", ChatColor.RED));
-                return false;
-            }
-            return true;
-        }
-
-        if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.other", true)) {
-            teleporter.sendMessage(String.format("Sorry you don't have permission to send %s to the world spawn!", teleportee.getDisplayName()));
-            teleporter.sendMessage(String.format("%s  (multiverse.core.spawn.other)", ChatColor.RED));
-            return false;
-        }
-        return true;
-    }
-
-    @NotNull
-    private Runnable unsafeTeleportRunnable(@NotNull CommandSender teleporter,
-                                            @NotNull Player teleportee,
-                                            @NotNull Location location) {
-
-        return () -> this.plugin.getSafeTTeleporter().safelyTeleport(teleporter, teleportee, location, false);
+    @Override
+    public boolean hasPermission(CommandIssuer issuer) {
+        return this.plugin.getDestinationsProvider().hasAnyTeleportPermission(issuer);
    }
 }
@@ -1,50 +1,40 @@
-/******************************************************************************
- * 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.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.MultiverseWorld;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
+import com.onarandombox.MultiverseCore.api.MVWorld;
 import org.jetbrains.annotations.NotNull;

@CommandAlias("mv")
 public class UnloadCommand extends MultiverseCoreCommand {
-
-    public UnloadCommand(MultiverseCore plugin) {
+    public UnloadCommand(@NotNull MultiverseCore plugin) {
        super(plugin);
    }

    @Subcommand("unload")
    @CommandPermission("multiverse.core.unload")
+    @CommandCompletion("@mvworlds")
    @Syntax("<world>")
-    @CommandCompletion("@MVWorlds")
    @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(@NotNull CommandSender sender,
+    public void onUnloadCommand(BukkitCommandIssuer issuer,

-                                @NotNull
                                @Syntax("<world>")
-                                @Description("Name of world you want to unload.")
-                                @Flags("other") MultiverseWorld 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())) {
-            sender.sendMessage(String.format("Error unloading world '%s'! See console for more details.",
-                    world.getColoredWorldString()));
+            issuer.sendMessage(String.format("Error unloading world '%s'! See console for more details.", world.getColoredWorldString()));
            return;
        }
-        Command.broadcastCommandMessage(sender,  String.format("Unloaded world '%s'!", world.getColoredWorldString()));
+        issuer.sendMessage(String.format("Unloaded world '%s'!", world.getColoredWorldString()));
    }
 }
@@ -1,37 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-import co.aikar.commands.CommandHelp;
-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.HelpCommand;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.jetbrains.annotations.NotNull;
-
-@CommandAlias("mv")
-public class UsageCommand extends MultiverseCoreCommand {
-
-    public UsageCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @HelpCommand
-    @Subcommand("help")
-    @CommandPermission("multiverse.core.help")
-    @Syntax("[filter] [page]")
-    @CommandCompletion("@subCommands:mv")
-    @Description("Show Multiverse-Core Command usage.")
-    public void onUsageCommand(@NotNull CommandHelp help) {
-        this.plugin.getMVCommandManager().showUsage(help);
-    }
-}
@@ -1,183 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.commandtools.flag.FlagGroup;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagResult;
-import com.onarandombox.MultiverseCore.commandtools.flag.CoreFlags;
-import com.onarandombox.MultiverseCore.event.MVVersionEvent;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteFailedException;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteService;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
-import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
-import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerFactory;
-import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerType;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Map;
-
-@CommandAlias("mv")
-public class VersionCommand extends MultiverseCoreCommand {
-
-    private static final URLShortener SHORTENER = URLShortenerFactory.getService(URLShortenerType.BITLY);
-
-    public VersionCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setFlagGroup(FlagGroup.of(
-                CoreFlags.PASTE_SERVICE_TYPE,
-                CoreFlags.INCLUDE_PLUGIN_LIST
-        ));
-    }
-
-    @Subcommand("version")
-    @CommandPermission("multiverse.core.version")
-    @Syntax("--paste [pastebin|hastebin|pastegg] [--include-plugin-list]")
-    @CommandCompletion("@flags")
-    @Description("Dumps version info to the console, optionally to pastal service.")
-    public void onVersionCommand(@NotNull CommandSender sender,
-
-                                 @NotNull
-                                 @Syntax("[paste-service]")
-                                 @Description("Website to upload your version info to.")
-                                 String[] flagsArray) {
-
-        FlagResult flags = FlagResult.parse(flagsArray, this.getFlagGroup());
-
-        MVVersionEvent versionEvent = new MVVersionEvent();
-        this.addVersionInfoToEvent(versionEvent);
-        this.plugin.getServer().getPluginManager().callEvent(versionEvent);
-
-        if (flags.getValue(CoreFlags.INCLUDE_PLUGIN_LIST)) {
-            versionEvent.appendVersionInfo('\n' + "Plugins: " + getPluginList());
-            versionEvent.putDetailedVersionInfo("plugins.txt", "Plugins: " + getPluginList());
-        }
-
-        String versionInfo = versionEvent.getVersionInfo();
-        versionEvent.putDetailedVersionInfo("version.txt", versionInfo);
-
-        Map<String, String> files = versionEvent.getDetailedVersionInfo();
-
-        logToConsole(versionInfo);
-
-        PasteServiceType pasteType = flags.getValue(CoreFlags.PASTE_SERVICE_TYPE);
-        if (pasteType == PasteServiceType.NONE && !(sender instanceof ConsoleCommandSender)) {
-            sender.sendMessage("Version info dumped to console! Please check your server logs.");
-            return;
-        }
-
-        BukkitRunnable logPoster = new BukkitRunnable() {
-            @Override
-            public void run() {
-                String pasteUrl = postToService(pasteType, true, versionInfo, files);
-                sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
-            }
-        };
-
-        // Run the log posting operation asynchronously, since we don't know how long it will take.
-        logPoster.runTaskAsynchronously(this.plugin);
-    }
-
-    private void logToConsole(String versionInfo) {
-        Arrays.stream(versionInfo.split("\\r?\\n"))
-                .filter(line -> !line.isEmpty())
-                .forEach(this.plugin.getServer().getLogger()::info);
-    }
-
-    private void addVersionInfoToEvent(MVVersionEvent event) {
-        // add the legacy version info
-        event.appendVersionInfo(this.getLegacyString());
-
-        // add the legacy file, but as markdown so it's readable
-        // TODO API: Readd this in 5.0.0
-        // event.putDetailedVersionInfo("version.md", this.getMarkdownString());
-
-        // add config.yml
-        File configFile = new File(this.plugin.getDataFolder(), "config.yml");
-        event.putDetailedVersionInfo("multiverse-core/config.yml", configFile);
-
-        // add worlds.yml
-        File worldsFile = new File(this.plugin.getDataFolder(), "worlds.yml");
-        event.putDetailedVersionInfo("multiverse-core/worlds.yml", worldsFile);
-    }
-
-    /**
-     * Send the current contents of this.pasteBinBuffer to a web service.
-     *
-     * @param type       Service type to send paste data to.
-     * @param isPrivate  Should the paste be marked as private.
-     * @param pasteData  Legacy string only data to post to a service.
-     * @param pasteFiles Map of filenames/contents of debug info.
-     * @return URL of visible paste
-     */
-    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData, Map<String, String> pasteFiles) {
-        PasteService ps = PasteServiceFactory.getService(type, isPrivate);
-
-        try {
-            String result = (ps.supportsMultiFile())
-                    ? ps.postData(pasteFiles)
-                    : ps.postData(pasteData);
-
-            return (SHORTENER != null) ? SHORTENER.shorten(result) : result;
-        }
-        catch (PasteFailedException e) {
-            e.printStackTrace();
-            return String.format("%sError posting to service.", ChatColor.RED);
-        }
-        catch (NullPointerException e) {
-            e.printStackTrace();
-            return String.format("%sThat service isn't supported yet.", ChatColor.RED);
-        }
-    }
-
-    private String getLegacyString() {
-        return "[Multiverse-Core] Multiverse-Core Version: " + this.plugin.getDescription().getVersion() + '\n'
-                + "[Multiverse-Core] Bukkit Version: " + this.plugin.getServer().getVersion() + '\n'
-                + "[Multiverse-Core] Loaded Worlds: " + this.plugin.getMVWorldManager().getMVWorlds() + '\n'
-                + "[Multiverse-Core] Multiverse Plugins Loaded: " + this.plugin.getPluginCount() + '\n'
-                + "[Multiverse-Core] Economy being used: " + plugin.getEconomist().getEconomyName() + '\n'
-                + "[Multiverse-Core] Permissions Plugin: " + this.plugin.getMVPerms().getType() + '\n'
-                + "[Multiverse-Core] Dumping Config Values: (version " + this.plugin.getMVConfig().getVersion() + ")" + '\n'
-                + "[Multiverse-Core]   enforceaccess: " + this.plugin.getMVConfig().getEnforceAccess() + '\n'
-                + "[Multiverse-Core]   prefixchat: " + this.plugin.getMVConfig().getPrefixChat() + '\n'
-                + "[Multiverse-Core]   prefixchatformat: " + this.plugin.getMVConfig().getPrefixChatFormat() + '\n'
-                + "[Multiverse-Core]   useasyncchat: " + this.plugin.getMVConfig().getUseAsyncChat() + '\n'
-                + "[Multiverse-Core]   teleportintercept: " + this.plugin.getMVConfig().getTeleportIntercept() + '\n'
-                + "[Multiverse-Core]   firstspawnoverride: " + this.plugin.getMVConfig().getFirstSpawnOverride() + '\n'
-                + "[Multiverse-Core]   displaypermerrors: " + this.plugin.getMVConfig().getDisplayPermErrors() + '\n'
-                + "[Multiverse-Core]   globaldebug: " + this.plugin.getMVConfig().getGlobalDebug() + '\n'
-                + "[Multiverse-Core]   enablebuscript: " + plugin.getMVConfig().getEnableBuscript() + '\n'
-                + "[Multiverse-Core]   silentstart: " + this.plugin.getMVConfig().getSilentStart() + '\n'
-                + "[Multiverse-Core]   messagecooldown: " + this.plugin.getMessaging().getCooldown() + '\n'
-                + "[Multiverse-Core]   version: " + this.plugin.getMVConfig().getVersion() + '\n'
-                + "[Multiverse-Core]   firstspawnworld: " + this.plugin.getMVConfig().getFirstSpawnWorld() + '\n'
-                + "[Multiverse-Core]   teleportcooldown: " + this.plugin.getMVConfig().getTeleportCooldown() + '\n'
-                + "[Multiverse-Core]   defaultportalsearch: " +this. plugin.getMVConfig().isUsingDefaultPortalSearch() + '\n'
-                + "[Multiverse-Core]   portalsearchradius: " + this.plugin.getMVConfig().getPortalSearchRadius() + '\n'
-                + "[Multiverse-Core]   autopurge: " +this. plugin.getMVConfig().isAutoPurgeEnabled() + '\n'
-                + "[Multiverse-Core] Special Code: FRN002" + '\n';
-    }
-
-    private String getPluginList() {
-        return StringUtils.join(this.plugin.getServer().getPluginManager().getPlugins(), ", ");
-    }
-}
@@ -1,129 +0,0 @@
-/******************************************************************************
- * 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.commands;
-
-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.Flags;
-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.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.PageFilter;
-import com.onarandombox.MultiverseCore.displaytools.ContentDisplay;
-import com.onarandombox.MultiverseCore.displaytools.ContentFilter;
-import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers;
-import com.onarandombox.MultiverseCore.displaytools.DisplaySettings;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-@CommandAlias("mv")
-public class WhoCommand extends MultiverseCoreCommand {
-
-    public WhoCommand(MultiverseCore plugin) {
-        super(plugin);
-    }
-
-    @Subcommand("whoall")
-    @CommandPermission("multiverse.core.list.who.all")
-    @Syntax("[filter]")
-    public void onWhoAllCommand(@NotNull CommandSender sender,
-
-                                @NotNull
-                                @Syntax("[filter] [page]")
-                                @Description("Filter and paging.")
-                                PageFilter pageFilter) {
-
-        Player player = (sender instanceof Player) ? (Player) sender : null;
-        Set<Player> visiblePlayers = getVisiblePlayers(player);
-
-        new ContentDisplay.Builder<Collection<String>>()
-                .sender(sender)
-                .header("%s--- Worlds and their players --- %s%s/%s", ChatColor.GOLD, ChatColor.AQUA, visiblePlayers.size(), this.plugin.getServer().getMaxPlayers())
-                .contents(buildAllWorlds(player, visiblePlayers))
-                .displayHandler(DisplayHandlers.PAGE_LIST)
-                .filter(pageFilter.getFilter())
-                .setting(DisplaySettings.SHOW_PAGE, pageFilter.getPage())
-                .display();
-    }
-
-    @Subcommand("who")
-    @CommandPermission("multiverse.core.list.who")
-    @Syntax("[world] [filter]")
-    @CommandCompletion("@MVWorlds")
-    public void onWhoCommand(@NotNull CommandSender sender,
-                             @Nullable @Optional Player player,
-
-                             @NotNull
-                             @Syntax("[world]")
-                             @Description("World to show player list.")
-                             @Flags("other,defaultself,fallbackself")
-                             @Conditions("hasWorldAccess") MultiverseWorld world,
-
-                             @NotNull
-                             @Syntax("[filter]")
-                             @Description("Filter the player names.")
-                             ContentFilter filter) {
-
-        Set<Player> visiblePlayers = getVisiblePlayers(player);
-
-        new ContentDisplay.Builder<Collection<String>>()
-                .sender(sender)
-                .header("%s===[ Players in %s%s ]===", ChatColor.AQUA, world.getColoredWorldString(), ChatColor.AQUA)
-                .contents(buildPlayerList(world, visiblePlayers))
-                .emptyMessage("%sNo players found.", ChatColor.GRAY)
-                .displayHandler(DisplayHandlers.PAGE_LIST)
-                //TODO: Filter
-                .display();
-    }
-
-    private List<String> buildAllWorlds(@Nullable Player player,
-                                        @NotNull Set<Player> visiblePlayers) {
-
-        return this.plugin.getMVWorldManager().getMVWorlds().stream()
-                .filter(world -> player == null || this.plugin.getMVPerms().canEnterWorld(player, world))
-                .map(world -> getPLayersInWorld(world, visiblePlayers))
-                .collect(Collectors.toList());
-    }
-
-    private String getPLayersInWorld(@NotNull MultiverseWorld world,
-                                     @NotNull Set<Player> visiblePlayers) {
-
-        return String.format("%s%s - %s",
-                world.getColoredWorldString(), ChatColor.WHITE, buildPlayerList(world, visiblePlayers));
-    }
-
-    @NotNull
-    private List<String> buildPlayerList(@NotNull MultiverseWorld world,
-                                         @NotNull Set<Player> visiblePlayers) {
-
-        return world.getCBWorld().getPlayers().stream()
-            .filter(visiblePlayers::contains)
-            .map(Player::getDisplayName)
-            .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Set<Player> getVisiblePlayers(@Nullable Player player) {
-        return this.plugin.getServer().getOnlinePlayers().stream()
-                .filter(targetPLayer -> player == null || player.canSee(targetPLayer))
-                .collect(Collectors.toSet());
-    }
-}
@@ -1,4 +1,4 @@
 /**
- * Where all the commands are.
+ * This package contains all the commands for Multiverse-Core.
 */
-package com.onarandombox.MultiverseCore.commands;
+package com.onarandombox.MultiverseCore.commands;
@@ -1,323 +1,102 @@
-/******************************************************************************
- * 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;

-import buscript.Buscript;
-import co.aikar.commands.BukkitCommandCompletionContext;
-import co.aikar.commands.CommandIssuer;
-import co.aikar.commands.PaperCommandCompletions;
-import co.aikar.commands.RegisteredCommand;
-import co.aikar.commands.RootCommand;
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commandtools.flag.CommandFlag;
-import com.onarandombox.MultiverseCore.commandtools.flag.CommandFlag.ValueRequirement;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup;
-import com.onarandombox.MultiverseCore.enums.AddProperties;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
-import org.bukkit.GameRule;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.text.DecimalFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;

-/**
- * Generate tab-complete suggestion.
- */
-public class MVCommandCompletions extends PaperCommandCompletions {
+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;

-    private static final DecimalFormat df = new DecimalFormat();
-
-    static {
-        df.setMinimumFractionDigits(0);
-        df.setMaximumFractionDigits(2);
-    }
-
-    public MVCommandCompletions(@NotNull MVCommandManager manager,
-                                @NotNull MultiverseCore plugin) {
-        super(manager);
+    public MVCommandCompletions(MVCommandManager mvCommandManager, MultiverseCore plugin) {
+        super(mvCommandManager);
+        this.commandManager = mvCommandManager;
        this.plugin = plugin;
        this.worldManager = plugin.getMVWorldManager();

-        registerAsyncCompletion("flags", this::suggestFlags);
-        registerAsyncCompletion("scripts", this::suggestScripts);
-        registerAsyncCompletion("subCommands", this::suggestSubCommands);
-        registerAsyncCompletion("MVWorlds", this::suggestMVWorlds);
-        registerAsyncCompletion("unloadedWorlds", this::suggestUnloadedWorlds);
-        registerAsyncCompletion("potentialWorlds", this::suggestPotentialWorlds);
-        registerAsyncCompletion("location", this::suggestLocation);
        registerAsyncCompletion("destinations", this::suggestDestinations);
-        registerAsyncCompletion("anchors", this::suggestAnchors);
-        registerStaticCompletion("MVConfigs", this::suggestMVConfig);
-        registerStaticCompletion("gameRules", this::suggestGameRules);
-        registerStaticCompletion("environments", this::suggestEnvironments);
-        registerStaticCompletion("setProperties", this::suggestSetProperties);
-        registerStaticCompletion("addProperties", this::suggestAddProperties);
-        registerStaticCompletion("livingEntities", this::suggestEntities);
-        registerStaticCompletion("pasteTypes", this::suggestPasteTypes);
-        registerStaticCompletion("toggles", this::suggestToggles);
+        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());
    }

-    @NotNull
    private Collection<String> suggestFlags(@NotNull BukkitCommandCompletionContext context) {
-        final MultiverseCommand command = MVCommandReflect.getCommandCompletionContextCommand(context);
-        if (command == null) {
-            Logging.warning("Unable to parse flags as MultiverseCommand not found!");
+        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();
        }

-        FlagGroup flagGroup = command.getFlagGroup();
-        String[] args = context.getContextValue(String[].class);
-        CommandFlag<?> flag = (args.length <= 1) ? null : flagGroup.getByKey(args[args.length - 2]);
-
-        if (flag == null || flag.getValueRequirement() == ValueRequirement.NONE) {
-            // suggest new flags.
-            return getRemainingFlagIdentifiers(flagGroup, args);
+        if (!context.hasConfig("multiple")) {
+            return getMVWorldNames(context);
        }

-        Collection<String> flagSuggestions = flag.suggestValue();
-
-        if (flag.getValueRequirement() == ValueRequirement.OPTIONAL) {
-            // suggest new flags and values.
-            flagSuggestions.addAll(getRemainingFlagIdentifiers(flagGroup, args));
-            return flagSuggestions;
-        }
-        // suggest new values.
-        return flagSuggestions == null ? Collections.emptySet() : flagSuggestions;
-    }
-
-    private Collection<String> getRemainingFlagIdentifiers(FlagGroup flagGroup, String[] args) {
-        Set<String> identifiersRemaining = new HashSet<>(flagGroup.getFlagIdentifiers());
-        identifiersRemaining.removeAll(Arrays.asList(args));
-        return identifiersRemaining;
-    }
-
-    @NotNull
-    private Collection<String> suggestScripts(@NotNull BukkitCommandCompletionContext context) {
-        Buscript scriptAPI = this.plugin.getScriptAPI();
-        if (scriptAPI == null) {
-            return Collections.emptyList();
-        }
-
-        return Arrays.stream(scriptAPI.getScriptFolder().listFiles())
-                .unordered()
-                .filter(File::isFile)
-                .map(File::getName)
-                .filter(fileName -> !fileName.equals("scripts.bin"))
+        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());
    }

-    @NotNull
-    private Collection<String> suggestSubCommands(@NotNull BukkitCommandCompletionContext context) {
-        String rootCmdName = context.getConfig();
-        if (rootCmdName == null) {
-            return Collections.emptyList();
-        }
-
-        RootCommand rootCommand = this.plugin.getMVCommandManager().getRegisteredRootCommands().stream()
-                .unordered()
-                .filter(c -> c.getCommandName().equals(rootCmdName))
-                .findFirst()
-                .orElse(null);
-
-        if (rootCommand == null) {
-            return Collections.emptyList();
-        }
-
-        return rootCommand.getSubCommands().entries().stream()
-                .unordered()
-                .filter(entry -> checkPerms(context.getIssuer(), entry.getValue()))
-                .map(Map.Entry::getKey)
-                .filter(cmdName -> !cmdName.startsWith("__"))
-                .collect(Collectors.toList());
-    }
-
-    private boolean checkPerms(@NotNull CommandIssuer issuer,
-                               @NotNull RegisteredCommand<?> cmd) {
-
-        return this.plugin.getMVCommandManager().hasPermission(issuer, cmd.getRequiredPermissions());
-    }
-
-    @NotNull
-    private Collection<String> suggestMVWorlds(@NotNull BukkitCommandCompletionContext context) {
-        if (isPlayerOnly(context)) {
-            return Collections.emptyList();
-        }
-
-        return this.worldManager.getMVWorlds().parallelStream()
-                .unordered()
-                .map(MultiverseWorld::getName)
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestUnloadedWorlds(@NotNull BukkitCommandCompletionContext context) {
-        if (isPlayerOnly(context)) {
-            return Collections.emptyList();
-        }
-
-        return this.worldManager.getUnloadedWorlds();
-    }
-
-    @NotNull
-    private Collection<String> suggestPotentialWorlds(@NotNull BukkitCommandCompletionContext context) {
-        if (isPlayerOnly(context)) {
-            return Collections.emptyList();
-        }
-
-        Collection<MultiverseWorld> worlds = this.worldManager.getMVWorlds();
-        Set<String> knownWorlds = worlds.parallelStream()
-                .unordered()
-                .map(MultiverseWorld::getName)
-                .collect(Collectors.toCollection(() -> new HashSet<>(worlds.size())));
-
-        return Arrays.stream(this.plugin.getServer().getWorldContainer().listFiles()).parallel()
-                .unordered()
-                .filter(File::isDirectory)
-                .filter(file -> !knownWorlds.contains(file.getName()))
-                .map(File::getName)
-                .filter(this.worldManager::isValidWorld)
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestLocation(@NotNull BukkitCommandCompletionContext context) {
-        if (isPlayerOnly(context)) {
-            return Collections.emptyList();
-        }
-
-        Player player = context.getPlayer();
-        if (player == null) {
-            return Collections.emptyList();
-        }
-
-        DecimalFormat df = new DecimalFormat();
-        df.setMinimumFractionDigits(0);
-        df.setMaximumFractionDigits(2);
-
-        Location playerLocation = player.getLocation();
-        double coordValue;
-        switch (context.getConfig()) {
-            case "x":
-                coordValue = playerLocation.getX();
+    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 "y":
-                coordValue = playerLocation.getY();
+            case "unloaded":
+                worlds.addAll(worldManager.getUnloadedWorlds());
                break;
-            case "z":
-                coordValue = playerLocation.getZ();
+            case "potential":
+                worlds.addAll(worldManager.getPotentialWorlds());
                break;
-            case "yaw":
-                coordValue = playerLocation.getYaw();
-                break;
-            case "pitch":
-                coordValue = playerLocation.getPitch();
-                break;
-            default:
-                return Collections.emptyList();
        }
-
-        return Collections.singletonList(df.format(coordValue));
-    }
-
-    @NotNull
-    private Collection<String> suggestDestinations(@NotNull BukkitCommandCompletionContext context) {
-        if (isPlayerOnly(context)) {
-            return Collections.emptyList();
-        }
-
-        return this.plugin.getDestFactory().getIdentifiers().parallelStream()
-                .unordered()
-                .filter(id -> !id.isEmpty())
-                .map(id -> id + ":")
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestAnchors(@NotNull BukkitCommandCompletionContext context) {
-        if (isPlayerOnly(context)) {
-            return Collections.emptyList();
-        }
-
-        return this.plugin.getAnchorManager().getAnchors(context.getPlayer());
-    }
-
-    private boolean isPlayerOnly(@NotNull BukkitCommandCompletionContext context) {
-        String config = context.getConfig();
-        return config != null && context.getPlayer() == null && config.equals("playerOnly");
-    }
-
-    @NotNull
-    private Collection<String> suggestMVConfig() {
-        final Set<String> configOptions = this.plugin.getMVConfig().serialize().keySet();
-        configOptions.remove("version");
-        return configOptions;
-    }
-
-    @NotNull
-    private Collection<String> suggestGameRules() {
-        return Arrays.stream(GameRule.values())
-                .map(GameRule::getName)
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestEnvironments() {
-        return Arrays.stream(World.Environment.values())
-                .map(e -> e.toString().toLowerCase())
-                .collect(Collectors.toList());
-    }
-
-    private Collection<String> suggestSetProperties() {
-        return this.worldManager.getMVWorlds().iterator().next().getAllPropertyTypes();
-    }
-
-    @NotNull
-    private Collection<String> suggestAddProperties() {
-        return Arrays.stream(AddProperties.values())
-                .map(p -> p.toString().toLowerCase())
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestEntities() {
-        return Arrays.stream(EntityType.values())
-                .filter(e -> e.isAlive() && e.isSpawnable())
-                .map(e -> e.toString().toLowerCase())
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestPasteTypes() {
-        return Arrays.stream(PasteServiceType.values())
-                .filter(pt -> pt != PasteServiceType.GITHUB && pt != PasteServiceType.NONE)
-                .map(p -> p.toString().toLowerCase())
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    private Collection<String> suggestToggles() {
-        return Arrays.asList("on", "off");
+        return worlds;
    }
 }
@@ -1,10 +1,3 @@
-/******************************************************************************
- * 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;

 import co.aikar.commands.BukkitCommandExecutionContext;
@@ -14,183 +7,69 @@ import co.aikar.commands.CommandConditions;
 import co.aikar.commands.ConditionContext;
 import co.aikar.commands.ConditionFailedException;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.enums.AddProperties;
-import com.onarandombox.MultiverseCore.enums.WorldValidationResult;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
+import com.onarandombox.MultiverseCore.world.WorldNameChecker;

-/**
- * Args input validation.
- */
 public class MVCommandConditions {
+    static void load(MVCommandManager commandManager, MultiverseCore plugin) {
+        new MVCommandConditions(commandManager, plugin);
+    }

+    private final MVCommandManager commandManager;
    private final MultiverseCore plugin;
-    private final MVWorldManager worldManager;
-
-    public MVCommandConditions(@NotNull MultiverseCore plugin,
-                               @NotNull CommandConditions<BukkitCommandIssuer, BukkitCommandExecutionContext, BukkitConditionContext> conditions) {

+    public MVCommandConditions(MVCommandManager commandManager, MultiverseCore plugin) {
+        this.commandManager = commandManager;
        this.plugin = plugin;
-        this.worldManager = plugin.getMVWorldManager();

-        conditions.addCondition(String.class, "isMVWorld", this::checkIsMVWorld);
-        conditions.addCondition(String.class, "isUnloadedWorld", this::checkIsUnloadedWorld);
-        conditions.addCondition(String.class, "isWorldInConfig", this::checkIsWorldInConfig);
-        conditions.addCondition(String.class, "creatableWorldName", this::checkCreatableWorldName);
-        conditions.addCondition(String.class, "importableWorldName", this::checkImportableWorldName);
-        conditions.addCondition(String.class, "validWorldFolder", this::checkValidWorldFolder);
-        conditions.addCondition(String.class, "validAddProperty", this::checkValidAddProperty);
-        conditions.addCondition(MultiverseWorld.class, "hasWorldAccess", this::checkHasWorldAccess);
+        CommandConditions<BukkitCommandIssuer, BukkitCommandExecutionContext, BukkitConditionContext> conditions
+                = commandManager.getCommandConditions();
+
+        conditions.addCondition(String.class, "validWorldName", this::checkValidWorldName);
    }

-    private void checkIsMVWorld(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                @NotNull BukkitCommandExecutionContext executionContext,
-                                @NotNull String worldName) {
+    private void checkValidWorldName(ConditionContext<BukkitCommandIssuer> context,
+                                     BukkitCommandExecutionContext executionContext,
+                                     String worldName
+    ) {
+        String scope = context.getConfigValue("scope", "loaded");

-        if (!this.worldManager.isMVWorld(worldName)) {
-            throw new ConditionFailedException(String.format("World '%s' not found.", worldName));
-        }
-    }
-
-    private void checkIsUnloadedWorld(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                      @NotNull BukkitCommandExecutionContext executionContext,
-                                      @NotNull String worldName) {
-
-        if (this.worldManager.isMVWorld(worldName)) {
-            throw new ConditionFailedException(String.format("World '%s' is already loaded.", worldName));
-        }
-
-        if (!this.worldManager.getUnloadedWorlds().contains(worldName)) {
-            if (this.worldManager.isValidWorld(worldName)) {
-                CommandSender sender = executionContext.getSender();
-                sender.sendMessage(String.format("%sMultiverse does not know about world '%s' yet. Please import it with %s/mv import %s <env>%s.",
-                        ChatColor.RED, worldName, ChatColor.AQUA, worldName, ChatColor.RED));
-                sender.sendMessage(String.format("See %s/mv help import %sfor more info.",
-                        ChatColor.AQUA, ChatColor.WHITE));
-                throw new ConditionFailedException();
-            }
-            throw new ConditionFailedException(String.format("World '%s' not found.", worldName));
-        }
-    }
-
-    private void checkIsWorldInConfig(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                      @NotNull BukkitCommandExecutionContext executionContext,
-                                      @NotNull String worldName) {
-
-        if (!this.worldManager.hasUnloadedWorld(worldName, true)) {
-            throw new ConditionFailedException(String.format("World '%s' not found.", worldName));
-        }
-    }
-
-    private void checkCreatableWorldName(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                         @NotNull BukkitCommandExecutionContext executionContext,
-                                         @NotNull String worldName) {
-
-        if (this.worldManager.isMVWorld(worldName)) {
-            throw new ConditionFailedException(String.format("%sMultiverse cannot create %sanother %s%sworld named '%s'.",
-                    ChatColor.RED, ChatColor.GOLD, ChatColor.RESET, ChatColor.RED, worldName));
-        }
-
-        WorldValidationResult validationResult = this.worldManager.validateWorld(worldName);
-        validateWorldNameResult(validationResult);
-
-        if (validationResult != WorldValidationResult.DOES_NOT_EXIST && validationResult != WorldValidationResult.NOT_A_DIRECTORY) {
-            CommandSender sender = executionContext.getSender();
-            if (validationResult == WorldValidationResult.VALID) {
-                sender.sendMessage(String.format("%sWorld Folder '%s' already look like a world to me! You can try importing it with %s/mv import%s.",
-                        ChatColor.RED, worldName, ChatColor.AQUA, ChatColor.RED));
-                sender.sendMessage(String.format("See %s/mv help import %sfor more info.",
-                        ChatColor.AQUA, ChatColor.WHITE));
-                throw new ConditionFailedException();
-            }
-
-            sender.sendMessage(String.format("%sA folder already exists with this name!", ChatColor.RED));
-            throw new ConditionFailedException();
-        }
-    }
-
-    private void checkImportableWorldName(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                          @NotNull BukkitCommandExecutionContext executionContext,
-                                          @NotNull String worldName) {
-
-        if (this.worldManager.isMVWorld(worldName)) {
-            executionContext.getSender().sendMessage(String.format("%sMultiverse %s already knows about %s%s%s!",
-                    ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, worldName, ChatColor.WHITE));
-            throw new ConditionFailedException();
-        }
-
-        checkValidWorldFolder(context, executionContext, worldName);
-    }
-
-    private void checkValidWorldFolder(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                       @NotNull BukkitCommandExecutionContext executionContext,
-                                       @NotNull String worldName) {
-
-        WorldValidationResult validationResult = this.worldManager.validateWorld(worldName);
-        validateWorldNameResult(validationResult);
-        validateWorldFolderResult(validationResult, worldName);
-    }
-
-    private void validateWorldNameResult(WorldValidationResult validationResult) {
-        switch (validationResult) {
-            case NAME_BLACKLISTED:
-                throw new ConditionFailedException("World should not be in reserved server folders.");
-            case NAME_CONTAINS_DAT:
-                throw new ConditionFailedException("Multiverse cannot have a world name that contains '.dat'.");
-            case NAME_INVALID:
-                throw new ConditionFailedException("World name should not contain spaces or special characters! Please rename your world folder.");
-        }
-    }
-
-    private void validateWorldFolderResult(@NotNull WorldValidationResult validationResult,
-                                           @NotNull String worldName) {
-        switch (validationResult) {
-            case DOES_NOT_EXIST:
-            case NOT_A_DIRECTORY:
-                throw new ConditionFailedException(String.format("World folder '%s' does not exist.", worldName));
-            case FOLDER_LACK_DAT:
-                throw new ConditionFailedException(String.format("'%s' does not appear to be a world! It is lacking .dat file.", worldName));
-        }
-    }
-
-    private void checkValidAddProperty (@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                        @NotNull BukkitCommandExecutionContext executionContext,
-                                        @NotNull String property) {
-
-        String actionType = context.getConfig();
-        if (actionType.equalsIgnoreCase("set")) {
-            return;
-        }
-
-        try {
-            AddProperties.valueOf(property);
-        }
-        catch (IllegalArgumentException e) {
-            CommandSender sender = executionContext.getSender();
-            sender.sendMessage(String.format("%sSorry, you can't use %s with '%s'.",
-                    ChatColor.RED, actionType, property));
-            sender.sendMessage(String.format("%sPlease visit our Github Wiki for more information: https://goo.gl/q1h01S",
-                    ChatColor.AQUA));
-            throw new ConditionFailedException();
-        }
-    }
-
-    private void checkHasWorldAccess(@NotNull ConditionContext<BukkitCommandIssuer> context,
-                                     @NotNull BukkitCommandExecutionContext executionContext,
-                                     @NotNull MultiverseWorld world) {
-
-        Player player = executionContext.getPlayer();
-        if (player == null) {
-            return;
-        }
-
-        if (!this.plugin.getMVPerms().canEnterWorld(player, world)) {
-            throw new ConditionFailedException(String.format("You aren't allowed to access to world '%s%s'!",
-                    world.getColoredWorldString(), ChatColor.RED));
+        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 + "'!");
        }
    }
 }
@@ -1,416 +1,291 @@
-/******************************************************************************
- * 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;

+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.annotation.Values;
+import co.aikar.commands.contexts.ContextResolver;
+import com.google.common.base.Strings;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.commands.EnvironmentCommand;
-import com.onarandombox.MultiverseCore.commandtools.context.GameRuleProperty;
-import com.onarandombox.MultiverseCore.commandtools.context.PageFilter;
-import com.onarandombox.MultiverseCore.commandtools.context.RequiredPlayer;
-import com.onarandombox.MultiverseCore.destination.InvalidDestination;
-import com.onarandombox.MultiverseCore.displaytools.ContentFilter;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
+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.World;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;

-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * Parse args into objects.
- */
 public class MVCommandContexts extends PaperCommandContexts {
-
    private final MultiverseCore plugin;
-    private final MVWorldManager worldManager;

-    private static final Pattern UUID_REGEX = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}");
-    private static final Pattern TRIM_REGEX = Pattern.compile("^[./\\\\]+");
-
-    public MVCommandContexts(@NotNull MVCommandManager manager,
-                             @NotNull MultiverseCore plugin) {
-
-        super(manager);
+    public MVCommandContexts(MVCommandManager mvCommandManager, MultiverseCore plugin) {
+        super(mvCommandManager);
        this.plugin = plugin;
-        this.worldManager = plugin.getMVWorldManager();

-        registerContext(RequiredPlayer.class, this::deriveRequiredPlayer);
-        registerIssuerOnlyContext(Player.class, this::derivePlayer);
-
-        registerIssuerAwareContext(MultiverseWorld.class, this::deriveMultiverseWorld);
-        registerContext(World.Environment.class, this::deriveEnvironment);
-        registerIssuerAwareContext(GameRuleProperty.class, this::deriveGameRuleProperty);
-        registerIssuerAwareContext(MVDestination.class, this::deriveMVDestination);
-        registerIssuerAwareContext(PasteServiceType.class, this::derivePasteServiceType);
-        registerOptionalContext(String.class, this::deriveString);
-        registerIssuerAwareContext(ContentFilter.class, this::deriveContentFilter);
-        registerOptionalContext(PageFilter.class, this::derivePageFilter);
+        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);
    }

-    @NotNull
-    private Player derivePlayer(@NotNull BukkitCommandExecutionContext context) {
-        Player player = context.getPlayer();
-        if (player == null) {
-            throw new InvalidCommandArgument("You must be a player to run this command.");
+    private ContentFilter parseContentFilter(BukkitCommandExecutionContext context) {
+        if (Strings.isNullOrEmpty(context.getFirstArg())) {
+            return DefaultContentFilter.get();
        }
-        return player;
+        String filterString = context.popFirstArg();
+        return RegexContentFilter.fromString(filterString);
    }

-    @NotNull
-    private RequiredPlayer deriveRequiredPlayer(BukkitCommandExecutionContext context) {
-        String playerIdentifier = context.getFirstArg();
-        Player player = getPlayerFromValue(context.getSender(), playerIdentifier);
-        if (player == null) {
-            throw new InvalidCommandArgument("Invalid player name '" + playerIdentifier + "'!");
+    private ParsedDestination<?> parseDestination(BukkitCommandExecutionContext context) {
+        String destination = context.popFirstArg();
+        if (Strings.isNullOrEmpty(destination)) {
+            throw new InvalidCommandArgument("No destination specified.");
        }
-        return new RequiredPlayer(player);
+
+        ParsedDestination<?> parsedDestination = plugin.getDestinationsProvider().parseDestination(destination);
+        if (parsedDestination == null) {
+            throw new InvalidCommandArgument("The destination " + destination + " is not valid.");
+        }
+
+        return parsedDestination;
    }

-    @Nullable
-    private MultiverseWorld deriveMultiverseWorld(@NotNull BukkitCommandExecutionContext context) {
-        if (!context.hasFlag("other")) {
-            return getPlayerWorld(
-                    context.getPlayer(),
-                    context.isOptional()
-                    , "You cannot run this command from console."
-            );
+    private GameRule<?> parseGameRule(BukkitCommandExecutionContext context) {
+        String gameRuleName = context.popFirstArg();
+        if (Strings.isNullOrEmpty(gameRuleName)) {
+            throw new InvalidCommandArgument("No game rule specified.");
        }

-        String worldName = context.getFirstArg();
-        if (worldName == null) {
-            if (context.hasFlag("defaultself")) {
-                return getPlayerWorld(
-                        context.getPlayer(),
-                        context.isOptional()
-                        , "You need to specific a world name from console."
-                );
+        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("You need to specific a world name.");
+            throw new InvalidCommandArgument("This command can only be used by a player in a Multiverse World.");
        }

-        MultiverseWorld world = getWorld(context.getSender(), worldName, !context.hasFlag("ignoreunload"));
-        if (world == null) {
-            if (context.hasFlag("fallbackself")) {
-                return getPlayerWorld(context.getPlayer(),
-                        context.isOptional(),
-                        String.format("World '%s' not found.", worldName));
+        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 (this.worldManager.isValidWorld(worldName)) {
-                CommandSender sender = context.getSender();
-                sender.sendMessage(String.format("%sMultiverse does not know about world '%s' yet. Please import it with %s/mv import %s <env>%s.",
-                        ChatColor.RED, worldName, ChatColor.AQUA, worldName, ChatColor.RED));
-                sender.sendMessage(String.format("See %s/mv help import %sfor more info.",
-                        ChatColor.AQUA, ChatColor.WHITE));
-                throw new InvalidCommandArgument();
+            if (context.getIssuer().isPlayer()) {
+                return plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
            }
-            throw new InvalidCommandArgument(String.format("World '%s' not found.", worldName), false);
-        }
-
-        context.popFirstArg();
-        return world;
-    }
-
-    @Nullable
-    private MultiverseWorld getWorld(@NotNull CommandSender sender,
-                                     @NotNull String worldName,
-                                     boolean checkUnloaded) {
-
-        MultiverseWorld targetWorld = this.worldManager.getMVWorld(worldName);
-        if (targetWorld != null) {
-            return targetWorld;
-        }
-
-        //TODO: API should have a isUnloadedWorld method.
-        if (checkUnloaded && this.worldManager.getUnloadedWorlds().contains(worldName)) {
-            sender.sendMessage(String.format("%sWorld '%s' exists, but it is unloaded!", ChatColor.RED, worldName));
-            sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, worldName));
-            throw new InvalidCommandArgument();
-        }
-
-        return null;
-    }
-
-    @Nullable
-    private MultiverseWorld getPlayerWorld(@Nullable Player player,
-                                           boolean allowNull,
-                                           @NotNull String errorReason) {
-
-        if (player == null) {
-            if (allowNull) {
+            if (context.isOptional()) {
                return null;
            }
-            throw new InvalidCommandArgument(errorReason, false);
+            throw new InvalidCommandArgument("Player is not in a Multiverse World.");
        }

-        MultiverseWorld targetWorld = this.worldManager.getMVWorld(player.getWorld());
-        if (targetWorld == null) {
-            player.sendMessage(String.format("%sMultiverse doesn't know about world '%s%s%s' that '%s%s%s' is in.",
-                    ChatColor.RED, ChatColor.DARK_AQUA, player.getWorld().getName(), ChatColor.RED,
-                    ChatColor.AQUA, player.getName(), ChatColor.RED));
-
-            player.sendMessage(String.format("You need to import the world with %s/mv import %s %s",
-                    ChatColor.DARK_AQUA, player.getWorld().getName(), player.getWorld().getEnvironment()));
-
-            throw new InvalidCommandArgument();
+        // Get world based on input only
+        if (world != null) {
+            context.popFirstArg();
+            return world;
        }
-
-        return targetWorld;
-    }
-
-    @Nullable
-    private Player getPlayerFromSelf(@NotNull BukkitCommandExecutionContext context, String errorReason) {
-        Player self = context.getPlayer();
-        if (self == null && !context.isOptional()) {
-            throw new InvalidCommandArgument(errorReason);
-        }
-        return self;
-    }
-
-    /**
-     * Parse Player from string.
-     * Supports player name, UUID and selectors.
-     *
-     * @param sender            Sender use to parse vanilla selectors.
-     * @param playerIdentifier  Text to parse into a Player object.
-     * @return A Player object if found, null otherwise.
-     */
-    @Nullable
-    public Player getPlayerFromValue(@NotNull CommandSender sender,
-                                     @Nullable String playerIdentifier) {
-
-        if (playerIdentifier == null) {
+        if (!context.isOptional()) {
            return null;
        }
-
-        Player player = getPlayerBySelector(sender, playerIdentifier);
-        if (player == null) {
-            player = Bukkit.getPlayerExact(playerIdentifier);
-        }
-        if (player == null) {
-            player = getPlayerByUUID(playerIdentifier);
-        }
-
-        return player;
+        throw new InvalidCommandArgument("World " + worldName + " is not a loaded multiverse world.");
    }

-    @Nullable
-    private Player getPlayerBySelector(@NotNull CommandSender sender,
-                                       @NotNull String playerIdentifier) {
+    private MVWorld[] parseMVWorldArray(BukkitCommandExecutionContext context) {
+        String resolve = context.getFlagValue("resolve", "");

-        if (playerIdentifier.charAt(0) != '@') {
-            return null;
+        MVWorld playerWorld = null;
+        if (context.getIssuer().isPlayer()) {
+            playerWorld = plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
        }

-        List<Player> matchedPlayers;
-        try {
-            matchedPlayers = this.plugin.getServer().selectEntities(sender, playerIdentifier).parallelStream()
-                    .unordered()
-                    .filter(e -> e instanceof Player)
-                    .map(e -> ((Player) e))
-                    .collect(Collectors.toList());
-        }
-        catch (IllegalArgumentException e) {
-            e.printStackTrace();
-            throw new InvalidCommandArgument(String.format("Error parsing selector '%s' for %s! See console for more details",
-                    playerIdentifier, sender.getName()));
-        }
-        if (matchedPlayers.isEmpty()) {
-            throw new InvalidCommandArgument(String.format("No player found with selector '%s' for %s",
-                    playerIdentifier, sender.getName()));
-        }
-        if (matchedPlayers.size() > 1) {
-            throw new InvalidCommandArgument(String.format("Error parsing selector '%s' for %s. ambiguous result (more than one player matched) - %s",
-                    playerIdentifier, sender.getName(), matchedPlayers.toString()));
-        }
-
-        return matchedPlayers.get(0);
-    }
-
-    @Nullable
-    private Player getPlayerByUUID(@NotNull String playerIdentifier) {
-        if (!UUID_REGEX.matcher(playerIdentifier).matches()) {
-            return null;
-        }
-        UUID playerUUID;
-        try {
-            playerUUID = UUID.fromString(playerIdentifier);
-        } catch (Exception e) {
-            return null;
-        }
-        return Bukkit.getPlayer(playerUUID);
-    }
-
-    @NotNull
-    private World.Environment deriveEnvironment(@NotNull BukkitCommandExecutionContext context) {
-        String env = context.popFirstArg();
-
-        if (env.equalsIgnoreCase("NORMAL") || env.equalsIgnoreCase("WORLD")) {
-            env = "NORMAL";
-        }
-        else if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER")) {
-            env = "NETHER";
-        }
-        else if (env.equalsIgnoreCase("END") || env.equalsIgnoreCase("THEEND") || env.equalsIgnoreCase("STARWARS")) {
-            env = "THE_END";
-        }
-
-        try {
-            return World.Environment.valueOf(env);
-        }
-        catch (IllegalArgumentException e) {
-            CommandSender sender = context.getSender();
-            sender.sendMessage(String.format("%s'%s' is not a valid environment.", ChatColor.RED, env));
-            EnvironmentCommand.showEnvironments(sender);
-            throw new InvalidCommandArgument(false);
-        }
-    }
-
-    @NotNull
-    private GameRuleProperty<?> deriveGameRuleProperty(@NotNull BukkitCommandExecutionContext context) {
-        int argLength = context.getArgs().size();
-        if (argLength == 0) {
-            throw new InvalidCommandArgument("You need to specify a game rule property and value to set.");
-        }
-        if (argLength == 1) {
-            throw new InvalidCommandArgument("You need to specify a value to set.");
-        }
-
-        String ruleString = context.popFirstArg();
-        GameRule<?> gameRule = GameRule.getByName(ruleString);
-        if (gameRule == null) {
-            throw new InvalidCommandArgument(String.format("'%s' is not a valid gamerule.", ruleString));
-        }
-
-        Class<?> ruleType = gameRule.getType();
-        String value = context.getFirstArg();
-        Object result = getResolver(ruleType).getContext(context);
-        if (result == null) {
-            context.getSender().sendMessage(String.format("%s'%s' is not a valid value.", ChatColor.RED, value));
-            context.getSender().sendMessage(String.format("%sValue need to be a %s", ChatColor.RED, ruleType.getTypeName()));
-            throw new InvalidCommandArgument();
-        }
-        if (result instanceof Integer && ((int) result) < 0) {
-            throw new InvalidCommandArgument("Value need to be a positive number.");
-        }
-
-        return new GameRuleProperty(gameRule, result);
-    }
-
-    @NotNull
-    private MVDestination deriveMVDestination(@NotNull BukkitCommandExecutionContext context) {
-        String destString = context.popFirstArg();
-        if (destString == null) {
-            throw new InvalidCommandArgument("Please specify a destination.");
-        }
-
-        MVDestination destination = this.plugin.getDestFactory().getDestination(destString);
-        if (destination instanceof InvalidDestination) {
-            throw new  InvalidCommandArgument(String.format("No such destination '%s' found.", destString));
-        }
-        return destination;
-    }
-
-    @Nullable
-    private String deriveString(@NotNull BukkitCommandExecutionContext context) {
-        if (context.hasAnnotation(Values.class)) {
-            return context.popFirstArg();
-        }
-
-        String string = context.popFirstArg();
-        if (string == null) {
-            if (!context.isOptional()) {
-                String argType = context.getFlagValue("type", "string");
-                throw new InvalidCommandArgument(String.format("You need to specify a %s.", argType));
+        // 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;
        }
-
-        if (context.hasFlag("trim")) {
-            return trimWorldName(string);
-        }
-
-        return string;
+        throw new InvalidCommandArgument("World " + worldStrings + " is not a loaded multiverse world.");
    }

-    @NotNull
-    private String trimWorldName(@NotNull String worldName) {
-        // Removes relative paths.
-        return TRIM_REGEX.matcher(worldName).replaceAll("");
+    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.");
    }

-    @NotNull
-    private PasteServiceType derivePasteServiceType(BukkitCommandExecutionContext context) {
-        String pasteType = context.popFirstArg();
-        if (pasteType == null) {
-            return PasteServiceType.NONE;
+
+    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.");
        }

-        try {
-            return PasteServiceType.valueOf(pasteType.toUpperCase());
-        }
-        catch (IllegalArgumentException e) {
-            throw new InvalidCommandArgument(String.format("Invalid paste service type '%s'.", pasteType));
-        }
-    }
+        String playerIdentifier = context.getFirstArg();
+        Player[] players = PlayerFinder.getMulti(playerIdentifier, context.getSender()).toArray(new Player[0]);

-    @NotNull
-    private ContentFilter deriveContentFilter(@NotNull BukkitCommandExecutionContext context) {
-        String filterString = context.popFirstArg();
-        return (filterString == null) ? ContentFilter.DEFAULT : new ContentFilter(filterString);
-    }
-
-    @NotNull
-    private PageFilter derivePageFilter(@NotNull BukkitCommandExecutionContext context) {
-        int argLength = context.getArgs().size();
-        if (argLength == 0) {
-            return new PageFilter(ContentFilter.DEFAULT, 1);
-        }
-        if (argLength == 1) {
-            String pageOrFilter = context.popFirstArg();
-            Optional<Integer> page = tryParseInt(pageOrFilter);
-            return page.map(pageNum -> new PageFilter(ContentFilter.DEFAULT, pageNum))
-                    .orElseGet(() -> new PageFilter(new ContentFilter(pageOrFilter), 1));
+        // 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.");
        }

-        String filter = context.popFirstArg();
-        String pageString = context.popFirstArg();
-        Optional<Integer> page = tryParseInt(pageString);
-        if (!page.isPresent()) {
-            throw new InvalidCommandArgument(String.format("'%s' is not a number.", pageString), false);
+        // Get player based on input only
+        if (players.length > 0) {
+            context.popFirstArg();
+            return players;
        }
-        return new PageFilter(new ContentFilter(filter), page.get());
-    }
-
-    private Optional<Integer> tryParseInt(String value) {
-        try {
-            return Optional.of(Integer.parseInt(value));
-        }
-        catch (NumberFormatException e) {
-            return Optional.empty();
+        if (!context.isOptional()) {
+            return null;
        }
+        throw new InvalidCommandArgument("Player " + playerIdentifier + " not found.");
    }
 }
@@ -1,275 +1,86 @@
-/******************************************************************************
- * 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;

-import co.aikar.commands.BaseCommand;
-import co.aikar.commands.CommandHelp;
-import co.aikar.commands.CommandIssuer;
-import co.aikar.commands.HelpEntry;
+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.commands.AnchorCommand;
-import com.onarandombox.MultiverseCore.commands.BedCommand;
-import com.onarandombox.MultiverseCore.commands.CheckCommand;
-import com.onarandombox.MultiverseCore.commands.CloneCommand;
-import com.onarandombox.MultiverseCore.commands.ConfigCommand;
-import com.onarandombox.MultiverseCore.commands.ConfirmCommand;
-import com.onarandombox.MultiverseCore.commands.CoordCommand;
-import com.onarandombox.MultiverseCore.commands.CreateCommand;
-import com.onarandombox.MultiverseCore.commands.DebugCommand;
-import com.onarandombox.MultiverseCore.commands.DeleteCommand;
-import com.onarandombox.MultiverseCore.commands.EnvironmentCommand;
-import com.onarandombox.MultiverseCore.commands.GameRuleCommand;
-import com.onarandombox.MultiverseCore.commands.GeneratorCommand;
-import com.onarandombox.MultiverseCore.commands.ImportCommand;
-import com.onarandombox.MultiverseCore.commands.InfoCommand;
-import com.onarandombox.MultiverseCore.commands.ListCommand;
-import com.onarandombox.MultiverseCore.commands.LoadCommand;
-import com.onarandombox.MultiverseCore.commands.ModifyCommand;
-import com.onarandombox.MultiverseCore.commands.PurgeCommand;
-import com.onarandombox.MultiverseCore.commands.RegenCommand;
-import com.onarandombox.MultiverseCore.commands.ReloadCommand;
-import com.onarandombox.MultiverseCore.commands.RemoveCommand;
-import com.onarandombox.MultiverseCore.commands.RootCommand;
-import com.onarandombox.MultiverseCore.commands.ScriptCommand;
-import com.onarandombox.MultiverseCore.commands.SetSpawnCommand;
-import com.onarandombox.MultiverseCore.commands.SilentCommand;
-import com.onarandombox.MultiverseCore.commands.SpawnCommand;
-import com.onarandombox.MultiverseCore.commands.SubModulesCommand;
-import com.onarandombox.MultiverseCore.commands.TeleportCommand;
-import com.onarandombox.MultiverseCore.commands.UnloadCommand;
-import com.onarandombox.MultiverseCore.commands.UsageCommand;
-import com.onarandombox.MultiverseCore.commands.VersionCommand;
-import com.onarandombox.MultiverseCore.commands.WhoCommand;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagsManager;
 import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
-import com.onarandombox.MultiverseCore.displaytools.ColorAlternator;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.PluginDescriptionFile;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;

 /**
- * Heart of Multiverse Command Handler.
+ * Main class to manage permissions.
 */
 public class MVCommandManager extends PaperCommandManager {

    private final MultiverseCore plugin;
-    private final CommandQueueManager commandQueueManager;
-    private final Map<String, BaseCommand> subModuleRootCommands;
-
-    private static final Pattern PERMISSION_SPLIT = Pattern.compile(",");
+    private CommandFlagsManager flagsManager;
+    private CommandQueueManager commandQueueManager;

    public MVCommandManager(@NotNull MultiverseCore plugin) {
        super(plugin);
        this.plugin = plugin;
-        this.commandQueueManager = new CommandQueueManager(plugin);
-        this.subModuleRootCommands = new HashMap<>(3);
-        new MVCommandConditions(plugin, getCommandConditions());

-        // Setup help command
-        enableUnstableAPI("help");
-        setDefaultHelpPerPage(6);
+        // Setup conditions
+        MVCommandConditions.load(this, plugin);

-        // General plugin command
-        registerCommand(new RootCommand(this.plugin));
-        registerCommand(new UsageCommand(this.plugin));
-        registerCommand(new VersionCommand(this.plugin));
-
-        // World commands
-        registerCommand(new CreateCommand(this.plugin));
-        registerCommand(new ImportCommand(this.plugin));
-        registerCommand(new LoadCommand(this.plugin));
-        registerCommand(new UnloadCommand(this.plugin));
-        registerCommand(new RemoveCommand(this.plugin));
-        registerCommand(new CloneCommand(this.plugin));
-        registerCommand(new RegenCommand(this.plugin));
-        registerCommand(new DeleteCommand(this.plugin));
-        registerCommand(new ConfirmCommand(this.plugin));
-
-        // Properties management commands
-        registerCommand(new ConfigCommand(this.plugin));
-        registerCommand(new GameRuleCommand(this.plugin));
-        registerCommand(new ModifyCommand(this.plugin));
-        registerCommand(new SetSpawnCommand(this.plugin));
-        registerCommand(new PurgeCommand(this.plugin));
-
-        // Show information commands
-        registerCommand(new InfoCommand(this.plugin));
-        registerCommand(new CoordCommand(this.plugin));
-        registerCommand(new EnvironmentCommand(this.plugin));
-        registerCommand(new GeneratorCommand(this.plugin));
-        registerCommand(new ListCommand(this.plugin));
-        registerCommand(new WhoCommand(this.plugin));
-
-        // Teleport commands
-        registerCommand(new TeleportCommand(this.plugin));
-        registerCommand(new AnchorCommand(this.plugin));
-        registerCommand(new BedCommand(this.plugin));
-        registerCommand(new SpawnCommand(this.plugin));
-
-        // Misc commands
-        registerCommand(new DebugCommand(this.plugin));
-        registerCommand(new CheckCommand(this.plugin));
-        registerCommand(new ReloadCommand(this.plugin));
-        registerCommand(new SilentCommand(this.plugin));
-        registerCommand(new ScriptCommand(this.plugin));
-
-        // Sub-modules
-        addAvailableSubModule("mvnp", new SubModulesCommand.NetherPortals());
-        addAvailableSubModule("mvp", new SubModulesCommand.Portals());
-        addAvailableSubModule("mvinv", new SubModulesCommand.Inventories());
+        // Setup locale
+        this.addSupportedLanguage(Locale.ENGLISH);
+        this.locales.addMessageBundles("multiverse-core");
+        this.locales.loadLanguages();
    }

    /**
-     * Use for download link suggestion for sub-module
+     * Gets class responsible for flag handling.
     *
-     * @param moduleName  A sub-module for Multiverse.
-     * @param cmd         Command to register.
+     * @return A not-null {@link CommandFlagsManager}.
     */
-    private void addAvailableSubModule(@NotNull String moduleName,
-                                       @NotNull BaseCommand cmd) {
-
-        subModuleRootCommands.put(moduleName, cmd);
-        registerCommand(cmd);
+    public synchronized @NotNull CommandFlagsManager getFlagsManager() {
+        if (this.flagsManager == null) {
+            this.flagsManager = new CommandFlagsManager();
+        }
+        return flagsManager;
    }

    /**
-     * Replace suggest download with actual command from sub-module.
+     * Manager for command that requires /mv confirm before execution.
     *
-     * @param moduleName  A sub-module for Multiverse.
-     * @param cmd         Command to register.
+     * @return A non-null {@link CommandQueueManager}.
     */
-    public void registerSubModule(@NotNull String moduleName,
-                                  @NotNull BaseCommand cmd) {
-
-        unregisterCommand(subModuleRootCommands.remove(moduleName));
-        registerCommand(cmd);
-    }
-
-    @Override
-    public synchronized MVCommandContexts getCommandContexts() {
-        if (this.contexts == null) {
-            this.contexts = new MVCommandContexts(this, plugin);
+    public synchronized @NotNull CommandQueueManager getCommandQueueManager() {
+        if (this.commandQueueManager == null) {
+            this.commandQueueManager = new CommandQueueManager(this.plugin);
        }
-        return (MVCommandContexts) this.contexts;
-    }
-
-    @Override
-    public synchronized MVCommandCompletions getCommandCompletions() {
-        if (this.completions == null) {
-            this.completions = new MVCommandCompletions(this, plugin);
-        }
-        return (MVCommandCompletions) this.completions;
-    }
-
-    /**
-     * Change default implementation to be able to choose from OR / AND
-     */
-    @Override
-    public boolean hasPermission(@NotNull CommandIssuer issuer,
-                                 @Nullable Set<String> permissions) {
-
-        if (permissions == null || permissions.isEmpty()) {
-            return true;
-        }
-
-        return (permissions.contains("AND"))
-                ? andPermissionCheck(issuer, permissions)
-                : orPermissionCheck(issuer, permissions);
-    }
-
-    private boolean orPermissionCheck(@NotNull CommandIssuer issuer,
-                                      @NotNull Set<String> permissions) {
-
-        return permissions.stream()
-                .unordered()
-                .anyMatch(permission -> hasPermission(issuer, permission));
-    }
-
-    private boolean andPermissionCheck(@NotNull CommandIssuer issuer,
-                                       @NotNull Set<String> permissions) {
-
-        return permissions.stream()
-                .unordered()
-                .allMatch(permission -> hasPermission(issuer, permission));
-    }
-
-    /**
-     * Change default implementation to be able to choose from OR / AND
-     */
-    @Override
-    public boolean hasPermission(@NotNull CommandIssuer issuer,
-                                 @Nullable String permission) {
-
-        if (permission == null || permission.isEmpty()) {
-            return true;
-        }
-        if (permission.startsWith("AND:")) {
-            return Arrays.stream(PERMISSION_SPLIT.split(permission.substring(4)))
-                    .unordered()
-                    .allMatch(issuer::hasPermission);
-        }
-        return Arrays.stream(PERMISSION_SPLIT.split(permission))
-                .unordered()
-                .anyMatch(issuer::hasPermission);
-    }
-
-    /**
-     * Gets {@link CommandQueueManager}.
-     *
-     * @return {@link CommandQueueManager}.
-     */
-    public CommandQueueManager getQueueManager() {
        return commandQueueManager;
    }

    /**
-     * Standardise usage command formatting for all mv modules.
+     * Gets class responsible for parsing string args into objects.
     *
-     * @param help The target {@link CommandHelp}.
+     * @return A not-null {@link CommandContexts}.
     */
-    public void showUsage(@NotNull CommandHelp help) {
-        List<HelpEntry> entries = help.getHelpEntries();
-
-        if (entries.size() == 1) {
-            this.plugin.getMVCommandManager().getHelpFormatter().showDetailedHelp(help, entries.get(0));
-            return;
+    @Override
+    public synchronized @NotNull CommandContexts<BukkitCommandExecutionContext> getCommandContexts() {
+        if (this.contexts == null) {
+            this.contexts = new MVCommandContexts(this, plugin);
        }
-
-        help.showHelp();
+        return this.contexts;
    }

    /**
-     * Standardise root command for all mv modules.
+     * Gets class responsible for tab-completion handling.
     *
-     * @param sender       Sender to send the info to.
-     * @param description  mv-module's description and info.
-     * @param color        Special colour for each mv-module.
-     * @param rootCmd      mv-module's root command name.
+     * @return A not-null {@link CommandCompletions}.
     */
-    public void showPluginInfo(@NotNull CommandSender sender,
-                               @NotNull PluginDescriptionFile description,
-                               @NotNull ColorAlternator color,
-                               @NotNull String rootCmd) {
-
-        sender.sendMessage(String.format("%s%s %s| %sv%s",
-                color.getThisColor(), description.getName(), ChatColor.DARK_GRAY,
-                color.getThatColor(), description.getVersion()));
-
-        sender.sendMessage(String.format("%sSee %s/%s help %sfor commands available.",
-                ChatColor.DARK_GREEN, ChatColor.GREEN, rootCmd, ChatColor.DARK_GREEN));
+    @Override
+    public synchronized @NotNull CommandCompletions<BukkitCommandCompletionContext> getCommandCompletions() {
+        if (this.completions == null) {
+            this.completions = new MVCommandCompletions(this, plugin);
+        }
+        return this.completions;
    }
 }
@@ -1,23 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools;
-
-import co.aikar.commands.CommandCompletionContext;
-import co.aikar.commands.RegisteredCommand;
-import com.onarandombox.MultiverseCore.utils.ReflectHelper;
-
-import java.lang.reflect.Field;
-
-public class MVCommandReflect {
-
-    private static final Field commandScope;
-    private static final Field commandField;
-
-    static {
-        commandField = ReflectHelper.getField(CommandCompletionContext.class, "command");
-        commandScope = ReflectHelper.getField(RegisteredCommand.class, "scope");
-    }
-
-    public static MultiverseCommand getCommandCompletionContextCommand(CommandCompletionContext context) {
-        RegisteredCommand registeredCommand = ReflectHelper.getFieldValue(context, commandField);
-        return ReflectHelper.getFieldValue(registeredCommand, commandScope);
-    }
-}
@@ -1,21 +1,29 @@
 package com.onarandombox.MultiverseCore.commandtools;

 import co.aikar.commands.BaseCommand;
-import com.onarandombox.MultiverseCore.commandtools.flag.FlagGroup;
+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 class MultiverseCommand extends BaseCommand {
+public abstract class MultiverseCommand extends BaseCommand {
+    protected final CommandFlagsManager flagsManager;
+    private String flagGroupName;

-    private FlagGroup flagGroup;
-
-    public MultiverseCommand() {
-        super();
+    protected MultiverseCommand(@NotNull MVPlugin plugin) {
+        this.flagsManager = plugin.getCore().getMVCommandManager().getFlagsManager();
    }

-    public FlagGroup getFlagGroup() {
-        return flagGroup;
+    protected void registerFlagGroup(@NotNull CommandFlagGroup flagGroup) {
+        if (flagGroupName != null) {
+            throw new IllegalStateException("Flag group already registered! (name: " + flagGroupName + ")");
+        }
+        flagsManager.registerFlagGroup(flagGroup);
+        flagGroupName = flagGroup.getName();
    }

-    public void setFlagGroup(FlagGroup flagGroup) {
-        this.flagGroup = flagGroup;
+    protected @NotNull ParsedCommandFlags parseFlags(@NotNull String[] flags) {
+        return flagsManager.parse(flagGroupName, flags);
    }
 }
@@ -1,39 +0,0 @@
-/******************************************************************************
- * 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.context;
-
-import org.bukkit.GameRule;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Single key value pair for a game rule.
- *
- * @param <T> Type of GameRule property.
- */
-public class GameRuleProperty<T> {
-
-    private final GameRule<T> gameRule;
-    private final T value;
-
-    public GameRuleProperty(@NotNull GameRule<T> gameRule,
-                            @NotNull T value) {
-
-        this.gameRule = gameRule;
-        this.value = value;
-    }
-
-    @NotNull
-    public GameRule<T> getGameRule() {
-        return gameRule;
-    }
-
-    @NotNull
-    public T getValue() {
-        return value;
-    }
-}
@@ -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;
+    }
+}
@@ -1,34 +0,0 @@
-/******************************************************************************
- * 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.context;
-
-import com.onarandombox.MultiverseCore.displaytools.ContentFilter;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Filter and paging.
- */
-public class PageFilter {
-    private final ContentFilter filter;
-    private final int page;
-
-    public PageFilter(@NotNull ContentFilter filter,
-                      int page) {
-        this.filter = filter;
-        this.page = page;
-    }
-
-    @NotNull
-    public ContentFilter getFilter() {
-        return filter;
-    }
-
-    public int getPage() {
-        return page;
-    }
-}
@@ -1,16 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.context;
-
-import org.bukkit.entity.Player;
-
-public class RequiredPlayer {
-
-    private final Player player;
-
-    public RequiredPlayer(Player player) {
-        this.player = player;
-    }
-
-    public Player get() {
-        return player;
-    }
-}
@@ -1,4 +0,0 @@
-/**
- * Classes derived from parsing command args and context.
- */
-package com.onarandombox.MultiverseCore.commandtools.context;
@@ -1,162 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * <p>Represents a flag that can be used in commands. This works as a key value pair.</p>
- *
- * <p>Key is the {@link #identifier} and {@link #aliases} set.</p>
- * <p>Value is the {@link T} parsed based on 3 scenarios during command input:</p>
- * <ol>
- *     <li>Flag completely not present. {@link #getDefaultValue()}</li>
- *     <li>Flag key present but no value. {@link #getValue()}</li>
- *     <li>Flag key and value present. {@link #getValue(String)}</li>
- * </ol>
- *
- * @param <T>   The flag Type.
- */
-public abstract class CommandFlag<T> {
-
-    protected final String name;
-    protected final String identifier;
-    protected final Class<T> type;
-    protected final ValueRequirement valueRequirement;
-    protected final Collection<String> aliases;
-
-    protected CommandFlag(@NotNull String name,
-                          @NotNull String identifier,
-                          @NotNull Class<T> type,
-                          @NotNull ValueRequirement valueRequirement) {
-
-        this.name = name;
-        this.identifier = identifier;
-        this.type = type;
-        this.valueRequirement = valueRequirement;
-        this.aliases = new ArrayList<>();
-    }
-
-    /**
-     * Gets name of the Command Flag.
-     *
-     * @return The Command Flag name.
-     */
-    @NotNull
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * Gets identifier of the Command Flag.
-     *
-     * @return The Command Flag identifier.
-     */
-    @NotNull
-    public String getIdentifier() {
-        return this.identifier;
-    }
-
-    /**
-     * Gets {@link T} Type of the Command Flag.
-     *
-     * @return The Command Flag type.
-     */
-    @NotNull
-    public Class<T> getType() {
-        return this.type;
-    }
-
-    /**
-     * Gets the requirements of this Command Flag user input value.
-     *
-     * @return The {@link ValueRequirement}.
-     */
-    @NotNull
-    public ValueRequirement getValueRequirement() {
-        return this.valueRequirement;
-    }
-
-    /**
-     * Gets all the alternative key identifiers set for this Command Flag.
-     *
-     * @return Collection of aliases.
-     */
-    @NotNull
-    public Collection<String> getAliases() {
-        return this.aliases;
-    }
-
-    /**
-     * Add alternative key identifiers for this Command Flag.
-     *
-     * @param aliases   Alias(es) to be added.
-     * @return A {@link CommandFlag}.
-     */
-    public CommandFlag<T> addAliases(String...aliases) {
-        Collections.addAll(this.aliases, aliases);
-        return this;
-    }
-
-    /**
-     * Tab-complete suggestion for this Command Flag values.
-     *
-     * @return Collection of suggested values available.
-     */
-    public abstract Collection<String> suggestValue();
-
-    /**
-     * When this Command Flag can get value by a user input.
-     *
-     * @return The {@link T} value.
-     */
-    public abstract T getValue(@NotNull String input) throws FlagParseFailedException;
-
-    /**
-     * When this Command Flag user input value is null/not present.
-     *
-     * @return The {@link T} value.
-     */
-    public T getValue() throws FlagParseFailedException {
-        return null;
-    }
-
-    /**
-     * When this Command Flag is not present in command input.
-     *
-     * @return The {@link T} value.
-     */
-    public T getDefaultValue() {
-        return null;
-    }
-
-    @Override
-    public String toString() {
-        return "CommandFlag{" +
-                "name='" + name + '\'' +
-                ", identifier='" + identifier + '\'' +
-                ", type=" + type +
-                ", valueRequirement=" + valueRequirement +
-                ", aliases=" + aliases +
-                '}';
-    }
-
-    public enum ValueRequirement {
-        /**
-         * No user input needed for value.
-         */
-        NONE,
-
-        /**
-         * User input for value is optional.
-         */
-        OPTIONAL,
-
-        /**
-         * User input is required for Command Flag value.
-         */
-        REQUIRED
-    }
-}
@@ -1,221 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import co.aikar.commands.InvalidCommandArgument;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
-import org.bukkit.Bukkit;
-import org.bukkit.WorldType;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.stream.Collectors;
-
-public class CoreFlags {
-
-    private static MultiverseCore multiverse;
-
-    public static void setCoreInstance(MultiverseCore plugin) {
-        multiverse = plugin;
-    }
-
-    /**
-     * Flag for custom seed.
-     */
-    public static final CommandFlag<String> SEED = new RequiredCommandFlag<String>
-            ("Seed", "--seed", String.class) {
-        @Override
-        public Collection<String> suggestValue() {
-            return Collections.singleton(String.valueOf(new Random().nextLong()));
-        }
-
-        @Override
-        public String getValue(@NotNull String input) throws FlagParseFailedException {
-            return input;
-        }
-    }.addAliases("-s");
-
-    /**
-     * Flag for custom seed. No value means random seed.
-     */
-    public static final CommandFlag<String> RANDOM_SEED = new OptionalCommandFlag<String>
-            ("Seed", "--seed", String.class) {
-        @Override
-        public Collection<String> suggestValue() {
-            return Collections.singletonList(String.valueOf(new Random().nextLong()));
-        }
-
-        @Override
-        public String getValue(@NotNull String input) throws FlagParseFailedException {
-            return input;
-        }
-    }.addAliases("-s");
-
-    /**
-     * Flag for world type used.
-     */
-    public static final CommandFlag<WorldType> WORLD_TYPE = new RequiredCommandFlag<WorldType>
-            ("WorldType", "--type", WorldType.class) {
-
-        private final Map<String, WorldType> typeAlias = new HashMap<String, WorldType>(4){{
-            put("normal", WorldType.NORMAL);
-            put("flat", WorldType.FLAT);
-            put("largebiomes", WorldType.LARGE_BIOMES);
-            put("amplified", WorldType.AMPLIFIED);
-        }};
-
-        @Override
-        public Collection<String> suggestValue() {
-            return typeAlias.keySet();
-        }
-
-        @Override
-        public WorldType getValue(@NotNull String input) throws FlagParseFailedException {
-            WorldType type = typeAlias.get(input);
-            if (type != null) {
-                return type;
-            }
-            try {
-                return WorldType.valueOf(input.toUpperCase());
-            }
-            catch (IllegalArgumentException e) {
-                throw new FlagParseFailedException("'%s' is not a valid. See /mv env for available World Type.", input);
-            }
-        }
-
-        @Override
-        public WorldType getDefaultValue() {
-            return WorldType.NORMAL;
-        }
-    }.addAliases("-t");
-
-    /**
-     * Flag for world generator.
-     */
-    public static final CommandFlag<String> GENERATOR = new RequiredCommandFlag<String>
-            ("Generator", "--gen", String.class) {
-        @Override
-        public Collection<String> suggestValue() {
-            return Arrays.stream(Bukkit.getServer().getPluginManager().getPlugins())
-                    .filter(Plugin::isEnabled)
-                    .filter(plugin -> multiverse.getUnsafeCallWrapper().wrap(
-                            () -> plugin.getDefaultWorldGenerator("world", ""),
-                            plugin.getName(),
-                            "Get generator"
-                    ) != null)
-                    .map(plugin -> plugin.getDescription().getName())
-                    .collect(Collectors.toList());
-        }
-
-        @Override
-        public String getValue(@NotNull String input) throws FlagParseFailedException {
-            String[] genArray = input.split(":");
-            String generator = genArray[0];
-            String generatorId = (genArray.length > 1) ? genArray[1] : "";
-            try {
-                if (multiverse.getMVWorldManager().getChunkGenerator(generator, generatorId, "test") == null) {
-                    throw new Exception();
-                }
-            } catch (Exception e) {
-                throw new FlagParseFailedException("Invalid generator string '%s'. See /mv gens for available generators.", input);
-            }
-            return input;
-        }
-    }.addAliases("-g");
-
-    /**
-     * Flag to toggle if world should generate structures.
-     */
-    public static final CommandFlag<Boolean> GENERATE_STRUCTURES = new RequiredCommandFlag<Boolean>
-            ("GenerateStructures", "--structures", Boolean.class) {
-        @Override
-        public Collection<String> suggestValue() {
-            return Arrays.asList("true", "false");
-        }
-
-        @Override
-        public Boolean getValue(@NotNull String input) throws FlagParseFailedException {
-            return input.equalsIgnoreCase("true");
-        }
-
-        @Override
-        public Boolean getDefaultValue() {
-            return true;
-        }
-    }.addAliases("--structure", "-a");
-
-    /**
-     * Flag to toggle if world spawn should be adjusted.
-     */
-    public static final CommandFlag<Boolean> SPAWN_ADJUST = new NoValueCommandFlag<Boolean>
-            ("AdjustSpawn", "--dont-adjust-spawn", Boolean.class) {
-        @Override
-        public Boolean getValue() throws FlagParseFailedException {
-            return false;
-        }
-
-        @Override
-        public Boolean getDefaultValue() {
-            return true;
-        }
-    }.addAliases("-n");
-
-    /**
-     * Flag to specify a paste service.
-     */
-    public static final CommandFlag<PasteServiceType> PASTE_SERVICE_TYPE = new OptionalCommandFlag<PasteServiceType>
-            ("PasteServiceType", "--paste", PasteServiceType.class) {
-
-        private final List<String> pasteTypes = Arrays.stream(PasteServiceType.values())
-                .filter(pt -> pt != PasteServiceType.NONE)
-                .map(p -> p.toString().toLowerCase())
-                .collect(Collectors.toList());
-
-        @Override
-        public Collection<String> suggestValue() {
-            return pasteTypes;
-        }
-
-        @Override
-        public PasteServiceType getValue(@NotNull String input) throws FlagParseFailedException {
-            try {
-                return PasteServiceType.valueOf(input.toUpperCase());
-            }
-            catch (IllegalArgumentException e) {
-                throw new InvalidCommandArgument(String.format("Invalid paste service type '%s'.", input));
-            }
-        }
-
-        @Override
-        public PasteServiceType getValue() throws FlagParseFailedException {
-            return PasteServiceType.PASTEGG;
-        }
-
-        @Override
-        public PasteServiceType getDefaultValue() {
-            return PasteServiceType.NONE;
-        }
-    }.addAliases("-p");
-
-    /**
-     * Flag to toggle if plugin list should be included.
-     */
-    public static final CommandFlag<Boolean> INCLUDE_PLUGIN_LIST = new NoValueCommandFlag<Boolean>
-            ("IncludePlugins", "--include-plugin-list", Boolean.class) {
-        @Override
-        public Boolean getValue() throws FlagParseFailedException {
-            return true;
-        }
-
-        @Override
-        public Boolean getDefaultValue() {
-            return true;
-        }
-    }.addAliases("-pl");
-}
@@ -1,59 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class FlagGroup {
-
-    public static FlagGroup of(CommandFlag<?>...flags) {
-        return new FlagGroup(flags);
-    }
-
-    private final List<String> flagIdentifiers;
-    private final Map<String, CommandFlag<?>> flagKeyMap;
-
-    private FlagGroup(CommandFlag<?>[] commandFlags) {
-        this.flagIdentifiers = new ArrayList<>(commandFlags.length);
-        this.flagKeyMap = new HashMap<>();
-        for (CommandFlag<?> flag : commandFlags) {
-            addFlag(flag);
-        }
-    }
-
-    private void addFlag(CommandFlag<?> flag) {
-        this.flagIdentifiers.add(flag.getIdentifier());
-        this.flagKeyMap.put(flag.getIdentifier(), flag);
-        for (String flagAlias : flag.getAliases()) {
-            this.flagKeyMap.put(flagAlias, flag);
-        }
-    }
-
-    @NotNull
-    public FlagResult calculateResult(String[] args) {
-        return FlagResult.parse(args,this);
-    }
-
-    @Nullable
-    public CommandFlag<?> getByKey(String key) {
-        return this.flagKeyMap.get(key);
-    }
-
-    @NotNull
-    public Collection<String> getFlagIdentifiers() {
-        return flagIdentifiers;
-    }
-
-    @Override
-    public String toString() {
-        return "FlagGroup{" +
-                "flagIdentifiers=" + flagIdentifiers +
-                ", keyFlagMap=" + flagKeyMap +
-                '}';
-    }
-}
@@ -1,13 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import co.aikar.commands.InvalidCommandArgument;
-
-public class FlagParseFailedException extends InvalidCommandArgument {
-
-    public FlagParseFailedException() {
-    }
-
-    public FlagParseFailedException(String message, Object...replacements) {
-        super(String.format(message, replacements), true);
-    }
-}
@@ -1,146 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.onarandombox.MultiverseCore.commandtools.flag.CommandFlag.ValueRequirement;
-
-public class FlagResult {
-
-    public static FlagResult parse(@Nullable String[] args,
-                                   @NotNull FlagGroup flagGroup) throws FlagParseFailedException {
-
-        FlagResult flagResult = new FlagResult();
-
-        // No args to parse.
-        if (args == null || args.length <= 0) {
-            return flagResult;
-        }
-
-        // First arg must be a flag.
-        CommandFlag<?> currentFlag = flagGroup.getByKey(args[0]);
-        boolean completed = false;
-
-        // Parse the arguments.
-        for (int i = 1, argsLength = args.length; i <= argsLength; i++) {
-            // Don't allow null flag obviously.
-            if (currentFlag == null) {
-                throw new FlagParseFailedException("%s is not a valid flag.", args[i-1]);
-            }
-            // THis ensures that flag is not null during final parse.
-            if (i >= argsLength) {
-                break;
-            }
-
-            CommandFlag<?> nextFlag = flagGroup.getByKey(args[i]);
-
-            switch (currentFlag.getValueRequirement()) {
-                case NONE:
-                    // Arg must be a flag key.
-                    flagResult.add(currentFlag, currentFlag.getValue(), false);
-                    currentFlag = nextFlag;
-                    break;
-                case OPTIONAL:
-                    // Arg can be a flag key or value.
-                    if (nextFlag != null) {
-                        // It's a key.
-                        flagResult.add(currentFlag, currentFlag.getValue(), false);
-                        currentFlag = nextFlag;
-                        break;
-                    }
-                    // It's a value.
-                    flagResult.add(currentFlag, currentFlag.getValue(args[i]), true);
-                    if (i == argsLength - 1) {
-                        completed = true;
-                        break;
-                    }
-                    currentFlag = flagGroup.getByKey(args[++i]);
-                    break;
-                case REQUIRED:
-                    // Arg must be a flag value.
-                    if (nextFlag != null) {
-                        // It's a key.
-                        throw new FlagParseFailedException("%s flag '%s' requires a value input.",
-                                currentFlag.getName(), currentFlag.getIdentifier());
-                    }
-                    // It's a value.
-                    flagResult.add(currentFlag, currentFlag.getValue(args[i]), true);
-                    if (i == argsLength - 1) {
-                        completed = true;
-                        break;
-                    }
-                    currentFlag = flagGroup.getByKey(args[++i]);
-                    break;
-            }
-        }
-
-        // Parse final flag.
-        if (!completed) {
-            if (currentFlag.getValueRequirement() == ValueRequirement.REQUIRED) {
-                throw new FlagParseFailedException("%s flag '%s' requires a value input.",
-                        currentFlag.getName(), currentFlag.getIdentifier());
-            }
-            flagResult.add(currentFlag, currentFlag.getValue(), false);
-        }
-
-        return flagResult;
-    }
-
-    private final Map<CommandFlag<?>, SingleFlagResult<?>> resultMap;
-
-    public FlagResult() {
-        resultMap = new HashMap<>();
-    }
-
-    private void add(CommandFlag<?> flag, Object value, boolean fromInput) {
-        resultMap.put(flag, new SingleFlagResult<>(value, fromInput));
-    }
-
-    public <T> T getValue(CommandFlag<T> flag) {
-        SingleFlagResult<?> result = resultMap.get(flag);
-        if (result == null) {
-            return flag.getDefaultValue();
-        }
-        return (T) result.value;
-    }
-
-    public boolean isByUserInput(CommandFlag<?> flag) {
-        SingleFlagResult<?> result = resultMap.get(flag);
-        if (result == null) {
-            return false;
-        }
-        return result.fromInput;
-    }
-
-    public boolean isDefaulted(CommandFlag<?> flag) {
-        return resultMap.get(flag) != null;
-    }
-
-    @Override
-    public String toString() {
-        return "FlagResult{" +
-                "resultMap=" + resultMap +
-                '}';
-    }
-
-    private class SingleFlagResult<T> {
-        private final T value;
-        private final boolean fromInput;
-
-        private SingleFlagResult(T value, boolean fromInput) {
-            this.fromInput = fromInput;
-            this.value = value;
-        }
-
-        @Override
-        public String toString() {
-            return "SingleFlagResult{" +
-                    "value=" + value +
-                    ", fromInput=" + fromInput +
-                    '}';
-        }
-    }
-}
@@ -1,37 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * Command Flag with {@link ValueRequirement#NONE}.
- * This flag will always not require a user input to parse value.
- *
- * @param <T>   The flag Type.
- */
-public abstract class NoValueCommandFlag<T> extends CommandFlag<T> {
-
-    public NoValueCommandFlag(String name, String identifier, Class<T> type) {
-        super(name, identifier, type, ValueRequirement.NONE);
-    }
-
-    /**
-     * {@link NoValueCommandFlag} will always not require a user input to parse value.
-     * Thus, no value suggestion needed.
-     */
-    @Override
-    public final Collection<String> suggestValue() {
-        return Collections.emptyList();
-    }
-
-    /**
-     * {@link NoValueCommandFlag} will always not require a user input to parse value.
-     * Thus, this operation is not allowed.
-     */
-    @Override
-    public final T getValue(@NotNull String input) throws FlagParseFailedException {
-        throw new FlagParseFailedException("%s flag '%s' does not require a value.", this.name, this.identifier);
-    }
-}
@@ -1,13 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-/**
- * Command Flag with {@link ValueRequirement#OPTIONAL}.
- *
- * @param <T>   The flag Type.
- */
-public abstract class OptionalCommandFlag<T> extends CommandFlag<T> {
-
-    public OptionalCommandFlag(String name, String identifier, Class<T> type) {
-        super(name, identifier, type, ValueRequirement.OPTIONAL);
-    }
-}
@@ -1,23 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flag;
-
-/**
- * Command Flag with {@link ValueRequirement#REQUIRED}.
- * This flag will always require a user input to parse value.
- *
- * @param <T>   The flag Type.
- */
-public abstract class RequiredCommandFlag<T> extends CommandFlag<T> {
-
-    public RequiredCommandFlag(String name, String identifier, Class<T> type) {
-        super(name, identifier, type, ValueRequirement.REQUIRED);
-    }
-
-    /**
-     * {@link RequiredCommandFlag} will always require a user input to parse value.
-     * Thus, this operation is not allowed.
-     */
-    @Override
-    public final T getValue() throws FlagParseFailedException {
-        throw new FlagParseFailedException("%s flag '%s' requires a value input.", this.name, this.identifier);
-    }
-}
@@ -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;
+    }
+}