Merge pull request #2972 from Multiverse/dtm/fix_pom_deps

Fix dependency set for maven pom.

.github/workflows/call.github_release.yml

@@ -0,0 +1,34 @@
+name: 'Call: GitHub Release'
+
+on:
+  workflow_call:
+    inputs:
+      release_mode:
+        description: 'Release mode'
+        required: true
+        type: string
+      version_bump:
+        description: 'Version bump'
+        required: false
+        type: string
+      promote_from:
+        description: 'Promote from'
+        required: false
+        type: string
+    outputs:
+      release_created:
+        description: 'Release created'
+        value: ${{ jobs.github_release.outputs.release_created }}
+      tag_name:
+        description: 'Tag name'
+        value: ${{ jobs.github_release.outputs.tag_name }}
+
+jobs:
+  github_release:
+    uses: ./.github/workflows/generic.github_release.yml
+    secrets: inherit
+    with:
+      plugin_name: multiverse-core
+      release_mode: ${{ inputs.release_mode }}
+      version_bump: ${{ inputs.version_bump }}
+      promote_from: ${{ inputs.promote_from }}

.github/workflows/call.platform_uploads.yml

@@ -0,0 +1,95 @@
+name: 'Call: Platform Uploads'
+
+on:
+  workflow_call:
+    inputs:
+      target_tag:
+        description: 'Version to upload'
+        required: true
+        type: string
+      upload_modrinth:
+        description: 'Upload to modrinth.com'
+        required: true
+        type: string
+      upload_dbo:
+        description: 'Upload to dev.bukkit.org'
+        required: true
+        type: string
+      upload_hangar:
+        description: 'Upload to hangar.papermc.io'
+        required: true
+        type: string
+    secrets:
+      MODRINTH_TOKEN:
+        required: true
+      DBO_UPLOAD_API_TOKEN:
+        required: true
+      HANGAR_UPLOAD_TOKEN:
+        required: true
+
+jobs:
+  platform_uploads:
+    uses: ./.github/workflows/generic.platform_uploads.yml
+    secrets: inherit
+    with:
+      plugin_name: multiverse-core
+      modrinth_project_id: 3wmN97b8
+      modrinth_dependencies: >
+        [
+          {"project_id": "qvdtDX3s", "dependency_type": "optional"},
+          {"project_id": "8VMk6P0I", "dependency_type": "optional"},
+          {"project_id": "vtawPsTo", "dependency_type": "optional"},
+          {"project_id": "WuErDeI1", "dependency_type": "optional"}
+        ]
+
+      dbo_project_id: 30765
+      dbo_project_relations: >
+        [
+          {"slug": "multiverse-inventories", "type": "optionalDependency"},
+          {"slug": "multiverse-portals", "type": "optionalDependency"},
+          {"slug": "multiverse-netherportals", "type": "optionalDependency"},
+          {"slug": "multiverse-signportals", "type": "optionalDependency"},
+          {"slug": "vault", "type": "optionalDependency"}
+        ]
+
+      hangar_slug: Multiverse-Core
+      hangar_plugin_dependencies: >
+        { "PAPER": [
+          {
+            "name": "Multiverse-Inventories",
+            "required": false,
+            "namespace": {
+              "owner": "Multiverse",
+              "slug": "Multiverse-Inventories"
+            }
+          },
+          {
+            "name": "Multiverse-Portals",
+            "required": false,
+            "namespace": {
+              "owner": "Multiverse",
+              "slug": "Multiverse-Portals"
+            }
+          },
+          {
+            "name": "Multiverse-NetherPortals",
+            "required": false,
+            "namespace": {
+              "owner": "Multiverse",
+              "slug": "Multiverse-NetherPortals"
+            }
+          },
+          {
+            "name": "Multiverse-SignPortals",
+            "required": false,
+            "namespace": {
+              "owner": "Multiverse",
+              "slug": "Multiverse-SignPortals"
+            }
+          }
+        ]}
+
+      target_tag: ${{ inputs.target_tag }}
+      upload_modrinth: ${{ inputs.upload_modrinth }}
+      upload_dbo: ${{ inputs.upload_dbo }}
+      upload_hangar: ${{ inputs.upload_hangar }}

.github/workflows/dispatch.platform_uploads.yml

@@ -0,0 +1,31 @@
+name: 'Dispatch: Platform Uploads'
+
+on:
+  workflow_dispatch:
+    inputs:
+      target_tag:
+        description: 'Version to upload'
+        required: true
+        type: string
+      upload_modrinth:
+        description: 'Upload to modrinth.com'
+        required: true
+        type: boolean
+      upload_dbo:
+        description: 'Upload to dev.bukkit.org'
+        required: true
+        type: boolean
+      upload_hangar:
+        description: 'Upload to hangar.papermc.io'
+        required: true
+        type: boolean
+
+jobs:
+  dispatch_platform_uploads:
+    uses: ./.github/workflows/call.platform_uploads.yml
+    secrets: inherit
+    with:
+      target_tag: ${{ github.event.inputs.target_tag }}
+      upload_modrinth: ${{ github.event.inputs.upload_modrinth }}
+      upload_dbo: ${{ github.event.inputs.upload_dbo }}
+      upload_hangar: ${{ github.event.inputs.upload_hangar }}

.github/workflows/dispatch.promote_release.yml

@@ -0,0 +1,38 @@
+name: 'Dispatch: Promote Release'
+
+on:
+  workflow_dispatch:
+    inputs:
+      target_tag:
+        description: 'Version to promote'
+        required: true
+
+jobs:
+  check_version:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Verify input version is prerelease
+        run: |
+          if [[ "${{ github.event.inputs.target_tag }}" != *"pre"* ]]; then
+              echo "Version must be a prerelease"
+              exit 1
+          fi
+
+  github_release:
+    needs: check_version
+    uses: ./.github/workflows/call.github_release.yml
+    secrets: inherit
+    with:
+      release_mode: promote
+      promote_from: ${{ github.event.inputs.target_tag }}
+
+  platform_uploads:
+    needs: github_release
+    if: needs.github_release.outputs.release_created == 'true'
+    uses: ./.github/workflows/call.platform_uploads.yml
+    secrets: inherit
+    with:
+      target_tag: ${{ needs.github_release.outputs.tag_name }}
+      upload_modrinth: 'true'
+      upload_dbo: 'true'
+      upload_hangar: 'true'

.github/workflows/generic.github_release.yml

@@ -0,0 +1,91 @@
+name: 'Generic: GitHub Release'
+
+on:
+  workflow_call:
+    inputs:
+      # Plugin specific
+      plugin_name:
+        description: 'Plugin name'
+        required: true
+        type: string
+
+      # Common params
+      release_mode:
+        description: 'Release mode'
+        required: true
+        type: string
+      version_bump:
+        description: 'Version bump'
+        required: false
+        type: string
+      promote_from:
+        description: 'Promote from'
+        required: false
+        type: string
+    outputs:
+      release_created:
+        description: 'Release created'
+        value: ${{ jobs.github_release.outputs.release_created }}
+      tag_name:
+        description: 'Tag name'
+        value: ${{ jobs.github_release.outputs.tag_name }}
+
+jobs:
+  github_release:
+    runs-on: ubuntu-latest
+    outputs:
+      release_created: ${{ steps.release.outputs.release_created }}
+      tag_name: ${{ steps.release.outputs.tag_name }}
+    steps:
+      - name: Echo inputs
+        run: |
+          echo "release_mode: ${{ inputs.release_mode }}"
+          echo "version_bump: ${{ inputs.version_bump }}"
+          echo "promote_from: ${{ inputs.promote_from }}"
+
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.promote_from }}
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Build and test
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: clean build -x assemble -x shadowJar -x checkStyleMain -x checkStyleTest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create release
+        id: release
+        uses: benwoo1110/semantic-release-action@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          release_mode: ${{ inputs.release_mode }}
+          version_bump: ${{ inputs.version_bump }}
+          promote_from: ${{ inputs.promote_from }}
+
+      - name: Publish package
+        if: steps.release.outputs.release_created == 'true'
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publish -x checkStyleMain -x checkStyleTest -x test
+        env:
+          GITHUB_VERSION: ${{ steps.release.outputs.publish_version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload release artifact
+        if: steps.release.outputs.release_created == 'true'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: build/libs/${{ inputs.plugin_name }}-${{ steps.release.outputs.publish_version }}.jar
+          asset_name: ${{ inputs.plugin_name }}-${{ steps.release.outputs.tag_name }}.jar
+          tag: ${{ steps.release.outputs.tag_name }}

.github/workflows/generic.platform_uploads.yml

@@ -0,0 +1,141 @@
+name: 'Generic: Platform Uploads'
+
+on:
+  workflow_call:
+    inputs:
+      # Plugin specific params
+      plugin_name:
+        description: 'Plugin name'
+        required: true
+        type: string
+
+      modrinth_project_id:
+        description: 'modrinth.com project ID'
+        required: true
+        type: string
+      modrinth_dependencies:
+        description: 'modrinth.com project dependencies'
+        required: false
+        type: string
+        default: '[]'
+
+      dbo_project_id:
+        description: 'dev.bukkit.org project ID'
+        required: true
+        type: string
+      dbo_project_relations:
+        description: 'dev.bukkit.org project relations'
+        required: false
+        type: string
+        default: '[]'
+
+      hangar_slug:
+        description: 'hangar.papermc.io project slug'
+        required: true
+        type: string
+      hangar_plugin_dependencies:
+        description: 'hangar.papermc.io project dependencies'
+        required: false
+        type: string
+        default: '{}'
+
+      # Common params
+      target_tag:
+        description: 'Version to upload'
+        required: true
+        type: string
+
+      upload_modrinth:
+        description: 'Upload to modrinth.com'
+        required: true
+        type: string
+      upload_dbo:
+        description: 'Upload to dev.bukkit.org'
+        required: true
+        type: string
+      upload_hangar:
+        description: 'Upload to hangar.papermc.io'
+        required: true
+        type: string
+
+    secrets:
+      MODRINTH_TOKEN:
+        required: true
+      DBO_UPLOAD_API_TOKEN:
+        required: true
+      HANGAR_UPLOAD_TOKEN:
+        required: true
+
+jobs:
+  platform_uploads:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Get release info
+      id: release-info
+      uses: cardinalby/git-get-release-action@1.2.4
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag: ${{ inputs.target_tag }}
+
+    - name: Download release artifact
+      id: release-artifact
+      uses: dsaltares/fetch-gh-release-asset@1.1.1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        version: tags/${{ steps.release-info.outputs.tag_name }}
+        file: ${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar
+
+    - name: Parse release type
+      id: parse-release-type
+      run: |
+        if [[ "${{ steps.release-info.outputs.prerelease }}" == "true" ]]; then
+            echo Setting release_type to Beta
+            echo "release_type=Beta" >> $GITHUB_OUTPUT
+        else
+          echo Setting release_type to Release
+            echo "release_type=Release" >> $GITHUB_OUTPUT
+        fi
+
+    - name: Upload to Modrinth
+      if: ${{ !cancelled() && inputs.upload_modrinth == 'true' }}
+      uses: benwoo1110/modrinth-upload-action@v1
+      with:
+        api_token: ${{ secrets.MODRINTH_TOKEN }}
+        project_id: ${{ inputs.modrinth_project_id }}
+        version_number: ${{ steps.release-info.outputs.tag_name }}
+        files: '["${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar"]'
+        name: ${{ steps.release-info.outputs.tag_name }}
+        changelog: ${{ steps.release-artifact.outputs.body }}
+        game_versions: 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13
+        version_type: ${{ steps.parse-release-type.outputs.release_type }}
+        loaders: bukkit, spigot, paper
+        dependencies: ${{ inputs.modrinth_dependencies }}
+
+    - name: Upload to DBO
+      if: ${{ !cancelled() && inputs.upload_dbo == 'true' }}
+      uses: benwoo1110/dbo-upload-action@v1
+      with:
+        api_token: ${{ secrets.DBO_UPLOAD_API_TOKEN }}
+        project_id: ${{ inputs.dbo_project_id }}
+        changelog: ${{ steps.release-artifact.outputs.body }}
+        changelog_type: markdown
+        display_name: ${{ steps.release-info.outputs.tag_name }}
+        game_versions: 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17, 1.16, 1.15, 1.14, 1.13
+        release_type: ${{ steps.parse-release-type.outputs.release_type }}
+        project_relations: ${{ inputs.dbo_project_relations }}
+        file_path: ${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar
+
+    - name: Upload to Hangar
+      if: ${{ !cancelled() && inputs.upload_hangar == 'true' }}
+      uses: benwoo1110/hangar-upload-action@v1
+      with:
+        api_token: ${{ secrets.HANGAR_UPLOAD_TOKEN }}
+        author: Multiverse
+        slug: ${{ inputs.hangar_slug }}
+        version: ${{ steps.release-info.outputs.tag_name }}
+        channel: ${{ steps.parse-release-type.outputs.release_type }}
+        files: '[{"path": "${{ github.workspace }}/${{ inputs.plugin_name }}-${{ steps.release-info.outputs.tag_name }}.jar", "platforms": ["PAPER"]}]'
+        description: ${{ steps.release-artifact.outputs.body }}
+        platform_dependencies: '{"PAPER": ["1.13-1.20.1"]}'
+        plugin_dependencies: ${{ inputs.hangar_plugin_dependencies }}

.github/workflows/main.prerelease.yml

@@ -0,0 +1,24 @@
+name: 'Main: Prerelease'
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  github_release_on_push:
+    uses: ./.github/workflows/call.github_release.yml
+    secrets: inherit
+    with:
+      release_mode: prerelease
+      version_bump: prlabel
+
+  platform_uploads_on_push:
+    needs: github_release_on_push
+    if: needs.github_release_on_push.outputs.release_created == 'true'
+    uses: ./.github/workflows/call.platform_uploads.yml
+    secrets: inherit
+    with:
+      target_tag: ${{ needs.github_release_on_push.outputs.tag_name }}
+      upload_modrinth: 'true'
+      upload_dbo: 'false'
+      upload_hangar: 'false'

.github/workflows/pr.require_label.yml

@@ -1,4 +1,4 @@
-name: Require PR Labels
+name: 'PR: Require Label'
 
 on:
   pull_request:

.github/workflows/pr.test.yml

@@ -1,4 +1,4 @@
-name: Run unit tests against all PRs
+name: 'PR: Test'
 
 on:
   pull_request:
@@ -26,4 +26,11 @@ jobs:
         with:
           arguments: build
         env:
+          GITHUB_VERSION: pr${{ github.event.pull_request.number }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Artifact output
+        uses: actions/upload-artifact@v3
+        with:
+          name: multiverse-core-pr${{ github.event.pull_request.number }}
+          path: build/libs/multiverse-core-pr${{ github.event.pull_request.number }}.jar

.github/workflows/release.yml

@@ -1,61 +0,0 @@
-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

README.md

@@ -1,26 +1,33 @@
-![Multiverse 2](config/multiverse2-long.png)
+<p align="center">
+<img src="config/multiverse2-long.png" alt="Multiverse Logo">
+</p>
+
+[![Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/modrinth_vector.svg)](https://modrinth.com/plugin/multiverse-core)
+[![hangar](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/hangar_vector.svg)](https://hangar.papermc.io/Multiverse/Multiverse-Core)
+[![bukkit](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/bukkit_vector.svg)](https://dev.bukkit.org/projects/multiverse-core)
+[![Spigot](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/spigot_vector.svg)](https://www.spigotmc.org/resources/multiverse-core.390/)
 
-[![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)
+[![Support us 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
-========
+
+# 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:
+## 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!
+* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleporters!
 
-Building
-========
+## Building
 Simply build the source with Gradle:
 ```
 ./gradlew build
@@ -28,17 +35,16 @@ Simply build the source with Gradle:
 More details are available on the [build instructions wiki page](https://github.com/Multiverse/Multiverse-Core/wiki/Building).
 
 
-Contributing
-=======
+## 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)!
+* 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
-=======
+## License
 Multiverse-Core is licensed under BSD-3-Clause License. Please see [LICENSE.md](LICENSE.md) for more info.

build.gradle

@@ -5,9 +5,10 @@ plugins {
     id 'maven-publish'
     id 'checkstyle'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id "com.modrinth.minotaur" version "2.+"
 }
 
-version = System.getenv('GITHUB_VERSION')?.substring(1) ?: 'local'
+version = System.getenv('GITHUB_VERSION') ?: 'local'
 group = 'com.onarandombox.multiversecore'
 description = 'Multiverse-Core'
 
@@ -15,6 +16,8 @@ java.sourceCompatibility = JavaVersion.VERSION_11
 
 repositories {
     mavenLocal()
+    mavenCentral()
+
     maven {
         url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
     }
@@ -38,53 +41,37 @@ repositories {
     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'
-    }
+    implementation 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT'
 
-    // Economy
-    implementation('com.github.MilkBowl:VaultAPI:1.7.1') {
+    implementation('com.github.MilkBowl:VaultAPI:1.7') {
         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') {
+    compileOnly('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') {
+    compileOnly('com.pneumaticraft.commandhandler:CommandHandler:11') {
+        exclude group: 'org.bukkit', module: 'bukkit'
         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'
+    compileOnly 'com.dumptruckman.minecraft:buscript:2.0-SNAPSHOT'
+    compileOnly 'org.bstats:bstats-bukkit:2.2.1'
+    compileOnly('com.dumptruckman.minecraft:Logging:1.1.1') {
+        exclude group: 'junit', module: 'junit'
+    }
+    compileOnly 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
+    compileOnly 'org.jetbrains:annotations:16.0.2'
 
-    // Tests
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT'
+    testImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
+        exclude group: 'junit', module: 'junit'
+    }
+    testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:3.11.2'
-    testImplementation 'commons-io:commons-io:2.7'
+    testImplementation 'commons-io:commons-io:2.4'
 }
 
 
@@ -107,12 +94,29 @@ configurations {
         it.outgoing.artifacts.removeIf { it.buildDependencies.getDependencies(null).contains(jar) }
         it.outgoing.artifact(shadowJar)
     }
+
+    testCompileOnly.extendsFrom compileOnly
+    testRuntimeOnly.extendsFrom testCompileOnly
+
+    shadowed.extendsFrom compileOnly {
+        canBeResolved = true
+    }
 }
 
 publishing {
     publications {
         maven(MavenPublication) {
             from components.java
+
+            pom.withXml {
+                asNode().dependencies.'*'.findAll() {
+                    it.scope.text() == 'runtime'  && project.configurations.implementation.allDependencies.find { dep ->
+                        dep.name == it.artifactId.text()
+                    }
+                }.each() {
+                    it.scope*.value = 'provided'
+                }
+            }
         }
     }
     repositories {
@@ -173,24 +177,31 @@ javadoc {
 project.configurations.api.canBeResolved = true
 
 shadowJar {
-    relocate 'co.alkar.commands', 'com.onarandombox.acf'
+    relocate 'me.main__.util', 'com.onarandombox.serializationconfig'
+    relocate 'com.pneumaticraft.commandhandler', 'com.onarandombox.commandhandler'
+    relocate 'buscript', 'com.onarandombox.buscript'
+    relocate 'org.bstats', 'com.onarandombox.bstats'
     relocate 'com.dumptruckman.minecraft.util.Logging', 'com.onarandombox.MultiverseCore.utils.CoreLogging'
     relocate 'com.dumptruckman.minecraft.util.DebugLog', 'com.onarandombox.MultiverseCore.utils.DebugFileLogger'
+    relocate 'org.codehaus.jettison', 'com.onarandombox.jettison'
     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]
+    configurations = [project.configurations.shadowed]
 
     archiveFileName = "$baseName-$version.$extension"
+    classifier = ''
 }
 
 build.dependsOn shadowJar
+jar.enabled = false
 
-
-// Excludes all test
-// TODO: Remove this when we have tests for MV5
-test {
-    exclude '**/*'
+modrinth {
+    token = System.getenv("MODRINTH_TOKEN")
+    projectId = "multiverse-core"
+    versionNumber = System.getenv("VERSION_NUMBER")
+    versionType = System.getenv("VERSION_TYPE")
+    uploadFile = jar
+    gameVersions = ["1.20.1", "1.20", "1.19.4", "1.19.3", "1.19.2", "1.19.1", "1.19", "1.18.2", "1.18.1", "1.18", "1.17.1", "1.17", "1.16.5", "1.16.4", "1.16.3", "1.16.2", "1.16.1", "1.16", "1.15.2", "1.15.1", "1.15", "1.14.4", "1.14.3", "1.14.2", "1.14.1", "1.14", "1.13.2", "1.13.1", "1.13"]
+    loaders = ["bukkit", "spigot", "paper"]
+    changelog = System.getenv("CHANGELOG")
 }

config/mv_checks.xml

@@ -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.commandsold,com.onarandombox.MultiverseCore.destination"/>
+            <property name="excludes" value="com.onarandombox.MultiverseCore.utils,com.onarandombox.MultiverseCore.configuration,com.onarandombox.MultiverseCore.commands,com.onarandombox.MultiverseCore.destination"/>
         </module>
         <module name="IllegalImport"/>
         <module name="RedundantImport"/>

settings.gradle

@@ -2,4 +2,10 @@
  * This file was generated by the Gradle 'init' task.
  */
 
-rootProject.name = 'Multiverse-Core'
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = 'multiverse-core'

src/main/java/com/onarandombox/MultiverseCore/MVWorld.java

@@ -5,29 +5,21 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package com.onarandombox.MultiverseCore.world;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+package com.onarandombox.MultiverseCore;
 
 import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.MultiverseCoreConfiguration;
 import com.onarandombox.MultiverseCore.api.BlockSafety;
-import com.onarandombox.MultiverseCore.api.MVWorld;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
+import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
+import com.onarandombox.MultiverseCore.configuration.SpawnSettings;
+import com.onarandombox.MultiverseCore.configuration.WorldPropertyValidator;
+import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
+import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
 import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
-import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType;
-import com.onarandombox.MultiverseCore.world.configuration.EnglishChatColor;
-import com.onarandombox.MultiverseCore.world.configuration.SpawnLocation;
-import com.onarandombox.MultiverseCore.world.configuration.SpawnSettings;
-import com.onarandombox.MultiverseCore.world.configuration.WorldPropertyValidator;
 import me.main__.util.SerializationConfig.ChangeDeniedException;
 import me.main__.util.SerializationConfig.NoSuchPropertyException;
 import me.main__.util.SerializationConfig.VirtualProperty;
-import net.minidev.json.JSONObject;
 import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
@@ -36,17 +28,25 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldType;
+import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.serialization.SerializableAs;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.Nullable;
+import org.json.simple.JSONObject;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.logging.Level;
 
 /**
  * The implementation of a Multiverse handled world.
  */
-public class SimpleMVWorld implements MVWorld {
+public class MVWorld implements MultiverseWorld {
     private static final int SPAWN_LOCATION_SEARCH_TOLERANCE = 16;
     private static final int SPAWN_LOCATION_SEARCH_RADIUS = 16;
 
@@ -55,14 +55,14 @@ public class SimpleMVWorld implements MVWorld {
     private final UUID worldUID;
     private final WorldProperties props;
 
-    public SimpleMVWorld(MultiverseCore plugin, World world, WorldProperties properties) {
+    public MVWorld(MultiverseCore plugin, World world, WorldProperties properties) {
         this(plugin, world, properties, true);
     }
 
     /*
      * We have to use setCBWorld(), setPlugin() and initPerms() to prepare this object for use.
      */
-    public SimpleMVWorld(MultiverseCore plugin, World world, WorldProperties properties, boolean fixSpawn) {
+    public MVWorld(MultiverseCore plugin, World world, WorldProperties properties, boolean fixSpawn) {
         this.plugin = plugin;
         this.name = world.getName();
         this.worldUID = world.getUID();
@@ -212,7 +212,7 @@ public class SimpleMVWorld implements MVWorld {
     private final class ScalePropertyValidator extends WorldPropertyValidator<Double> {
         @Override
         public Double validateChange(String property, Double newValue, Double oldValue,
-                SimpleMVWorld object) throws ChangeDeniedException {
+                MVWorld object) throws ChangeDeniedException {
             if (newValue <= 0) {
                 Logging.fine("Someone tried to set a scale <= 0, aborting!");
                 throw new ChangeDeniedException();
@@ -227,7 +227,7 @@ public class SimpleMVWorld implements MVWorld {
     private final class RespawnWorldPropertyValidator extends WorldPropertyValidator<String> {
         @Override
         public String validateChange(String property, String newValue, String oldValue,
-                SimpleMVWorld object) throws ChangeDeniedException {
+                MVWorld object) throws ChangeDeniedException {
             if (!newValue.isEmpty() && !plugin.getMVWorldManager().isMVWorld(newValue))
                 throw new ChangeDeniedException();
             return super.validateChange(property, newValue, oldValue, object);
@@ -242,7 +242,7 @@ public class SimpleMVWorld implements MVWorld {
     private final class AllowWeatherPropertyValidator extends WorldPropertyValidator<Boolean> {
         @Override
         public Boolean validateChange(String property, Boolean newValue, Boolean oldValue,
-                SimpleMVWorld object) throws ChangeDeniedException {
+                MVWorld object) throws ChangeDeniedException {
             if (!newValue) {
                 final World world = getCBWorld();
                 if (world != null) {
@@ -260,7 +260,7 @@ public class SimpleMVWorld implements MVWorld {
     private final class SpawningPropertyValidator extends WorldPropertyValidator<SpawnSettings> {
         @Override
         public SpawnSettings validateChange(String property, SpawnSettings newValue, SpawnSettings oldValue,
-                                      SimpleMVWorld object) throws ChangeDeniedException {
+                                      MVWorld object) throws ChangeDeniedException {
             boolean allowMonsters, allowAnimals;
             if (getAnimalList().isEmpty()) {
                 allowAnimals = canAnimalsSpawn();
@@ -274,16 +274,16 @@ public class SimpleMVWorld implements MVWorld {
             }
             final World world = getCBWorld();
             if (world != null) {
-                if (SimpleMVWorld.this.props.getAnimalSpawnRate() != -1) {
-                    world.setTicksPerAnimalSpawns(SimpleMVWorld.this.props.getAnimalSpawnRate());
+                if (MVWorld.this.props.getAnimalSpawnRate() != -1) {
+                    world.setTicksPerAnimalSpawns(MVWorld.this.props.getAnimalSpawnRate());
                 }
-                if (SimpleMVWorld.this.props.getMonsterSpawnRate() != -1) {
-                    world.setTicksPerMonsterSpawns(SimpleMVWorld.this.props.getMonsterSpawnRate());
+                if (MVWorld.this.props.getMonsterSpawnRate() != -1) {
+                    world.setTicksPerMonsterSpawns(MVWorld.this.props.getMonsterSpawnRate());
                 }
                 world.setSpawnFlags(allowMonsters, allowAnimals);
             }
             if (MultiverseCoreConfiguration.getInstance().isAutoPurgeEnabled()) {
-                plugin.getMVWorldManager().getTheWorldPurger().purgeWorld(SimpleMVWorld.this);
+                plugin.getMVWorldManager().getTheWorldPurger().purgeWorld(MVWorld.this);
             }
             return super.validateChange(property, newValue, oldValue, object);
         }
@@ -295,11 +295,11 @@ public class SimpleMVWorld implements MVWorld {
     private final class GameModePropertyValidator extends WorldPropertyValidator<GameMode> {
         @Override
         public GameMode validateChange(String property, GameMode newValue, GameMode oldValue,
-                SimpleMVWorld object) throws ChangeDeniedException {
+                MVWorld object) throws ChangeDeniedException {
             for (Player p : plugin.getServer().getWorld(getName()).getPlayers()) {
                 Logging.finer(String.format("Setting %s's GameMode to %s",
                         p.getName(), newValue.toString()));
-                plugin.getPlayerListener().handleGameModeAndFlight(p, SimpleMVWorld.this);
+                plugin.getPlayerListener().handleGameModeAndFlight(p, MVWorld.this);
             }
             return super.validateChange(property, newValue, oldValue, object);
         }
@@ -311,7 +311,7 @@ public class SimpleMVWorld implements MVWorld {
     private final class SpawnLocationPropertyValidator extends WorldPropertyValidator<Location> {
         @Override
         public Location validateChange(String property, Location newValue, Location oldValue,
-                SimpleMVWorld object) throws ChangeDeniedException {
+                MVWorld object) throws ChangeDeniedException {
             if (newValue == null)
                 throw new ChangeDeniedException();
             if (props.getAdjustSpawn()) {
@@ -380,7 +380,7 @@ public class SimpleMVWorld implements MVWorld {
 
         @Override
         public String toString() {
-            return "Location{null}";
+            return "NULL LOCATION";
         };
     }
 
@@ -484,10 +484,10 @@ public class SimpleMVWorld implements MVWorld {
     }
 
     /**
-     * Copies all properties from another {@link SimpleMVWorld} object.
+     * Copies all properties from another {@link MVWorld} object.
      * @param other The other world object.
      */
-    public void copyValues(SimpleMVWorld other) {
+    public void copyValues(MVWorld other) {
         props.copyValues(other.props);
     }
 

src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java

@@ -3,7 +3,7 @@ package com.onarandombox.MultiverseCore;
 import java.util.Map;
 
 import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.api.MVConfig;
+import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
 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 MVConfig {
+public class MultiverseCoreConfiguration extends SerializationConfig implements MultiverseCoreConfig {
     private static MultiverseCoreConfiguration instance;
 
     /**
@@ -35,7 +35,6 @@ 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!");
@@ -49,20 +48,28 @@ 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;
@@ -88,12 +95,16 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     protected void setDefaults() {
         // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
         enforceaccess = false;
+        useasyncchat = 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 = true;
@@ -205,6 +216,22 @@ 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}
      */
@@ -231,6 +258,22 @@ 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}
      */
@@ -263,6 +306,32 @@ 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);

src/main/java/com/onarandombox/MultiverseCore/WorldProperties.java

@@ -1,21 +1,13 @@
-package com.onarandombox.MultiverseCore.world;
+package com.onarandombox.MultiverseCore;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.onarandombox.MultiverseCore.world.configuration.EntryFee;
-import com.onarandombox.MultiverseCore.world.configuration.SpawnLocation;
-import com.onarandombox.MultiverseCore.world.configuration.SpawnSettings;
-import com.onarandombox.MultiverseCore.world.configuration.WorldPropertyValidator;
-import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType;
-import com.onarandombox.MultiverseCore.world.configuration.EnglishChatColor;
-import com.onarandombox.MultiverseCore.world.configuration.EnglishChatStyle;
-import com.onarandombox.MultiverseCore.world.SimpleMVWorld.NullLocation;
+import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
+import com.onarandombox.MultiverseCore.configuration.EntryFee;
+import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
+import com.onarandombox.MultiverseCore.configuration.SpawnSettings;
+import com.onarandombox.MultiverseCore.configuration.WorldPropertyValidator;
+import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
+import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
+import com.onarandombox.MultiverseCore.enums.EnglishChatStyle;
 import me.main__.util.SerializationConfig.IllegalPropertyValueException;
 import me.main__.util.SerializationConfig.Property;
 import me.main__.util.SerializationConfig.SerializationConfig;
@@ -31,6 +23,14 @@ import org.bukkit.World.Environment;
 import org.bukkit.configuration.serialization.SerializableAs;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /*
  * This is a property class, I think we don't need that much javadoc.
  * BEGIN CHECKSTYLE-SUPPRESSION: Javadoc
@@ -88,7 +88,7 @@ public class WorldProperties extends SerializationConfig {
         keepSpawnFallback = true;
     }
 
-    void setMVWorld(SimpleMVWorld world) {
+    void setMVWorld(MVWorld world) {
         registerObjectUsing(world);
         registerGlobalValidator(new WorldPropertyValidator());
     }

src/main/java/com/onarandombox/MultiverseCore/anchor/package-info.java

@@ -1,4 +0,0 @@
-/**
- * this package contains the classes that are used for the anchor system.
- */
-package com.onarandombox.MultiverseCore.anchor;

src/main/java/com/onarandombox/MultiverseCore/api/Core.java

@@ -0,0 +1,245 @@
+/******************************************************************************
+ * 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 buscript.Buscript;
+import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
+import com.onarandombox.MultiverseCore.destination.DestinationFactory;
+import com.onarandombox.MultiverseCore.utils.AnchorManager;
+import com.onarandombox.MultiverseCore.utils.MVEconomist;
+import com.onarandombox.MultiverseCore.utils.MVPermissions;
+import com.onarandombox.MultiverseCore.utils.MVPlayerSession;
+import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety;
+import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
+import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
+import com.onarandombox.MultiverseCore.utils.VaultHandler;
+import com.pneumaticraft.commandhandler.CommandHandler;
+import org.bukkit.entity.Player;
+
+/**
+ * Multiverse 2 Core API
+ * <p>
+ * This API contains a bunch of useful things you can get out of Multiverse in general!
+ */
+public interface Core {
+
+    /**
+     * 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();
+
+    /**
+     * Retrieves Multiverse's friendly economist. The economist can be used for dealing with economies without
+     * worrying about any of the messy details.
+     *
+     * @return the economy manager for Multiverse.
+     */
+    MVEconomist getEconomist();
+
+    /**
+     * Reloads the Multiverse Configuration files:
+     * worlds.yml and config.yml.
+     */
+    void loadConfigs();
+
+    /**
+     * Gets the Multiverse message system. This allows you to send messages
+     * to users at specified intervals.
+     *
+     * @return The loaded {@link MultiverseMessaging}.
+     */
+    MultiverseMessaging getMessaging();
+
+    /**
+     * Gets the {@link MVPlayerSession} for the given player.
+     * This will also create a player session if one does not exist
+     * for a player.
+     *
+     * @param player The player's session to grab.
+     *
+     * @return The corresponding {@link MVPlayerSession}.
+     */
+    MVPlayerSession getPlayerSession(Player player);
+
+    /**
+     * Multiverse uses an advanced permissions setup, this object
+     * simplifies getting/setting permissions.
+     *
+     * @return A non-null {@link MVPermissions}.
+     */
+    MVPermissions getMVPerms();
+
+    /**
+     * Multiverse uses {@link CommandHandler} to make adding and using commands
+     * a piece of cake.
+     *
+     * @return A non-null {@link CommandHandler}.
+     */
+    CommandHandler getCommandHandler();
+
+    /**
+     * Manager for command that requires /mv confirm before execution.
+     *
+     * @return A non-null {@link CommandQueueManager}.
+     * @deprecated To be moved to new command manager in 5.0.0
+     */
+    @Deprecated
+    CommandQueueManager getCommandQueueManager();
+
+    /**
+     * Gets the factory class responsible for loading many different destinations
+     * on demand.
+     *
+     * @return A valid {@link DestinationFactory}.
+     */
+    DestinationFactory getDestFactory();
+
+    /**
+     * Gets the primary class responsible for managing Multiverse Worlds.
+     *
+     * @return {@link MVWorldManager}.
+     */
+    MVWorldManager getMVWorldManager();
+
+    /**
+     * Saves all configs.
+     *
+     * @return Whether the config was successfully saved
+     */
+    boolean saveMVConfigs();
+
+    /**
+     * Gets the {@link AnchorManager}.
+     *
+     * @return The {@link AnchorManager}
+     */
+    AnchorManager getAnchorManager();
+
+    /**
+     * Previously used by queued commands to regenerate a world on a delay.
+     * Do not use api method for any other purpose.
+     *
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
+     *
+     * @return True if success, false if fail.
+     *
+     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String, boolean)} instead.
+     */
+    @Deprecated
+    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed);
+
+    /**
+     * Used by queued commands to regenerate a world on a delay.
+     * Do not use api method for any other purpose.
+     *
+     * @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.
+     *
+     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String, boolean)} instead.
+     */
+    @Deprecated
+    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed, Boolean keepGameRules);
+
+    /**
+     * Decrements the number of plugins that have specifically hooked into core.
+     */
+    void decrementPluginCount();
+
+    /**
+     * Increments the number of plugins that have specifically hooked into core.
+     */
+    void incrementPluginCount();
+
+    /**
+     * Returns the number of plugins that have specifically hooked into core.
+     *
+     * @return The number if plugins that have hooked into core.
+     */
+    int getPluginCount();
+
+    /**
+     * Parse the Authors Array into a readable String with ',' and 'and'.
+     *
+     * @return The readable authors-{@link String}
+     */
+    String getAuthors();
+
+    /**
+     * Gets the {@link BlockSafety} this {@link Core} is using.
+     * @return The {@link BlockSafety} this {@link Core} is using.
+     * @see BlockSafety
+     * @see SimpleBlockSafety
+     */
+    BlockSafety getBlockSafety();
+
+    /**
+     * Sets the {@link BlockSafety} this {@link Core} is using.
+     * @param blockSafety The new {@link BlockSafety}.
+     * @see BlockSafety
+     * @see SimpleBlockSafety
+     */
+    void setBlockSafety(BlockSafety blockSafety);
+
+    /**
+     * Gets the {@link LocationManipulation} this {@link Core} is using.
+     * @return The {@link LocationManipulation} this {@link Core} is using.
+     * @see LocationManipulation
+     * @see SimpleLocationManipulation
+     */
+    LocationManipulation getLocationManipulation();
+
+    /**
+     * Sets the {@link LocationManipulation} this {@link Core} is using.
+     * @param locationManipulation The new {@link LocationManipulation}.
+     * @see LocationManipulation
+     * @see SimpleLocationManipulation
+     */
+    void setLocationManipulation(LocationManipulation locationManipulation);
+
+    /**
+     * Gets the {@link SafeTTeleporter} this {@link Core} is using.
+     * @return The {@link SafeTTeleporter} this {@link Core} is using.
+     * @see SafeTTeleporter
+     * @see SimpleSafeTTeleporter
+     */
+    SafeTTeleporter getSafeTTeleporter();
+
+    /**
+     * Sets the {@link SafeTTeleporter} this {@link Core} is using.
+     * @param safeTTeleporter The new {@link SafeTTeleporter}.
+     * @see SafeTTeleporter
+     * @see SimpleSafeTTeleporter
+     */
+    void setSafeTTeleporter(SafeTTeleporter safeTTeleporter);
+
+    /**
+     * Gets the {@link MultiverseCoreConfig}.
+     * @return The configuration.
+     */
+    MultiverseCoreConfig getMVConfig();
+
+    /**
+     * Gets the buscript object for Multiverse.  This is what handles Javascript processing.
+     *
+     * @return The Multiverse buscript object.
+     */
+    Buscript getScriptAPI();
+}

src/main/java/com/onarandombox/MultiverseCore/api/Destination.java

@@ -1,56 +0,0 @@
-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();
-}

src/main/java/com/onarandombox/MultiverseCore/api/DestinationInstance.java

@@ -1,45 +0,0 @@
-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();
-}

src/main/java/com/onarandombox/MultiverseCore/api/FancyText.java

@@ -0,0 +1,20 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.api;
+
+/**
+ * A fancy text.
+ */
+public interface FancyText {
+    /**
+     * Gets the {@link String}-representation of this {@link FancyText}.
+     *
+     * @return The {@link String}-representation of this {@link FancyText}.
+     */
+    String getFancyText();
+}

src/main/java/com/onarandombox/MultiverseCore/api/LoggablePlugin.java

@@ -0,0 +1,36 @@
+/******************************************************************************
+ * 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();
+}

src/main/java/com/onarandombox/MultiverseCore/api/MVCore.java

@@ -1,169 +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.onarandombox.MultiverseCore.anchor.AnchorManager;
-import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
-import com.onarandombox.MultiverseCore.destination.DestinationsProvider;
-import com.onarandombox.MultiverseCore.economy.MVEconomist;
-import com.onarandombox.MultiverseCore.teleportation.SimpleBlockSafety;
-import com.onarandombox.MultiverseCore.teleportation.SimpleLocationManipulation;
-import com.onarandombox.MultiverseCore.teleportation.SimpleSafeTTeleporter;
-import com.onarandombox.MultiverseCore.utils.MVPermissions;
-import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper;
-
-/**
- * Multiverse 2 Core API
- * <p>
- * This API contains a bunch of useful things you can get out of Multiverse in general!
- */
-public interface MVCore extends MVPlugin {
-    /**
-     * Retrieves Multiverse's friendly economist. The economist can be used for dealing with economies without
-     * worrying about any of the messy details.
-     *
-     * @return the economy manager for Multiverse.
-     */
-    MVEconomist getEconomist();
-
-    /**
-     * Reloads the Multiverse Configuration files:
-     * worlds.yml and config.yml.
-     */
-    void loadConfigs();
-
-    /**
-     * Gets the {@link UnsafeCallWrapper} class.
-     *
-     * @return A non-null {@link UnsafeCallWrapper}.
-     */
-    UnsafeCallWrapper getUnsafeCallWrapper();
-
-    /**
-     * Multiverse uses an advanced permissions setup, this object
-     * simplifies getting/setting permissions.
-     *
-     * @return A non-null {@link MVPermissions}.
-     */
-    MVPermissions getMVPerms();
-
-    /**
-     * Multiverse uses {@link MVCommandManager} to make adding and using commands
-     * a piece of cake.
-     *
-     * @return A non-null {@link MVCommandManager}.
-     */
-    MVCommandManager getMVCommandManager();
-
-    /**
-     * Gets the class responsible for loading many different destinations
-     * on demand.
-     *
-     * @return A valid {@link DestinationsProvider}.
-     */
-    DestinationsProvider getDestinationsProvider();
-
-    /**
-     * Gets the primary class responsible for managing Multiverse Worlds.
-     *
-     * @return {@link MVWorldManager}.
-     */
-    MVWorldManager getMVWorldManager();
-
-    /**
-     * Saves the Multiverse-Config.
-     *
-     * @return Whether the Multiverse-Config was successfully saved
-     */
-    boolean saveMVConfig();
-
-    /**
-     * Saves all configs.
-     *
-     * @return Whether the config was successfully saved
-     */
-    boolean saveAllConfigs();
-
-    /**
-     * Gets the {@link AnchorManager}.
-     *
-     * @return The {@link AnchorManager}
-     */
-    AnchorManager getAnchorManager();
-
-    /**
-     * Decrements the number of plugins that have specifically hooked into core.
-     */
-    void decrementPluginCount();
-
-    /**
-     * Increments the number of plugins that have specifically hooked into core.
-     */
-    void incrementPluginCount();
-
-    /**
-     * Returns the number of plugins that have specifically hooked into core.
-     *
-     * @return The number if plugins that have hooked into core.
-     */
-    int getPluginCount();
-
-    /**
-     * Gets the {@link BlockSafety} this {@link MVCore} is using.
-     * @return The {@link BlockSafety} this {@link MVCore} is using.
-     * @see BlockSafety
-     * @see SimpleBlockSafety
-     */
-    BlockSafety getBlockSafety();
-
-    /**
-     * Sets the {@link BlockSafety} this {@link MVCore} is using.
-     * @param blockSafety The new {@link BlockSafety}.
-     * @see BlockSafety
-     * @see SimpleBlockSafety
-     */
-    void setBlockSafety(BlockSafety blockSafety);
-
-    /**
-     * Gets the {@link LocationManipulation} this {@link MVCore} is using.
-     * @return The {@link LocationManipulation} this {@link MVCore} is using.
-     * @see LocationManipulation
-     * @see SimpleLocationManipulation
-     */
-    LocationManipulation getLocationManipulation();
-
-    /**
-     * Sets the {@link LocationManipulation} this {@link MVCore} is using.
-     * @param locationManipulation The new {@link LocationManipulation}.
-     * @see LocationManipulation
-     * @see SimpleLocationManipulation
-     */
-    void setLocationManipulation(LocationManipulation locationManipulation);
-
-    /**
-     * Gets the {@link SafeTTeleporter} this {@link MVCore} is using.
-     * @return The {@link SafeTTeleporter} this {@link MVCore} is using.
-     * @see SafeTTeleporter
-     * @see SimpleSafeTTeleporter
-     */
-    SafeTTeleporter getSafeTTeleporter();
-
-    /**
-     * Sets the {@link SafeTTeleporter} this {@link MVCore} is using.
-     * @param safeTTeleporter The new {@link SafeTTeleporter}.
-     * @see SafeTTeleporter
-     * @see SimpleSafeTTeleporter
-     */
-    void setSafeTTeleporter(SafeTTeleporter safeTTeleporter);
-
-    /**
-     * Gets the {@link MVConfig}.
-     * @return The configuration.
-     */
-    MVConfig getMVConfig();
-}

src/main/java/com/onarandombox/MultiverseCore/api/MVDestination.java

@@ -16,7 +16,6 @@ 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.

src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java

@@ -7,16 +7,39 @@
 
 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 {
+public interface MVPlugin extends LoggablePlugin {
+    /**
+     * Adds This plugin's version information to the buffer and returns the new string.
+     *
+     * @param buffer The string that contains Core and all other MV plugins' versions.
+     *
+     * @return A modified buffer that contains this MVPlugin's version information.
+     *
+     * @deprecated This is now deprecated, nobody needs it any longer.
+     * All version info-dumping is now done with {@link MVVersionEvent}.
+     */
+    @Deprecated
+    String dumpVersionInfo(String buffer);
+
     /**
      * Gets the reference to MultiverseCore.
      *
      * @return A valid {@link com.onarandombox.MultiverseCore}.
      */
-    MVCore getCore();
+    MultiverseCore getCore();
+
+    /**
+     * Sets the reference to MultiverseCore.
+     *
+     * @param core A valid {@link com.onarandombox.MultiverseCore}.
+     */
+    void setCore(MultiverseCore core);
 
     /**
      * Allows Multiverse or a plugin to query another Multiverse plugin to see what version its protocol is. This
@@ -26,11 +49,4 @@ public interface MVPlugin {
      * @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();
 }

src/main/java/com/onarandombox/MultiverseCore/api/MVWorldManager.java

@@ -7,17 +7,18 @@
 
 package com.onarandombox.MultiverseCore.api;
 
-import java.io.File;
-import java.util.Collection;
-import java.util.List;
-
-import com.onarandombox.MultiverseCore.world.SimpleWorldPurger;
+import com.onarandombox.MultiverseCore.utils.PurgeWorlds;
+import com.onarandombox.MultiverseCore.utils.SimpleWorldPurger;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldType;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.generator.ChunkGenerator;
 
+import java.io.File;
+import java.util.Collection;
+import java.util.List;
+
 /**
  * Multiverse 2 World Manager API
  * <p>
@@ -58,6 +59,18 @@ 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.
      *
@@ -147,40 +160,40 @@ public interface MVWorldManager {
     /**
      * Returns a list of all the worlds Multiverse knows about.
      *
-     * @return A list of {@link MVWorld}.
+     * @return A list of {@link MultiverseWorld}.
      */
-    Collection<MVWorld> getMVWorlds();
+    Collection<MultiverseWorld> getMVWorlds();
 
 
     /**
-     * Returns a {@link MVWorld} if it exists, and null if it does not.
+     * Returns a {@link MultiverseWorld} if it exists, and null if it does not.
      * This will search name AND alias.
      *
      * @param name The name or alias of the world to get.
-     * @return A {@link MVWorld} or null.
+     * @return A {@link MultiverseWorld} or null.
      */
-    MVWorld getMVWorld(String name);
+    MultiverseWorld getMVWorld(String name);
 
     /**
-     * Returns a {@link MVWorld} if the world with name given exists, and null if it does not.
+     * Returns a {@link MultiverseWorld} 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.
+     * @return A {@link MultiverseWorld} or null.
      */
-    MVWorld getMVWorld(String name, boolean checkAliases);
+    MultiverseWorld getMVWorld(String name, boolean checkAliases);
 
     /**
-     * Returns a {@link MVWorld} if it exists, and null if it does not.
+     * Returns a {@link MultiverseWorld} if it exists, and null if it does not.
      *
      * @param world The Bukkit world to check.
-     * @return A {@link MVWorld} or null.
+     * @return A {@link MultiverseWorld} or null.
      */
-    MVWorld getMVWorld(World world);
+    MultiverseWorld getMVWorld(World world);
 
     /**
-     * Checks to see if the given name is a valid {@link MVWorld}
+     * Checks to see if the given name is a valid {@link MultiverseWorld}
      * Searches based on world name AND alias.
      *
      * @param name The name or alias of the world to check.
@@ -189,7 +202,7 @@ public interface MVWorldManager {
     boolean isMVWorld(String name);
 
     /**
-     * Checks to see if the given name is a valid {@link MVWorld}.
+     * Checks to see if the given name is a valid {@link MultiverseWorld}.
      * Optionally searches by alias is specified.
      *
      * @param name          The name or alias of the world to check.
@@ -199,7 +212,7 @@ public interface MVWorldManager {
     boolean isMVWorld(String name, boolean checkAliases);
 
     /**
-     * Checks to see if the given world is a valid {@link MVWorld}.
+     * Checks to see if the given world is a valid {@link MultiverseWorld}.
      *
      * @param world The Bukkit world to check.
      * @return True if the world has been loaded into MV2, false if not.
@@ -221,9 +234,19 @@ 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
@@ -236,7 +259,7 @@ public interface MVWorldManager {
      *
      * @return A Multiverse world that players will spawn in or null if no MV world has been set.
      */
-    MVWorld getSpawnWorld();
+    MultiverseWorld getSpawnWorld();
 
     /**
      * Gets the list of worlds in the config, but unloaded.
@@ -283,9 +306,9 @@ public interface MVWorldManager {
     /**
      * Gets the world players should spawn in first.
      *
-     * @return The {@link MVWorld} new players should spawn in.
+     * @return The {@link MultiverseWorld} new players should spawn in.
      */
-    MVWorld getFirstSpawnWorld();
+    MultiverseWorld getFirstSpawnWorld();
 
     /**
      * Regenerates a world.

src/main/java/com/onarandombox/MultiverseCore/api/MultiverseCoreConfig.java

@@ -5,7 +5,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerializable;
 /**
  * The configuration of MultiverseCore.
  */
-public interface MVConfig extends ConfigurationSerializable {
+public interface MultiverseCoreConfig extends ConfigurationSerializable {
     /**
      * Sets a property using a {@link String}.
      * @param property The name of the property.
@@ -14,6 +14,18 @@ public interface MVConfig 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.
@@ -38,6 +50,18 @@ public interface MVConfig 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.
@@ -62,6 +86,18 @@ public interface MVConfig 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.
@@ -122,6 +158,18 @@ public interface MVConfig 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.
      *

src/main/java/com/onarandombox/MultiverseCore/api/MultiverseMessaging.java

@@ -0,0 +1,56 @@
+package com.onarandombox.MultiverseCore.api;
+
+import java.util.Collection;
+
+import org.bukkit.command.CommandSender;
+
+/**
+ * Multiverse-messaging.
+ */
+public interface MultiverseMessaging {
+    /**
+     * Sets the message-cooldown.
+     * @param milliseconds The new message-cooldown in milliseconds.
+     */
+    void setCooldown(int milliseconds);
+
+    /**
+     * Sends a message to the specified sender if the cooldown has passed.
+     *
+     * @param sender         The person/console to send the message to.
+     * @param message        The message to send.
+     * @param ignoreCooldown If true this message will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
+    boolean sendMessage(CommandSender sender, String message, boolean ignoreCooldown);
+
+    /**
+     * Sends a group of messages to the specified sender if the cooldown has passed.
+     * This method is needed, since sending many messages in quick succession would violate
+     * the cooldown.
+     *
+     * @param sender         The person/console to send the message to.
+     * @param messages       The messages to send.
+     * @param ignoreCooldown If true these messages will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
+    boolean sendMessages(CommandSender sender, String[] messages, boolean ignoreCooldown);
+
+    /**
+     * Sends a group of messages to the specified sender if the cooldown has passed.
+     * This method is needed, since sending many messages in quick succession would violate
+     * the cooldown.
+     *
+     * @param sender         The person/console to send the message to.
+     * @param messages       The messages to send.
+     * @param ignoreCooldown If true these messages will always be sent. Useful for things like menus
+     * @return true if the message was sent, false if not.
+     */
+    boolean sendMessages(CommandSender sender, Collection<String> messages, boolean ignoreCooldown);
+
+    /**
+     * Gets the message-cooldown.
+     * @return The message-cooldown.
+     */
+    int getCooldown();
+}

src/main/java/com/onarandombox/MultiverseCore/api/MultiversePlugin.java

@@ -0,0 +1,161 @@
+package com.onarandombox.MultiverseCore.api;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.utils.DebugLog;
+import com.pneumaticraft.commandhandler.CommandHandler;
+
+/**
+ * Make things easier for MV-Plugins!
+ */
+public abstract class MultiversePlugin extends JavaPlugin implements MVPlugin {
+    private MultiverseCore core;
+    /**
+     * Prefix for standard log entrys.
+     */
+    protected String logTag;
+    private DebugLog debugLog;
+
+    /**
+     * {@inheritDoc}
+     *
+     * Note: You can't override this, use {@link #onPluginEnable()} instead!
+     * @see #onPluginEnable()
+     */
+    @Override
+    public final void onEnable() {
+        MultiverseCore theCore = (MultiverseCore) this.getServer().getPluginManager().getPlugin("Multiverse-Core");
+        if (theCore == null) {
+            this.getLogger().severe("Core not found! The plugin dev needs to add a dependency!");
+            this.getLogger().severe("Disabling!");
+            this.getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+        if (theCore.getProtocolVersion() < this.getProtocolVersion()) {
+            this.getLogger().severe("You need a newer version of Multiverse-Core!");
+            this.getLogger().severe("Disabling!");
+            this.getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+        this.setCore(theCore);
+
+        this.getServer().getLogger().info(String.format("%s - Version %s enabled - By %s",
+                this.getDescription().getName(), this.getDescription().getVersion(), getAuthors()));
+        getDataFolder().mkdirs();
+        File debugLogFile = new File(getDataFolder(), "debug.log");
+        try {
+            debugLogFile.createNewFile();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        debugLog = new DebugLog(this.getDescription().getName(), getDataFolder() + File.separator + "debug.log");
+        debugLog.setTag(String.format("[%s-Debug]", this.getDescription().getName()));
+
+        this.onPluginEnable();
+    }
+
+    /**
+     * Parse the Authors Array into a readable String with ',' and 'and'.
+     *
+     * @return The readable authors-{@link String}
+     */
+    protected String getAuthors() {
+        String authors = "";
+        List<String> auths = this.getDescription().getAuthors();
+        if (auths.size() == 0) {
+            return "";
+        }
+
+        if (auths.size() == 1) {
+            return auths.get(0);
+        }
+
+        for (int i = 0; i < auths.size(); i++) {
+            if (i == this.getDescription().getAuthors().size() - 1) {
+                authors += " and " + this.getDescription().getAuthors().get(i);
+            } else {
+                authors += ", " + this.getDescription().getAuthors().get(i);
+            }
+        }
+        return authors.substring(2);
+    }
+
+    /**
+     * Called when the plugin is enabled.
+     * @see #onEnable()
+     */
+    protected abstract void onPluginEnable();
+
+    /**
+     * You can register commands here.
+     * @param handler The CommandHandler.
+     */
+    protected abstract void registerCommands(CommandHandler handler);
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!this.isEnabled()) {
+            sender.sendMessage("This plugin is Disabled!");
+            return true;
+        }
+
+        ArrayList<String> allArgs = new ArrayList<String>(args.length + 1);
+        allArgs.add(command.getName());
+        allArgs.addAll(Arrays.asList(args));
+        return this.getCore().getCommandHandler().locateAndRunCommand(sender, allArgs);
+    }
+
+    @Override
+    public void log(Level level, String msg) {
+        int debugLevel = this.getCore().getMVConfig().getGlobalDebug();
+        if ((level == Level.FINE && debugLevel >= 1) || (level == Level.FINER && debugLevel >= 2)
+                || (level == Level.FINEST && debugLevel >= 3)) {
+            debugLog.log(level, msg);
+        } else if (level != Level.FINE && level != Level.FINER && level != Level.FINEST) {
+            String message = new StringBuilder(getLogTag()).append(msg).toString();
+            this.getServer().getLogger().log(level, message);
+            debugLog.log(level, message);
+        }
+    }
+
+    private String getLogTag() {
+        if (logTag == null)
+            logTag = String.format("[%s]", this.getDescription().getName());
+        return logTag;
+    }
+
+    /**
+     * Sets the debug log-tag.
+     * @param tag The new tag.
+     */
+    protected final void setDebugLogTag(String tag) {
+        this.debugLog.setTag(tag);
+    }
+
+    @Override
+    public final String dumpVersionInfo(String buffer) {
+        throw new UnsupportedOperationException("This is gone.");
+    }
+
+    @Override
+    public final MultiverseCore getCore() {
+        if (this.core == null)
+            throw new IllegalStateException("Core is null!");
+        return this.core;
+    }
+
+    @Override
+    public final void setCore(MultiverseCore core) {
+        this.core = core;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/api/MultiverseWorld.java

@@ -7,12 +7,8 @@
 
 package com.onarandombox.MultiverseCore.api;
 
-import java.util.List;
-
+import com.onarandombox.MultiverseCore.enums.AllowedPortalType;
 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;
@@ -20,13 +16,16 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.WorldType;
+import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 /**
  * The API for a Multiverse Handled World.
  */
-public interface MVWorld {
+public interface MultiverseWorld {
     /**
      * Returns the Bukkit world object that this world describes.
      *
@@ -157,9 +156,9 @@ public interface MVWorld {
     boolean setPropertyValue(String property, String value) throws PropertyDoesNotExistException;
 
     /**
-     * Adds a value to the given property. The property must be a {@link AddProperties}.
+     * Adds a value to the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
      *
-     * @param property The name of a {@link AddProperties} to add a value to.
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to add a value to.
      * @param value    A value in string representation, it will be parsed to the correct type.
      * @return True if the value was added, false if not.
      * @deprecated We changed the entire world-config-system. This is not compatible any more.
@@ -168,9 +167,9 @@ public interface MVWorld {
     boolean addToVariable(String property, String value);
 
     /**
-     * Removes a value from the given property. The property must be a {@link AddProperties}.
+     * Removes a value from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
      *
-     * @param property The name of a {@link AddProperties} to remove a value
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to remove a value
      *                 from.
      * @param value    A value in string representation, it will be parsed to the correct type.
      * @return True if the value was removed, false if not.
@@ -180,9 +179,9 @@ public interface MVWorld {
     boolean removeFromVariable(String property, String value);
 
     /**
-     * Removes all values from the given property. The property must be a {@link AddProperties}.
+     * Removes all values from the given property. The property must be a {@link com.onarandombox.MultiverseCore.enums.AddProperties}.
      *
-     * @param property The name of a {@link AddProperties} to clear.
+     * @param property The name of a {@link com.onarandombox.MultiverseCore.enums.AddProperties} to clear.
      * @return True if it was cleared, false if not.
      * @deprecated We changed the entire world-config-system. This is not compatible any more.
      */
@@ -280,7 +279,7 @@ public interface MVWorld {
      * @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 EnglishChatColor#isValidAliasColor(String)}
+     * @deprecated This has been moved: {@link com.onarandombox.MultiverseCore.enums.EnglishChatColor#isValidAliasColor(String)}
      */
     @Deprecated
     boolean isValidAliasColor(String color);

src/main/java/com/onarandombox/MultiverseCore/api/SafeTTeleporter.java

@@ -1,12 +1,11 @@
 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.
  */
@@ -32,12 +31,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 destination   Destination to teleport them to
+     * @param teleporter Person who performed the teleport command.
+     * @param teleportee Entity to teleport
+     * @param d          Destination to teleport them to
      * @return true for success, false for failure
      */
-    TeleportResult safelyTeleport(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination<?> destination);
+    TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, MVDestination d);
 
     /**
      * Safely teleport the entity to the Location. This may perform checks to
@@ -56,11 +55,11 @@ public interface SafeTTeleporter extends Teleporter {
     /**
      * Returns a safe location for the entity to spawn at.
      *
-     * @param entity        The entity to spawn
-     * @param destination   The MVDestination to take the entity to.
+     * @param e The entity to spawn
+     * @param d The MVDestination to take the entity to.
      * @return A new location to spawn the entity at.
      */
-    Location getSafeLocation(Entity entity, DestinationInstance destination);
+    Location getSafeLocation(Entity e, MVDestination d);
 
     /**
      * Finds a portal-block next to the specified {@link Location}.

src/main/java/com/onarandombox/MultiverseCore/api/Teleporter.java

@@ -1,18 +1,10 @@
 package com.onarandombox.MultiverseCore.api;
 
-import co.aikar.commands.BukkitCommandIssuer;
-import com.onarandombox.MultiverseCore.destination.ParsedDestination;
-import com.onarandombox.MultiverseCore.teleportation.TeleportResult;
-import org.bukkit.entity.Entity;
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.enums.TeleportResult;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 public interface Teleporter {
-    /**
-     * 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);
+    TeleportResult teleport(CommandSender teleporter, Player teleportee, MVDestination destination);
 }

src/main/java/com/onarandombox/MultiverseCore/api/WorldPurger.java

@@ -12,39 +12,39 @@ public interface WorldPurger {
     /**
      * Synchronizes the given worlds with their settings.
      *
-     * @param worlds A list of {@link MVWorld}
+     * @param worlds A list of {@link MultiverseWorld}
      */
-    void purgeWorlds(List<MVWorld> worlds);
+    void purgeWorlds(List<MultiverseWorld> worlds);
 
     /**
-     * Convenience method for {@link #purgeWorld(MVWorld, java.util.List, boolean, boolean)} that takes the settings from the world-config.
+     * Convenience method for {@link #purgeWorld(MultiverseWorld, java.util.List, boolean, boolean)} that takes the settings from the world-config.
      *
-     * @param world The {@link MVWorld}.
+     * @param world The {@link MultiverseWorld}.
      */
-    void purgeWorld(MVWorld world);
+    void purgeWorld(MultiverseWorld world);
 
     /**
      * Clear all animals/monsters that do not belong to a world according to the config.
      *
-     * @param mvworld The {@link MVWorld}.
+     * @param mvworld The {@link MultiverseWorld}.
      * @param thingsToKill A {@link List} of animals/monsters to be killed.
      * @param negateAnimals Whether the monsters in the list should be negated.
      * @param negateMonsters Whether the animals in the list should be negated.
      */
-    void purgeWorld(MVWorld mvworld, List<String> thingsToKill, boolean negateAnimals,
-                    boolean negateMonsters);
+    void purgeWorld(MultiverseWorld mvworld, List<String> thingsToKill, boolean negateAnimals,
+            boolean negateMonsters);
 
     /**
      * Clear all animals/monsters that do not belong to a world according to the config.
      *
-     * @param mvworld The {@link MVWorld}.
+     * @param mvworld The {@link MultiverseWorld}.
      * @param thingsToKill A {@link List} of animals/monsters to be killed.
      * @param negateAnimals Whether the monsters in the list should be negated.
      * @param negateMonsters Whether the animals in the list should be negated.
      * @param sender The {@link CommandSender} that initiated the action. He will/should be notified.
      */
-    void purgeWorld(MVWorld mvworld, List<String> thingsToKill, boolean negateAnimals,
-                    boolean negateMonsters, CommandSender sender);
+    void purgeWorld(MultiverseWorld 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(MVWorld w, Entity e);
+    boolean shouldWeKillThisCreature(MultiverseWorld w, Entity e);
 }

src/main/java/com/onarandombox/MultiverseCore/commands/AnchorCommand.java

@@ -0,0 +1,162 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class AnchorCommand extends PaginatedCoreCommand<String> {
+
+    public AnchorCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Create, Delete and Manage Anchor Destinations.");
+        this.setCommandUsage("/mv anchor " + ChatColor.GREEN + "{name}" + ChatColor.GOLD + " [-d]");
+        this.setArgRange(0, 2);
+        this.addKey("mv anchor");
+        this.addKey("mv anchors");
+        this.addKey("mvanchor");
+        this.addKey("mvanchors");
+        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "awesomething");
+        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "otherthing");
+        this.addCommandExample("/mv anchor " + ChatColor.GREEN + "awesomething " + ChatColor.RED + "-d");
+        this.addCommandExample("/mv anchors ");
+        this.setPermission("multiverse.core.anchor.list", "Allows a player to list all anchors.", PermissionDefault.OP);
+        this.addAdditonalPermission(new Permission("multiverse.core.anchor.create",
+                "Allows a player to create anchors.", PermissionDefault.OP));
+        this.addAdditonalPermission(new Permission("multiverse.core.anchor.delete",
+                "Allows a player to delete anchors.", PermissionDefault.OP));
+        this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+    }
+
+    private List<String> getFancyAnchorList(Player p) {
+        List<String> anchorList = new ArrayList<String>();
+        ChatColor color = ChatColor.GREEN;
+        for (String anchor : this.plugin.getAnchorManager().getAnchors(p)) {
+            anchorList.add(color + anchor);
+            color = (color == ChatColor.GREEN) ? ChatColor.GOLD : ChatColor.GREEN;
+        }
+        return anchorList;
+    }
+
+    private void showList(CommandSender sender, List<String> args) {
+        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.list", true)) {
+            sender.sendMessage(ChatColor.RED + "You don't have the permission to list anchors!");
+            return;
+        }
+
+        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse Anchor List ]====");
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+
+
+        FilterObject filterObject = this.getPageAndFilter(args);
+
+        List<String> availableAnchors = new ArrayList<String>(this.getFancyAnchorList(p));
+        if (filterObject.getFilter().length() > 0) {
+            availableAnchors = this.getFilteredItems(availableAnchors, filterObject.getFilter());
+            if (availableAnchors.size() == 0) {
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
+                        + "No anchors matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
+                return;
+            }
+        } else {
+            if (availableAnchors.size() == 0) {
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE + "No anchors were defined.");
+                return;
+            }
+        }
+
+
+        if (!(sender instanceof Player)) {
+            for (String c : availableAnchors) {
+                sender.sendMessage(c);
+            }
+            return;
+        }
+
+        int totalPages = (int) Math.ceil(availableAnchors.size() / (this.itemsPerPage + 0.0));
+
+        if (filterObject.getPage() > totalPages) {
+            filterObject.setPage(totalPages);
+        } else if (filterObject.getPage() < 1) {
+            filterObject.setPage(1);
+        }
+
+        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
+
+        this.showPage(filterObject.getPage(), sender, availableAnchors);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() == 0) {
+            this.showList(sender, args);
+            return;
+        }
+        if (args.size() == 1 && (this.getPageAndFilter(args).getPage() != 1 || args.get(0).equals("1"))) {
+            this.showList(sender, args);
+            return;
+        }
+        if (args.size() == 2 && args.get(1).equalsIgnoreCase("-d")) {
+            if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.delete", true)) {
+                sender.sendMessage(ChatColor.RED + "You don't have the permission to delete anchors!");
+            } else {
+                if (this.plugin.getAnchorManager().deleteAnchor(args.get(0))) {
+                    sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.RED + "deleted!");
+                } else {
+                    sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "deleted!");
+                }
+            }
+            return;
+        }
+
+        if (!(sender instanceof Player)) {
+            sender.sendMessage("You must be a player to create Anchors.");
+            return;
+        }
+
+        if (!this.plugin.getMVPerms().hasPermission(sender, "multiverse.core.anchor.create", true)) {
+            sender.sendMessage(ChatColor.RED + "You don't have the permission to create anchors!");
+        } else {
+            Player player = (Player) sender;
+            if (this.plugin.getAnchorManager().saveAnchorLocation(args.get(0), player.getLocation())) {
+                sender.sendMessage("Anchor '" + args.get(0) + "' was successfully " + ChatColor.GREEN + "created!");
+            } else {
+                sender.sendMessage("Anchor '" + args.get(0) + "' was " + ChatColor.RED + " NOT " + ChatColor.WHITE + "created!");
+            }
+        }
+    }
+
+    @Override
+    protected List<String> getFilteredItems(List<String> availableItems, String filter) {
+        List<String> filtered = new ArrayList<String>();
+        for (String s : availableItems) {
+            if (s.matches("(?i).*" + filter + ".*")) {
+                filtered.add(s);
+            }
+        }
+        return filtered;
+    }
+
+    @Override
+    protected String getItemText(String item) {
+        return item;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/CheckCommand.java

@@ -1,40 +1,58 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.destination.InvalidDestination;
+import com.onarandombox.MultiverseCore.utils.MVPermissions;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.permissions.PermissionDefault;
 
-@CommandAlias("mv")
-public class CheckCommand extends MultiverseCoreCommand {
-    public CheckCommand(@NotNull MultiverseCore plugin) {
+import java.util.List;
+/**
+ * Checks to see if a player can go to a destination.
+ */
+public class CheckCommand extends MultiverseCommand {
+
+    public CheckCommand(MultiverseCore plugin) {
         super(plugin);
+        this.setName("Help you validate your multiverse settings");
+        this.setCommandUsage("/mv check " + ChatColor.GREEN + "{PLAYER} {DESTINATION}");
+        this.setArgRange(2, 2);
+        this.addKey("mv check");
+        this.addKey("mvcheck");
+        this.addCommandExample("/mv check " + ChatColor.GREEN + "fernferret " + ChatColor.LIGHT_PURPLE + "w:MyWorld");
+        this.addCommandExample("/mv check " + ChatColor.GREEN + "Rigby90 " + ChatColor.LIGHT_PURPLE + "p:MyPortal");
+        this.addCommandExample("/mv check " + ChatColor.GREEN + "lithium3141 " + ChatColor.LIGHT_PURPLE + "ow:WarpName");
+        this.setPermission("multiverse.core.debug", "Checks to see if a player can go to a destination. Prints debug if false.", PermissionDefault.OP);
     }
 
-    @Subcommand("check")
-    @CommandPermission("multiverse.core.check")
-    @CommandCompletion("@players @destinations|@mvworlds")
-    @Syntax("<player> <destination>")
-    @Description("Checks if a player can teleport to a destination.")
-    public void onCheckCommand(BukkitCommandIssuer issuer,
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Player p = PlayerFinder.get(args.get(0), sender);
+        if (p == null) {
+            sender.sendMessage("Could not find player " + ChatColor.GREEN + args.get(0));
+            sender.sendMessage("Are they online?");
+            return;
+        }
+        MVDestination dest = this.plugin.getDestFactory().getDestination(args.get(1));
+        if (dest instanceof InvalidDestination) {
+            sender.sendMessage(String.format("You asked if '%s' could go to %s%s%s,",
+                    args.get(0), ChatColor.GREEN, args.get(0), ChatColor.WHITE));
+            sender.sendMessage("but I couldn't find a Destination of that name? Did you type it correctly?");
+            return;
+        }
 
-                               @Syntax("<player>")
-                               @Description("Player to check destination on.")
-                               Player player,
-
-                               @Syntax("<destination>")
-                               @Description("A destination location, e.g. a world name.")
-                               ParsedDestination<?> destination
-    ) {
-        issuer.sendMessage("Checking " + player + " to " + destination + "...");
-        //TODO More detailed output on permissions required.
-        this.plugin.getDestinationsProvider().checkTeleportPermissions(issuer, player, destination);
+        MVPermissions perms = this.plugin.getMVPerms();
+        perms.tellMeWhyICantDoThis(sender, p, dest);
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java

@@ -1,48 +1,55 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
-import co.aikar.commands.CommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Single;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.ChatColor;
-import org.jetbrains.annotations.NotNull;
+import java.util.List;
 
-@CommandAlias("mv")
-public class CloneCommand extends MultiverseCoreCommand {
-    public CloneCommand(@NotNull MultiverseCore plugin) {
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+
+/**
+ * Creates a clone of a world.
+ */
+public class CloneCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public CloneCommand(MultiverseCore plugin) {
         super(plugin);
+        this.setName("Clone World");
+        this.setCommandUsage("/mv clone" + ChatColor.GREEN + " {TARGET} {NAME}" + ChatColor.GOLD + " -g [GENERATOR[:ID]]");
+        this.setArgRange(2, 4); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        this.addKey("mvclone");
+        this.addKey("mvcl");
+        this.addKey("mv cl");
+        this.addKey("mv clone");
+        this.addCommandExample("/mv clone " + ChatColor.GOLD + "world" + ChatColor.GREEN + " world_backup");
+        this.addCommandExample("/mv clone " + ChatColor.GOLD + "skyblock_pristine" + ChatColor.GREEN + " skyblock");
+        this.setPermission("multiverse.core.clone", "Clones a world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
     }
 
-    @Subcommand("clone")
-    @CommandPermission("multiverse.core.clone")
-    @CommandCompletion("@mvworlds:scope=both @empty")
-    @Syntax("<world> <new world name>")
-    @Description("Clones a world.")
-    public void onCloneCommand(CommandIssuer issuer,
-
-                               @Conditions("validWorldName:scope=both")
-                               @Syntax("<world>")
-                               @Description("The target world to clone.")
-                               String worldName,
-
-                               @Single
-                               @Conditions("validWorldName:scope=new")
-                               @Syntax("<new world name>")
-                               @Description("The new cloned world name.")
-                               String newWorldName
-    ) {
-        issuer.sendMessage(String.format("Cloning world '%s' to '%s'...", worldName, newWorldName));
-
-        if (!this.plugin.getMVWorldManager().cloneWorld(worldName, newWorldName)) {
-            issuer.sendMessage(String.format("%sWorld could not be cloned! See console for more details.", ChatColor.RED));
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        String oldName = args.get(0);
+	    if (!this.worldManager.hasUnloadedWorld(oldName, true)) {
+            // If no world was found, we can't clone.
+            sender.sendMessage("Sorry, Multiverse doesn't know about world " + oldName + ", so we can't clone it!");
+            sender.sendMessage("Check the " + ChatColor.GREEN + "/mv list" + ChatColor.WHITE + " command to verify it is listed.");
             return;
         }
-        issuer.sendMessage(String.format("%sCloned world '%s'!", ChatColor.GREEN, newWorldName));
+        if (this.plugin.getMVWorldManager().cloneWorld(oldName, args.get(1))) {
+            sender.sendMessage(ChatColor.GREEN + "World cloned!");
+        } else {
+            sender.sendMessage(ChatColor.RED + "World could NOT be cloned!");
+        }
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java

@@ -0,0 +1,72 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Allows you to set Global MV Variables.
+ */
+public class ConfigCommand extends MultiverseCommand {
+    public ConfigCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Configuration");
+        this.setCommandUsage("/mv config " + ChatColor.GREEN + "{PROPERTY} {VALUE}");
+        this.setArgRange(1, 2);
+        this.addKey("mv config");
+        this.addKey("mvconfig");
+        this.addKey("mv conf");
+        this.addKey("mvconf");
+        this.addCommandExample("/mv config show");
+        this.addCommandExample("/mv config " + ChatColor.GREEN + "debug" + ChatColor.AQUA + " 3");
+        this.addCommandExample("/mv config " + ChatColor.GREEN + "enforceaccess" + ChatColor.AQUA + " false");
+        this.setPermission("multiverse.core.config", "Allows you to set Global MV Variables.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() <= 1) {
+            StringBuilder builder = new StringBuilder();
+            Map<String, Object> serializedConfig = this.plugin.getMVConfig().serialize();
+            for (Map.Entry<String, Object> entry : serializedConfig.entrySet()) {
+                builder.append(ChatColor.GREEN);
+                builder.append(entry.getKey());
+                builder.append(ChatColor.WHITE).append(" = ").append(ChatColor.GOLD);
+                builder.append(entry.getValue().toString());
+                builder.append(ChatColor.WHITE).append(", ");
+            }
+            String message = builder.toString();
+            message = message.substring(0, message.length() - 2);
+            sender.sendMessage(message);
+            return;
+        }
+        if (!this.plugin.getMVConfig().setConfigProperty(args.get(0).toLowerCase(), args.get(1))) {
+            sender.sendMessage(String.format("%sSetting '%s' to '%s' failed!", ChatColor.RED, args.get(0).toLowerCase(), args.get(1)));
+            return;
+        }
+
+        // special rule
+        if (args.get(0).equalsIgnoreCase("firstspawnworld")) {
+            // Don't forget to set the world!
+            this.plugin.getMVWorldManager().setFirstSpawnWorld(args.get(1));
+        }
+
+        if (this.plugin.saveMVConfigs()) {
+            sender.sendMessage(ChatColor.GREEN + "SUCCESS!" + ChatColor.WHITE + " Values were updated successfully!");
+            this.plugin.loadConfigs();
+        } else {
+            sender.sendMessage(ChatColor.RED + "FAIL!" + ChatColor.WHITE + " Check your console for details!");
+        }
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java

@@ -1,23 +1,39 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
 
-@CommandAlias("mv")
-public class ConfirmCommand extends MultiverseCoreCommand {
-    public ConfirmCommand(@NotNull MultiverseCore plugin) {
+import java.util.List;
+
+/**
+ * Confirms actions.
+ */
+public class ConfirmCommand extends MultiverseCommand {
+
+    public ConfirmCommand(MultiverseCore plugin) {
         super(plugin);
+        // Any command that is dangerous should require op
+        this.setName("Confirms a command that could destroy life, the universe and everything.");
+        this.setCommandUsage("/mv confirm");
+        this.setArgRange(0, 0);
+        this.addKey("mvconfirm");
+        this.addKey("mv confirm");
+        this.addCommandExample("/mv confirm");
+        this.setPermission("multiverse.core.confirm", "If you have not been prompted to use this, it will not do anything.", PermissionDefault.OP);
+
     }
 
-    @Subcommand("confirm")
-    @CommandPermission("multiverse.core.confirm")
-    @Description("Confirms dangerous commands before executing them.")
-    public void onConfirmCommand(@NotNull BukkitCommandIssuer issuer) {
-        this.plugin.getMVCommandManager().getCommandQueueManager().runQueuedCommand(issuer.getIssuer());
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        this.plugin.getCommandQueueManager().runQueuedCommand(sender);
     }
+
 }

src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java

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

src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java

@@ -1,127 +1,131 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.pneumaticraft.commandhandler.CommandHandler;
+import org.bukkit.ChatColor;
+import org.bukkit.World.Environment;
+import org.bukkit.WorldType;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
-import java.util.Random;
-import java.util.stream.Collectors;
 
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.InvalidCommandArgument;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Optional;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag;
-import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
-import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag;
-import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
-import com.onarandombox.MultiverseCore.locale.MVCorei18n;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.WorldType;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
+/**
+ * Creates a new world and loads it.
+ */
+public class CreateCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
 
-@CommandAlias("mv")
-public class CreateCommand extends MultiverseCoreCommand {
-    public CreateCommand(@NotNull MultiverseCore plugin) {
+    public CreateCommand(MultiverseCore plugin) {
         super(plugin);
-
-        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());
+        this.setName("Create World");
+        this.setCommandUsage(String.format("/mv create %s{NAME} {ENV} %s-s [SEED] -g [GENERATOR[:ID]] -t [WORLDTYPE] [-n] -a [true|false]",
+                ChatColor.GREEN, ChatColor.GOLD));
+        this.setArgRange(2, 11); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        this.addKey("mvcreate");
+        this.addKey("mvc");
+        this.addKey("mv create");
+        this.setPermission("multiverse.core.create", "Creates a new world and loads it.", PermissionDefault.OP);
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "world" + ChatColor.GREEN + " normal");
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "lavaland" + ChatColor.RED + " nether");
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "starwars" + ChatColor.AQUA + " end");
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "flatroom" + ChatColor.GREEN + " normal" + ChatColor.AQUA + " -t flat");
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "gargamel" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -s gargamel");
+        this.addCommandExample("/mv create " + ChatColor.GOLD + "moonworld" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -g BukkitFullOfMoon");
+        this.worldManager = this.plugin.getMVWorldManager();
     }
-
-    @Subcommand("create")
-    @CommandPermission("multiverse.core.create")
-    @CommandCompletion("@empty  @flags:groupName=mvcreate")
-    @Syntax("<name> <environment> --seed [seed] --generator [generator[:id]] --world-type [worldtype] --adjust-spawn --no-structures")
-    @Description("{@@mv-core.create.description}")
-    public void onCreateCommand(BukkitCommandIssuer issuer,
-
-                                @Conditions("validWorldName:scope=new")
-                                @Syntax("<name>")
-                                @Description("{@@mv-core.create.name.description}")
-                                String worldName,
-
-                                @Syntax("<environment>")
-                                @Description("{@@mv-core.create.environment.description}")
-                                World.Environment environment,
-
-                                @Optional
-                                @Syntax("--seed [seed] --generator [generator[:id]] --world-type [worldtype] --adjust-spawn --no-structures")
-                                @Description("{@@mv-core.create.flags.description}")
-                                String[] flags
-    ) {
-        ParsedCommandFlags parsedFlags = parseFlags(flags);
-
-        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES, "{worldName}", worldName);
-        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES_ENVIRONMENT, "{environment}", environment.name());
-        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES_SEED, "{seed}", parsedFlags.flagValue("--seed", "RANDOM", String.class));
-        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES_WORLDTYPE, "{worldType}", parsedFlags.flagValue("--world-type", WorldType.NORMAL, WorldType.class).name());
-        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES_ADJUSTSPAWN, "{adjustSpawn}", String.valueOf(parsedFlags.hasFlag("--adjust-spawn")));
-        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES_GENERATOR, "{generator}", parsedFlags.flagValue("--generator", "null", String.class));
-        issuer.sendInfo(MVCorei18n.CREATE_PROPERTIES_STRUCTURES, "{structures}", String.valueOf(!parsedFlags.hasFlag("--no-structures")));
-
-        issuer.sendInfo(MVCorei18n.CREATE_LOADING);
-
-        if (!worldManager.addWorld(
-                worldName,
-                environment,
-                parsedFlags.flagValue("--seed", String.class),
-                parsedFlags.flagValue("--world-type", WorldType.NORMAL, WorldType.class),
-                parsedFlags.hasFlag("--adjust-spawn"),
-                parsedFlags.flagValue("--generator", String.class),
-                parsedFlags.hasFlag("--no-structures")
-        )) {
-            issuer.sendError(MVCorei18n.CREATE_FAILED, "{worldName}", worldName);
+	
+	private String trimWorldName(String userInput) {
+        // Removes relative paths.
+        return userInput.replaceAll("^[./\\\\]+", "");
+    }
+	
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        String worldName = trimWorldName(args.get(0));
+        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
+        String env = args.get(1);
+        String seed = CommandHandler.getFlag("-s", args);
+        String generator = CommandHandler.getFlag("-g", args);
+        boolean allowStructures = true;
+        String structureString = CommandHandler.getFlag("-a", args);
+        if (structureString != null) {
+            allowStructures = Boolean.parseBoolean(structureString);
+        }
+        String typeString = CommandHandler.getFlag("-t", args);
+        boolean useSpawnAdjust = true;
+        for (String s : args) {
+            if (s.equalsIgnoreCase("-n")) {
+                useSpawnAdjust = false;
+            }
+        }
+		
+		// Make sure the world name doesn't contain the words 'plugins' and '.dat'
+		if(worldName.contains("plugins")||worldName.contains(".dat")){
+			sender.sendMessage(ChatColor.RED + "Multiverse cannot create a world that contains 'plugins' or '.dat'");
+            return;
+		}
+		
+        if (this.worldManager.isMVWorld(worldName)) {
+            sender.sendMessage(ChatColor.RED + "Multiverse cannot create " + ChatColor.GOLD + ChatColor.UNDERLINE
+                    + "another" + ChatColor.RESET + ChatColor.RED + " world named " + worldName);
             return;
         }
-        issuer.sendInfo(MVCorei18n.CREATE_SUCCESS, "{worldName}", worldName);
+
+        if (worldFile.exists()) {
+            sender.sendMessage(ChatColor.RED + "A Folder/World already exists with this name!");
+            sender.sendMessage(ChatColor.RED + "If you are confident it is a world you can import with /mvimport");
+            return;
+        }
+
+        Environment environment = EnvironmentCommand.getEnvFromString(env);
+        if (environment == null) {
+            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
+            EnvironmentCommand.showEnvironments(sender);
+            return;
+        }
+
+        // If they didn't specify a type, default to NORMAL
+        if (typeString == null) {
+            typeString = "NORMAL";
+        }
+        WorldType type = EnvironmentCommand.getWorldTypeFromString(typeString);
+        if (type == null) {
+            sender.sendMessage(ChatColor.RED + "That is not a valid World Type.");
+            EnvironmentCommand.showWorldTypes(sender);
+            return;
+        }
+        // Determine if the generator is valid. #918
+        if (generator != null) {
+            List<String> genarray = new ArrayList<String>(Arrays.asList(generator.split(":")));
+            if (genarray.size() < 2) {
+                // If there was only one arg specified, pad with another empty one.
+                genarray.add("");
+            }
+            if (this.worldManager.getChunkGenerator(genarray.get(0), genarray.get(1), "test") == null) {
+                // We have an invalid generator.
+                sender.sendMessage("Invalid generator! '" + generator + "'. " + ChatColor.RED + "Aborting world creation.");
+                return;
+            }
+        }
+        Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'...");
+
+        if (this.worldManager.addWorld(worldName, environment, seed, type, allowStructures, generator, useSpawnAdjust)) {
+            Command.broadcastCommandMessage(sender, "Complete!");
+        } else {
+            Command.broadcastCommandMessage(sender, "FAILED.");
+        }
     }
-}
+}

src/main/java/com/onarandombox/MultiverseCore/commands/DebugCommand.java

@@ -1,53 +1,67 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.locale.MVCorei18n;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
 
-@CommandAlias("mv")
-public class DebugCommand extends MultiverseCoreCommand {
-    public DebugCommand(@NotNull MultiverseCore plugin) {
+import java.util.List;
+import java.util.logging.Level;
+
+/**
+ * Enables debug-information.
+ */
+public class DebugCommand extends MultiverseCommand {
+
+    public DebugCommand(MultiverseCore plugin) {
         super(plugin);
+        this.setName("Turn Debug on/off?");
+        this.setCommandUsage("/mv debug" + ChatColor.GOLD + " [1|2|3|off|silent]");
+        this.setArgRange(0, 1);
+        this.addKey("mv debug");
+        this.addKey("mv d");
+        this.addKey("mvdebug");
+        this.addCommandExample("/mv debug " + ChatColor.GOLD + "2");
+        this.setPermission("multiverse.core.debug", "Spams the console a bunch.", PermissionDefault.OP);
     }
 
-    @Subcommand("debug")
-    @CommandPermission("multiverse.core.debug")
-    @Description("{@@mv-core.debug.info.description}")
-    public void onShowDebugCommand(BukkitCommandIssuer issuer) {
-        this.displayDebugMode(issuer);
-    }
-
-    @Subcommand("debug")
-    @CommandPermission("multiverse.core.debug")
-    @CommandCompletion("@range:3")
-    @Syntax("<{@@mv-core.debug.change.syntax}>")
-    @Description("{@@mv-core.debug.change.description}")
-    public void onChangeDebugCommand(BukkitCommandIssuer issuer,
-
-                                     @Syntax("<{@@mv-core.debug.change.syntax}>")
-                                     @Description("{@@mv-core.debug.change.level.description}")
-                                     int level) {
-
-        this.plugin.getMVConfig().setGlobalDebug(level);
-        this.plugin.saveAllConfigs();
-        this.displayDebugMode(issuer);
-    }
-
-    private void displayDebugMode(BukkitCommandIssuer issuer) {
-        final int debugLevel = this.plugin.getMVConfig().getGlobalDebug();
-        if (debugLevel == 0) {
-            issuer.sendInfo(MVCorei18n.DEBUG_INFO_OFF);
-            return;
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() == 1) {
+            if (args.get(0).equalsIgnoreCase("off")) {
+                plugin.getMVConfig().setGlobalDebug(0);
+            } else {
+                try {
+                    int debugLevel = Integer.parseInt(args.get(0));
+                    if (debugLevel > 3 || debugLevel < 0) {
+                        throw new NumberFormatException();
+                    }
+                    plugin.getMVConfig().setGlobalDebug(debugLevel);
+                } catch (NumberFormatException e) {
+                    sender.sendMessage(ChatColor.RED + "Error" + ChatColor.WHITE
+                            + " setting debug level. Please use a number 0-3 " + ChatColor.AQUA + "(3 being many many messages!)");
+                }
+            }
+            plugin.saveMVConfigs();
+        }
+        this.displayDebugMode(sender);
+    }
+
+    private void displayDebugMode(CommandSender sender) {
+        final int debugLevel = plugin.getMVConfig().getGlobalDebug();
+        if (debugLevel == 0) {
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
+        } else {
+            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel);
+            Logging.fine("Multiverse Debug ENABLED");
         }
-        issuer.sendInfo(MVCorei18n.DEBUG_INFO_ON, "{level}", String.valueOf(debugLevel));
-        Logging.fine("Multiverse Debug ENABLED.");
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java

@@ -1,49 +1,60 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Single;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
 import org.jetbrains.annotations.NotNull;
 
-@CommandAlias("mv")
-public class DeleteCommand extends MultiverseCoreCommand {
-    public DeleteCommand(@NotNull MultiverseCore plugin) {
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Deletes worlds.
+ */
+public class DeleteCommand extends MultiverseCommand {
+
+    public DeleteCommand(MultiverseCore plugin) {
         super(plugin);
+        this.setName("Delete World");
+        this.setCommandUsage("/mv delete" + ChatColor.GREEN + " {WORLD}");
+        this.setArgRange(1, 1);
+        this.addKey("mvdelete");
+        this.addKey("mv delete");
+        this.addCommandExample("/mv delete " + ChatColor.GOLD + "MyWorld");
+        this.setPermission("multiverse.core.delete", "Deletes a world on your server. " + ChatColor.RED + "PERMANENTLY.", PermissionDefault.OP);
     }
 
-    @Subcommand("delete")
-    @CommandPermission("multiverse.core.delete")
-    @CommandCompletion("@mvworlds:scope=both")
-    @Syntax("<world>")
-    @Description("Deletes a world on your server PERMANENTLY.")
-    public void onDeleteCommand(BukkitCommandIssuer issuer,
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        String worldName = args.get(0);
 
-                                @Single
-                                @Conditions("validWorldName:scope=both")
-                                @Syntax("<world>")
-                                @Description("The world you want to delete.")
-                                String worldName
-    ) {
-        this.plugin.getMVCommandManager().getCommandQueueManager().addToQueue(new QueuedCommand(
-                issuer.getIssuer(),
-                () -> {
-                    issuer.sendMessage(String.format("Deleting world '%s'...", worldName));
-                    if (!this.plugin.getMVWorldManager().deleteWorld(worldName)) {
-                        issuer.sendMessage(String.format("%sThere was an issue deleting '%s'! Please check console for errors.", ChatColor.RED, worldName));
-                        return;
-                    }
-                    issuer.sendMessage(String.format("%sWorld %s was deleted!", ChatColor.GREEN, worldName));
-                },
-                "Are you sure you want to delete world '" + worldName + "'?"
+        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
+                sender,
+                deleteRunnable(sender, worldName),
+                String.format("Are you sure you want to delete world '%s'? You cannot undo this action.", worldName)
         ));
     }
+
+    private Runnable deleteRunnable(@NotNull CommandSender sender,
+                                    @NotNull String worldName) {
+
+        return () -> {
+            sender.sendMessage(String.format("Deleting world '%s'...", worldName));
+            if (this.plugin.getMVWorldManager().deleteWorld(worldName)) {
+                sender.sendMessage(String.format("%sWorld %s was deleted!", ChatColor.GREEN, worldName));
+                return;
+            }
+            sender.sendMessage(String.format("%sThere was an issue deleting '%s'! Please check console for errors.",
+                    ChatColor.RED, worldName));
+        };
+    }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java

@@ -0,0 +1,118 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.WorldType;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Lists valid known environments.
+ */
+public class EnvironmentCommand extends MultiverseCommand {
+
+    public EnvironmentCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("List Environments");
+        this.setCommandUsage("/mv env");
+        this.setArgRange(0, 0);
+        this.addKey("mvenv");
+        this.addKey("mv env");
+        this.addKey("mv type");
+        this.addKey("mv environment");
+        this.addKey("mv environments");
+        this.addCommandExample("/mv env");
+        this.setPermission("multiverse.core.list.environments", "Lists valid known environments/world types.", PermissionDefault.OP);
+    }
+
+    /**
+     * Shows all valid known environments to a {@link CommandSender}.
+     *
+     * @param sender The {@link CommandSender}.
+     */
+    public static void showEnvironments(CommandSender sender) {
+        sender.sendMessage(ChatColor.YELLOW + "Valid Environments are:");
+        sender.sendMessage(ChatColor.GREEN + "NORMAL");
+        sender.sendMessage(ChatColor.RED + "NETHER");
+        sender.sendMessage(ChatColor.AQUA + "END");
+    }
+    /**
+     * Shows all valid known world types to a {@link CommandSender}.
+     *
+     * @param sender The {@link CommandSender}.
+     */
+    public static void showWorldTypes(CommandSender sender) {
+        sender.sendMessage(ChatColor.YELLOW + "Valid World Types are:");
+        sender.sendMessage(String.format("%sNORMAL%s, %sFLAT, %sLARGEBIOMES %sor %sVERSION_1_1",
+                ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, ChatColor.RED, ChatColor.WHITE, ChatColor.GOLD));
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        EnvironmentCommand.showEnvironments(sender);
+        EnvironmentCommand.showWorldTypes(sender);
+    }
+
+    /**
+     * Converts a {@link String} into a {@link WorldType}.
+     *
+     * @param type The WorldType as a {@link String}
+     * @return The WorldType as a {@link WorldType}
+     */
+    public static WorldType getWorldTypeFromString(String type) {
+        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
+        if (type.equalsIgnoreCase("normal")) {
+            type = "NORMAL";
+        } else if (type.equalsIgnoreCase("flat")) {
+            type = "FLAT";
+        } else if (type.equalsIgnoreCase("largebiomes")) {
+            type = "LARGE_BIOMES";
+        } else if (type.equalsIgnoreCase("amplified")) {
+            type = "AMPLIFIED";
+        }
+        try {
+            // Now that we've converted a potentially unfriendly value
+            // to a friendly one, get it from the ENUM!
+            return WorldType.valueOf(type);
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Converts a {@link String} into an {@link org.bukkit.World.Environment}.
+     *
+     * @param env The environment as {@link String}
+     * @return The environment as {@link org.bukkit.World.Environment}
+     */
+    public static World.Environment getEnvFromString(String env) {
+        env = env.toUpperCase();
+        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
+        if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER"))
+            env = "NETHER";
+
+        if (env.equalsIgnoreCase("END") || env.equalsIgnoreCase("THEEND") || env.equalsIgnoreCase("STARWARS"))
+            env = "THE_END";
+
+        if (env.equalsIgnoreCase("NORMAL") || env.equalsIgnoreCase("WORLD"))
+            env = "NORMAL";
+
+        try {
+            // Now that we've converted a potentially unfriendly value
+            // to a friendly one, get it from the ENUM!
+            return World.Environment.valueOf(env);
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java

@@ -1,63 +1,116 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
-import 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.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameRule;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
 
-@CommandAlias("mv")
-public class GameruleCommand extends MultiverseCoreCommand {
-    public GameruleCommand(@NotNull MultiverseCore plugin) {
+import java.util.List;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class GameruleCommand extends MultiverseCommand {
+
+    public GameruleCommand(MultiverseCore plugin) {
         super(plugin);
+        this.setName("Set a Minecraft Game Rule for a World.");
+        this.setCommandUsage("/mv gamerule " + ChatColor.GREEN + "{RULE} {VALUE}" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(2, 3);
+        this.addKey("mv gamerule");
+        this.addKey("mv rule");
+        this.addKey("mvgamerule");
+        this.addKey("mvrule");
+        this.addCommandExample("/mv gamerule " + ChatColor.GREEN + "doMobLoot false");
+        this.addCommandExample("/mvrule " + ChatColor.GREEN + "keepInventory true " + ChatColor.RED + "world_nether");
+        this.setPermission("multiverse.core.gamerule.set", "Allows a player to set a gamerule.", PermissionDefault.OP);
     }
 
-    @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,
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        final Player p;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        } else {
+            p = null;
+        }
 
-                                  @Syntax("<Value>")
-                                  @Description("Value of gamerule")
-                                  GameRuleValue gameRuleValue,
+        if (args.size() == 2 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
 
-                                  @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;
+        final GameRule gameRule = GameRule.getByName(args.get(0));
+        final String value = args.get(1);
+        final World world;
+        if (args.size() == 2) {
+            world = p.getWorld();
+        } else {
+            world = Bukkit.getWorld(args.get(2));
+            if (world == null) {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(2)
+                        + ChatColor.WHITE + " does not exist.");
+                return;
             }
         }
-        // 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.");
+
+        if (gameRule == null) {
+            sender.sendMessage(ChatColor.RED + "Failure! " + ChatColor.AQUA + args.get(0) + ChatColor.WHITE
+                    + " is not a valid gamerule.");
+        } else {
+            if (gameRule.getType() == Boolean.class) {
+                boolean booleanValue;
+                if (value.equalsIgnoreCase("true")) {
+                    booleanValue = true;
+                } else if (value.equalsIgnoreCase("false")) {
+                    booleanValue = false;
+                } else {
+                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "it can only be set to true or false.");
+                    return;
+                }
+
+                if (!world.setGameRule(gameRule, booleanValue)) {
+                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "something went wrong.");
+                    return;
+                }
+            } else if (gameRule.getType() == Integer.class) {
+                try {
+                    if (!world.setGameRule(gameRule, Integer.parseInt(value))) {
+                        throw new NumberFormatException();
+                    }
+                } catch (NumberFormatException e) {
+                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "it can only be set to a positive integer.");
+                    return;
+                }
+            } else {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule.getName()
+                        + ChatColor.WHITE + " isn't supported yet, please let us know about it.");
+                return;
             }
+
+            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule.getName()
+                    + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value + ChatColor.WHITE + ".");
         }
     }
+
+    private String getErrorMessage(String gameRule, String value) {
+        return ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                + ChatColor.WHITE + " could not be set to " + ChatColor.RED + value + ChatColor.WHITE + ", ";
+    }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/GamerulesCommand.java

@@ -0,0 +1,95 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.display.ColorAlternator;
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.settings.MapDisplaySettings;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.GameRule;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Allows management of Anchor Destinations.
+ */
+public class GamerulesCommand extends MultiverseCommand {
+
+    public GamerulesCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("List the Minecraft Game Rules for a World.");
+        this.setCommandUsage("/mv gamerules" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(0, 1);
+        this.addKey("mv gamerules");
+        this.addKey("mv rules");
+        this.addKey("mvgamerules");
+        this.addKey("mvrules");
+        this.addCommandExample("/mv gamerules");
+        this.addCommandExample("/mvrules " + ChatColor.RED + "world_nether");
+        this.setPermission("multiverse.core.gamerule.list", "Allows a player to list gamerules.", PermissionDefault.OP);
+    }
+
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        final Player p;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        } else {
+            p = null;
+        }
+
+        if (args.size() == 0 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        final World world;
+        if (args.size() == 0) {
+            world = p.getWorld();
+        } else {
+            world = Bukkit.getWorld(args.get(0));
+            if (world == null) {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(0)
+                        + ChatColor.WHITE + " does not exist.");
+                return;
+            }
+        }
+
+        ContentDisplay.forContent(getGameRuleMap(world))
+                .header("=== Gamerules for %s%s%s ===", ChatColor.AQUA, world.getName(), ChatColor.WHITE)
+                .colorTool(ColorAlternator.with(ChatColor.GREEN, ChatColor.GOLD))
+                .setting(MapDisplaySettings.OPERATOR, ": ")
+                .show(sender);
+    }
+
+    private Map<String, Object> getGameRuleMap(World world) {
+        Map<String, Object> gameRuleMap = new HashMap<>();
+        for (GameRule<?> rule : GameRule.values()) {
+            Object value = world.getGameRuleValue(rule);
+            if (value == null) {
+                gameRuleMap.put(rule.getName(), "null");
+                continue;
+            }
+            gameRuleMap.put(rule.getName(), value);
+        }
+        return gameRuleMap;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/GeneratorCommand.java

@@ -0,0 +1,60 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+import org.bukkit.plugin.Plugin;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Returns a list of loaded generator plugins.
+ */
+public class GeneratorCommand extends MultiverseCommand {
+
+    public GeneratorCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("World Information");
+        this.setCommandUsage("/mv generators");
+        this.setArgRange(0, 0);
+        this.addKey("mv generators");
+        this.addKey("mvgenerators");
+        this.addKey("mv gens");
+        this.addKey("mvgens");
+        this.addCommandExample("/mv generators");
+        this.setPermission("multiverse.core.generator", "Returns a list of Loaded Generator Plugins.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Logging.info("PLEASE IGNORE the 'Plugin X does not contain any generators' message below!");
+        Plugin[] plugins = this.plugin.getServer().getPluginManager().getPlugins();
+        List<String> generators = new ArrayList<String>();
+        for (Plugin p : plugins) {
+            if (p.isEnabled() && p.getDefaultWorldGenerator("world", "") != null) {
+                generators.add(p.getDescription().getName());
+            }
+        }
+        sender.sendMessage(ChatColor.AQUA + "--- Loaded Generator Plugins ---");
+        String loadedGens = "";
+        boolean altColor = false;
+        for (String s : generators) {
+            loadedGens += (altColor ? ChatColor.YELLOW : ChatColor.WHITE) + s + " ";
+            altColor = !altColor;
+        }
+        if (loadedGens.length() == 0) {
+            loadedGens = ChatColor.RED + "No Generator Plugins found.";
+        }
+        sender.sendMessage(loadedGens);
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/HelpCommand.java

@@ -0,0 +1,98 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.pneumaticraft.commandhandler.Command;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Displays a nice help menu.
+ */
+public class HelpCommand extends PaginatedCoreCommand<Command> {
+
+    public HelpCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Get Help with Multiverse");
+        this.setCommandUsage("/mv " + ChatColor.GOLD + "[FILTER] [PAGE #]");
+        this.setArgRange(0, 2);
+        this.addKey("mv");
+        this.addKey("mvh");
+        this.addKey("mvhelp");
+        this.addKey("mv help");
+        this.addKey("mvsearch");
+        this.addKey("mv search");
+        this.addCommandExample("/mv help ?");
+        this.setPermission("multiverse.help", "Displays a nice help menu.", PermissionDefault.TRUE);
+        this.setItemsPerPage(7); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+    }
+
+    @Override
+    protected List<Command> getFilteredItems(List<Command> availableItems, String filter) {
+        String expression = "(?i).*" + cleanFilter(filter) + ".*";
+        List<Command> filtered = new ArrayList<Command>();
+
+        for (Command c : availableItems) {
+            if (stitchThisString(c.getKeyStrings()).matches(expression)
+                    || c.getCommandName().matches(expression)
+                    || c.getCommandDesc().matches(expression)
+                    || c.getCommandUsage().matches(expression)
+                    || c.getCommandExamples().stream().anyMatch(eg -> eg.matches(expression))) {
+                filtered.add(c);
+            }
+        }
+        return filtered;
+    }
+
+    @Override
+    protected String getItemText(Command item) {
+        return ChatColor.AQUA + item.getCommandUsage();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        sender.sendMessage(ChatColor.AQUA + "====[ Multiverse Help ]====");
+
+        FilterObject filterObject = this.getPageAndFilter(args);
+
+        List<Command> availableCommands = new ArrayList<Command>(this.plugin.getCommandHandler().getCommands(sender));
+        if (filterObject.getFilter().length() > 0) {
+            availableCommands = this.getFilteredItems(availableCommands, filterObject.getFilter());
+            if (availableCommands.size() == 0) {
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
+                        + "No commands matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
+                return;
+            }
+        }
+
+        if (!(sender instanceof Player)) {
+            sender.sendMessage(ChatColor.AQUA + " Add a '" + ChatColor.DARK_PURPLE + "?" + ChatColor.AQUA + "' after a command to see more about it.");
+            for (Command c : availableCommands) {
+                sender.sendMessage(ChatColor.AQUA + c.getCommandUsage());
+            }
+            return;
+        }
+
+        int totalPages = (int) Math.ceil(availableCommands.size() / (this.itemsPerPage + 0.0));
+
+        if (filterObject.getPage() > totalPages) {
+            filterObject.setPage(totalPages);
+        }
+
+        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
+        sender.sendMessage(ChatColor.AQUA + " Add a '" + ChatColor.DARK_PURPLE + "?" + ChatColor.AQUA + "' after a command to see more about it.");
+
+        this.showPage(filterObject.getPage(), sender, availableCommands);
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java

@@ -1,88 +1,137 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Optional;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.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 com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.utils.WorldNameChecker;
+import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.World.Environment;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
 
-@CommandAlias("mv")
-public class ImportCommand extends MultiverseCoreCommand {
-    public ImportCommand(@NotNull MultiverseCore plugin) {
+import java.io.File;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Imports a new world of the specified type.
+ */
+public class ImportCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public ImportCommand(MultiverseCore plugin) {
         super(plugin);
-
-        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());
+        this.setName("Import World");
+        this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV}" + ChatColor.GOLD + " -g [GENERATOR[:ID]] [-n]");
+        this.setArgRange(1, 5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+        this.addKey("mvimport");
+        this.addKey("mvim");
+        this.addKey("mv import");
+        this.addCommandExample("/mv import " + ChatColor.GOLD + "gargamel" + ChatColor.GREEN + " normal");
+        this.addCommandExample("/mv import " + ChatColor.GOLD + "hell_world" + ChatColor.GREEN + " nether");
+        this.addCommandExample("To import a world that uses a generator, you'll need the generator:");
+        this.addCommandExample("/mv import " + ChatColor.GOLD + "CleanRoom" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " CleanRoomGenerator");
+        this.setPermission("multiverse.core.import", "Imports a new world of the specified type.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
     }
 
-    @Subcommand("import")
-    @CommandPermission("multiverse.core.import")
-    @CommandCompletion("@mvworlds:scope=potential  @flags:groupName=mvimport")
-    @Syntax("<name> <env> --generator [generator[:id]] --adjust-spawn")
-    @Description("Imports a existing world folder.")
-    public void onImportCommand(BukkitCommandIssuer issuer,
+    private String getPotentialWorldStrings() {
+        final Collection<String> potentialWorlds = this.worldManager.getPotentialWorlds();
+        StringBuilder worldList = new StringBuilder();
+        ChatColor currColor = ChatColor.WHITE;
 
-                                @Conditions("validWorldName:scope=new")
-                                @Syntax("<name>")
-                                @Description("Name of the world folder.")
-                                String worldName,
+        for (String world : potentialWorlds) {
+            worldList.append(currColor).append(world).append(' ');
+            currColor = currColor == ChatColor.WHITE ? ChatColor.YELLOW : ChatColor.WHITE;
+        }
 
-                                @Syntax("<env>")
-                                @Description("The world's environment. See: /mv env")
-                                World.Environment environment,
+        return worldList.toString();
+    }
+    
+    private String trimWorldName(String userInput) {
+        // Removes relative paths.
+        return userInput.replaceAll("^[./\\\\]+", "");
+    }
 
-                                @Optional
-                                @Syntax("--generator [generator[:id]] --adjust-spawn")
-                                @Description("Other world settings. See: https://gg.gg/nn8c2")
-                                String[] flags) {
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        String worldName = trimWorldName(args.get(0));
 
-        ParsedCommandFlags parsedFlags = parseFlags(flags);
-
-        issuer.sendMessage(String.format("Starting import of world '%s'...", worldName));
-
-        if (!this.worldManager.addWorld(
-                worldName, environment,
-                null,
-                null,
-                null,
-                parsedFlags.flagValue("--generator", String.class),
-                parsedFlags.hasFlag("--adjust-spawn"))
-        ) {
-            issuer.sendMessage(String.format("%sFailed! See console for more details.", ChatColor.RED));
+        if (worldName.toLowerCase().equals("--list") || worldName.toLowerCase().equals("-l")) {
+            String worldList = this.getPotentialWorldStrings();
+            if (worldList.length() > 2) {
+                sender.sendMessage(ChatColor.AQUA + "====[ These look like worlds ]====");
+                sender.sendMessage(worldList);
+            } else {
+                sender.sendMessage(ChatColor.RED + "No potential worlds found. Sorry!");
+            }
             return;
         }
-        issuer.sendMessage(String.format("%sComplete!", ChatColor.GREEN));
+        // Since we made an exception for the list, we have to make sure they have at least 2 params:
+        // Note the exception is --list, which is covered above.
+        if (args.size() == 1 || worldName.length() < 1) {
+            this.showHelp(sender);
+            return;
+        }
+		
+		// Make sure the world name doesn't contain the words 'plugins' and '.dat'
+		if(worldName.contains("plugins")||worldName.contains(".dat")){
+			sender.sendMessage(ChatColor.RED + "Multiverse cannot create a world that contains 'plugins' or '.dat'");
+            return;
+		}
+
+        // Make sure we don't already know about this world.
+        if (this.worldManager.isMVWorld(worldName)) {
+            sender.sendMessage(ChatColor.GREEN + "Multiverse" + ChatColor.WHITE
+                    + " already knows about '" + ChatColor.AQUA + worldName + ChatColor.WHITE + "'!");
+            return;
+        }
+
+        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
+
+        String generator = CommandHandler.getFlag("-g", args);
+        boolean useSpawnAdjust = true;
+        for (String s : args) {
+            if (s.equalsIgnoreCase("-n")) {
+                useSpawnAdjust = false;
+            }
+        }
+
+        String env = args.get(1);
+        Environment environment = EnvironmentCommand.getEnvFromString(env);
+        if (environment == null) {
+            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
+            EnvironmentCommand.showEnvironments(sender);
+            return;
+        }
+
+        if (!worldFile.exists()) {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            String worldList = this.getPotentialWorldStrings();
+            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
+            sender.sendMessage(worldList);
+        } else if (!WorldNameChecker.isValidWorldFolder(worldFile)) {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            sender.sendMessage(String.format("'%s' does not appear to be a world. It is lacking a .dat file.",
+                                             worldName));
+        } else if (env == null) {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            sender.sendMessage("That world environment did not exist.");
+            sender.sendMessage("For a list of available world types, type: " + ChatColor.AQUA + "/mvenv");
+        } else {
+            Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
+            if (this.worldManager.addWorld(worldName, environment, null, null, null, generator, useSpawnAdjust))
+                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
+            else
+                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
+        }
     }
-}
+}

src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java

@@ -0,0 +1,274 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.FancyText;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.utils.FancyColorScheme;
+import com.onarandombox.MultiverseCore.utils.FancyHeader;
+import com.onarandombox.MultiverseCore.utils.FancyMessage;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.ArrayList;
+import java.util.List;
+
+// Will use when we can compile with JDK 6
+//import com.sun.xml.internal.ws.util.StringUtils;
+
+/**
+ * Returns detailed information about a world.
+ */
+public class InfoCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public InfoCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("World Information");
+        this.setCommandUsage("/mv info" + ChatColor.GOLD + " [WORLD] [PAGE]");
+        this.setArgRange(0, 2);
+        this.addKey("mvinfo");
+        this.addKey("mvi");
+        this.addKey("mv info");
+        this.addCommandExample("/mv info " + ChatColor.GOLD + "1");
+        this.addCommandExample("/mv info " + ChatColor.GOLD + "3");
+        this.setPermission("multiverse.core.info", "Returns detailed information on the world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // Check if the command was sent from a Player.
+        String worldName = "";
+        int pageNum = 0;
+
+        if (args.size() == 0) {
+            if (sender instanceof Player) {
+                Player p = (Player) sender;
+                worldName = p.getWorld().getName();
+            } else {
+                sender.sendMessage("You must enter a" + ChatColor.LIGHT_PURPLE + " world" + ChatColor.WHITE + " from the console!");
+                return;
+            }
+        } else if (args.size() == 1) {
+            if (this.worldManager.isMVWorld(args.get(0))) {
+                // then we have a world!
+                worldName = args.get(0);
+            } else if (this.worldManager.getUnloadedWorlds().contains(args.get(0))) {
+                sender.sendMessage("That world exists, but it is unloaded!");
+                sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, args.get(0)));
+                return;
+            } else {
+                if (sender instanceof Player) {
+                    Player p = (Player) sender;
+                    worldName = p.getWorld().getName();
+                    try {
+                        pageNum = Integer.parseInt(args.get(0)) - 1;
+                    } catch (NumberFormatException e) {
+                        sender.sendMessage("That world does not exist.");
+                        return;
+                    }
+                } else {
+                    sender.sendMessage("You must enter a" + ChatColor.LIGHT_PURPLE + " world" + ChatColor.WHITE + " from the console!");
+                    return;
+                }
+            }
+        } else if (args.size() == 2) {
+            worldName = args.get(0);
+            try {
+                pageNum = Integer.parseInt(args.get(1)) - 1;
+            } catch (NumberFormatException e) {
+                pageNum = 0;
+            }
+        }
+
+        if (this.worldManager.isMVWorld(worldName)) {
+            Player p = null;
+            if (sender instanceof Player) {
+                p = (Player) sender;
+            }
+            showPage(pageNum, sender, this.buildEntireCommand(this.worldManager.getMVWorld(worldName), p));
+        } else if (this.worldManager.getUnloadedWorlds().contains(worldName)) {
+            sender.sendMessage("That world exists, but it is unloaded!");
+            sender.sendMessage(String.format("You can load it with: %s/mv load %s", ChatColor.AQUA, worldName));
+        } else if (this.plugin.getServer().getWorld(worldName) != null) {
+            sender.sendMessage("That world exists, but Multiverse does not know about it!");
+            sender.sendMessage("You can import it with" + ChatColor.AQUA + "/mv import " + ChatColor.GREEN + worldName + ChatColor.LIGHT_PURPLE + "{ENV}");
+            sender.sendMessage("For available environments type " + ChatColor.GREEN + "/mv env");
+        }
+    }
+
+    private List<List<FancyText>> buildEntireCommand(MultiverseWorld world, Player p) {
+        List<FancyText> message = new ArrayList<FancyText>();
+        List<List<FancyText>> worldInfo = new ArrayList<List<FancyText>>();
+        // Page 1
+        FancyColorScheme colors = new FancyColorScheme(ChatColor.AQUA, ChatColor.AQUA, ChatColor.GOLD, ChatColor.WHITE);
+        message.add(new FancyHeader("General Info", colors));
+        message.add(new FancyMessage("World Name: ", world.getName(), colors));
+        message.add(new FancyMessage("World UID: ", world.getCBWorld().getUID().toString(), colors));
+        message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
+        message.add(new FancyMessage("Game Mode: ", world.getGameMode().toString(), colors));
+        message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
+
+        //message.add(new FancyMessage("Game Mode: ", StringUtils.capitalize(world.getGameMode().toString()), colors));
+        Location spawn = world.getSpawnLocation();
+        message.add(new FancyMessage("Spawn Location: ", plugin.getLocationManipulation().strCoords(spawn), colors));
+        message.add(new FancyMessage("World Scale: ", String.valueOf(world.getScaling()), colors));
+        message.add(new FancyMessage("World Seed: ", String.valueOf(world.getSeed()), colors));
+        if (world.getPrice() > 0) {
+            message.add(new FancyMessage("Price to enter this world: ",
+                    plugin.getEconomist().formatPrice(world.getPrice(), world.getCurrency()),
+                    colors));
+        } else if (world.getPrice() < 0) {
+            message.add(new FancyMessage("Reward for entering this world: ",
+                    plugin.getEconomist().formatPrice(-world.getPrice(), world.getCurrency()),
+                    colors));
+        } else {
+            message.add(new FancyMessage("Price to enter this world: ", ChatColor.GREEN + "FREE!", colors));
+        }
+
+        if (world.getRespawnToWorld() != null) {
+            MultiverseWorld respawn = this.worldManager.getMVWorld(world.getRespawnToWorld());
+            if (respawn != null) {
+                message.add(new FancyMessage("Players will respawn in: ", respawn.getColoredWorldString(), colors));
+            } else {
+                message.add(new FancyMessage("Players will respawn in: ", ChatColor.RED + "!!INVALID!!", colors));
+            }
+
+        }
+
+        worldInfo.add(message);
+        // Page 2
+        message = new ArrayList<FancyText>();
+        message.add(new FancyHeader("More World Settings", colors));
+        message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
+        message.add(new FancyMessage("Generator: ", world.getGenerator(), colors));
+        message.add(new FancyMessage("Structures: ", world.getCBWorld().canGenerateStructures() + "", colors));
+        message.add(new FancyMessage("Weather: ", world.isWeatherEnabled() + "", colors));
+        message.add(new FancyMessage("Players will get hungry: ", world.getHunger() + "", colors));
+        message.add(new FancyMessage("Keep spawn in memory: ", world.isKeepingSpawnInMemory() + "", colors));
+        message.add(new FancyHeader("PVP Settings", colors));
+        message.add(new FancyMessage("Multiverse Setting: ", world.isPVPEnabled() + "", colors));
+        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getPVP() + "", colors));
+        worldInfo.add(message);
+        // Page 3
+        message = new ArrayList<FancyText>();
+        message.add(new FancyHeader("Monster Settings", colors));
+        message.add(new FancyMessage("Multiverse Setting: ", world.canMonstersSpawn() + "", colors));
+        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getAllowMonsters() + "", colors));
+        if (world.getMonsterList().size() > 0) {
+            if (world.canMonstersSpawn()) {
+                message.add(new FancyMessage("Monsters that" + ChatColor.RED + " CAN NOT "
+                        + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getMonsterList()), colors));
+            } else {
+                message.add(new FancyMessage("Monsters that" + ChatColor.GREEN + " CAN SPAWN: ", toCommaSeperated(world.getMonsterList()), colors));
+            }
+        } else {
+            message.add(new FancyMessage("Monsters that CAN spawn: ", world.canMonstersSpawn() ? "ALL" : "NONE", colors));
+        }
+        worldInfo.add(message);
+
+        // Page 4
+        message = new ArrayList<FancyText>();
+        message.add(new FancyHeader("Animal Settings", colors));
+        message.add(new FancyMessage("Multiverse Setting: ", world.canAnimalsSpawn() + "", colors));
+        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getAllowAnimals() + "", colors));
+        if (world.getAnimalList().size() > 0) {
+            if (world.canAnimalsSpawn()) {
+                message.add(new FancyMessage("Animals that" + ChatColor.RED + " CAN NOT "
+                        + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getAnimalList()), colors));
+            } else {
+                message.add(new FancyMessage("Animals that" + ChatColor.GREEN + " CAN SPAWN: ", toCommaSeperated(world.getAnimalList()), colors));
+            }
+        } else {
+            message.add(new FancyMessage("Animals that CAN spawn: ", world.canAnimalsSpawn() ? "ALL" : "NONE", colors));
+        }
+        worldInfo.add(message);
+
+        return worldInfo;
+    }
+
+    private static String toCommaSeperated(List<String> list) {
+        if (list == null || list.size() == 0) {
+            return "";
+        }
+        if (list.size() == 1) {
+            return list.get(0);
+        }
+        String result = list.get(0);
+
+        for (int i = 1; i < list.size() - 1; i++) {
+            result += ", " + list.get(i);
+        }
+        result += " and " + list.get(list.size() - 1);
+        return result;
+    }
+
+    /**
+     * Gets a "positive" or "negative" {@link ChatColor}.
+     *
+     * @param positive Whether this {@link ChatColor} should be "positive".
+     * @return The {@link ChatColor}.
+     */
+    protected ChatColor getChatColor(boolean positive) {
+        return positive ? ChatColor.GREEN : ChatColor.RED;
+    }
+
+    private static void showPage(int page, CommandSender sender, List<List<FancyText>> doc) {
+        page = page < 0 ? 0 : page;
+        page = page > doc.size() - 1 ? doc.size() - 1 : page;
+        boolean altColor = false;
+        boolean appendedPageNum = false;
+        if (sender instanceof Player) {
+            List<FancyText> list = doc.get(page);
+            for (FancyText fancyT : list) {
+                if (fancyT instanceof FancyMessage) {
+                    FancyMessage text = (FancyMessage) fancyT;
+                    text.setAltColor(altColor);
+                    altColor = !altColor;
+                    sender.sendMessage(text.getFancyText());
+                } else if (fancyT instanceof FancyHeader) {
+                    FancyHeader text = (FancyHeader) fancyT;
+                    if (!appendedPageNum) {
+                        text.appendText(ChatColor.DARK_PURPLE + " [ Page " + (page + 1) + " of " + doc.size() + " ]");
+                        appendedPageNum = true;
+                    }
+                    sender.sendMessage(text.getFancyText());
+                    altColor = false;
+                }
+            }
+
+        } else {
+            for (List<FancyText> list : doc) {
+                for (FancyText fancyT : list) {
+                    if (fancyT instanceof FancyMessage) {
+                        FancyMessage text = (FancyMessage) fancyT;
+                        text.setAltColor(altColor);
+                        altColor = !altColor;
+                        sender.sendMessage(text.getFancyText());
+                    } else {
+                        FancyText text = fancyT;
+                        if (appendedPageNum) {
+                            sender.sendMessage(" ");
+                        } else {
+                            appendedPageNum = true;
+                        }
+                        sender.sendMessage(text.getFancyText());
+                        altColor = false;
+                    }
+                }
+            }
+        }
+    }
+
+}

src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java

@@ -0,0 +1,119 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.display.ColorAlternator;
+import com.onarandombox.MultiverseCore.display.ContentDisplay;
+import com.onarandombox.MultiverseCore.display.ContentFilter;
+import com.onarandombox.MultiverseCore.display.DisplayHandlers;
+import com.onarandombox.MultiverseCore.display.settings.PagedDisplaySettings;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Displays a listing of all worlds that a player can enter.
+ */
+public class ListCommand extends MultiverseCommand {
+
+    public ListCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("World Listing");
+        this.setCommandUsage("/mv list [filter] [page]");
+        this.setArgRange(0, 2);
+        this.addKey("mvlist");
+        this.addKey("mvl");
+        this.addKey("mv list");
+        this.setPermission("multiverse.core.list.worlds", "Displays a listing of all worlds that you can enter.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        ContentFilter filter = ContentFilter.DEFAULT;
+        int page = 1;
+
+        // Either page or filter.
+        if (args.size() == 1) {
+            try {
+                page = Integer.parseInt(args.get(0));
+            } catch (NumberFormatException ignore) {
+                filter = new ContentFilter(args.get(0));
+            }
+        }
+
+        // Filter then page.
+        if (args.size() == 2) {
+            filter = new ContentFilter(args.get(0));
+            try {
+                page = Integer.parseInt(args.get(1));
+            } catch (NumberFormatException ignore) {
+                sender.sendMessage(ChatColor.RED + args.get(1) + " is not valid number!");
+            }
+        }
+
+        ContentDisplay.forContent(getListContents(sender))
+                .header("%s====[ Multiverse World List ]====", ChatColor.GOLD)
+                .displayHandler(DisplayHandlers.PAGE_LIST)
+                .colorTool(ColorAlternator.with(ChatColor.AQUA, ChatColor.GOLD))
+                .filter(filter)
+                .setting(PagedDisplaySettings.SHOW_PAGE, page)
+                .show(sender);
+    }
+
+    private Collection<String> getListContents(@NotNull CommandSender sender) {
+        Player player = (sender instanceof Player) ? (Player) sender : null;
+
+        List<String> worldList = 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()))
+                .collect(Collectors.toList());
+
+        this.plugin.getMVWorldManager().getUnloadedWorlds().stream()
+                .filter(world -> plugin.getMVPerms().hasPermission(sender, "multiverse.access." + world, true))
+                .map(world -> ChatColor.GRAY + world + " - UNLOADED")
+                .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();
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/LoadCommand.java

@@ -1,42 +1,42 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Single;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
 
-@CommandAlias("mv")
-public class LoadCommand extends MultiverseCoreCommand {
-    public LoadCommand(@NotNull MultiverseCore plugin) {
+import java.util.List;
+
+/**
+ * Loads a world into Multiverse.
+ */
+public class LoadCommand extends MultiverseCommand {
+
+    public LoadCommand(MultiverseCore plugin) {
         super(plugin);
+        this.setName("Load World");
+        this.setCommandUsage("/mv load" + ChatColor.GREEN + " {WORLD}");
+        this.setArgRange(1, 1);
+        this.addKey("mvload");
+        this.addKey("mv load");
+        this.addCommandExample("/mv load " + ChatColor.GREEN + "MyUnloadedWorld");
+        this.setPermission("multiverse.core.load", "Loads a world into Multiverse.", PermissionDefault.OP);
     }
 
-    @Subcommand("load")
-    @CommandPermission("multiverse.core.load")
-    @CommandCompletion("@mvworlds:scope=unloaded")
-    @Syntax("<world>")
-    @Description("Loads a world. World must be already in worlds.yml, else please use /mv import.")
-    public void onLoadCommand(BukkitCommandIssuer issuer,
-
-                              @Single
-                              @Conditions("validWorldName:scope=unloaded")
-                              @Syntax("<world>")
-                              @Description("Name of world you want to load.")
-                              String worldName
-    ) {
-        issuer.sendMessage(String.format("Loading world '%s'...", worldName));
-
-        if (!this.plugin.getMVWorldManager().loadWorld(worldName)) {
-            issuer.sendMessage(String.format("Error trying to load world '%s'!", worldName));
-            return;
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (this.plugin.getMVWorldManager().loadWorld(args.get(0))) {
+            Command.broadcastCommandMessage(sender, "Loaded world '" + args.get(0) + "'!");
+        } else {
+            sender.sendMessage("Error trying to load world '" + args.get(0) + "'!");
         }
-        issuer.sendMessage(String.format("Loaded world '%s'!", worldName));
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java

@@ -0,0 +1,95 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.Action;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+// This will contain all the properties that support the ADD/REMOVE
+// Anything not in here will only support the SET action
+
+/**
+ * Used to modify various aspects of worlds.
+ */
+public class ModifyAddCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public ModifyAddCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Modify a World (Add a value)");
+        this.setCommandUsage("/mv modify " + ChatColor.GREEN + "add {VALUE} {PROPERTY}" + ChatColor.GOLD + " [WORLD] ");
+        this.setArgRange(2, 3);
+        this.addKey("mvm add");
+        this.addKey("mvmadd");
+        this.addKey("mv modify add");
+        this.addKey("mvmodify add");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "add " + ChatColor.GREEN + "sheep " + ChatColor.RED + "animals");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "add " + ChatColor.GREEN + "creeper " + ChatColor.RED + "monsters");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "add " + ChatColor.GREEN + "MyWorld " + ChatColor.RED + "worldblacklist");
+        this.setPermission("multiverse.core.modify.add", "Modify various aspects of worlds. See the help wiki for how to use this command properly. "
+                + "If you do not include a world, the current world will be used.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+
+        if (args.size() == 2 && p == null) {
+            sender.sendMessage(ChatColor.RED + "From the console, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        MultiverseWorld world;
+        String value = args.get(0);
+        String property = args.get(1);
+
+        if (args.size() == 2) {
+            world = this.worldManager.getMVWorld(p.getWorld().getName());
+        } else {
+            world = this.worldManager.getMVWorld(args.get(2));
+        }
+
+        if (world == null) {
+            sender.sendMessage("That world does not exist!");
+            return;
+        }
+
+        if (!ModifyCommand.validateAction(Action.Add, property)) {
+            sender.sendMessage("Sorry, you can't ADD to " + property);
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/OMGwzx");
+            return;
+        }
+
+        // TODO fix this
+        if (world.addToVariable(property, value)) {
+            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA
+                    + value + ChatColor.WHITE + " was " + ChatColor.GREEN + "added to " + ChatColor.GREEN + property);
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
+        } else {
+            sender.sendMessage(value + " could not be added to " + property);
+        }
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java

@@ -0,0 +1,92 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.Action;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Removes all values from a world-property.
+ */
+public class ModifyClearCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public ModifyClearCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Modify a World (Clear a property)");
+        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " clear {PROPERTY}" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(1, 2);
+        this.addKey("mvm clear");
+        this.addKey("mvmclear");
+        this.addKey("mv modify clear");
+        this.addKey("mvmodify clear");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "clear " + ChatColor.RED + "animals");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "clear " + ChatColor.RED + "monsters");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "clear " + ChatColor.RED + "worldblacklist");
+        this.setPermission("multiverse.core.modify.clear",
+                "Removes all values from a property. This will work on properties that contain lists.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+        if (args.size() == 1 && p == null) {
+            sender.sendMessage(ChatColor.RED + "From the console, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        MultiverseWorld world;
+        String property = args.get(0);
+
+        if (args.size() == 1) {
+            world = this.worldManager.getMVWorld(p.getWorld().getName());
+        } else {
+            world = this.worldManager.getMVWorld(args.get(1));
+        }
+
+        if (world == null) {
+            sender.sendMessage("That world does not exist!");
+            return;
+        }
+
+        if (!ModifyCommand.validateAction(Action.Clear, property)) {
+            sender.sendMessage("Sorry, you can't use CLEAR with " + property);
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/q1h01S");
+            return;
+        }
+        // TODO fix this
+        if (world.clearList(property)) {
+            sender.sendMessage(property + " was cleared. It contains 0 values now.");
+            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + property + ChatColor.WHITE + " was "
+                    + ChatColor.GREEN + "CLEARED" + ChatColor.WHITE + ". It contains " + ChatColor.LIGHT_PURPLE + "0" + ChatColor.WHITE + " values now.");
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
+        } else {
+            sender.sendMessage(ChatColor.RED + "Error: " + ChatColor.GOLD + property
+                    + ChatColor.WHITE + " was " + ChatColor.GOLD + "NOT" + ChatColor.WHITE + " cleared.");
+        }
+    }
+
+}

src/main/java/com/onarandombox/MultiverseCore/commands/ModifyCommand.java

@@ -0,0 +1,76 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.enums.Action;
+import com.onarandombox.MultiverseCore.enums.AddProperties;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Used to modify various aspects of worlds.
+ */
+public class ModifyCommand extends MultiverseCommand {
+
+    public ModifyCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Modify a World");
+        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " {set|add|remove|clear} ...");
+        this.setArgRange(2, 3);
+        this.addKey("mvm");
+        this.addKey("mvmodify");
+        this.addKey("mv modify");
+        Map<String, Boolean> children = new HashMap<String, Boolean>();
+        children.put("multiverse.core.modify.add", true);
+        children.put("multiverse.core.modify.modify", true);
+        children.put("multiverse.core.modify.clear", true);
+        children.put("multiverse.core.modify.remove", true);
+        Permission modify = new Permission("multiverse.core.modify",
+                "Modify various aspects of worlds. It requires add/set/clear/remove. See the examples below", PermissionDefault.OP, children);
+        this.addCommandExample(ChatColor.AQUA + "/mv modify set ?");
+        this.addCommandExample(ChatColor.GREEN + "/mv modify add ?");
+        this.addCommandExample(ChatColor.BLUE + "/mv modify clear ?");
+        this.addCommandExample(ChatColor.RED + "/mv modify remove ?");
+        this.setPermission(modify);
+    }
+
+    /**
+     * Validates the specified action.
+     *
+     * @param action The {@link Action}.
+     * @param property The property.
+     * @return Whether this action is valid.
+     */
+    protected static boolean validateAction(Action action, String property) {
+        if (action != Action.Set) {
+            try {
+                AddProperties.valueOf(property);
+                return true;
+            } catch (IllegalArgumentException e) {
+                return false;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // This is just a place holder. The real commands are in:
+        // ModifyAddCommand
+        // ModifyRemoveCommand
+        // ModifySetCommand
+        // ModifyClearCommand
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java

@@ -0,0 +1,97 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.Action;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Removes values from a world-property.
+ */
+public class ModifyRemoveCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public ModifyRemoveCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Modify a World (Remove a value)");
+        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " remove {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(2, 3);
+        this.addKey("mvm remove");
+        this.addKey("mvmremove");
+        this.addKey("mv modify remove");
+        this.addKey("mvmodify remove");
+        this.addKey("mvm delete");
+        this.addKey("mvmdelete");
+        this.addKey("mv modify delete");
+        this.addKey("mvmodify delete");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "remove " + ChatColor.GREEN + "sheep " + ChatColor.RED + "animals");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "remove " + ChatColor.GREEN + "creeper " + ChatColor.RED + "monsters");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "remove " + ChatColor.GREEN + "MyWorld " + ChatColor.RED + "worldblacklist");
+        this.setPermission("multiverse.core.modify.remove", "Modify various aspects of worlds. See the help wiki for how to use this command properly. "
+                + "If you do not include a world, the current world will be used.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // We NEED a world from the command line
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+
+        if (args.size() == 2 && p == null) {
+            sender.sendMessage(ChatColor.RED + "From the console, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        MultiverseWorld world;
+        String value = args.get(0);
+        String property = args.get(1);
+
+        if (args.size() == 2) {
+            world = this.worldManager.getMVWorld(p.getWorld().getName());
+        } else {
+            world = this.worldManager.getMVWorld(args.get(2));
+        }
+
+        if (world == null) {
+            sender.sendMessage("That world does not exist!");
+            return;
+        }
+
+        if (!ModifyCommand.validateAction(Action.Remove, property)) {
+            sender.sendMessage("Sorry, you can't REMOVE anything from" + property);
+            sender.sendMessage("Please visit our Github Wiki for more information: https://goo.gl/OMGwzx");
+            return;
+        }
+        // TODO fix this
+        if (world.removeFromVariable(property, value)) {
+            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + value + ChatColor.WHITE
+                    + " was " + ChatColor.RED + "removed from " + ChatColor.GREEN + property);
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
+        } else {
+            sender.sendMessage(ChatColor.RED + "There was an error removing " + ChatColor.GRAY
+                    + value + ChatColor.WHITE + " from " + ChatColor.GOLD + property);
+        }
+    }
+
+}

src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java

@@ -0,0 +1,125 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.enums.EnglishChatColor;
+import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Used to set world-properties.
+ */
+public class ModifySetCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public ModifySetCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.worldManager = this.plugin.getMVWorldManager();
+        this.setName("Modify a World (Set a value)");
+        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " set {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
+        this.setArgRange(1, 3);
+        this.addKey("mvm set");
+        this.addKey("mvmset");
+        this.addKey("mv modify set");
+        this.addKey("mvmodify set");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "mode " + ChatColor.RED + "creative");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "animals " + ChatColor.RED + "false");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "monsters " + ChatColor.RED + "false");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "alias " + ChatColor.RED + "MyWorld");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "color " + ChatColor.RED + "green");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "curr " + ChatColor.RED + "3");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "price " + ChatColor.RED + "5");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "scale " + ChatColor.RED + "1.2");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "memory " + ChatColor.RED + "true");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "diff " + ChatColor.RED + "hard");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "hunger " + ChatColor.RED + "false");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "hidden " + ChatColor.RED + "true");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "pvp " + ChatColor.RED + "false");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "heal " + ChatColor.RED + "true");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "adjustspawn " + ChatColor.RED + "false");
+        this.addCommandExample("/mvm " + ChatColor.GOLD + "set " + ChatColor.GREEN + "spawn");
+        this.setPermission("multiverse.core.modify.set", "Modify various aspects of worlds. See the help wiki for how to use this command properly. "
+                + "If you do not include a world, the current world will be used.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // Special case for spawn:
+        if (args.size() == 1) {
+            if (!(sender instanceof Player)) {
+                sender.sendMessage("You must be a player to set the" + ChatColor.GREEN + " spawn");
+                return;
+            }
+            if (args.get(0).equalsIgnoreCase("spawn")) {
+                SetSpawnCommand c = new SetSpawnCommand(this.plugin);
+                c.setWorldSpawn(sender);
+
+            } else {
+                sender.sendMessage("Spawn is the only param with no" + ChatColor.GREEN + " VALUE");
+                sender.sendMessage("Type " + ChatColor.GREEN + "/mv modify ?" + ChatColor.WHITE + " For help.");
+            }
+            return;
+        }
+        // We NEED a world from the command line
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+
+        if (args.size() == 2 && p == null) {
+            sender.sendMessage("From the command line, WORLD is required.");
+            sender.sendMessage(this.getCommandDesc());
+            sender.sendMessage(this.getCommandUsage());
+            sender.sendMessage("Nothing changed.");
+            return;
+        }
+
+        MultiverseWorld world;
+        String value = args.get(1);
+        String property = args.get(0);
+
+        if (args.size() == 2) {
+            world = this.worldManager.getMVWorld(p.getWorld().getName());
+        } else {
+            world = this.worldManager.getMVWorld(args.get(2));
+        }
+
+        if (world == null) {
+            sender.sendMessage("That world does not exist!");
+            return;
+        }
+
+        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !EnglishChatColor.isValidAliasColor(value)) {
+            sender.sendMessage(value + " is not a valid color. Please pick one of the following:");
+            sender.sendMessage(EnglishChatColor.getAllColors());
+            return;
+        }
+        try {
+            if (world.setPropertyValue(property, value)) {
+                sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Property " + ChatColor.AQUA + property
+                        + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
+                if (!plugin.saveWorldConfig()) {
+                    sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+                }
+            } else {
+                sender.sendMessage(ChatColor.RED + world.getPropertyHelp(property));
+            }
+        } catch (PropertyDoesNotExistException e) {
+            sender.sendMessage(ChatColor.RED + "Sorry, You can't set: '" + ChatColor.GRAY + property + ChatColor.RED + "'");
+            sender.sendMessage("Valid world-properties: " + world.getAllPropertyNames());
+        }
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCommand.java

@@ -0,0 +1,40 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
+import com.pneumaticraft.commandhandler.Command;
+import org.bukkit.command.CommandSender;
+
+import java.util.List;
+
+/**
+ * A generic Multiverse-command.
+ */
+public abstract class MultiverseCommand extends Command {
+
+    /**
+     * The reference to the core.
+     */
+    protected MultiverseCore plugin;
+    /**
+     * The reference to {@link MultiverseMessaging}.
+     */
+    protected MultiverseMessaging messaging;
+
+    public MultiverseCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.plugin = plugin;
+        this.messaging = this.plugin.getMessaging();
+    }
+
+    @Override
+    public abstract void runCommand(CommandSender sender, List<String> args);
+
+}

src/main/java/com/onarandombox/MultiverseCore/commands/MultiverseCoreCommand.java

@@ -1,20 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A base command for Multiverse.
- */
-abstract class MultiverseCoreCommand extends MultiverseCommand {
-    protected final MultiverseCore plugin;
-    protected final MVWorldManager worldManager;
-
-    protected MultiverseCoreCommand(@NotNull MultiverseCore plugin) {
-        super(plugin);
-        this.plugin = plugin;
-        this.worldManager = plugin.getMVWorldManager();
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commands/PaginatedCommand.java

@@ -0,0 +1,177 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.pneumaticraft.commandhandler.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * A generic paginated command.
+ * @param <T> The type of items on the page.
+ */
+public abstract class PaginatedCommand<T> extends Command {
+    private final Pattern REGEX_SPECIAL_CHARS = Pattern.compile("[.+*?\\[^\\]$(){}=!<>|:-\\\\]");
+    private static final int DEFAULT_ITEMS_PER_PAGE = 9;
+    /**
+     * The number of items per page.
+     */
+    protected int itemsPerPage = DEFAULT_ITEMS_PER_PAGE;
+
+    public PaginatedCommand(JavaPlugin plugin) {
+        super(plugin);
+    }
+
+    /**
+     * Set the number of items per page.
+     *
+     * @param items The new number of items per page.
+     */
+    protected void setItemsPerPage(int items) {
+        itemsPerPage = items;
+    }
+
+    /**
+     * Gets filtered items.
+     *
+     * @param availableItems All available items.
+     * @param filter The filter-{@link String}.
+     * @return A list of items that match the filter.
+     */
+    protected abstract List<T> getFilteredItems(List<T> availableItems, String filter);
+
+    /**
+     * Escape regex special characters from filter
+     *
+     * @param filter The filter-{@link String}.
+     * @return String with regex characters escaped
+     */
+    protected String cleanFilter(String filter) {
+        return REGEX_SPECIAL_CHARS.matcher(filter).replaceAll("\\\\$0");
+    }
+
+    /**
+     * Constructs a single string from a list of strings.
+     *
+     * @param list The {@link List} of strings.
+     * @return A single {@link String}.
+     */
+    protected String stitchThisString(List<String> list) {
+        StringBuilder builder = new StringBuilder();
+        for (String s : list) {
+            builder.append(s);
+            builder.append(' ');
+        }
+        return builder.toString();
+    }
+
+    /**
+     * Shows a page.
+     *
+     * @param page The number of the page to show.
+     * @param sender The {@link CommandSender} that wants to see the page.
+     * @param cmds The items that should be displayed on the page.
+     */
+    protected void showPage(int page, CommandSender sender, List<T> cmds) {
+        // Ensure the page is at least 1.
+        page = (page <= 0) ? 1 : page;
+        int start = (page - 1) * itemsPerPage;
+        int end = start + itemsPerPage;
+
+        for (int i = start; i < end; i++) {
+            // For consistancy, print some extra lines if it's a player:
+            if (i < cmds.size()) {
+                sender.sendMessage(this.getItemText(cmds.get(i)));
+            } else if (sender instanceof Player) {
+                sender.sendMessage(" ");
+            }
+        }
+    }
+
+    /**
+     * Converts an item into a string.
+     *
+     * @param item The item.
+     * @return A {@link String}.
+     */
+    protected abstract String getItemText(T item);
+
+    /**
+     * Constructs a {@link FilterObject} from a {@link List} of arguments.
+     *
+     * @param args The {@link List} of arguments.
+     * @return The {@link FilterObject}.
+     */
+    protected FilterObject getPageAndFilter(List<String> args) {
+        int page = 1;
+
+        String filter = "";
+
+        if (args.size() == 0) {
+            filter = "";
+            page = 1;
+        } else if (args.size() == 1) {
+            try {
+                page = Integer.parseInt(args.get(0));
+            } catch (NumberFormatException ex) {
+                filter = args.get(0);
+                page = 1;
+            }
+        } else if (args.size() == 2) {
+            filter = args.get(0);
+            try {
+                page = Integer.parseInt(args.get(1));
+            } catch (NumberFormatException ex) {
+                page = 1;
+            }
+        }
+        return new FilterObject(page, filter);
+    }
+
+    /**
+     * "Key-Object" containing information about the page and the filter that were requested.
+     */
+    protected class FilterObject {
+        private Integer page;
+        private String filter;
+
+        public FilterObject(Integer page, String filter) {
+            this.page = page;
+            this.filter = filter;
+        }
+
+        /**
+         * Gets the page.
+         * @return The page.
+         */
+        public Integer getPage() {
+            return this.page;
+        }
+
+        /**
+         * Sets the page.
+         *
+         * @param page The new page.
+         */
+        public void setPage(int page) {
+            this.page = page;
+        }
+
+        /**
+         * Gets the filter.
+         * @return The filter.
+         */
+        public String getFilter() {
+            return this.filter;
+        }
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/PaginatedCoreCommand.java

@@ -0,0 +1,26 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+
+/**
+ * A generic paginated Multiverse-command.
+ * @param <T> The type of items on the page.
+ */
+public abstract class PaginatedCoreCommand<T> extends PaginatedCommand<T> {
+    /**
+     * The reference to the core.
+     */
+    protected MultiverseCore plugin;
+
+    public PaginatedCoreCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.plugin = plugin;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java

@@ -0,0 +1,92 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.api.WorldPurger;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Removes a type of mob from a world.
+ */
+public class PurgeCommand extends MultiverseCommand {
+    private MVWorldManager worldManager;
+
+    public PurgeCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Purge World of Creatures");
+        this.setCommandUsage("/mv purge" + ChatColor.GOLD + " [WORLD|all] " + ChatColor.GREEN + "{all|animals|monsters|MOBNAME}");
+        this.setArgRange(1, 2);
+        this.addKey("mvpurge");
+        this.addKey("mv purge");
+        this.addCommandExample("/mv purge " + ChatColor.GREEN + "all");
+        this.addCommandExample("/mv purge " + ChatColor.GOLD + "all " + ChatColor.GREEN + "all");
+        this.addCommandExample("/mv purge " + ChatColor.GREEN + "monsters");
+        this.addCommandExample("/mv purge " + ChatColor.GOLD + "all " + ChatColor.GREEN + "animals");
+        this.addCommandExample("/mv purge " + ChatColor.GOLD + "MyWorld " + ChatColor.GREEN + "squid");
+        this.addCommandExample("/mv purge " + ChatColor.GOLD + "MyWorld_nether " + ChatColor.GREEN + "ghast");
+        this.setPermission("multiverse.core.purge", "Removed the specified type of mob from the specified world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+        if (args.size() == 1 && p == null) {
+            sender.sendMessage("This command requires a WORLD when being run from the console!");
+            sender.sendMessage(this.getCommandUsage());
+            return;
+        }
+        String worldName = null;
+        String deathName = null;
+        if (args.size() == 1) {
+            worldName = p.getWorld().getName();
+            deathName = args.get(0);
+        } else {
+            worldName = args.get(0);
+            deathName = args.get(1);
+        }
+
+        if (!worldName.equalsIgnoreCase("all") && !this.worldManager.isMVWorld(worldName)) {
+            this.plugin.showNotMVWorldMessage(sender, worldName);
+            sender.sendMessage("It cannot be purged.");
+            return;
+        }
+
+        List<MultiverseWorld> worldsToRemoveEntitiesFrom = new ArrayList<MultiverseWorld>();
+        // Handle all case any user who names a world "all" should know better...
+        if (worldName.equalsIgnoreCase("all")) {
+            worldsToRemoveEntitiesFrom.addAll(this.worldManager.getMVWorlds());
+        } else {
+            worldsToRemoveEntitiesFrom.add(this.worldManager.getMVWorld(worldName));
+        }
+
+        WorldPurger purger = this.worldManager.getTheWorldPurger();
+        ArrayList<String> thingsToKill = new ArrayList<String>();
+        if (deathName.equalsIgnoreCase("all") || deathName.equalsIgnoreCase("animals") || deathName.equalsIgnoreCase("monsters")) {
+            thingsToKill.add(deathName.toUpperCase());
+        } else {
+            Collections.addAll(thingsToKill, deathName.toUpperCase().split(","));
+        }
+        for (MultiverseWorld w : worldsToRemoveEntitiesFrom) {
+            purger.purgeWorld(w, thingsToKill, false, false, sender);
+        }
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java

@@ -1,79 +1,72 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
-import java.util.Collections;
-import java.util.Random;
-
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Optional;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag;
-import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
-import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag;
-import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
 import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
+import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
 import org.jetbrains.annotations.NotNull;
 
-@CommandAlias("mv")
-public class RegenCommand extends MultiverseCoreCommand {
-    public RegenCommand(@NotNull MultiverseCore plugin) {
-        super(plugin);
+import java.util.List;
 
-        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());
+/**
+ * Regenerates a world.
+ */
+public class RegenCommand extends MultiverseCommand {
+
+    public RegenCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Regenerates a World");
+        this.setCommandUsage("/mv regen" + ChatColor.GREEN + " {WORLD}" + ChatColor.GOLD + " [-s [SEED]] [--keep-gamerules]");
+        this.setArgRange(1, 4);
+        this.addKey("mvregen");
+        this.addKey("mv regen");
+        this.addCommandExample("You can use the -s with no args to get a new seed:");
+        this.addCommandExample("/mv regen " + ChatColor.GREEN + "MyWorld" + ChatColor.GOLD + " -s");
+        this.addCommandExample("or specifiy a seed to get that one:");
+        this.addCommandExample("/mv regen " + ChatColor.GREEN + "MyWorld" + ChatColor.GOLD + " -s" + ChatColor.AQUA + " gargamel");
+        this.setPermission("multiverse.core.regen", "Regenerates a world on your server. The previous state will be lost "
+                + ChatColor.RED + "PERMANENTLY.", PermissionDefault.OP);
     }
 
-    @Subcommand("regen")
-    @CommandPermission("multiverse.core.regen")
-    @CommandCompletion("@mvworlds:scope=both @flags:groupName=mvregen")
-    @Syntax("<world> --seed [seed] --keep-gamerules")
-    @Description("Regenerates a world on your server. The previous state will be lost PERMANENTLY.")
-    public void onRegenCommand(BukkitCommandIssuer issuer,
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        String worldName = args.get(0);
+        boolean useseed = CommandHandler.hasFlag("-s", args);
+        String seedflag = CommandHandler.getFlag("-s", args);
+        boolean keepGamerules = CommandHandler.hasFlag("--keep-gamerules", args);
 
-                               @Conditions("validWorldName:scope=both")
-                               @Syntax("<world>")
-                               @Description("World that you want to regen.")
-                               String worldName,
+        boolean randomseed = seedflag == null || seedflag.isEmpty() || seedflag.equalsIgnoreCase("--keep-gamerules");
+        String seed = randomseed ? "" : seedflag;
 
-                               @Optional
-                               @Syntax("--seed [seed] --keep-gamerules")
-                               @Description("Other world settings. See: http://gg.gg/nn8lk")
-                               String[] flags
-    ) {
-        ParsedCommandFlags parsedFlags = parseFlags(flags);
-
-        this.plugin.getMVCommandManager().getCommandQueueManager().addToQueue(new QueuedCommand(
-                issuer.getIssuer(),
-                () -> {
-                    issuer.sendMessage(String.format("Regenerating world '%s'...", worldName));
-                    if (!this.plugin.getMVWorldManager().regenWorld(
-                            worldName,
-                            parsedFlags.hasFlag("--seed"),
-                            !parsedFlags.hasFlagValue("--seed"),
-                            parsedFlags.flagValue("--seed", String.class),
-                            parsedFlags.hasFlag("--keep-gamerules")
-                    )) {
-                        issuer.sendMessage(String.format("%sThere was an issue regenerating '%s'! Please check console for errors.", ChatColor.RED, worldName));
-                        return;
-                    }
-                    issuer.sendMessage(String.format("%sWorld %s was regenerated!", ChatColor.GREEN, worldName));
-                },
-                "Are you sure you want to regenerate world '" + worldName + "'?"
+        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
+                sender,
+                doWorldRegen(sender, worldName, useseed, randomseed, seed, keepGamerules),
+                String.format("Are you sure you want to regen '%s'? You cannot undo this action.", worldName)
         ));
     }
+
+    private Runnable doWorldRegen(@NotNull CommandSender sender,
+                                  @NotNull String worldName,
+                                  boolean useSeed,
+                                  boolean randomSeed,
+                                  @NotNull String seed,
+                                  boolean keepGamerules) {
+
+        return () -> {
+            if (this.plugin.getMVWorldManager().regenWorld(worldName, useSeed, randomSeed, seed, keepGamerules)) {
+                sender.sendMessage(ChatColor.GREEN + "World Regenerated!");
+                return;
+            }
+            sender.sendMessage(ChatColor.RED + "World could NOT be regenerated!");
+        };
+    }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java

@@ -1,42 +1,58 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent;
-import org.bukkit.ChatColor;
-import org.jetbrains.annotations.NotNull;
+/**
+ * Reloads worlds.yml and config.yml.
+ */
+public class ReloadCommand extends MultiverseCommand {
 
-@CommandAlias("mv")
-public class ReloadCommand extends MultiverseCoreCommand {
-    public ReloadCommand(@NotNull MultiverseCore plugin) {
+    public ReloadCommand(MultiverseCore plugin) {
         super(plugin);
+        this.setName("Reload Configs");
+        this.setCommandUsage("/mv reload");
+        this.setArgRange(0, 0);
+        this.addKey("mvreload");
+        this.addKey("mvr");
+        this.addKey("mv reload");
+        this.addCommandExample("/mv reload");
+        this.setPermission("multiverse.core.reload", "Reloads worlds.yml and config.yml.", PermissionDefault.OP);
     }
 
-    @Subcommand("reload")
-    @CommandPermission("multiverse.core.reload")
-    @Description("Reloads config files for all multiverse modules.")
-    public void onReloadCommand(@NotNull BukkitCommandIssuer issuer) {
-        issuer.sendMessage(ChatColor.GOLD + "Reloading all Multiverse Plugin configs...");
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        sender.sendMessage(ChatColor.GOLD + "Reloading all Multiverse Plugin configs...");
         this.plugin.loadConfigs();
         this.plugin.getAnchorManager().loadAnchors();
         this.plugin.getMVWorldManager().loadWorlds(true);
 
-        List<String> configsLoaded = new ArrayList<>();
+        List<String> configsLoaded = new ArrayList<String>();
         configsLoaded.add("Multiverse-Core - config.yml");
         configsLoaded.add("Multiverse-Core - worlds.yml");
         configsLoaded.add("Multiverse-Core - anchors.yml");
-
+        // Create the event
         MVConfigReloadEvent configReload = new MVConfigReloadEvent(configsLoaded);
+        // Fire it off
         this.plugin.getServer().getPluginManager().callEvent(configReload);
+        for (String s : configReload.getAllConfigsLoaded()) {
+            sender.sendMessage(s);
+        }
 
-        configReload.getAllConfigsLoaded().forEach(issuer::sendMessage);
-        issuer.sendMessage(String.format("%sReload Complete!", ChatColor.GREEN));
+        sender.sendMessage(ChatColor.GREEN + "Reload Complete!");
     }
+
 }

src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java

@@ -1,41 +1,42 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Conditions;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Single;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
 
-@CommandAlias("mv")
-public class RemoveCommand extends MultiverseCoreCommand {
-    public RemoveCommand(@NotNull MultiverseCore plugin) {
+import java.util.List;
+
+/**
+ * Unloads a world and removes it from the config.
+ */
+public class RemoveCommand extends MultiverseCommand {
+
+    public RemoveCommand(MultiverseCore plugin) {
         super(plugin);
+        this.setName("Remove World");
+        this.setCommandUsage("/mv remove" + ChatColor.GREEN + " {WORLD}");
+        this.setArgRange(1, 1);
+        this.addKey("mvremove");
+        this.addKey("mv remove");
+        this.addCommandExample("/mv remove " + ChatColor.GREEN + "MyWorld");
+        this.setPermission("multiverse.core.remove",
+                "Unloads a world from Multiverse and removes it from worlds.yml, this does NOT DELETE the world folder.", PermissionDefault.OP);
     }
 
-    @Subcommand("remove")
-    @CommandPermission("multiverse.core.remove")
-    @CommandCompletion("@mvworlds:scope=both")
-    @Syntax("<world>")
-    @Description("Unloads a world from Multiverse and removes it from worlds.yml, this does NOT DELETE the world folder.")
-    public void onRemoveCommand(BukkitCommandIssuer issuer,
-
-                                @Single
-                                @Conditions("mvworlds:scope=both")
-                                @Syntax("<world>")
-                                @Description("World you want to remove from mv's knowledge.")
-                                String worldName
-    ) {
-        if (!this.plugin.getMVWorldManager().removeWorldFromConfig(worldName)) {
-            issuer.sendMessage(String.format("%sError trying to remove world from config!", ChatColor.RED));
-            return;
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (this.plugin.getMVWorldManager().removeWorldFromConfig(args.get(0))) {
+            sender.sendMessage("World removed from config!");
+        } else {
+            sender.sendMessage("Error trying to remove world from config!");
         }
-        issuer.sendMessage(String.format("World '%s' is removed from config!", worldName));
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/ScriptCommand.java

@@ -0,0 +1,58 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * States who is in what world.
+ */
+public class ScriptCommand extends MultiverseCommand {
+
+    public ScriptCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Runs a script.");
+        this.setCommandUsage("/mv script" + ChatColor.GOLD + " {script} [target]");
+        this.setArgRange(1, 2);
+        this.addKey("mv script");
+        this.addKey("mvscript");
+        this.addCommandExample(String.format("/mv script %sscript.txt", ChatColor.GOLD));
+        this.addCommandExample(String.format("/mv script %stest.txt %ssomeplayer", ChatColor.GOLD, ChatColor.GREEN));
+        this.setPermission("multiverse.core.script", "Runs a script.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (plugin.getScriptAPI() == null) {
+            sender.sendMessage("Buscript failed to load while the server was starting. Scripts cannot be run.");
+            return;
+        }
+        File file = new File(plugin.getScriptAPI().getScriptFolder(), args.get(0));
+        if (!file.exists()) {
+            sender.sendMessage("That script file does not exist in the Multiverse-Core scripts directory!");
+            return;
+        }
+        Player player = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+        }
+        String target = null;
+        if (args.size() == 2) {
+            target = args.get(1);
+        }
+        plugin.getScriptAPI().executeScript(file, target, player);
+        sender.sendMessage(String.format("Script '%s%s%s' finished!", ChatColor.GOLD, file.getName(), ChatColor.WHITE));
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java

@@ -0,0 +1,148 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.BlockSafety;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+import org.bukkit.Bukkit;
+
+/**
+ * Sets the spawn for a world.
+ */
+public class SetSpawnCommand extends MultiverseCommand {
+    public SetSpawnCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Set World Spawn");
+        this.setCommandUsage("/mv setspawn");
+        this.setArgRange(0, 6);
+        this.addKey("mvsetspawn");
+        this.addKey("mvsets");
+        this.addKey("mvss");
+        this.addKey("mv set spawn");
+        this.addKey("mv setspawn");
+        this.addKey("mvset spawn");
+        this.addCommandExample("/mv set spawn");
+        this.setPermission("multiverse.core.spawn.set", "Sets the spawn for the current world.", PermissionDefault.OP);
+    }
+
+    /**
+     * Dispatches the user's command depending on the number of parameters
+     * @param sender The player who executes the command, may be console as well.
+     * @param args Command line parameters
+     */
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.isEmpty()) {
+            setWorldSpawn(sender);
+        } else if (args.size() == 4) {
+            setWorldSpawn(sender, args.get(0), args.get(1), args.get(2), args.get(3));
+        } else if (args.size() == 6) {
+            setWorldSpawn(sender, args.get(0), args.get(1), args.get(2), args.get(3), args.get(4), args.get(5));
+        } else {
+            sender.sendMessage("Use no arguments for your current location, or world/x/y/z, or world/x/y/z/yaw/pitch!");
+        }
+    }
+
+    /**
+     * Set the world spawn when no parameters are given
+     * @param sender The {@link CommandSender} who executes the command. 
+     *               Everything not a {@link Player}, e.g. console, gets rejected, as we can't get coordinates from there.
+     */
+    protected void setWorldSpawn(CommandSender sender) {
+        if (sender instanceof Player) {
+            Player p = (Player) sender;
+            Location l = p.getLocation();
+            World w = p.getWorld();
+            setWorldSpawn(sender, w, l);
+        } else {
+            sender.sendMessage("You need to give coordinates to use this command from the console!");
+        }
+    }
+    
+    /**
+     * Set the world spawn when 4 parameters are given
+     * @param sender The {@link CommandSender} who executes the command
+     * @param world The world to set the spawn in
+     * @param x X-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param y Y-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param z Z-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     */
+    protected void setWorldSpawn(CommandSender sender, String world, String x, String y, String z) {
+        setWorldSpawn(sender, world, x, y, z, "0", "0");
+    }
+
+    /**
+     * Set the world spawn when 6 parameters are given
+     * @param sender The {@link CommandSender} who executes the command
+     * @param world The world to set the spawn in
+     * @param x X-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param y Y-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param z Z-coordinate to set the spawn to (as a {@link String} as it's from the command line, gets parsed into a double)
+     * @param yaw Yaw a newly spawned player should look at (as a {@link String} as it's from the command line, gets parsed into a float)
+     * @param pitch Pitch a newly spawned player should look at (as a {@link String} as it's from the command line, gets parsed into a float)
+     */
+    protected void setWorldSpawn(CommandSender sender, String world, String x, String y, String z, String yaw, String pitch) {
+        double dx, dy, dz;
+        float fpitch, fyaw;
+        World bukkitWorld = Bukkit.getWorld(world);
+        if (bukkitWorld == null) {
+            sender.sendMessage("World " + world + " is unknown!");
+            return;
+        }
+        try {
+            dx = Double.parseDouble(x);
+            dy = Double.parseDouble(y);
+            dz = Double.parseDouble(z);
+            fpitch = Float.parseFloat(pitch);
+            fyaw = Float.parseFloat(yaw);
+        } catch (NumberFormatException ex) {
+            sender.sendMessage("All coordinates must be numeric");
+            return;
+        }
+        Location l = new Location(bukkitWorld, dx, dy, dz, fyaw, fpitch);
+        setWorldSpawn(sender, bukkitWorld, l);
+    }
+
+    /**
+     * Does the actual spawn-setting-work.
+     *
+     * @param sender The {@link CommandSender} that's setting the spawn.
+     * @param w The {@link World} to set the spawn in
+     * @param l The {@link Location} to set the spawn to
+     */
+    private void setWorldSpawn(CommandSender sender, World w, Location l) {
+        MultiverseWorld foundWorld = this.plugin.getMVWorldManager().getMVWorld(w.getName());
+        if (foundWorld != null) {
+            foundWorld.setSpawnLocation(l);
+            BlockSafety bs = this.plugin.getBlockSafety();
+            if (!bs.playerCanSpawnHereSafely(l) && foundWorld.getAdjustSpawn()) {
+                sender.sendMessage("It looks like that location would normally be unsafe. But I trust you.");
+                sender.sendMessage("I'm turning off the Safe-T-Teleporter for spawns to this world.");
+                sender.sendMessage("If you want this turned back on just do:");
+                sender.sendMessage(ChatColor.AQUA + "/mvm set adjustspawn true " + foundWorld.getAlias());
+                foundWorld.setAdjustSpawn(false);
+            }
+            sender.sendMessage("Spawn was set to: " + plugin.getLocationManipulation().strCoords(l));
+            if (!plugin.saveWorldConfig()) {
+                sender.sendMessage(ChatColor.RED + "There was an issue saving worlds.yml!  Your changes will only be temporary!");
+            }
+        } else {
+            w.setSpawnLocation(l.getBlockX(), l.getBlockY(), l.getBlockZ());
+            sender.sendMessage("Multiverse does not know about this world, only X,Y and Z set. Please import it to set the spawn fully (Pitch/Yaws).");
+        }
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/SilentCommand.java

@@ -0,0 +1,52 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Enables debug-information.
+ */
+public class SilentCommand extends MultiverseCommand {
+
+    public SilentCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Turn silent mode on/off?");
+        this.setCommandUsage("/mv silent" + ChatColor.GOLD + " [true|false|on|off]");
+        this.setArgRange(0, 1);
+        this.addKey("mv silent");
+        this.addKey("mvsilent");
+        this.addCommandExample("/mv silent " + ChatColor.GOLD + "true");
+        this.setPermission("multiverse.core.silent", "Reduces the amount of startup messages.", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (args.size() == 1) {
+            if (args.get(0).equalsIgnoreCase("on")) {
+                args.set(0, "true");
+            }
+            plugin.getMVConfig().setSilentStart(Boolean.valueOf(args.get(0)));
+            plugin.saveMVConfigs();
+        }
+        this.displaySilentMode(sender);
+    }
+
+    private void displaySilentMode(CommandSender sender) {
+        if (plugin.getMVConfig().getSilentStart()) {
+            sender.sendMessage("Multiverse Silent Start mode is " + ChatColor.GREEN + "ON");
+        } else {
+            sender.sendMessage("Multiverse Silent Start mode is " + ChatColor.RED + "OFF");
+        }
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/SleepCommand.java

@@ -0,0 +1,42 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Takes the player to the latest bed he's slept in.
+ */
+public class SleepCommand extends MultiverseCommand {
+
+    public SleepCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Go to Sleep");
+        this.setCommandUsage("/mv sleep");
+        this.setArgRange(0, 0);
+        this.addKey("mv sleep");
+        this.setPermission("multiverse.core.sleep", "Takes you the latest bed you've slept in (Currently BROKEN).", PermissionDefault.OP);
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }
+
+        if (p == null) {
+            return;
+        }
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java

@@ -0,0 +1,91 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.List;
+
+/**
+ * Teleports a player to the spawn.
+ */
+public class SpawnCommand extends MultiverseCommand {
+
+    public SpawnCommand(MultiverseCore plugin) {
+        super(plugin);
+        Permission otherPerm = new Permission("multiverse.core.spawn.other",
+                "Teleports another player to the spawn of the world they are in.", PermissionDefault.OP);
+        this.setName("Spawn");
+        this.setCommandUsage("/mv spawn" + ChatColor.GOLD + " [PLAYER]");
+        this.setArgRange(0, 1);
+        this.addKey("mvspawn");
+        this.addKey("mv spawn");
+        this.addKey("mvs");
+        this.setPermission("multiverse.core.spawn.self", "Teleports you to the Spawn Point of the world you are in.", PermissionDefault.OP);
+        this.addAdditonalPermission(otherPerm);
+
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        Player player = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+        }
+        // If a persons name was passed in, you must be A. the console, or B have permissions
+        if (args.size() == 1) {
+            if (player != null && !this.plugin.getMVPerms().hasPermission(player, "multiverse.core.spawn.other", true)) {
+                sender.sendMessage("You don't have permission to teleport another player to spawn. (multiverse.core.spawn.other)");
+                return;
+            }
+            Player target = PlayerFinder.get(args.get(0), sender);
+            if (target != null) {
+                target.sendMessage("Teleporting to this world's spawn...");
+                spawnAccurately(target);
+
+                if (player != null) {
+                    target.sendMessage("You were teleported by: " + ChatColor.YELLOW + player.getName());
+                } else {
+                    target.sendMessage("You were teleported by: " + ChatColor.LIGHT_PURPLE + "the console");
+                }
+            } else {
+                sender.sendMessage(args.get(0) + " is not logged on right now!");
+            }
+        } else {
+            if (player != null && !this.plugin.getMVPerms().hasPermission(player, "multiverse.core.spawn.self", true)) {
+                sender.sendMessage("You don't have permission to teleport yourself to spawn. (multiverse.core.spawn.self)");
+                return;
+            }
+            if (player != null) {
+                player.sendMessage("Teleporting to this world's spawn...");
+                spawnAccurately(player);
+            } else {
+                sender.sendMessage("From the console, you must provide a PLAYER.");
+            }
+        }
+    }
+
+    private void spawnAccurately(Player player) {
+        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(player.getWorld().getName());
+        Location spawnLocation;
+        if (world != null) {
+            spawnLocation = world.getSpawnLocation();
+        } else {
+            spawnLocation = player.getWorld().getSpawnLocation();
+        }
+        this.plugin.getSafeTTeleporter().safelyTeleport(player, player, spawnLocation, false);
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java

@@ -1,49 +1,199 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.CommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Flags;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
+import com.onarandombox.MultiverseCore.destination.CustomTeleporterDestination;
+import com.onarandombox.MultiverseCore.destination.DestinationFactory;
+import com.onarandombox.MultiverseCore.destination.InvalidDestination;
+import com.onarandombox.MultiverseCore.destination.WorldDestination;
+import com.onarandombox.MultiverseCore.enums.TeleportResult;
+import com.onarandombox.MultiverseCore.event.MVTeleportEvent;
+import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Used to teleport players.
+ */
+public class TeleportCommand extends MultiverseCommand {
+    private SafeTTeleporter playerTeleporter;
 
-@CommandAlias("mv")
-public class TeleportCommand extends MultiverseCoreCommand {
     public TeleportCommand(MultiverseCore plugin) {
         super(plugin);
+        Permission menu = new Permission("multiverse.teleport.*", "Allows you to display the teleport menu.", PermissionDefault.OP);
+
+        this.setName("Teleport");
+        this.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {DESTINATION}");
+        this.setArgRange(1, 2);
+        this.addKey("mvtp");
+        this.addKey("mv tp");
+        this.playerTeleporter = this.plugin.getSafeTTeleporter();
+        this.setPermission(menu);
     }
 
-    @Subcommand("teleport|tp")
-    @CommandCompletion("@players|@mvworlds:playerOnly|@destinations:playerOnly @mvworlds|@destinations")
-    @Syntax("[player] <destination>")
-    @Description("Allows you to the teleport to a location on your server!")
-    public void onTeleportCommand(BukkitCommandIssuer issuer,
-
-                                  @Flags("resolve=issuerAware")
-                                  @Syntax("[player]")
-                                  @Description("Target player to teleport.")
-                                  Player[] players,
-
-                                  @Syntax("<destination>")
-                                  @Description("Location, can be a world name.")
-                                  ParsedDestination<?> destination
-    ) {
-        // TODO Add warning if teleporting too many players at once.
-        for (Player player : players) {
-            issuer.sendMessage("Teleporting "
-                    + (issuer.getPlayer() == player ? "you" : player.getName())
-                    + " to " + destination + "...");
-            this.plugin.getDestinationsProvider().playerTeleport(issuer, player, destination);
-        }
-    }
+    private static final int UNSAFE_TELEPORT_EXPIRE_DELAY = 15;
 
     @Override
-    public boolean hasPermission(CommandIssuer issuer) {
-        return this.plugin.getDestinationsProvider().hasAnyTeleportPermission(issuer);
+    public void runCommand(CommandSender sender, List<String> args) {
+        CommandSender teleporter = sender;
+        Player teleportee = null;
+
+        String destinationName;
+
+        if (args.size() == 2) {
+            teleportee = PlayerFinder.get(args.get(0), sender);
+            if (teleportee == null) {
+                this.messaging.sendMessage(sender, String.format("Sorry, I couldn't find player: %s%s",
+                        ChatColor.GOLD, args.get(0)), false);
+                return;
+            }
+            destinationName = args.get(1);
+
+        } else {
+            destinationName = args.get(0);
+            if (!(sender instanceof Player)) {
+                this.messaging.sendMessage(sender, String.format("From the console, you must specify a player to teleport"), false);
+                return;
+            }
+            teleportee = (Player) sender;
+        }
+
+        DestinationFactory df = this.plugin.getDestFactory();
+        MVDestination d = df.getPlayerAwareDestination(teleportee, destinationName);
+
+        MVTeleportEvent teleportEvent = new MVTeleportEvent(d, teleportee, teleporter, true);
+        this.plugin.getServer().getPluginManager().callEvent(teleportEvent);
+        if (teleportEvent.isCancelled()) {
+            Logging.fine("Someone else cancelled the MVTeleport Event!!!");
+            return;
+        }
+
+        if (d != null && d instanceof InvalidDestination) {
+            this.messaging.sendMessage(sender, String.format("Multiverse does not know how to take you to %s%s",
+                    ChatColor.RED, destinationName), false);
+            return;
+        }
+
+        if (!this.checkSendPermissions(teleporter, teleportee, d)) {
+            return;
+        }
+
+        if (plugin.getMVConfig().getEnforceAccess() && teleporter != null && !this.plugin.getMVPerms().canEnterDestination(teleporter, d)) {
+            if (teleportee.equals(teleporter)) {
+                teleporter.sendMessage("Doesn't look like you're allowed to go " + ChatColor.RED + "there...");
+            } else {
+                teleporter.sendMessage("Doesn't look like you're allowed to send " + ChatColor.GOLD
+                        + teleportee.getName() + ChatColor.WHITE + " to " + ChatColor.RED + "there...");
+            }
+            return;
+        } else if (teleporter != null && !this.plugin.getMVPerms().canTravelFromLocation(teleporter, d.getLocation(teleportee))) {
+            if (teleportee.equals(teleporter)) {
+                this.messaging.sendMessage(teleporter, String.format("DOH! Doesn't look like you can get to %s%s %sfrom where you are...",
+                        ChatColor.GREEN, d.toString(), ChatColor.WHITE), false);
+            } else {
+                this.messaging.sendMessage(teleporter, String.format("DOH! Doesn't look like %s%s %scan get to %sTHERE from where they are...",
+                        ChatColor.GREEN, ((Player) teleporter).getWorld().getName(), ChatColor.WHITE, ChatColor.RED), false);
+            }
+            return;
+        }
+
+        // Special check to verify if players are tryint to teleport to the same
+        // WORLDDestination as the world they're in, that they ALSO have multiverse.core.spawn.self
+
+        if (d instanceof WorldDestination) {
+            World w = d.getLocation(teleportee).getWorld();
+            if (teleportee.getWorld().equals(w)) {
+                if (teleporter.equals(teleportee)) {
+                    if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.self", true)) {
+                        this.messaging.sendMessages(teleporter, new String[]{
+                                String.format("Sorry you don't have permission to go to the world spawn!"),
+                                String.format("%s  (multiverse.core.spawn.self)",
+                                        ChatColor.RED) }, false);
+                        return;
+                    }
+                } else {
+                    if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.core.spawn.other", true)) {
+                        this.messaging.sendMessages(teleporter, new String[]{
+                                String.format("Sorry you don't have permission to send %s to the world spawn!",
+                                        teleportee.getDisplayName()),
+                                String.format("%s  (multiverse.core.spawn.other)",
+                                        ChatColor.RED) }, false);
+                        return;
+                    }
+                }
+            }
+        }
+
+        if (d.getLocation(teleportee) == null) {
+            this.messaging.sendMessage(teleporter, "Sorry Boss, I tried everything, but just couldn't teleport ya there!", false);
+            return;
+        }
+        Teleporter teleportObject = (d instanceof CustomTeleporterDestination) ?
+                ((CustomTeleporterDestination)d).getTeleporter() : this.playerTeleporter;
+        TeleportResult result = teleportObject.teleport(teleporter, teleportee, d);
+        if (result == TeleportResult.FAIL_UNSAFE) {
+            Logging.fine("Could not teleport " + teleportee.getName()
+                    + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
+
+            String player = "you";
+            if (!teleportee.equals(teleporter)) {
+                player = teleportee.getName();
+            }
+
+            this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
+                    sender,
+                    doUnsafeTeleport(teleporter, teleportee, d.getLocation(teleportee)),
+                    String.format("%sMultiverse %sdid not teleport %s%s %sto %s%s %sbecause it was unsafe. Would you like to try anyway?",
+                            ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE),
+                    UNSAFE_TELEPORT_EXPIRE_DELAY
+            ));
+        }
+        // else: Player was teleported successfully (or the tp event was fired I should say)
+    }
+
+    private Runnable doUnsafeTeleport(CommandSender teleporter, Player player, Location location) {
+        return () -> this.plugin.getSafeTTeleporter().safelyTeleport(teleporter, player, location, false);
+    }
+
+    private boolean checkSendPermissions(CommandSender teleporter, Player teleportee, MVDestination destination) {
+        if (teleporter.equals(teleportee)) {
+            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.self." + destination.getIdentifier(), true)) {
+                this.messaging.sendMessages(teleporter, new String[]{
+                        String.format("%sYou don't have permission to teleport %syourself %sto a %s%s %sDestination",
+                                ChatColor.WHITE, ChatColor.AQUA, ChatColor.WHITE, ChatColor.RED, destination.getType(), ChatColor.WHITE),
+                        String.format("%s   (multiverse.teleport.self.%s)",
+                                ChatColor.RED, destination.getIdentifier()) }, false);
+                return false;
+            }
+        } else {
+            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.other." + destination.getIdentifier(), true)) {
+                this.messaging.sendMessages(teleporter, new String[]{
+                        String.format("You don't have permission to teleport another player to a %s%s Destination.",
+                                ChatColor.GREEN, destination.getType()),
+                        String.format("%s(multiverse.teleport.other.%s)",
+                                ChatColor.RED, destination.getIdentifier()) }, false);
+                return false;
+            }
+        }
+        return true;
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java

@@ -1,40 +1,42 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
 package com.onarandombox.MultiverseCore.commands;
 
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.annotation.CommandAlias;
-import co.aikar.commands.annotation.CommandCompletion;
-import co.aikar.commands.annotation.CommandPermission;
-import co.aikar.commands.annotation.Description;
-import co.aikar.commands.annotation.Subcommand;
-import co.aikar.commands.annotation.Syntax;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorld;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.PermissionDefault;
 
-@CommandAlias("mv")
-public class UnloadCommand extends MultiverseCoreCommand {
-    public UnloadCommand(@NotNull MultiverseCore plugin) {
+import java.util.List;
+
+/**
+ * Unloads worlds from Multiverse.
+ */
+public class UnloadCommand extends MultiverseCommand {
+
+    public UnloadCommand(MultiverseCore plugin) {
         super(plugin);
+        this.setName("Unload World");
+        this.setCommandUsage("/mv unload" + ChatColor.GREEN + " {WORLD}");
+        this.setArgRange(1, 1);
+        this.addKey("mvunload");
+        this.addKey("mv unload");
+        this.setPermission("multiverse.core.unload",
+                "Unloads a world from Multiverse. This does NOT remove the world folder. This does NOT remove it from the config file.", PermissionDefault.OP);
     }
 
-    @Subcommand("unload")
-    @CommandPermission("multiverse.core.unload")
-    @CommandCompletion("@mvworlds")
-    @Syntax("<world>")
-    @Description("Unloads a world from Multiverse. This does NOT remove the world folder. This does NOT remove it from the config file.")
-    public void onUnloadCommand(BukkitCommandIssuer issuer,
-
-                                @Syntax("<world>")
-                                @Description("Name of the world you want to unload.")
-                                MVWorld world
-    ) {
-        issuer.sendMessage(String.format("Unloading world '%s'...", world.getColoredWorldString()));
-
-        //TODO API: Should be able to use MVWorld object directly
-        if (!this.plugin.getMVWorldManager().unloadWorld(world.getName())) {
-            issuer.sendMessage(String.format("Error unloading world '%s'! See console for more details.", world.getColoredWorldString()));
-            return;
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        if (this.plugin.getMVWorldManager().unloadWorld(args.get(0))) {
+            Command.broadcastCommandMessage(sender, "Unloaded world '" + args.get(0) + "'!");
+        } else {
+            sender.sendMessage("Error trying to unload world '" + args.get(0) + "'!");
         }
-        issuer.sendMessage(String.format("Unloaded world '%s'!", world.getColoredWorldString()));
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java

@@ -0,0 +1,225 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.event.MVVersionEvent;
+import com.onarandombox.MultiverseCore.utils.webpaste.PasteFailedException;
+import com.onarandombox.MultiverseCore.utils.webpaste.PasteService;
+import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
+import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
+import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
+import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerFactory;
+import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerType;
+import com.pneumaticraft.commandhandler.CommandHandler;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Dumps version info to the console.
+ */
+public class VersionCommand extends MultiverseCommand {
+    private static final URLShortener SHORTENER = URLShortenerFactory.getService(URLShortenerType.BITLY);
+
+    public VersionCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Multiverse Version");
+        this.setCommandUsage("/mv version " + ChatColor.GOLD + "[-b|-h|-p] [--include-plugin-list]");
+        this.setArgRange(0, 2);
+        this.addKey("mv version");
+        this.addKey("mvver");
+        this.addKey("mvv");
+        this.addKey("mvversion");
+        this.setPermission(
+                "multiverse.core.version",
+                "Dumps version info to the console, optionally to pastebin.com with -b, to hastebin.com using -h, or to paste.gg with -p.",
+                PermissionDefault.OP)
+        ;
+    }
+
+    private String getLegacyString() {
+        return "[Multiverse-Core] Multiverse-Core Version: " + this.plugin.getDescription().getVersion() + '\n'
+                + "[Multiverse-Core] Bukkit Version: " + this.plugin.getServer().getVersion() + '\n'
+                + "[Multiverse-Core] Loaded Worlds: " + this.plugin.getMVWorldManager().getMVWorlds() + '\n'
+                + "[Multiverse-Core] Multiverse Plugins Loaded: " + this.plugin.getPluginCount() + '\n'
+                +"[Multiverse-Core] Economy being used: " + plugin.getEconomist().getEconomyName() + '\n'
+                + "[Multiverse-Core] Permissions Plugin: " + this.plugin.getMVPerms().getType() + '\n'
+                + "[Multiverse-Core] Dumping Config Values: (version " + this.plugin.getMVConfig().getVersion() + ")" + '\n'
+                + "[Multiverse-Core]   enforceaccess: " + plugin.getMVConfig().getEnforceAccess() + '\n'
+                + "[Multiverse-Core]   prefixchat: " + plugin.getMVConfig().getPrefixChat() + '\n'
+                + "[Multiverse-Core]   prefixchatformat: " + plugin.getMVConfig().getPrefixChatFormat() + '\n'
+                + "[Multiverse-Core]   useasyncchat: " + plugin.getMVConfig().getUseAsyncChat() + '\n'
+                + "[Multiverse-Core]   teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + '\n'
+                + "[Multiverse-Core]   firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + '\n'
+                + "[Multiverse-Core]   displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + '\n'
+                + "[Multiverse-Core]   enablebuscript: " + plugin.getMVConfig().getEnableBuscript() + '\n'
+                + "[Multiverse-Core]   globaldebug: " + plugin.getMVConfig().getGlobalDebug() + '\n'
+                + "[Multiverse-Core]   silentstart: " + plugin.getMVConfig().getSilentStart() + '\n'
+                + "[Multiverse-Core]   messagecooldown: " + plugin.getMessaging().getCooldown() + '\n'
+                + "[Multiverse-Core]   version: " + plugin.getMVConfig().getVersion() + '\n'
+                + "[Multiverse-Core]   firstspawnworld: " + plugin.getMVConfig().getFirstSpawnWorld() + '\n'
+                + "[Multiverse-Core]   teleportcooldown: " + plugin.getMVConfig().getTeleportCooldown() + '\n'
+                + "[Multiverse-Core]   defaultportalsearch: " + plugin.getMVConfig().isUsingDefaultPortalSearch() + '\n'
+                + "[Multiverse-Core]   portalsearchradius: " + plugin.getMVConfig().getPortalSearchRadius() + '\n'
+                + "[Multiverse-Core]   autopurge: " + plugin.getMVConfig().isAutoPurgeEnabled() + '\n'
+                + "[Multiverse-Core] Special Code: FRN002" + '\n';
+    }
+
+    private String getMarkdownString() {
+        return "# Multiverse-Core" + '\n'
+                + "## Overview" + '\n'
+                + "| Name | Value |" + '\n'
+                + "| --- | --- |" + '\n'
+                + "| Multiverse-Core Version | `" + this.plugin.getDescription().getVersion() + "` |" + '\n'
+                + "| Bukkit Version | `" + this.plugin.getServer().getVersion() + "` |" + '\n'
+                + "| Loaded Worlds | `" + this.plugin.getMVWorldManager().getMVWorlds() + "` |" + '\n'
+                + "| Multiverse Plugins Loaded | `" + this.plugin.getPluginCount() + "` |" + '\n'
+                + "| Economy being used | `" + plugin.getEconomist().getEconomyName() + "` |" + '\n'
+                + "| Permissions Plugin | `" + this.plugin.getMVPerms().getType() + "` |" + '\n'
+                + "## Parsed Config" + '\n'
+                + "These are what Multiverse thought the in-memory values of the config were." + "\n\n"
+                + "| Config Key  | Value |" + '\n'
+                + "| --- | --- |" + '\n'
+                + "| version | `" + this.plugin.getMVConfig().getVersion() + "` |" + '\n'
+                + "| messagecooldown | `" + plugin.getMessaging().getCooldown() + "` |" + '\n'
+                + "| teleportcooldown | `" + plugin.getMVConfig().getTeleportCooldown() + "` |" + '\n'
+                + "| worldnameprefix | `" + plugin.getMVConfig().getPrefixChat() + "` |" + '\n'
+                + "| worldnameprefixFormat | `" + plugin.getMVConfig().getPrefixChatFormat() + "` |" + '\n'
+                + "| enforceaccess | `" + plugin.getMVConfig().getEnforceAccess() + "` |" + '\n'
+                + "| displaypermerrors | `" + plugin.getMVConfig().getDisplayPermErrors() + "` |" + '\n'
+                + "| teleportintercept | `" + plugin.getMVConfig().getTeleportIntercept() + "` |" + '\n'
+                + "| firstspawnoverride | `" + plugin.getMVConfig().getFirstSpawnOverride() + "` |" + '\n'
+                + "| firstspawnworld | `" + plugin.getMVConfig().getFirstSpawnWorld() + "` |" + '\n'
+                + "| debug | `" + plugin.getMVConfig().getGlobalDebug() + "` |" + '\n';
+    }
+
+    private void addVersionInfoToEvent(MVVersionEvent event) {
+        // add the legacy version info
+        event.appendVersionInfo(this.getLegacyString());
+
+        // add the legacy file, but as markdown so it's readable
+        // TODO Readd this in 5.0.0
+        // event.putDetailedVersionInfo("version.md", this.getMarkdownString());
+
+        // add config.yml
+        File configFile = new File(this.plugin.getDataFolder(), "config.yml");
+        event.putDetailedVersionInfo("multiverse-core/config.yml", configFile);
+
+        // add worlds.yml
+        File worldsFile = new File(this.plugin.getDataFolder(), "worlds.yml");
+        event.putDetailedVersionInfo("multiverse-core/worlds.yml", worldsFile);
+    }
+
+    @Override
+    public void runCommand(final CommandSender sender, final List<String> args) {
+        // Check if the command was sent from a Player.
+        if (sender instanceof Player) {
+            sender.sendMessage("Version info dumped to console. Please check your server logs.");
+        }
+
+        MVVersionEvent versionEvent = new MVVersionEvent();
+
+        this.addVersionInfoToEvent(versionEvent);
+        this.plugin.getServer().getPluginManager().callEvent(versionEvent);
+
+        if (CommandHandler.hasFlag("--include-plugin-list", args)) {
+            versionEvent.appendVersionInfo('\n' + "Plugins: " + getPluginList());
+            versionEvent.putDetailedVersionInfo("plugins.txt", "Plugins: " + getPluginList());
+        }
+
+        final String versionInfo = versionEvent.getVersionInfo();
+        versionEvent.putDetailedVersionInfo("version.txt", versionInfo);
+
+        final Map<String, String> files = versionEvent.getDetailedVersionInfo();
+
+        // log to console
+        String[] lines = versionInfo.split("\\r?\\n");
+        for (String line : lines) {
+            if (!line.isEmpty()) {
+                this.plugin.getServer().getLogger().info(line);
+            }
+        }
+
+        BukkitRunnable logPoster = new BukkitRunnable() {
+            @Override
+            public void run() {
+                if (args.size() > 0) {
+                    String pasteUrl;
+                    if (CommandHandler.hasFlag("-b", args)) {
+                        // private post to pastebin
+                        pasteUrl = postToService(PasteServiceType.PASTEBIN, true, versionInfo, files);
+                    } else if (CommandHandler.hasFlag("-g", args)) {
+                        // private post to github
+                        pasteUrl = postToService(PasteServiceType.GITHUB, true, versionInfo, files);
+                    } else if (CommandHandler.hasFlag("-h", args)) {
+                        // private post to hastebin
+                        pasteUrl = postToService(PasteServiceType.HASTEBIN, true, versionInfo, files);
+                    } else if (CommandHandler.hasFlag("-p", args)) {
+                        // private post to paste.gg
+                        pasteUrl = postToService(PasteServiceType.PASTEGG, true, versionInfo, files);
+                    } else {
+                        return;
+                    }
+
+                    if (!(sender instanceof ConsoleCommandSender)) {
+                        sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteUrl);
+                    }
+                    Logging.info("Version info dumped here: %s", pasteUrl);
+                }
+            }
+        };
+
+        // Run the log posting operation asynchronously, since we don't know how long it will take.
+        logPoster.runTaskAsynchronously(this.plugin);
+    }
+
+    /**
+     * Send the current contents of this.pasteBinBuffer to a web service.
+     *
+     * @param type       Service type to send paste data to.
+     * @param isPrivate  Should the paste be marked as private.
+     * @param pasteData  Legacy string only data to post to a service.
+     * @param pasteFiles Map of filenames/contents of debug info.
+     * @return URL of visible paste
+     */
+    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData, Map<String, String> pasteFiles) {
+        PasteService ps = PasteServiceFactory.getService(type, isPrivate);
+
+        try {
+            String result;
+            if (ps.supportsMultiFile()) {
+                result = ps.postData(pasteFiles);
+            } else {
+                result = ps.postData(pasteData);
+            }
+
+            if (SHORTENER != null) return SHORTENER.shorten(result);
+            return result;
+        } catch (PasteFailedException e) {
+            e.printStackTrace();
+            return "Error posting to service.";
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return "That service isn't supported yet.";
+        }
+    }
+
+    private String getPluginList() {
+        return StringUtils.join(plugin.getServer().getPluginManager().getPlugins(), ", ");
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java

@@ -0,0 +1,118 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.commands;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+/**
+ * States who is in what world.
+ */
+public class WhoCommand extends MultiverseCommand {
+
+    private MVWorldManager worldManager;
+
+    public WhoCommand(MultiverseCore plugin) {
+        super(plugin);
+        this.setName("Who?");
+        this.setCommandUsage("/mv who" + ChatColor.GOLD + " [WORLD|--all]");
+        this.setArgRange(0, 1);
+        this.addKey("mv who");
+        this.addKey("mvw");
+        this.addKey("mvwho");
+        this.addCommandExample("/mv who");
+        this.addCommandExample(String.format("/mv who %s--all", ChatColor.GREEN));
+        this.addCommandExample(String.format("/mv who %smyworld", ChatColor.GOLD));
+        this.setPermission("multiverse.core.list.who", "States who is in what world.", PermissionDefault.OP);
+        this.worldManager = this.plugin.getMVWorldManager();
+    }
+
+    @Override
+    public void runCommand(CommandSender sender, List<String> args) {
+        // If this command was sent from a Player then we need to check Permissions
+        Player p = null;
+        // By default, show all from the console
+        boolean showAll = true;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+            showAll = false;
+        }
+
+        final Collection onlinePlayers = plugin.getServer().getOnlinePlayers();
+        final Collection<Player> visiblePlayers = new HashSet<Player>(onlinePlayers.size());
+        for (final Object player : onlinePlayers) {
+            if (player instanceof Player && (p == null || p.canSee((Player) player))) {
+                visiblePlayers.add((Player) player);
+            }
+        }
+
+        if (args.size()  == 1) {
+            if (args.get(0).equalsIgnoreCase("--all") || args.get(0).equalsIgnoreCase("-a")) {
+                showAll = true;
+            } else {
+                // single world mode
+                MultiverseWorld world = this.worldManager.getMVWorld(args.get(0));
+                if (world == null) {
+                    sender.sendMessage(ChatColor.RED + "That world does not exist.");
+                    return;
+                }
+
+                if (!this.plugin.getMVPerms().canEnterWorld(p, world)) {
+                    sender.sendMessage(ChatColor.RED + "You aren't allowed to access to this world!");
+                    return;
+                }
+
+                sender.sendMessage(String.format("%s--- Players in %s%s ---", ChatColor.AQUA,
+                        world.getColoredWorldString(), ChatColor.AQUA));
+                sender.sendMessage(this.buildPlayerString(world, p, visiblePlayers));
+                return;
+            }
+        }
+
+        // multiworld mode
+        sender.sendMessage(ChatColor.AQUA + "--- Worlds and their players --- "
+                + visiblePlayers.size() + "/" + plugin.getServer().getMaxPlayers());
+        boolean shownOne = false;
+        for (MultiverseWorld world : this.worldManager.getMVWorlds()) {
+            if (this.plugin.getMVPerms().canEnterWorld(p, world)) { // only show world if the player can access it
+                if (showAll || !world.getCBWorld().getPlayers().isEmpty()) { // either show all or show if the world is not empty
+                    sender.sendMessage(String.format("%s%s - %s", world.getColoredWorldString(), ChatColor.WHITE, buildPlayerString(world, p, visiblePlayers)));
+                    shownOne = true;
+                }
+            }
+        }
+        if (!shownOne) {
+            sender.sendMessage("No worlds found.");
+        }
+        return;
+    }
+
+    private static String buildPlayerString(MultiverseWorld world, Player viewer, final Collection<Player> visiblePlayers) {
+        // Retrieve the players in this world
+        List<Player> players = world.getCBWorld().getPlayers();
+        StringBuilder playerBuilder = new StringBuilder();
+        for (Player player : players) {
+            // If the viewer is the console or the viewier is allowed to see the player, show them.
+            // Make sure we're also ONLY showing online players.
+            // Since we already checked visible players, we'll just make sure who we're about to show is in that.
+            if (visiblePlayers.contains(player))
+                playerBuilder.append(player.getDisplayName()).append(", ");
+        }
+        String bString = playerBuilder.toString();
+        return (bString.length() == 0) ? "No players found." : bString.substring(0, bString.length() - 2);
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/commands/package-info.java

@@ -1,4 +1,4 @@
 /**
- * This package contains all the commands for Multiverse-Core.
+ * This package contains all Commands.
  */
 package com.onarandombox.MultiverseCore.commands;

src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandCompletions.java

@@ -1,102 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import co.aikar.commands.BukkitCommandCompletionContext;
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.PaperCommandCompletions;
-import com.google.common.collect.Sets;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorld;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.destination.ParsedDestination;
-import org.bukkit.GameRule;
-import org.jetbrains.annotations.NotNull;
-
-public class MVCommandCompletions extends PaperCommandCompletions {
-    protected final MVCommandManager commandManager;
-    private final MultiverseCore plugin;
-    private final MVWorldManager worldManager;
-
-    public MVCommandCompletions(MVCommandManager mvCommandManager, MultiverseCore plugin) {
-        super(mvCommandManager);
-        this.commandManager = mvCommandManager;
-        this.plugin = plugin;
-        this.worldManager = plugin.getMVWorldManager();
-
-        registerAsyncCompletion("destinations", this::suggestDestinations);
-        registerAsyncCompletion("flags", this::suggestFlags);
-        registerStaticCompletion("gamerules", this::suggestGamerules);
-        registerAsyncCompletion("mvworlds", this::suggestMVWorlds);
-
-        setDefaultCompletion("destinations", ParsedDestination.class);
-        setDefaultCompletion("flags", String[].class);
-        setDefaultCompletion("gamerules", GameRule.class);
-        setDefaultCompletion("mvworlds", MVWorld.class);
-    }
-
-    private Collection<String> suggestDestinations(BukkitCommandCompletionContext context) {
-        if (context.hasConfig("playerOnly") && !context.getIssuer().isPlayer()) {
-            return Collections.emptyList();
-        }
-
-        return this.plugin.getDestinationsProvider()
-                .suggestDestinations((BukkitCommandIssuer)context.getIssuer(), context.getInput());
-    }
-
-    private Collection<String> suggestFlags(@NotNull BukkitCommandCompletionContext context) {
-        return this.commandManager.getFlagsManager().suggest(
-                context.getConfig("groupName", ""), context.getContextValue(String[].class));
-    }
-
-    private Collection<String> suggestGamerules() {
-        return Arrays.stream(GameRule.values()).map(GameRule::getName).collect(Collectors.toList());
-    }
-
-    private Collection<String> suggestMVWorlds(BukkitCommandCompletionContext context) {
-        if (context.hasConfig("playerOnly") && !context.getIssuer().isPlayer()) {
-            return Collections.emptyList();
-        }
-
-        if (!context.hasConfig("multiple")) {
-            return getMVWorldNames(context);
-        }
-
-        String input = context.getInput();
-        int lastComma = input.lastIndexOf(',');
-        String currentWorldsString = input.substring(0, lastComma + 1);
-        Set<String> currentWorlds = Sets.newHashSet(input.split(","));
-        return getMVWorldNames(context).stream()
-                .filter(world -> !currentWorlds.contains(world))
-                .map(world -> currentWorldsString + world)
-                .collect(Collectors.toList());
-    }
-
-    private List<String> getMVWorldNames(BukkitCommandCompletionContext context) {
-        String scope = context.getConfig("scope", "loaded");
-        List<String> worlds = new ArrayList<>();
-        switch (scope) {
-            case "both":
-                worlds.addAll(worldManager.getUnloadedWorlds());
-            case "loaded":
-                worldManager.getMVWorlds()
-                        .stream()
-                        .map(MVWorld::getName)
-                        .forEach(worlds::add);
-                break;
-            case "unloaded":
-                worlds.addAll(worldManager.getUnloadedWorlds());
-                break;
-            case "potential":
-                worlds.addAll(worldManager.getPotentialWorlds());
-                break;
-        }
-        return worlds;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandConditions.java

@@ -1,75 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools;
-
-import co.aikar.commands.BukkitCommandExecutionContext;
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.BukkitConditionContext;
-import co.aikar.commands.CommandConditions;
-import co.aikar.commands.ConditionContext;
-import co.aikar.commands.ConditionFailedException;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.world.WorldNameChecker;
-
-public class MVCommandConditions {
-    static void load(MVCommandManager commandManager, MultiverseCore plugin) {
-        new MVCommandConditions(commandManager, plugin);
-    }
-
-    private final MVCommandManager commandManager;
-    private final MultiverseCore plugin;
-
-    public MVCommandConditions(MVCommandManager commandManager, MultiverseCore plugin) {
-        this.commandManager = commandManager;
-        this.plugin = plugin;
-
-        CommandConditions<BukkitCommandIssuer, BukkitCommandExecutionContext, BukkitConditionContext> conditions
-                = commandManager.getCommandConditions();
-
-        conditions.addCondition(String.class, "validWorldName", this::checkValidWorldName);
-    }
-
-    private void checkValidWorldName(ConditionContext<BukkitCommandIssuer> context,
-                                     BukkitCommandExecutionContext executionContext,
-                                     String worldName
-    ) {
-        String scope = context.getConfigValue("scope", "loaded");
-
-        switch (scope) {
-            // Worlds that are loaded
-            case "loaded":
-                if (!this.plugin.getMVWorldManager().isMVWorld(worldName)) {
-                    throw new ConditionFailedException("World with name '" + worldName + "' does not exist or is not loaded!");
-                }
-                break;
-            // Worlds that are unloaded
-            case "unloaded":
-                if (!this.plugin.getMVWorldManager().hasUnloadedWorld(worldName, false)) {
-                    if (this.plugin.getMVWorldManager().isMVWorld(worldName)) {
-                        throw new ConditionFailedException("World with name '" + worldName + "' is loaded already!");
-                    }
-                    throw new ConditionFailedException("World with name '" + worldName + "' does not exist!");
-                }
-                break;
-            // World that are loaded or unloaded
-            case "both":
-                if (!this.plugin.getMVWorldManager().hasUnloadedWorld(worldName, true)) {
-                    throw new ConditionFailedException("World with name '" + worldName + "' does not exist!");
-                }
-                break;
-            // World that are does not exist
-            case "new":
-                if (this.plugin.getMVWorldManager().hasUnloadedWorld(worldName, true)) {
-                    throw new ConditionFailedException("World with name '" + worldName + "' already exists!");
-                }
-                switch (WorldNameChecker.checkName(worldName)) {
-                    case INVALID_CHARS:
-                        throw new ConditionFailedException("World name '" + worldName + "' contains invalid characters!");
-                    case BLACKLISTED:
-                        throw new ConditionFailedException("World name '" + worldName + "' is used for critical server operations and is blacklisted!");
-                }
-                break;
-            // Probably a typo happened here
-            default:
-                throw new ConditionFailedException("Unknown scope '" + scope + "'!");
-        }
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandContexts.java

@@ -1,291 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import co.aikar.commands.BukkitCommandExecutionContext;
-import co.aikar.commands.BukkitCommandIssuer;
-import co.aikar.commands.InvalidCommandArgument;
-import co.aikar.commands.PaperCommandContexts;
-import co.aikar.commands.contexts.ContextResolver;
-import com.google.common.base.Strings;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorld;
-import com.onarandombox.MultiverseCore.commandtools.context.GameRuleValue;
-import com.onarandombox.MultiverseCore.destination.ParsedDestination;
-import com.onarandombox.MultiverseCore.display.filters.ContentFilter;
-import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter;
-import com.onarandombox.MultiverseCore.display.filters.RegexContentFilter;
-import com.onarandombox.MultiverseCore.utils.PlayerFinder;
-import org.bukkit.GameRule;
-import org.bukkit.entity.Player;
-
-public class MVCommandContexts extends PaperCommandContexts {
-    private final MultiverseCore plugin;
-
-    public MVCommandContexts(MVCommandManager mvCommandManager, MultiverseCore plugin) {
-        super(mvCommandManager);
-        this.plugin = plugin;
-
-        registerIssuerOnlyContext(BukkitCommandIssuer.class, BukkitCommandExecutionContext::getIssuer);
-        registerOptionalContext(ContentFilter.class, this::parseContentFilter);
-        registerContext(ParsedDestination.class, this::parseDestination);
-        registerContext(GameRule.class, this::parseGameRule);
-        registerContext(GameRuleValue.class, this::parseGameRuleValue);
-        registerIssuerAwareContext(MVWorld.class, this::parseMVWorld);
-        registerIssuerAwareContext(MVWorld[].class, this::parseMVWorldArray);
-        registerIssuerAwareContext(Player.class, this::parsePlayer);
-        registerIssuerAwareContext(Player[].class, this::parsePlayerArray);
-    }
-
-    private ContentFilter parseContentFilter(BukkitCommandExecutionContext context) {
-        if (Strings.isNullOrEmpty(context.getFirstArg())) {
-            return DefaultContentFilter.get();
-        }
-        String filterString = context.popFirstArg();
-        return RegexContentFilter.fromString(filterString);
-    }
-
-    private ParsedDestination<?> parseDestination(BukkitCommandExecutionContext context) {
-        String destination = context.popFirstArg();
-        if (Strings.isNullOrEmpty(destination)) {
-            throw new InvalidCommandArgument("No destination specified.");
-        }
-
-        ParsedDestination<?> parsedDestination = plugin.getDestinationsProvider().parseDestination(destination);
-        if (parsedDestination == null) {
-            throw new InvalidCommandArgument("The destination " + destination + " is not valid.");
-        }
-
-        return parsedDestination;
-    }
-
-    private GameRule<?> parseGameRule(BukkitCommandExecutionContext context) {
-        String gameRuleName = context.popFirstArg();
-        if (Strings.isNullOrEmpty(gameRuleName)) {
-            throw new InvalidCommandArgument("No game rule specified.");
-        }
-
-        GameRule<?> gameRule = GameRule.getByName(gameRuleName);
-        if (gameRule == null) {
-            throw new InvalidCommandArgument("The game rule " + gameRuleName + " is not valid.");
-        }
-
-        return gameRule;
-    }
-
-    private GameRuleValue parseGameRuleValue(BukkitCommandExecutionContext context) {
-        GameRule<?> gameRule = (GameRule<?>) context.getResolvedArg(GameRule.class);
-        if (gameRule == null) {
-            throw new InvalidCommandArgument("No game rule specified.");
-        }
-        String valueString = context.getFirstArg();
-        if (Strings.isNullOrEmpty(valueString)) {
-            throw new InvalidCommandArgument("No game rule value specified.");
-        }
-
-        ContextResolver<?, BukkitCommandExecutionContext> resolver = getResolver(gameRule.getType());
-        if (resolver == null) {
-            return new GameRuleValue(valueString);
-        }
-
-        Object resolvedValue = resolver.getContext(context);
-        if (resolvedValue == null) {
-            throw new InvalidCommandArgument("The game rule value " + valueString + " is not valid for game rule " + gameRule.getName() + ".");
-        }
-
-        return new GameRuleValue(resolvedValue);
-    }
-
-    private MVWorld parseMVWorld(BukkitCommandExecutionContext context) {
-        String resolve = context.getFlagValue("resolve", "");
-
-        // Get world based on sender only
-        if (resolve.equals("issuerOnly")) {
-            if (context.getIssuer().isPlayer()) {
-                return plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
-            }
-            if (context.isOptional()) {
-                return null;
-            }
-            throw new InvalidCommandArgument("This command can only be used by a player in a Multiverse World.");
-        }
-
-        String worldName = context.getFirstArg();
-        MVWorld world = plugin.getMVWorldManager().getMVWorld(worldName);
-
-        // Get world based on input, fallback to sender if input is not a world
-        if (resolve.equals("issuerAware")) {
-            if (world != null) {
-                context.popFirstArg();
-                return world;
-            }
-            if (context.getIssuer().isPlayer()) {
-                return plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
-            }
-            if (context.isOptional()) {
-                return null;
-            }
-            throw new InvalidCommandArgument("Player is not in a Multiverse World.");
-        }
-
-        // Get world based on input only
-        if (world != null) {
-            context.popFirstArg();
-            return world;
-        }
-        if (!context.isOptional()) {
-            return null;
-        }
-        throw new InvalidCommandArgument("World " + worldName + " is not a loaded multiverse world.");
-    }
-
-    private MVWorld[] parseMVWorldArray(BukkitCommandExecutionContext context) {
-        String resolve = context.getFlagValue("resolve", "");
-
-        MVWorld playerWorld = null;
-        if (context.getIssuer().isPlayer()) {
-            playerWorld = plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
-        }
-
-        // Get world based on sender only
-        if (resolve.equals("issuerOnly")) {
-            if (playerWorld != null) {
-                return new MVWorld[]{playerWorld};
-            }
-            if (context.isOptional()) {
-                return null;
-            }
-            throw new InvalidCommandArgument("This command can only be used by a player in a Multiverse World.");
-        }
-
-        String worldStrings = context.getFirstArg();
-        String[] worldNames = worldStrings.split(",");
-        Set<MVWorld> worlds = new HashSet<>(worldNames.length);
-        for (String worldName : worldNames) {
-            if ("*".equals(worldName)) {
-                worlds.addAll(plugin.getMVWorldManager().getMVWorlds());
-                break;
-            }
-            MVWorld world = plugin.getMVWorldManager().getMVWorld(worldName);
-            if (world == null) {
-                throw new InvalidCommandArgument("World " + worldName + " is not a loaded multiverse world.");
-            }
-            worlds.add(world);
-        }
-
-        // Get world based on input, fallback to sender if input is not a world
-        if (resolve.equals("issuerAware")) {
-            if (!worlds.isEmpty()) {
-                context.popFirstArg();
-                return worlds.toArray(new MVWorld[0]);
-            }
-            if (playerWorld != null) {
-                return new MVWorld[]{playerWorld};
-            }
-            if (context.isOptional()) {
-                return null;
-            }
-            throw new InvalidCommandArgument("Player is not in a Multiverse World.");
-        }
-
-        // Get world based on input only
-        if (!worlds.isEmpty()) {
-            context.popFirstArg();
-            return worlds.toArray(new MVWorld[0]);
-        }
-        if (!context.isOptional()) {
-            return null;
-        }
-        throw new InvalidCommandArgument("World " + worldStrings + " is not a loaded multiverse world.");
-    }
-
-    private Player parsePlayer(BukkitCommandExecutionContext context) {
-        String resolve = context.getFlagValue("resolve", "");
-
-        // Get player based on sender only
-        if (resolve.equals("issuerOnly")) {
-            if (context.getIssuer().isPlayer()) {
-                return context.getIssuer().getPlayer();
-            }
-            if (context.isOptional()) {
-                return null;
-            }
-            throw new InvalidCommandArgument("This command can only be used by a player.");
-        }
-
-        String playerIdentifier = context.getFirstArg();
-        Player player = PlayerFinder.get(playerIdentifier, context.getSender());
-
-        // Get player based on input, fallback to sender if input is not a player
-        if (resolve.equals("issuerAware")) {
-            if (player != null) {
-                context.popFirstArg();
-                return player;
-            }
-            if (context.getIssuer().isPlayer()) {
-                return context.getIssuer().getPlayer();
-            }
-            if (context.isOptional()) {
-                return null;
-            }
-            throw new InvalidCommandArgument("Invalid player: " + playerIdentifier
-                    + ". Either specify an online player or use this command as a player.");
-        }
-
-        // Get player based on input only
-        if (player != null) {
-            context.popFirstArg();
-            return player;
-        }
-        if (!context.isOptional()) {
-            return null;
-        }
-        throw new InvalidCommandArgument("Player " + playerIdentifier + " not found.");
-    }
-
-
-    private Player[] parsePlayerArray(BukkitCommandExecutionContext context) {
-        String resolve = context.getFlagValue("resolve", "");
-
-        // Get player based on sender only
-        if (resolve.equals("issuerOnly")) {
-            if (context.getIssuer().isPlayer()) {
-                return new Player[]{context.getIssuer().getPlayer()};
-            }
-            if (context.isOptional()) {
-                return null;
-            }
-            throw new InvalidCommandArgument("This command can only be used by a player.");
-        }
-
-        String playerIdentifier = context.getFirstArg();
-        Player[] players = PlayerFinder.getMulti(playerIdentifier, context.getSender()).toArray(new Player[0]);
-
-        // Get player based on input, fallback to sender if input is not a player
-        if (resolve.equals("issuerAware")) {
-            if (players.length > 0) {
-                context.popFirstArg();
-                return players;
-            }
-            if (context.getIssuer().isPlayer()) {
-                return new Player[]{context.getIssuer().getPlayer()};
-            }
-            if (context.isOptional()) {
-                return null;
-            }
-            throw new InvalidCommandArgument("Invalid player: " + playerIdentifier
-                    + ". Either specify an online player or use this command as a player.");
-        }
-
-        // Get player based on input only
-        if (players.length > 0) {
-            context.popFirstArg();
-            return players;
-        }
-        if (!context.isOptional()) {
-            return null;
-        }
-        throw new InvalidCommandArgument("Player " + playerIdentifier + " not found.");
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/MVCommandManager.java

@@ -1,86 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools;
-
-import java.util.Locale;
-
-import co.aikar.commands.BukkitCommandCompletionContext;
-import co.aikar.commands.BukkitCommandExecutionContext;
-import co.aikar.commands.CommandCompletions;
-import co.aikar.commands.CommandContexts;
-import co.aikar.commands.PaperCommandManager;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagsManager;
-import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Main class to manage permissions.
- */
-public class MVCommandManager extends PaperCommandManager {
-
-    private final MultiverseCore plugin;
-    private CommandFlagsManager flagsManager;
-    private CommandQueueManager commandQueueManager;
-
-    public MVCommandManager(@NotNull MultiverseCore plugin) {
-        super(plugin);
-        this.plugin = plugin;
-
-        // Setup conditions
-        MVCommandConditions.load(this, plugin);
-
-        // Setup locale
-        this.addSupportedLanguage(Locale.ENGLISH);
-        this.locales.addMessageBundles("multiverse-core");
-        this.locales.loadLanguages();
-    }
-
-    /**
-     * Gets class responsible for flag handling.
-     *
-     * @return A not-null {@link CommandFlagsManager}.
-     */
-    public synchronized @NotNull CommandFlagsManager getFlagsManager() {
-        if (this.flagsManager == null) {
-            this.flagsManager = new CommandFlagsManager();
-        }
-        return flagsManager;
-    }
-
-    /**
-     * Manager for command that requires /mv confirm before execution.
-     *
-     * @return A non-null {@link CommandQueueManager}.
-     */
-    public synchronized @NotNull CommandQueueManager getCommandQueueManager() {
-        if (this.commandQueueManager == null) {
-            this.commandQueueManager = new CommandQueueManager(this.plugin);
-        }
-        return commandQueueManager;
-    }
-
-    /**
-     * Gets class responsible for parsing string args into objects.
-     *
-     * @return A not-null {@link CommandContexts}.
-     */
-    @Override
-    public synchronized @NotNull CommandContexts<BukkitCommandExecutionContext> getCommandContexts() {
-        if (this.contexts == null) {
-            this.contexts = new MVCommandContexts(this, plugin);
-        }
-        return this.contexts;
-    }
-
-    /**
-     * Gets class responsible for tab-completion handling.
-     *
-     * @return A not-null {@link CommandCompletions}.
-     */
-    @Override
-    public synchronized @NotNull CommandCompletions<BukkitCommandCompletionContext> getCommandCompletions() {
-        if (this.completions == null) {
-            this.completions = new MVCommandCompletions(this, plugin);
-        }
-        return this.completions;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/MultiverseCommand.java

@@ -1,29 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools;
-
-import co.aikar.commands.BaseCommand;
-import com.onarandombox.MultiverseCore.api.MVPlugin;
-import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
-import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagsManager;
-import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
-import org.jetbrains.annotations.NotNull;
-
-public abstract class MultiverseCommand extends BaseCommand {
-    protected final CommandFlagsManager flagsManager;
-    private String flagGroupName;
-
-    protected MultiverseCommand(@NotNull MVPlugin plugin) {
-        this.flagsManager = plugin.getCore().getMVCommandManager().getFlagsManager();
-    }
-
-    protected void registerFlagGroup(@NotNull CommandFlagGroup flagGroup) {
-        if (flagGroupName != null) {
-            throw new IllegalStateException("Flag group already registered! (name: " + flagGroupName + ")");
-        }
-        flagsManager.registerFlagGroup(flagGroup);
-        flagGroupName = flagGroup.getName();
-    }
-
-    protected @NotNull ParsedCommandFlags parseFlags(@NotNull String[] flags) {
-        return flagsManager.parse(flagGroupName, flags);
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/context/GameRuleValue.java

@@ -1,13 +0,0 @@
-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;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlag.java

@@ -1,93 +0,0 @@
-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);
-        }
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagGroup.java

@@ -1,129 +0,0 @@
-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);
-        }
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsManager.java

@@ -1,93 +0,0 @@
-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();
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandFlagsParser.java

@@ -1,118 +0,0 @@
-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;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/CommandValueFlag.java

@@ -1,172 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flags;
-
-import java.util.Collection;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Represents a flag with a value.
- *
- * @param <T> The type of the value.
- */
-public class CommandValueFlag<T> extends CommandFlag {
-    /**
-     * A builder for a flag.
-     *
-     * @param key  The key for the new flag.
-     * @param type The type of the value.
-     * @return The builder.
-     */
-    public static @NotNull <T> Builder<T, ?> builder(@NotNull String key, @NotNull Class<T> type) {
-        return new Builder<>(key, type);
-    }
-
-    private final Class<T> type;
-    private final boolean optional;
-    private final T defaultValue;
-    private final Function<String, T> context;
-    private final Supplier<Collection<String>> completion;
-
-    /**
-     * Creates a new flag.
-     *
-     * @param builder The builder.
-     */
-    protected CommandValueFlag(@NotNull Builder<T, ?> builder) {
-        super(builder);
-        type = builder.type;
-        optional = builder.optional;
-        defaultValue = builder.defaultValue;
-        context = builder.context;
-        completion = builder.completion;
-    }
-
-    /**
-     * Get the type of the value.
-     *
-     * @return The type of the value.
-     */
-    public @NotNull Class<T> getType() {
-        return type;
-    }
-
-    /**
-     * Check if it is optional for users to specify a value.
-     *
-     * @return True if the value is optional, false otherwise.
-     */
-    public boolean isOptional() {
-        return optional;
-    }
-
-    /**
-     * Get the default value. May be null.
-     *
-     * @return The default value.
-     */
-    public @Nullable T getDefaultValue() {
-        return defaultValue;
-    }
-
-    /**
-     * Get the context. May be null for {@link String} value type.
-     *
-     * @return The context.
-     */
-    public @Nullable Function<String, T> getContext() {
-        return context;
-    }
-
-    /**
-     * Get the completion. May be null.
-     *
-     * @return The completion.
-     */
-    public @Nullable Supplier<Collection<String>> getCompletion() {
-        return completion;
-    }
-
-    /**
-     * A builder for a flag.
-     *
-     * @param <T> The type of the value.
-     * @param <S> The type of the builder.
-     */
-    public static class Builder<T, S extends Builder<T, S>> extends CommandFlag.Builder<S> {
-        private final Class<T> type;
-        private boolean optional = false;
-        private T defaultValue = null;
-        private Function<String, T> context = null;
-        private Supplier<Collection<String>> completion = null;
-
-        /**
-         * Create a new builder.
-         *
-         * @param key  The key for the new flag.
-         * @param type The type of the value.
-         */
-        public Builder(@NotNull String key, @NotNull Class<T> type) {
-            super(key);
-            this.type = type;
-        }
-
-        /**
-         * Set the flag as optional for users to specify a value.
-         *
-         * @return The builder.
-         */
-        public @NotNull S optional() {
-            this.optional = true;
-            return (S) this;
-        }
-
-        /**
-         * Set the default value. Used if optional is true and user does not specify a value.
-         *
-         * @param defaultValue The default value.
-         * @return The builder.
-         */
-        public @NotNull S defaultValue(@NotNull T defaultValue) {
-            this.defaultValue = defaultValue;
-            return (S) this;
-        }
-
-        /**
-         * Set the context callback for parsing string into value type.
-         *
-         * @param context The context.
-         * @return The builder.
-         */
-        public @NotNull S context(@NotNull Function<String, T> context) {
-            this.context = context;
-            return (S) this;
-        }
-
-        /**
-         * Set the completion callback for autocomplete.
-         *
-         * @param completion The completion.
-         * @return The builder.
-         */
-        public @NotNull S completion(@NotNull Supplier<Collection<String>> completion) {
-            this.completion = completion;
-            return (S) this;
-        }
-
-        /**
-         * Build the flag.
-         *
-         * @return The flag.
-         */
-        @Override
-        public @NotNull CommandFlag build() {
-            if (context == null && !String.class.equals(type)) {
-                throw new IllegalStateException("Context is required for none-string value flags");
-            }
-            return new CommandValueFlag<>(this);
-        }
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/ParsedCommandFlags.java

@@ -1,61 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.flags;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Object to contain the results of the flags present and its values.
- */
-public class ParsedCommandFlags
-{
-    public static final ParsedCommandFlags EMPTY = new ParsedCommandFlags();
-
-    private final Map<String, Object> flagValues;
-
-    public ParsedCommandFlags() {
-        flagValues = new HashMap<>();
-    }
-
-    /**
-     * Add a flag result to the parsed flags.
-     *
-     * @param key   The key of the flag.
-     * @param value The value of the flag.
-     */
-    void addFlagResult(@NotNull String key, @Nullable Object value) {
-        flagValues.put(key, value);
-    }
-
-    /**
-     * Check if a flag is present.
-     *
-     * @param key The key of the flag.
-     * @return True if the flag is present, false otherwise.
-     */
-    public boolean hasFlag(@Nullable String key) {
-        return this.flagValues.containsKey(key);
-    }
-
-    public boolean hasFlagValue(@Nullable String key) {
-        return flagValue(key, Object.class) != null;
-    }
-
-    /**
-     * Get the value of a flag.
-     *
-     * @param key The key of the flag.
-     * @return The value of the flag, null if flag does not exist or no value.
-     */
-    public @Nullable <T> T flagValue(@Nullable String key, @NotNull Class<T> type) {
-        Object value = this.flagValues.get(key);
-        return (T) value;
-    }
-
-    public @NotNull <T> T flagValue(@Nullable String key, @NotNull T defaultValue, @NotNull Class<T> type) {
-        T value = flagValue(key, type);
-        return value != null ? value : defaultValue;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/commandtools/flags/package-info.java

@@ -1,5 +0,0 @@
-/**
- * This package contains all the flags parsing classes.
- *
- */
-package com.onarandombox.MultiverseCore.commandtools.flags;

src/main/java/com/onarandombox/MultiverseCore/commandtools/package-info.java

@@ -1,4 +0,0 @@
-/**
- * This package contains the classes that manages command handling.
- */
-package com.onarandombox.MultiverseCore.commandtools;

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/CommandQueueManager.java

@@ -7,9 +7,6 @@
 
 package com.onarandombox.MultiverseCore.commandtools.queue;
 
-import java.util.Map;
-import java.util.WeakHashMap;
-
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Bukkit;
@@ -20,6 +17,9 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Map;
+import java.util.WeakHashMap;
+
 /**
  * <p>Manages the queuing of dangerous commands that require {@code /mv confirm} before executing.</p>
  *
@@ -50,7 +50,7 @@ public class CommandQueueManager {
         // Since only one command is stored in queue per sender, we remove the old one.
         this.removeFromQueue(targetSender);
 
-        Logging.finer("Add new command to queue for sender %s.", targetSender.getName());
+        Logging.finer("Add new command to queue for sender %s.", targetSender);
         this.queuedCommandMap.put(targetSender, queuedCommand);
         queuedCommand.setExpireTask(runExpireLater(queuedCommand));
 
@@ -140,7 +140,7 @@ public class CommandQueueManager {
      */
     @NotNull
     private CommandSender parseSender(@NotNull CommandSender sender) {
-        Logging.finer("Sender is of class %s.", sender.getClass().getName());
+        Logging.fine(sender.getClass().getName());
         if (isCommandBlock(sender)) {
             Logging.finer("Is command block.");
             return COMMAND_BLOCK;

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/DummyCommandBlockSender.java

@@ -11,7 +11,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Set;
-import java.util.UUID;
 
 /**
  * Used by {@link CommandQueueManager}, so different commands block can be recognised as one.
@@ -28,16 +27,6 @@ class DummyCommandBlockSender implements CommandSender {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void sendMessage(@Nullable UUID uuid, @NotNull String s) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendMessage(@Nullable UUID uuid, @NotNull String[] strings) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public @NotNull Server getServer() {
         return Bukkit.getServer();
@@ -48,12 +37,6 @@ class DummyCommandBlockSender implements CommandSender {
         return "DummyCommandBlockSender";
     }
 
-    @NotNull
-    @Override
-    public Spigot spigot() {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public boolean isPermissionSet(@NotNull String name) {
         throw new UnsupportedOperationException();

src/main/java/com/onarandombox/MultiverseCore/commandtools/queue/QueuedCommand.java

@@ -7,7 +7,6 @@
 
 package com.onarandombox.MultiverseCore.commandtools.queue;
 
-import co.aikar.commands.BukkitCommandIssuer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.NotNull;
@@ -27,18 +26,6 @@ public class QueuedCommand {
     private final int validDuration;
     private BukkitTask expireTask;
 
-    public QueuedCommand(BukkitCommandIssuer issuer, Runnable action) {
-        this(issuer.getIssuer(), action, DEFAULT_PROMPT_MESSAGE, DEFAULT_VALID_TIME);
-    }
-
-    public QueuedCommand(BukkitCommandIssuer issuer, Runnable action, String prompt) {
-        this(issuer.getIssuer(), action, prompt, DEFAULT_VALID_TIME);
-    }
-
-    public QueuedCommand(BukkitCommandIssuer issuer, Runnable action, int validDuration) {
-        this(issuer.getIssuer(), action, DEFAULT_PROMPT_MESSAGE, validDuration);
-    }
-
     public QueuedCommand(CommandSender sender, Runnable action) {
         this(sender, action, DEFAULT_PROMPT_MESSAGE, DEFAULT_VALID_TIME);
     }

src/main/java/com/onarandombox/MultiverseCore/configuration/EntryFee.java

@@ -1,4 +1,4 @@
-package com.onarandombox.MultiverseCore.world.configuration;
+package com.onarandombox.MultiverseCore.configuration;
 
 import java.util.Map;
 

src/main/java/com/onarandombox/MultiverseCore/configuration/SpawnLocation.java

@@ -1,4 +1,4 @@
-package com.onarandombox.MultiverseCore.world.configuration;
+package com.onarandombox.MultiverseCore.configuration;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
@@ -95,18 +95,4 @@ public class SpawnLocation extends Location implements ConfigurationSerializable
         float yaw = ((Number) args.get("yaw")).floatValue();
         return new SpawnLocation(x, y, z, yaw, pitch);
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String toString() {
-        return "Location{world=" + getWorld()
-                + ",x=" + this.getX()
-                + ",y=" + this.getY()
-                + ",z=" + this.getZ()
-                + ",pitch=" + this.getPitch()
-                + ",yaw=" + this.getYaw()
-                + '}';
-    }
 }

src/main/java/com/onarandombox/MultiverseCore/configuration/SpawnSettings.java

@@ -1,4 +1,4 @@
-package com.onarandombox.MultiverseCore.world.configuration;
+package com.onarandombox.MultiverseCore.configuration;
 
 import java.util.Map;
 

src/main/java/com/onarandombox/MultiverseCore/configuration/SubSpawnSettings.java

@@ -1,4 +1,4 @@
-package com.onarandombox.MultiverseCore.world.configuration;
+package com.onarandombox.MultiverseCore.configuration;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/onarandombox/MultiverseCore/configuration/WorldPropertyValidator.java

@@ -1,8 +1,8 @@
-package com.onarandombox.MultiverseCore.world.configuration;
+package com.onarandombox.MultiverseCore.configuration;
 
 import org.bukkit.Bukkit;
 
-import com.onarandombox.MultiverseCore.world.SimpleMVWorld;
+import com.onarandombox.MultiverseCore.MVWorld;
 import com.onarandombox.MultiverseCore.event.MVWorldPropertyChangeEvent;
 
 import me.main__.util.SerializationConfig.ChangeDeniedException;
@@ -12,12 +12,12 @@ import me.main__.util.SerializationConfig.ObjectUsingValidator;
  * Validates world-property-changes.
  * @param <T> The type of the property that should be validated.
  */
-public class WorldPropertyValidator<T> extends ObjectUsingValidator<T, SimpleMVWorld> {
+public class WorldPropertyValidator<T> extends ObjectUsingValidator<T, MVWorld> {
     /**
      * {@inheritDoc}
      */
     @Override
-    public T validateChange(String property, T newValue, T oldValue, SimpleMVWorld object) throws ChangeDeniedException {
+    public T validateChange(String property, T newValue, T oldValue, MVWorld object) throws ChangeDeniedException {
         MVWorldPropertyChangeEvent<T> event = new MVWorldPropertyChangeEvent<T>(object, null, property, newValue);
         Bukkit.getPluginManager().callEvent(event);
         if (event.isCancelled())

src/main/java/com/onarandombox/MultiverseCore/configuration/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * This package contains the Multiverse-configuration.
+ */
+package com.onarandombox.MultiverseCore.configuration;

src/main/java/com/onarandombox/MultiverseCore/destination/AnchorDestination.java

@@ -0,0 +1,148 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.destination;
+
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVDestination;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.util.Vector;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * An anchor-{@link MVDestination}.
+ */
+public class AnchorDestination implements MVDestination {
+    private boolean isValid;
+    private Location location;
+    private MultiverseCore plugin;
+    private String name;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getIdentifier() {
+        return "a";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Vector getVelocity() {
+        return new Vector(0, 0, 0);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isThisType(JavaPlugin plugin, String destination) {
+        if (!(plugin instanceof MultiverseCore)) {
+            return false;
+        }
+        this.plugin = (MultiverseCore) plugin;
+        List<String> parsed = Arrays.asList(destination.split(":"));
+        // Need at least: a:name
+        if (!(parsed.size() == 2)) {
+            return false;
+        }
+        // If it's not an Anchor type
+        return parsed.get(0).equalsIgnoreCase("a");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Location getLocation(Entity e) {
+        return this.location;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isValid() {
+        return this.isValid;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDestination(JavaPlugin plugin, String destination) {
+        if (!(plugin instanceof MultiverseCore)) {
+            return;
+        }
+        this.plugin = (MultiverseCore) plugin;
+        List<String> parsed = Arrays.asList(destination.split(":"));
+        // Need at least: e:world:x,y,z
+        // OR e:world:x,y,z:pitch:yaw
+        // so basically 3 or 5
+        if (!(parsed.size() == 2)) {
+            this.isValid = false;
+            return;
+        }
+        this.name = parsed.get(1);
+        this.location = this.plugin.getAnchorManager().getAnchorLocation(parsed.get(1));
+        if (this.location == null) {
+            this.isValid = false;
+            return;
+        }
+        if (!parsed.get(0).equalsIgnoreCase(this.getIdentifier())) {
+            this.isValid = false;
+        }
+        this.isValid = true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getType() {
+        return "Anchor";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getName() {
+        return "Anchor: " + this.name;
+    }
+
+    @Override
+    public String toString() {
+        if (isValid) {
+            return "a:" + this.name;
+        }
+        return "i:Invalid Destination";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getRequiredPermission() {
+        return "multiverse.access." + this.location.getWorld().getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean useSafeTeleporter() {
+        // This is an ANCHOR destination, don't safely teleport here.
+        return false;
+    }
+}