build: Relocate commentedconfiguration

.github/workflows/call.github_release.yml

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

@@ -1,83 +0,0 @@
-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,
-            "platforms": ["PAPER"]
-          },
-          {
-            "name": "Multiverse-Portals",
-            "required": false,
-            "platforms": ["PAPER"]
-          },
-          {
-            "name": "Multiverse-NetherPortals",
-            "required": false,
-            "platforms": ["PAPER"]
-          },
-          {
-            "name": "Multiverse-SignPortals",
-            "required": false,
-            "platforms": ["PAPER"]
-          }
-        ]}
-
-      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

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

@@ -1,38 +0,0 @@
-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.checkstyle.yml

@@ -1,22 +0,0 @@
-name: 'Generic: Checkstyle'
-
-on:
-  workflow_call:
-
-jobs:
-  checkstyle:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: dbelyaev/action-checkstyle@v0.8.4
-        continue-on-error: true
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          checkstyle_version: 10.12.2
-          checkstyle_config: ./config/mv_checks.xml
-          level: warning

.github/workflows/generic.github_release.yml

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

@@ -1,140 +0,0 @@
-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 }}
-        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/generic.test.yml

@@ -1,40 +0,0 @@
-name: 'Generic: Test'
-
-on:
-  workflow_call:
-    inputs:
-      plugin_name:
-        description: 'Plugin name'
-        required: true
-        type: string
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Run unit tests
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
-        env:
-          GITHUB_VERSION: pr${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Artifact output
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ inputs.plugin_name }}-pr${{ github.event.pull_request.number }}
-          path: build/libs/${{ inputs.plugin_name }}-pr${{ github.event.pull_request.number }}.jar

.github/workflows/main.prerelease.yml

@@ -1,24 +0,0 @@
-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.checkstyle.yml

@@ -1,9 +0,0 @@
-name: 'PR: Checkstyle'
-
-on:
-  pull_request:
-    types: [opened, synchronize]
-
-jobs:
-  checkstyle:
-    uses: ./.github/workflows/generic.checkstyle.yml

.github/workflows/pr.test.yml

@@ -1,11 +0,0 @@
-name: 'PR: Test'
-
-on:
-  pull_request:
-    types: [opened, synchronize]
-
-jobs:
-  test:
-    uses: ./.github/workflows/generic.test.yml
-    with:
-      plugin_name: multiverse-core

.github/workflows/release.yml

@@ -0,0 +1,61 @@
+name: Create Release Version
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  release_on_push:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Test & Build
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: clean build -x assemble -x shadowJar
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create release
+        uses: rymndhng/release-on-push-action@v0.27.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          bump_version_scheme: norelease
+          tag_prefix: v
+          release_name: "Release <RELEASE_VERSION>"
+          use_github_release_notes: true
+
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@v1.3.2
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Publish package
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publish
+        env:
+          GITHUB_VERSION: ${{ steps.get_release.outputs.tag }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload release artifact
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: build/libs/Multiverse-Core-${{ steps.get_release.outputs.tag }}.jar
+          asset_name: Multiverse-Core-${{ steps.get_release.outputs.tag }}.jar
+          asset_content_type: application/java-archive

.github/workflows/require_label.yml

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

.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Run unit tests against all PRs
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Run unit tests
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,33 +1,26 @@
-<p align="center">
-<img src="config/multiverse2-long.png" alt="Multiverse Logo">
-</p>
+![Multiverse 2](config/multiverse2-long.png)
 
-[![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/)
-
-[![Release](https://img.shields.io/nexus/r/com.onarandombox.multiversecore/multiverse-core?server=https%3A%2F%2Frepo.onarandombox.com&label=release&color=dark-green)](https://dev.bukkit.org/projects/multiverse-core)
-[![Dev builds](https://img.shields.io/nexus/s/com.onarandombox.multiversecore/multiverse-core?server=https%3A%2F%2Frepo.onarandombox.com&label=prerelease&color=orange)](https://ci.onarandombox.com/job/Multiverse-Core/)
+[![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 us on Patreon](https://img.shields.io/badge/donate-patreon-white?logo=patreon)](https://patreon.com/dumptruckman)
-[![License](https://img.shields.io/github/license/Multiverse/Multiverse-Core?color=blue)](LICENSE.md)
-
-
-# About
+[![Support me on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Ddumptruckman%26type%3Dpatrons&style=flat)](https://patreon.com/dumptruckman)
+[![License](https://img.shields.io/github/license/Multiverse/Multiverse-Core)](LICENSE.md)
 
+About
+========
 [Multiverse](https://dev.bukkit.org/projects/multiverse-core) was created at the dawn of Bukkit multiworld support. It has since then grown into a **complete world management solution!** Multiverse provides the easiest to use world management solution for your Minecraft server, big or small, and with great addons like [Portals](https://dev.bukkit.org/projects/multiverse-portals) and [NetherPortals](https://dev.bukkit.org/projects/multiverse-netherportals/), what's not to love!
-
+<br><br>
 Now it's time to create your very own Multiverse server, do check out our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) and [Usage Guide](https://github.com/Multiverse/Multiverse-Core/wiki/Basics) to get started. Feel free to hop onto our [Discord](https://discord.gg/NZtfKky) if you have any question or just want to have a chat with us!
 
-## Amazing sub-modules available:
-
+### 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 teleporters!
+* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleprompters!
 
-## Building
+Building
+========
 Simply build the source with Gradle:
 ```
 ./gradlew build
@@ -35,16 +28,17 @@ 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

@@ -3,24 +3,18 @@ import org.apache.tools.ant.filters.ReplaceTokens
 plugins {
     id 'java-library'
     id 'maven-publish'
+    id 'checkstyle'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
-    id "org.jetbrains.kotlin.jvm" version "1.8.10"
 }
 
-version = System.getenv('GITHUB_VERSION') ?: 'local'
+version = System.getenv('GITHUB_VERSION')?.substring(1) ?: 'local'
 group = 'com.onarandombox.multiversecore'
 description = 'Multiverse-Core'
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
-}
+java.sourceCompatibility = JavaVersion.VERSION_11
 
 repositories {
     mavenLocal()
-    mavenCentral()
-
     maven {
         url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
     }
@@ -54,94 +48,43 @@ repositories {
         name = 'glaremasters repo'
         url = 'https://repo.glaremasters.me/repository/towny/'
     }
-
-    maven {
-        name = 'PlaceholderAPI'
-        url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/'
-    }
-
-    maven {
-        name = 'papermc repo'
-        url = 'https://repo.papermc.io/repository/maven-public/'
-    }
-}
-
-configurations {
-    // Add configuration for server API
-    compileOnly.extendsFrom serverApi
-    runtimeClasspath.extendsFrom serverApi
-
-    // Add configuration for external plugins
-    implementation.extendsFrom externalPlugin
-
-    // Add configuration for dependencies that will be included in fat jar
-    compileClasspath.extendsFrom shadowed
-    testCompileClasspath.extendsFrom shadowed
-    testRuntimeClasspath.extendsFrom shadowed
-    oldTestCompileClasspath.extendsFrom shadowed
-    oldTestRuntimeClasspath.extendsFrom shadowed
-
-    // Add configuration for old tests
-    oldTestImplementation.extendsFrom implementation
-    oldTestRuntime.extendsFrom runtime
 }
 
 dependencies {
-    serverApi 'org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT'
+    // Spigot
+    implementation('org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT') {
+        exclude group: 'junit', module: 'junit'
+    }
 
     // Economy
-    externalPlugin('com.github.MilkBowl:VaultAPI:1.7.1') {
+    implementation('com.github.MilkBowl:VaultAPI:1.7.1') {
         exclude group: 'org.bukkit', module: 'bukkit'
     }
 
-    // PlaceholderAPI
-    externalPlugin 'me.clip:placeholderapi:2.11.3'
-
     // Command Framework
-    shadowed 'co.aikar:acf-paper:0.5.1-SNAPSHOT'
+    api 'co.aikar:acf-paper:0.5.1-SNAPSHOT'
 
     // Config
-    shadowed('me.main__.util:SerializationConfig:1.7') {
+    api('me.main__.util:SerializationConfig:1.7') {
         exclude group: 'org.bukkit', module: 'bukkit'
     }
-    shadowed('io.github.townyadvanced.commentedconfiguration:CommentedConfiguration:1.0.1') {
+    api('io.github.townyadvanced.commentedconfiguration:CommentedConfiguration:1.0.0') {
         exclude group: 'org.spigotmc', module: 'spigot-api'
     }
 
     // Utils
-    shadowed 'io.vavr:vavr:0.10.4'
-    shadowed 'org.glassfish.hk2:hk2-locator:3.0.3'
-    shadowed('com.dumptruckman.minecraft:Logging:1.1.1') {
+    api('com.dumptruckman.minecraft:Logging:1.1.1') {
         exclude group: 'junit', module: 'junit'
     }
-    shadowed 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
-    shadowed 'org.bstats:bstats-bukkit:2.2.1'
-    shadowed 'net.minidev:json-smart:2.4.9'
-    shadowed 'org.jetbrains:annotations:22.0.0'
-    shadowed 'io.papermc:paperlib:1.0.8'
+    api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
+    api 'org.bstats:bstats-bukkit:2.2.1'
+    api 'net.minidev:json-smart:2.4.8'
+    api 'org.jetbrains:annotations:22.0.0'
 
     // Tests
-    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10'
-    testImplementation 'com.github.seeseemelk:MockBukkit-v1.20:3.20.2'
-    testImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
-        exclude group: 'junit', module: 'junit'
-    }
-    testImplementation 'org.jetbrains.kotlin:kotlin-test'
-    testImplementation 'com.natpryce:hamkrest:1.8.0.1'
-    testImplementation 'org.mockito.kotlin:mockito-kotlin:4.1.0'
-
-    // Old Tests
-    oldTestImplementation 'org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT'
-    oldTestImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
-        exclude group: 'junit', module: 'junit'
-    }
-    oldTestImplementation 'junit:junit:4.13.1'
-    oldTestImplementation 'org.mockito:mockito-core:3.11.2'
-    oldTestImplementation 'commons-io:commons-io:2.7'
-
-    // Annotation Processors
-    annotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.0.3'
-    testAnnotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.0.3'
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.mockito:mockito-core:3.11.2'
+    testImplementation 'commons-io:commons-io:2.7'
 }
 
 
@@ -166,51 +109,10 @@ configurations {
     }
 }
 
-
-sourceSets {
-    oldTest {
-        java {
-            compileClasspath += main.output
-            runtimeClasspath += main.output
-            srcDir file('src/old-test/java')
-        }
-        resources.srcDir file('src/old-test/resources')
-    }
-}
-
-
 publishing {
     publications {
         maven(MavenPublication) {
             from components.java
-
-            pom.withXml {
-                Node pomNode = asNode()
-
-                // Remove Kotlin dependency
-                pomNode.dependencies.'*'.findAll() {
-                    it.groupId.text() == 'org.jetbrains.kotlin'
-                }.each() {
-                    it.parent().remove(it)
-                }
-
-                // Switch runtime deps to provided
-                pomNode.dependencies.'*'.findAll() {
-                    it.scope.text() == 'runtime'
-                }.each() {
-                    it.scope*.value = 'provided'
-                }
-
-                // Add spigot api to pom
-                project.configurations.serverApi.allDependencies.each { dependency ->
-                    pomNode.dependencies[0].appendNode("dependency").with {
-                        it.appendNode("groupId", dependency.group)
-                        it.appendNode("artifactId", dependency.name)
-                        it.appendNode("version", dependency.version)
-                        it.appendNode("scope", "provided")
-                    }
-                }
-            }
         }
     }
     repositories {
@@ -240,19 +142,6 @@ task prepareSource(type: Sync) {
 compileJava {
     source = prepareSource.outputs
 }
-tasks.withType(JavaCompile) {
-    configure(options) {
-        options.compilerArgs << '-Aorg.glassfish.hk2.metadata.location=META-INF/hk2-locator/Multiverse-Core'
-    }
-}
-
-compileKotlin {
-    // We're not using Kotlin in the plugin itself, just tests!
-    enabled = false
-}
-configurations.findAll { !it.name.startsWith('test') }.each {
-    it.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
-}
 
 processResources {
     def props = [version: "${project.version}"]
@@ -268,6 +157,13 @@ processResources {
 }
 
 
+checkstyle {
+    toolVersion = '6.1.1'
+    configFile file('config/mv_checks.xml')
+    ignoreFailures = true
+}
+
+
 javadoc {
     source = sourceSets.main.allJava
     classpath = configurations.compileClasspath
@@ -277,45 +173,24 @@ javadoc {
 project.configurations.api.canBeResolved = true
 
 shadowJar {
-    relocate 'co.aikar', 'org.mvplugins.multiverse.external.acf'
-    relocate 'com.dumptruckman.minecraft.util.Logging', 'org.mvplugins.multiverse.core.utils.CoreLogging'
-    relocate 'com.dumptruckman.minecraft.util.DebugLog', 'org.mvplugins.multiverse.core.utils.DebugFileLogger'
-    relocate 'de.themoep.idconverter', 'org.mvplugins.multiverse.external.idconverter'
-    relocate 'io.github.townyadvanced.commentedconfiguration', 'org.mvplugins.multiverse.external.commentedconfiguration'
-    relocate 'me.main__.util', 'org.mvplugins.multiverse.external.serializationconfig'
-    relocate 'org.bstats', 'org.mvplugins.multiverse.external.bstats'
-    relocate 'com.sun', 'org.mvplugins.multiverse.external.sun'
-    relocate 'net.minidev', 'org.mvplugins.multiverse.external.minidev'
-    relocate 'org.objectweb', 'org.mvplugins.multiverse.external.objectweb'
-    relocate 'io.vavr', 'org.mvplugins.multiverse.external.vavr'
-    relocate 'jakarta', 'org.mvplugins.multiverse.external.jakarta'
-    relocate 'javassist', 'org.mvplugins.multiverse.external.javassist'
-    relocate 'org.aopalliance', 'org.mvplugins.multiverse.external.aopalliance'
-    relocate 'org.glassfish', 'org.mvplugins.multiverse.external.glassfish'
-    relocate 'org.jvnet', 'org.mvplugins.multiverse.external.jvnet'
-    relocate 'org.intellij', 'org.mvplugins.multiverse.external.intellij'
-    relocate 'org.jetbrains', 'org.mvplugins.multiverse.external.jetbrains'
-    relocate 'io.papermc.lib', 'org.mvplugins.multiverse.external.paperlib'
+    relocate 'co.alkar.commands', 'com.onarandombox.acf'
+    relocate 'com.dumptruckman.minecraft.util.Logging', 'com.onarandombox.MultiverseCore.utils.CoreLogging'
+    relocate 'com.dumptruckman.minecraft.util.DebugLog', 'com.onarandombox.MultiverseCore.utils.DebugFileLogger'
+    relocate 'de.themoep.idconverter', 'com.onarandombox.idconverter'
+    relocate 'io.github.townyadvanced.commentedconfiguration', 'com.onarandombox.commentedconfiguration'
+    relocate 'me.main__.util', 'com.onarandombox.serializationconfig'
+    relocate 'org.bstats', 'com.onarandombox.bstats'
 
-    configurations = [project.configurations.shadowed]
+    configurations = [project.configurations.api]
 
     archiveFileName = "$baseName-$version.$extension"
-
-    dependencies {
-        exclude(dependency {
-            it.moduleGroup == 'org.jetbrains.kotlin'
-        })
-    }
-    //classifier = ''
 }
 
 build.dependsOn shadowJar
-jar.enabled = false
 
+
+// Excludes all test
+// TODO: Remove this when we have tests for MV5
 test {
-    useJUnitPlatform()
-
-    testLogging {
-        exceptionFormat = 'full'
-    }
+    exclude '**/*'
 }

config/mv_checks.xml

@@ -6,660 +6,136 @@
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
 <!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <!-- Future reference: valid severity values are 'ignore', 'info', 'warning', 'error' -->
 <module name="Checker">
-    <property name="charset" value="UTF-8"/>
-    <property name="fileExtensions" value="java, properties, xml"/>
-    <property name="severity" value="warning"/>
-
-    <!-- Javadoc Comments -->
-    <module name="JavadocPackage"/><!-- require package-info.java file -->
-
-    <!-- Miscellaneous -->
+    <module name="JavadocPackage">
+        <property name="allowLegacy" value="true"/>
+    </module>
     <module name="NewlineAtEndOfFile" />
-    <module name="OrderedProperties"/>
     <module name="Translation"/>
-    <module name="UniqueProperties"/>
-
-    <!-- Regexp -->
+    <module name="FileLength"/>
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+    </module>
     <module name="RegexpSingleline">
         <property name="message" value="Line has trailing spaces."/>
         <property name="format" value="\s+$"/>
     </module>
-
-    <!-- Size Violations -->
-    <module name="FileLength">
-        <property name="max" value="2000"/>
+    <module name="SuppressWithNearbyCommentFilter">
+        <property name="commentFormat" value="SUPPRESS CHECKSTYLE: (\w+)"/>
+        <property name="checkFormat" value="$1"/>
     </module>
-    <module name="LineLength">
-        <property name="fileExtensions" value="java"/>
-        <property name="max" value="120"/>
-        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    <module name="SuppressionCommentFilter">
+           <property name="offCommentFormat" value="BEGIN CHECKSTYLE-SUPPRESSION\: (\w+)"/>
+           <property name="onCommentFormat" value="END CHECKSTYLE-SUPPRESSION\: (\w+)"/>
+           <property name="checkFormat" value="$1"/>
     </module>
-
-    <!-- Whitespace -->
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
+    <module name="SuppressionCommentFilter">
+           <property name="offCommentFormat" value="BEGIN CHECKSTYLE-SUPPRESSION\: ALL"/>
+           <property name="onCommentFormat" value="END CHECKSTYLE-SUPPRESSION\: ALL"/>
     </module>
-
     <module name="TreeWalker">
         <!-- Make suppression possible -->
-        <module name="SuppressWithNearbyCommentFilter">
-            <property name="commentFormat" value="SUPPRESS CHECKSTYLE: (\w+)"/>
-            <property name="checkFormat" value="$1"/>
-        </module>
-        <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat" value="BEGIN CHECKSTYLE-SUPPRESSION\: (\w+)"/>
-            <property name="onCommentFormat" value="END CHECKSTYLE-SUPPRESSION\: (\w+)"/>
-            <property name="checkFormat" value="$1"/>
-        </module>
-        <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat" value="BEGIN CHECKSTYLE-SUPPRESSION\: ALL"/>
-            <property name="onCommentFormat" value="END CHECKSTYLE-SUPPRESSION\: ALL"/>
-        </module>
-
+        <module name="FileContentsHolder"/>
         <!-- Actual checks -->
-
-        <!-- Annotations -->
-        <module name="AnnotationLocation">
-            <property name="id" value="AnnotationLocationMostCases"/>
-            <property name="tokens"
-                      value="CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF,
-                    ENUM_DEF, METHOD_DEF, CTOR_DEF, RECORD_DEF, COMPACT_CTOR_DEF"/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="id" value="AnnotationLocationVariables"/>
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="allowSamelineMultipleAnnotations" value="true"/>
-        </module>
-        <module name="AnnotationLocation"/>
-        <module name="AnnotationUseStyle"/>
-        <module name="MissingDeprecated"/>
-        <module name="MissingOverride"/>
-
-        <!-- Block Checks -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock">
-            <property name="tokens"
-                      value="LITERAL_WHILE, LITERAL_TRY, LITERAL_FINALLY, LITERAL_DO, LITERAL_IF,
-                    LITERAL_ELSE, LITERAL_FOR, INSTANCE_INIT, STATIC_INIT, LITERAL_SWITCH,
-                    LITERAL_SYNCHRONIZED"/>
-        </module>
-        <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="(ignore|expect)"/>
-        </module>
-        <module name="LeftCurly">
-            <property name="ignoreEnums" value="false"/>
-            <property name="tokens"
-                      value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF,
-                    INTERFACE_DEF, LAMBDA, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT,
-                    LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
-                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF,
-                    OBJBLOCK, STATIC_INIT, RECORD_DEF, COMPACT_CTOR_DEF"/>
-        </module>
-        <module name="NeedBraces">
-            <property name="id" value="SingleLineIf"/>
-            <property name="tokens" value="LITERAL_IF"/>
-            <property name="allowSingleLineStatement" value="true"/>
-        </module>
-        <module name="NeedBraces">
-            <property name="id" value="NoSingleLineControl"/>
-            <property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_WHILE"/>
-        </module>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlySame"/>
-            <property name="tokens"
-                      value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
-                    LITERAL_DO"/>
-        </module>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlyAlone"/>
-            <property name="option" value="alone"/>
-            <property name="tokens"
-                      value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
-                    INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF, INTERFACE_DEF, RECORD_DEF,
-                    COMPACT_CTOR_DEF, LITERAL_SWITCH"/>
-        </module>
-
-        <!-- Class Design -->
-        <module name="DesignForExtension">
-            <property name="severity" value="info"/>
-        </module>
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <module name="InnerTypeLast"/>
-        <module name="InterfaceIsType"/>
-        <module name="MutableException"/>
-        <module name="OneTopLevelClass"/>
-        <module name="ThrowsCount">
-            <property name="max" value="0"/>
-        </module>
-        <module name="VisibilityModifier">
-            <property name="protectedAllowed" value="true"/>
-        </module>
-
-        <!-- Coding -->
-        <module name="ArrayTrailingComma"/>
-        <module name="AvoidDoubleBraceInitialization"/>
-        <module name="AvoidNoArgumentSuperConstructorCall"/>
-        <module name="CovariantEquals"/>
-        <module name="DeclarationOrder">
-            <!-- Doesn't respect static methods at top -->
-            <property name="severity" value="ignore"/>
-        </module>
-        <module name="DefaultComesLast"/>
-        <module name="EmptyStatement"/>
-        <module name="EqualsAvoidNull"/>
-        <module name="EqualsHashCode"/>
-        <module name="FallThrough">
-            <property name="checkLastCaseGroup" value="true"/>
-        </module>
-        <module name="HiddenField">
-            <property name="ignoreConstructorParameter" value="true"/>
-            <property name="ignoreSetter" value="true"/>
-            <property name="setterCanReturnItsClass" value="true"/>
-            <property name="ignoreAbstractMethods" value="true"/>
-            <!-- Not smart enough -->
-            <property name="severity" value="ignore"/>
-        </module>
-        <module name="IllegalCatch"/>
-        <module name="IllegalThrows"/>
-        <module name="IllegalToken"/>
-        <module name="IllegalTokenText">
-            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
-            <property name="format"
-                      value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
-            <property name="message"
-                      value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
-        </module>
-        <module name="IllegalType"/>
-        <module name="InnerAssignment"/>
-        <module name="MagicNumber">
-            <property name="ignoreHashCodeMethod" value="true"/>
-            <property name="ignoreAnnotationElementDefaults" value="true"/>
-        </module>
-        <module name="MissingSwitchDefault"/>
-        <module name="ModifiedControlVariable"/>
-        <module name="MultipleStringLiterals">
-
-        </module>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="NestedForDepth">
+        <module name="LineLength">
+            <property name="max" value="160"/>
             <property name="severity" value="warning"/>
         </module>
-        <module name="NestedIfDepth"/>
-        <module name="NestedTryDepth"/>
-        <module name="NoClone"/>
-        <module name="NoFinalizer"/>
-        <module name="OneStatementPerLine"/>
-        <module name="PackageDeclaration"/>
-        <module name="ParameterAssignment"/>
-        <module name="RequireThis"/>
-        <module name="ReturnCount">
-            <property name="severity" value="info"/>
-        </module>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-        <module name="StringLiteralEquality"/>
-        <module name="SuperClone"/>
-        <module name="SuperFinalize"/>
-        <module name="UnnecessaryParentheses"/>
-        <module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
-        <module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
-        <module name="UnnecessarySemicolonInEnumeration"/>
-        <module name="UnnecessarySemicolonInTryWithResources"/>
-        <module name="UnusedLocalVariable"/>
-        <module name="VariableDeclarationUsageDistance">
-            <property name="allowedDistance" value="3"/>
-            <property name="validateBetweenScopes" value="false"/>
-        </module>
-        <module name="VariableDeclarationUsageDistance">
-            <property name="allowedDistance" value="5"/>
-            <property name="validateBetweenScopes" value="true"/>
-        </module>
-
-        <!-- Imports -->
-        <module name="AvoidStarImport"/>
-        <module name="IllegalImport">
-            <property name="illegalPkgs" value="sun"/>
-        </module>
-        <module name="ImportOrder">
-            <property name="option" value="bottom"/>
-            <property name="ordered" value="true"/>
-            <property name="separated" value="true"/>
-            <property name="separatedStaticGroups" value="true"/>
-            <property name="caseSensitive" value="true"/>
-            <property name="sortStaticImportsAlphabetically" value="true"/>
-            <property name="groups"
-                      value="java,javax,*,org.mvplugins"/>
-            <property name="staticGroups"
-                      value="/^.*$/"/>
-        </module>
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-        <!-- Javadoc Comments -->
-        <module name="AtclauseOrder">
-            <property name="target"
-                      value="CLASS_DEF, COMPACT_CTOR_DEF, CTOR_DEF, ENUM_DEF,
-                    INTERFACE_DEF, METHOD_DEF, RECORD_DEF, VARIABLE_DEF"/>
-        </module>
-        <module name="InvalidJavadocPosition"/>
-        <module name="JavadocBlockTagLocation"/>
-        <module name="JavadocContentLocationCheck"/>
         <module name="JavadocMethod">
-            <property name="accessModifiers" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
-            <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
+            <property name="scope" value="package"/><!-- We don't need javadoc for private methods -->
+            <property name="tokens" value="METHOD_DEF"/><!-- We don't need javadoc for constructors -->
         </module>
-        <module name="JavadocMethod">
-            <property name="accessModifiers" value="public"/>
-        </module>
-        <module name="JavadocMissingLeadingAsterisk"/>
-        <module name="JavadocMissingWhitespaceAfterAsterisk"/>
-        <module name="JavadocParagraph">
-            <property name="allowNewlineParagraph" value="true"/>
-        </module>
-        <module name="JavadocStyle">
-            <property name="scope" value="package"/>
-        </module>
-        <module name="JavadocTagContinuationIndentation"/>
         <module name="JavadocType"/>
         <module name="JavadocVariable">
-            <property name="scope" value="package"/>
-        </module>
-        <module name="MissingJavadocMethod">
-            <property name="scope" value="public"/>
-            <property name="allowMissingPropertyJavadoc" value="true"/>
-        </module>
-        <module name="MissingJavadocMethod">
-            <property name="scope" value="protected"/>
-            <property name="excludeScope" value="public"/>
-            <property name="allowMissingPropertyJavadoc" value="true"/>
-            <property name="minLineCount" value="2"/>
-        </module>
-        <module name="MissingJavadocType">
-            <property name="scope" value="protected"/>
-            <property name="tokens"
-                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
-                      RECORD_DEF, ANNOTATION_DEF"/>
-            <property name="excludeScope" value="nothing"/>
-        </module>
-        <module name="NonEmptyAtclauseDescription"/>
-        <module name="RequireEmptyLineBeforeBlockTagGroup"/>
-        <module name="SingleLineJavadoc"/>
-        <module name="SummaryJavadoc">
-            <property name="forbiddenSummaryFragments"
-                      value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+            <property name="scope" value="package"/><!-- We don't need javadoc for private variables -->
         </module>
+        <module name="JavadocStyle"/>
         <module name="WriteTag">
             <property name="tag" value="@author"/>
             <property name="tagFormat" value="\S"/>
             <property name="severity" value="ignore"/>
             <property name="tagSeverity" value="warning"/>
         </module>
-
-        <!-- Metrics -->
-        <module name="BooleanExpressionComplexity"/>
-        <module name="ClassDataAbstractionCoupling">
-            <property name="max" value="7"/>
-            <property name="excludedClasses"
-                      value="ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte, Character,
-                      Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet, Exception,
-                      Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException,
-                      IllegalStateException, IndexOutOfBoundsException, IntStream, Integer,
-                      LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map,
-                      NullPointerException, Object, Optional, OptionalDouble, OptionalInt,
-                      OptionalLong, Override, Queue, RuntimeException, SafeVarargs, SecurityException,
-                      Set, Short, SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder,
-                      SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException,
-                      Void, boolean, byte, char, double, float, int, long, short, var, void"/>
-        </module>
-        <module name="ClassFanOutComplexity">
-            <property name="id" value="FanOutComplexityGettingTooHigh"/>
-            <property name="max" value="20"/>
-            <property name="excludedClasses"
-                      value="ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte, Character,
-                      Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet, Exception,
-                      Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException,
-                      IllegalStateException, IndexOutOfBoundsException, IntStream, Integer,
-                      LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map,
-                      NullPointerException, Object, Optional, OptionalDouble, OptionalInt,
-                      OptionalLong, Override, Queue, RuntimeException, SafeVarargs, SecurityException,
-                      Set, Short, SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder,
-                      SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException,
-                      Void, boolean, byte, char, double, float, int, long, short, var, void"/>
-            <property name="severity" value="info"/>
-        </module>
-        <module name="ClassFanOutComplexity">
-            <property name="id" value="FanOutComplexityProbablyTooHigh"/>
-            <property name="max" value="35"/>
-            <property name="excludedClasses"
-                      value="ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte, Character,
-                      Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet, Exception,
-                      Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException,
-                      IllegalStateException, IndexOutOfBoundsException, IntStream, Integer,
-                      LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map,
-                      NullPointerException, Object, Optional, OptionalDouble, OptionalInt,
-                      OptionalLong, Override, Queue, RuntimeException, SafeVarargs, SecurityException,
-                      Set, Short, SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder,
-                      SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException,
-                      Void, boolean, byte, char, double, float, int, long, short, var, void"/>
-        </module>
-        <module name="CyclomaticComplexity">
-            <property name="max" value="7"/>
+        <module name="ConstantName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+        <module name="AvoidStarImport">
             <property name="severity" value="warning"/>
+            <property name="excludes" value="com.onarandombox.MultiverseCore.utils,com.onarandombox.MultiverseCore.configuration,com.onarandombox.MultiverseCore.commandsold,com.onarandombox.MultiverseCore.destination"/>
         </module>
-        <module name="JavaNCSS">
-            <property name="methodMaximum" value="50"/>
-            <property name="classMaximum" value="1500"/>
-            <property name="fileMaximum" value="2000"/>
-            <property name="recordMaximum" value="150"/>
-        </module>
-        <module name="NPathComplexity">
-            <property name="max" value="200"/>
-        </module>
-
-        <!-- Miscellaneous -->
-        <module name="ArrayTypeStyle"/>
-        <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
-        </module>
-        <module name="CommentsIndentation">
-            <property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
-        </module>
-        <module name="Indentation">
-            <property name="basicOffset" value="4"/>
-            <property name="braceAdjustment" value="4"/>
-            <property name="caseIndent" value="4"/>
-            <property name="throwsIndent" value="8"/>
-            <property name="arrayInitIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="8"/>
-            <property name="forceStrictCondition" value="true"/>
-        </module>
-        <module name="NoCodeInFile"/>
-        <module name="OuterTypeFilename"/>
-        <module name="TodoComment">
-            <property name="format" value="TODO"/>
-            <!-- TODO change back to warning after MV5 -->
-            <property name="severity" value="info"/>
-        </module>
-        <module name="TrailingComment">
-            <property name="legalComment" value="^\sSUPPRESS CHECKSTYLE:"/>
-        </module>
-        <module name="UncommentedMain"/>
-        <module name="UpperEll"/>
-
-        <!-- Modifiers -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-        <!-- Naming Conventions -->
-        <module name="AbbreviationAsWordInName">
-            <property name="ignoreFinal" value="false"/>
-            <property name="allowedAbbreviationLength" value="0"/>
-            <property name="allowedAbbreviations" value="MV"/>
-            <property name="tokens"
-                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
-                    PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
-                    RECORD_COMPONENT_DEF"/>
-        </module>
-        <module name="AbstractClassName">
-            <property name="ignoreName" value="true"/>
-            <message key="name.invalidPattern"
-                     value="Abstract class name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="CatchParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ClassTypeParameterName">
-            <property name="format" value="^[A-Z]{1,3}$"/>
-            <message key="name.invalidPattern"
-                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ConstantName">
-            <message key="name.invalidPattern"
-                     value="Constant name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="InterfaceTypeParameterName">
-            <property name="format" value="^[A-Z]{1,3}$"/>
-            <message key="name.invalidPattern"
-                     value="Interface type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LambdaParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LocalFinalVariableName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Local final variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LocalVariableName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MemberName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$|^[A-Z][A-Z0-9_]*$"/>
-            <message key="name.invalidPattern"
-                     value="Member name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MethodName">
-            <message key="name.invalidPattern"
-                     value="Method name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MethodTypeParameterName">
-            <property name="format" value="^[A-Z]{1,3}$"/>
-            <message key="name.invalidPattern"
-                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="PackageName">
-            <property name="severity" value="info"/>
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-            <message key="name.invalidPattern"
-                     value="Package name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="PatternVariableName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Pattern variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="RecordComponentName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Record component name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="RecordTypeParameterName">
-            <property name="format" value="^[A-Z]{1,3}$"/>
-            <message key="name.invalidPattern"
-                     value="Record type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="StaticVariableName">
-            <message key="name.invalidPattern"
-                     value="Static variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="TypeName">
-            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
-                    ANNOTATION_DEF, RECORD_DEF"/>
-            <message key="name.invalidPattern"
-                     value="Type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-
-        <!-- Size Violations -->
-        <module name="AnonInnerLength">
-            <property name="max" value="20"/>
-        </module>
-        <module name="ExecutableStatementCount">
-            <property name="max" value="30"/>
-        </module>
-        <module name="LambdaBodyLength">
-            <property name="id" value="LambdaGettingTooLong"/>
-            <property name="max" value="10"/>
-            <property name="severity" value="info"/>
-        </module>
-        <module name="LambdaBodyLength">
-            <property name="id" value="LambdaProbablyTooLong"/>
-            <property name="max" value="25"/>
-        </module>
-        <module name="MethodCount">
-            <property name="maxTotal" value="100"/>
-            <property name="maxPrivate" value="100"/>
-            <property name="maxPackage" value="100"/>
-            <property name="maxProtected" value="100"/>
-            <property name="maxPublic" value="100"/>
+        <module name="IllegalImport"/>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports">
+            <property name="processJavadoc" value="true"/>
         </module>
         <module name="MethodLength">
-            <property name="max" value="50"/>
             <property name="severity" value="warning"/>
+            <property name="countEmpty" value="false"/>
         </module>
-        <module name="OuterTypeNumber">
-            <property name="max" value="1"/>
-        </module>
-        <module name="ParameterNumber">
-            <property name="id" value="ConsiderLessMethodParameters"/>
-            <property name="max" value="4"/>
-            <property name="ignoreOverriddenMethods" value="true"/>
-            <property name="severity" value="info"/>
-            <property name="tokens" value="METHOD_DEF"/>
-        </module>
-        <module name="ParameterNumber">
-            <property name="id" value="ProbablyTooManyMethodParameters"/>
-            <property name="max" value="10"/>
-            <property name="ignoreOverriddenMethods" value="true"/>
-            <property name="tokens" value="METHOD_DEF"/>
-        </module>
-        <module name="ParameterNumber">
-            <property name="id" value="ConsiderLessConstructorParameters"/>
-            <property name="max" value="7"/>
-            <property name="ignoreOverriddenMethods" value="true"/>
-            <property name="severity" value="info"/>
-            <property name="tokens" value="CTOR_DEF"/>
-        </module>
-        <module name="ParameterNumber">
-            <property name="id" value="ProbablyTooManyConstructorParameters"/>
-            <property name="max" value="12"/>
-            <property name="ignoreOverriddenMethods" value="true"/>
-            <property name="tokens" value="CTOR_DEF"/>
-        </module>
-        <module name="RecordComponentNumber">
-            <property name="max" value="8"/>
-        </module>
-
-        <!-- Whitespace -->
-        <module name="EmptyForInitializerPad"/>
+        <module name="ParameterNumber"/>
         <module name="EmptyForIteratorPad"/>
-        <module name="EmptyLineSeparator">
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-            <property name="allowMultipleEmptyLines" value="false"/>
-            <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
-            <property name="tokens"
-                      value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
-                    STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF,
-                    COMPACT_CTOR_DEF"/>
-        </module>
-        <module name="GenericWhitespace">
-            <message key="ws.followed"
-                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
-            <message key="ws.preceded"
-                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
-            <message key="ws.illegalFollow"
-                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
-            <message key="ws.notPreceded"
-                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="MethodParamPad">
-            <property name="tokens"
-                      value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
-                    SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF"/>
-        </module>
-        <module name="NoLineWrap">
-            <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
-        </module>
+        <module name="MethodParamPad"/>
         <module name="NoWhitespaceAfter">
-            <property name="tokens"
-                      value="AT, INC, DEC, UNARY_MINUS,UNARY_PLUS,BNOT,LNOT,DOT,ARRAY_DECLARATOR,INDEX_OP,LITERAL_SYNCHRONIZED,METHOD_REF"/>
+            <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
         </module>
-        <module name="NoWhitespaceBefore">
-            <property name="id" value="AllowedWhitespaceBeforeWithoutLinebreak"/>
-            <property name="tokens"
-                      value="COMMA, SEMI, POST_INC, POST_DEC, ELLIPSIS, LABELED_STAT"/>
-        </module>
-        <module name="NoWhitespaceBefore">
-            <property name="id" value="AllowedWhitespaceBeforeWithLinebreak"/>
-            <property name="tokens" value="DOT, METHOD_REF"/>
-            <property name="allowLineBreaks" value="true"/>
-        </module>
-        <module name="NoWhitespaceBeforeCaseDefaultColon"/>
-        <module name="OperatorWrap">
-            <property name="tokens"
-                      value="QUESTION, COLON, EQUAL, NOT_EQUAL, DIV, PLUS, MINUS, STAR, MOD,
-                    SR, BSR, GE, GT, SL, LE, LT, BXOR, BOR, LOR, BAND, LAND, LITERAL_INSTANCEOF,
-                    TYPE_EXTENSION_AND, ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN,
-                    STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN,
-                    BOR_ASSIGN, BAND_ASSIGN, METHOD_REF"/>
-        </module>
-        <module name="ParenPad">
-            <property name="tokens"
-                      value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF,
-                    EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW,
-                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL,
-                    METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA,
-                    RECORD_DEF"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapNl"/>
-            <property name="option" value="nl"/>
-            <property name="tokens" value="DOT, AT, METHOD_REF"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapEol"/>
-            <property name="option" value="eol"/>
-            <property name="tokens"
-                      value="COMMA, SEMI, ELLIPSIS, RPAREN, ARRAY_DECLARATOR, RBRACK"/>
-        </module>
-        <module name="SingleSpaceSeparator"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="OperatorWrap"/>
+        <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
         <module name="WhitespaceAfter">
-            <property name="tokens"
-                      value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_RETURN,
-                    LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, LITERAL_FINALLY, DO_WHILE, ELLIPSIS,
-                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_CATCH, LAMBDA,
-                    LITERAL_YIELD, LITERAL_CASE"/>
+            <property name="severity" value="warning"/>
         </module>
         <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyLambdas" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyTypes" value="true"/>
-            <property name="allowEmptyLoops" value="true"/>
-            <property name="ignoreEnhancedForColon" value="false"/>
-            <property name="tokens"
-                      value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR,
-                    BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND,
-                    LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY,
-                    LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED,
-                    LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN,
-                    NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
-                    SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
-            <message key="ws.notFollowed"
-                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks
-               may only be represented as '{}' when not part of a multi-block statement"/>
-            <message key="ws.notPreceded"
-                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+            <property name="severity" value="warning"/>
         </module>
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+        <module name="AvoidNestedBlocks"/>
+        <module name="EmptyBlock">
+            <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_FOR,LITERAL_TRY,LITERAL_WHILE,INSTANCE_INIT,STATIC_INIT"/>
+        </module>
+        <module name="LeftCurly"/>
+        <module name="RightCurly"/>
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="HiddenField">
+            <property name="tokens" value="VARIABLE_DEF"/><!-- We don't care if parameters hide fields. -->
+        </module>
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+        <module name="MagicNumber">
+            <property name="ignoreNumbers" value="-1, 0, 0.5, 1, 2, 3"/>
+        </module>
+        <module name="MissingSwitchDefault"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <!-- Don't like errors for `final` missing
+        <module name="DesignForExtension"/>
+        <module name="FinalClass"/>
+        -->
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <module name="VisibilityModifier">
+            <property name="protectedAllowed" value="true"/>
+        </module>
+        <module name="ArrayTypeStyle"/>
+        <!-- Don't like errors for `final` missing
+        <module name="FinalParameters"/>
+        -->
+        <module name="TodoComment">
+            <property name="severity" value="info"/>
+        </module>
+        <module name="UpperEll"/>
+        <module name="Indentation"/>
+        <module name="MissingDeprecated"/>
+        <module name="MissingOverride"/>
     </module>
 </module>

settings.gradle

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

src/main/java/co/aikar/commands/OpenBukkitCommandIssuer.java

@@ -1,13 +0,0 @@
-package co.aikar.commands;
-
-import org.bukkit.command.CommandSender;
-
-/**
- * Exists just so we can extend BukkitCommandIssuer since it has a package-private constructor.
- */
-public abstract class OpenBukkitCommandIssuer extends BukkitCommandIssuer {
-
-    protected OpenBukkitCommandIssuer(BukkitCommandManager manager, CommandSender sender) {
-        super(manager, sender);
-    }
-}

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

@@ -0,0 +1,602 @@
+/******************************************************************************
+ * 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;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.anchor.AnchorManager;
+import com.onarandombox.MultiverseCore.api.BlockSafety;
+import com.onarandombox.MultiverseCore.api.LocationManipulation;
+import com.onarandombox.MultiverseCore.api.MVConfig;
+import com.onarandombox.MultiverseCore.api.MVCore;
+import com.onarandombox.MultiverseCore.api.MVWorld;
+import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
+import com.onarandombox.MultiverseCore.commands.CheckCommand;
+import com.onarandombox.MultiverseCore.commands.CloneCommand;
+import com.onarandombox.MultiverseCore.commands.ConfirmCommand;
+import com.onarandombox.MultiverseCore.commands.CreateCommand;
+import com.onarandombox.MultiverseCore.commands.DebugCommand;
+import com.onarandombox.MultiverseCore.commands.DeleteCommand;
+import com.onarandombox.MultiverseCore.commands.ImportCommand;
+import com.onarandombox.MultiverseCore.commands.GameruleCommand;
+import com.onarandombox.MultiverseCore.commands.LoadCommand;
+import com.onarandombox.MultiverseCore.commands.RegenCommand;
+import com.onarandombox.MultiverseCore.commands.ReloadCommand;
+import com.onarandombox.MultiverseCore.commands.RemoveCommand;
+import com.onarandombox.MultiverseCore.commands.TeleportCommand;
+import com.onarandombox.MultiverseCore.commands.UnloadCommand;
+import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
+import com.onarandombox.MultiverseCore.destination.DestinationsProvider;
+import com.onarandombox.MultiverseCore.destination.core.AnchorDestination;
+import com.onarandombox.MultiverseCore.destination.core.BedDestination;
+import com.onarandombox.MultiverseCore.destination.core.CannonDestination;
+import com.onarandombox.MultiverseCore.destination.core.ExactDestination;
+import com.onarandombox.MultiverseCore.destination.core.PlayerDestination;
+import com.onarandombox.MultiverseCore.destination.core.WorldDestination;
+import com.onarandombox.MultiverseCore.economy.MVEconomist;
+import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
+import com.onarandombox.MultiverseCore.listeners.MVChatListener;
+import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
+import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
+import com.onarandombox.MultiverseCore.listeners.MVPortalListener;
+import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
+import com.onarandombox.MultiverseCore.listeners.MVWorldInitListener;
+import com.onarandombox.MultiverseCore.listeners.MVWorldListener;
+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.TestingMode;
+import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper;
+import com.onarandombox.MultiverseCore.utils.metrics.MetricsConfigurator;
+import com.onarandombox.MultiverseCore.world.SimpleMVWorldManager;
+import com.onarandombox.MultiverseCore.world.WorldProperties;
+import me.main__.util.SerializationConfig.SerializationConfig;
+import org.bukkit.configuration.Configuration;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.plugin.java.JavaPluginLoader;
+
+/**
+ * The implementation of the Multiverse-{@link MVCore}.
+ */
+public class MultiverseCore extends JavaPlugin implements MVCore {
+    private static final int PROTOCOL = 50;
+
+    // Setup various managers
+    private final AnchorManager anchorManager = new AnchorManager(this);
+    private BlockSafety blockSafety = new SimpleBlockSafety(this);
+    private MVCommandManager commandManager;
+    private DestinationsProvider destinationsProvider;
+    private MVEconomist economist;
+    private LocationManipulation locationManipulation = new SimpleLocationManipulation();
+    private final MVPermissions mvPermissions = new MVPermissions(this);
+    private SafeTTeleporter safeTTeleporter = new SimpleSafeTTeleporter(this);
+    private final UnsafeCallWrapper unsafeCallWrapper = new UnsafeCallWrapper(this);
+    private final MVWorldManager worldManager = new SimpleMVWorldManager(this);
+
+    // Configurations
+    private FileConfiguration multiverseConfig;
+    private volatile MultiverseCoreConfiguration config;
+
+    // Listeners
+    private MVChatListener chatListener;
+    private final MVEntityListener entityListener = new MVEntityListener(this);
+    private final MVPlayerListener playerListener = new MVPlayerListener(this);
+    private final MVPortalListener portalListener = new MVPortalListener(this);
+    private final MVWeatherListener weatherListener = new MVWeatherListener(this);
+    private final MVWorldListener worldListener = new MVWorldListener(this);
+    private final MVWorldInitListener worldInitListener = new MVWorldInitListener(this);
+
+    // Counter for the number of plugins that have registered with us
+    private int pluginCount;
+
+    /**
+     * This is the constructor for the MultiverseCore.
+     */
+    public MultiverseCore() {
+        super();
+    }
+
+    @Override
+    public void onLoad() {
+        // Create our DataFolder
+        getDataFolder().mkdirs();
+
+        // Setup our Logging
+        Logging.init(this);
+
+        // Register our config classes
+        SerializationConfig.registerAll(MultiverseCoreConfiguration.class);
+        SerializationConfig.registerAll(WorldProperties.class);
+        SerializationConfig.initLogging(Logging.getLogger());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onEnable() {
+        // Load our configs first as we need them for everything else.
+        this.loadConfigs();
+        if (this.multiverseConfig == null) {
+            Logging.severe("Your configs were not loaded.");
+            Logging.severe("Please check your configs and restart the server.");
+            this.getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+
+        Logging.setShowingConfig(!getMVConfig().getSilentStart());
+
+        this.worldManager.getDefaultWorldGenerators();
+        this.worldManager.loadDefaultWorlds();
+        this.worldManager.loadWorlds(true);
+
+        // Now set the firstspawnworld (after the worlds are loaded):
+        this.worldManager.setFirstSpawnWorld(getMVConfig().getFirstSpawnWorld());
+        MVWorld firstSpawnWorld = this.worldManager.getFirstSpawnWorld();
+        if (firstSpawnWorld != null) {
+            getMVConfig().setFirstSpawnWorld(firstSpawnWorld.getName());
+        }
+
+        //Setup economy here so vault is loaded
+        this.economist = new MVEconomist(this);
+
+        // Init all the other stuff
+        this.anchorManager.loadAnchors();
+        this.registerEvents();
+        this.registerCommands();
+        this.registerDestinations();
+        this.setupMetrics();
+        this.saveMVConfig();
+        this.logEnableMessage();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onDisable() {
+        this.saveAllConfigs();
+        Logging.shutdown();
+    }
+
+    /**
+     * Function to Register all the Events needed.
+     */
+    private void registerEvents() {
+        PluginManager pluginManager = getServer().getPluginManager();
+        this.chatListener = new MVChatListener(this, this.playerListener);
+        pluginManager.registerEvents(this.chatListener, this);
+        pluginManager.registerEvents(this.entityListener, this);
+        pluginManager.registerEvents(this.playerListener, this);
+        pluginManager.registerEvents(this.portalListener, this);
+        pluginManager.registerEvents(this.weatherListener, this);
+        pluginManager.registerEvents(this.worldListener, this);
+        pluginManager.registerEvents(this.worldInitListener, this);
+    }
+
+    /**
+     * Register Multiverse-Core commands to Command Manager.
+     */
+    private void registerCommands() {
+        this.commandManager = new MVCommandManager(this);
+        this.commandManager.registerCommand(new CheckCommand(this));
+        this.commandManager.registerCommand(new CloneCommand(this));
+        this.commandManager.registerCommand(new ConfirmCommand(this));
+        this.commandManager.registerCommand(new CreateCommand(this));
+        this.commandManager.registerCommand(new DebugCommand(this));
+        this.commandManager.registerCommand(new DeleteCommand(this));
+        this.commandManager.registerCommand(new ImportCommand(this));
+        this.commandManager.registerCommand(new GameruleCommand(this));
+        this.commandManager.registerCommand(new LoadCommand(this));
+        this.commandManager.registerCommand(new RegenCommand(this));
+        this.commandManager.registerCommand(new ReloadCommand(this));
+        this.commandManager.registerCommand(new RemoveCommand(this));
+        this.commandManager.registerCommand(new TeleportCommand(this));
+        this.commandManager.registerCommand(new UnloadCommand(this));
+    }
+
+    /**
+     * Register all the destinations.
+     */
+    private void registerDestinations() {
+        this.destinationsProvider = new DestinationsProvider(this);
+        this.destinationsProvider.registerDestination(new AnchorDestination(this));
+        this.destinationsProvider.registerDestination(new BedDestination());
+        this.destinationsProvider.registerDestination(new CannonDestination(this));
+        this.destinationsProvider.registerDestination(new ExactDestination(this));
+        this.destinationsProvider.registerDestination(new PlayerDestination());
+        this.destinationsProvider.registerDestination(new WorldDestination(this));
+    }
+
+    /**
+     * Setup bstats Metrics.
+     */
+    private void setupMetrics() {
+        if (TestingMode.isDisabled()) {
+            MetricsConfigurator.configureMetrics(this);
+        }
+    }
+
+    /**
+     * Logs the enable message.
+     */
+    private void logEnableMessage() {
+        Logging.config("Version %s (API v%s) Enabled - By %s", this.getDescription().getVersion(), PROTOCOL, getAuthors());
+
+        if (getMVConfig().isShowingDonateMessage()) {
+            getLogger().config("Help dumptruckman keep this project alive. Become a patron! https://www.patreon.com/dumptruckman");
+            getLogger().config("One time donations are also appreciated: https://www.paypal.me/dumptruckman");
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public MVCore getCore() {
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getProtocolVersion() {
+        return PROTOCOL;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public MVEconomist getEconomist() {
+        return economist;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public MVPermissions getMVPerms() {
+        return this.mvPermissions;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getAuthors() {
+        List<String> authorsList = this.getDescription().getAuthors();
+        if (authorsList.size() == 0) {
+            return "";
+        }
+
+        StringBuilder authors = new StringBuilder();
+        authors.append(authorsList.get(0));
+
+        for (int i = 1; i < authorsList.size(); i++) {
+            if (i == authorsList.size() - 1) {
+                authors.append(" and ").append(authorsList.get(i));
+            } else {
+                authors.append(", ").append(authorsList.get(i));
+            }
+        }
+
+        return authors.toString();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public MVCommandManager getMVCommandManager() {
+        return this.commandManager;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getPluginCount() {
+        return this.pluginCount;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void incrementPluginCount() {
+        this.pluginCount += 1;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void decrementPluginCount() {
+        this.pluginCount -= 1;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DestinationsProvider getDestinationsProvider() {
+        return this.destinationsProvider;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public MVWorldManager getMVWorldManager() {
+        return this.worldManager;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void loadConfigs() {
+        // Now grab the Configuration Files.
+        this.multiverseConfig = YamlConfiguration.loadConfiguration(new File(getDataFolder(), "config.yml"));
+        InputStream resourceURL = this.getClass().getResourceAsStream("/defaults/config.yml");
+
+        // Read in our default config with UTF-8 now
+        Configuration coreDefaults;
+        try {
+            coreDefaults = YamlConfiguration.loadConfiguration(new BufferedReader(new InputStreamReader(resourceURL, "UTF-8")));
+            this.multiverseConfig.setDefaults(coreDefaults);
+        } catch (UnsupportedEncodingException e) {
+            Logging.severe("Couldn't load default config with UTF-8 encoding. Details follow:");
+            e.printStackTrace();
+            Logging.severe("Default configs NOT loaded.");
+        }
+
+        this.multiverseConfig.options().copyDefaults(false);
+        this.multiverseConfig.options().copyHeader(true);
+
+        MultiverseCoreConfiguration wantedConfig = null;
+        try {
+            wantedConfig = (MultiverseCoreConfiguration) multiverseConfig.get("multiverse-configuration");
+        } catch (Exception ignore) {
+        } finally {
+            config = ((wantedConfig == null) ? new MultiverseCoreConfiguration() : wantedConfig);
+        }
+        this.worldManager.loadWorldConfig(new File(getDataFolder(), "worlds.yml"));
+
+        int level = Logging.getDebugLevel();
+        Logging.setDebugLevel(getMVConfig().getGlobalDebug());
+        if (level != Logging.getDebugLevel()) {
+            getServer().getPluginManager().callEvent(new MVDebugModeEvent(level));
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean saveMVConfig() {
+        try {
+            this.multiverseConfig.set("multiverse-configuration", getMVConfig());
+            this.multiverseConfig.save(new File(getDataFolder(), "config.yml"));
+            return true;
+        } catch (IOException e) {
+            Logging.severe("Could not save Multiverse config.yml config. Please check your file permissions.");
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean saveAllConfigs() {
+        return this.saveMVConfig() && this.worldManager.saveWorldsConfig();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public AnchorManager getAnchorManager() {
+        return this.anchorManager;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public BlockSafety getBlockSafety() {
+        return blockSafety;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setBlockSafety(BlockSafety blockSafety) {
+        if (blockSafety == null) {
+            throw new NullPointerException("block safety may not be null.");
+        }
+        this.blockSafety = blockSafety;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public LocationManipulation getLocationManipulation() {
+        return locationManipulation;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setLocationManipulation(LocationManipulation locationManipulation) {
+        if (locationManipulation == null) {
+            throw new NullPointerException("location manipulation may not be null.");
+        }
+        this.locationManipulation = locationManipulation;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public SafeTTeleporter getSafeTTeleporter() {
+        return safeTTeleporter;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setSafeTTeleporter(SafeTTeleporter safeTTeleporter) {
+        if (safeTTeleporter == null) {
+            throw new NullPointerException("safeTTeleporter may not be null.");
+        }
+        this.safeTTeleporter = safeTTeleporter;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public MVConfig getMVConfig() {
+        return config;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public UnsafeCallWrapper getUnsafeCallWrapper() {
+        return this.unsafeCallWrapper;
+    }
+
+
+    //TODO: REMOVE THIS STATIC CRAP - START
+    private static final Map<String, String> teleportQueue = new HashMap<String, String>();
+
+    /**
+     * This method is used to add a teleportation to the teleportQueue.
+     *
+     * @param teleporter The name of the player that initiated the teleportation.
+     * @param teleportee The name of the player that was teleported.
+     */
+    public static void addPlayerToTeleportQueue(String teleporter, String teleportee) {
+        Logging.finest("Adding mapping '%s' => '%s' to teleport queue", teleporter, teleportee);
+        teleportQueue.put(teleportee, teleporter);
+    }
+
+    /**
+     * This method is used to find out who is teleporting a player.
+     * @param playerName The teleported player (the teleportee).
+     * @return The player that teleported the other one (the teleporter).
+     */
+    public static String getPlayerTeleporter(String playerName) {
+        if (teleportQueue.containsKey(playerName)) {
+            String teleportee = teleportQueue.get(playerName);
+            teleportQueue.remove(playerName);
+            return teleportee;
+        }
+        return null;
+    }
+    //TODO: REMOVE THIS STATIC CRAP - END
+
+
+    // For testing purposes only //
+
+    private File serverFolder = new File(System.getProperty("user.dir"));
+
+    /**
+     * This is for unit testing.
+     *
+     * @param loader The PluginLoader to use.
+     * @param description The Description file to use.
+     * @param dataFolder The folder that other datafiles can be found in.
+     * @param file The location of the plugin.
+     */
+    public MultiverseCore(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file) {
+        super(loader, description, dataFolder, file);
+    }
+
+    /**
+     * Gets the {@link MVPlayerListener}.
+     *
+     * @return The {@link MVPlayerListener}.
+     */
+    public MVPlayerListener getPlayerListener() {
+        return this.playerListener;
+    }
+
+    /**
+     * Gets the {@link MVChatListener}.
+     *
+     * @return The {@link MVChatListener}.
+     */
+    public MVChatListener getChatListener() {
+        return this.chatListener;
+    }
+
+    /**
+     * Gets the {@link MVEntityListener}.
+     *
+     * @return The {@link MVEntityListener}.
+     */
+    public MVEntityListener getEntityListener() {
+        return this.entityListener;
+    }
+
+    /**
+     * Gets the {@link MVWeatherListener}.
+     *
+     * @return The {@link MVWeatherListener}.
+     */
+    public MVWeatherListener getWeatherListener() {
+        return this.weatherListener;
+    }
+
+    /**
+     * Gets the server's root-folder as {@link File}.
+     *
+     * @return The server's root-folder
+     */
+    public File getServerFolder() {
+        return serverFolder;
+    }
+
+    /**
+     * Sets this server's root-folder.
+     *
+     * @param newServerFolder The new server-root
+     */
+    public void setServerFolder(File newServerFolder) {
+        if (!newServerFolder.isDirectory())
+            throw new IllegalArgumentException("That's not a folder!");
+
+        this.serverFolder = newServerFolder;
+    }
+}

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

@@ -0,0 +1,316 @@
+package com.onarandombox.MultiverseCore;
+
+import java.util.Map;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.api.MVConfig;
+import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
+import me.main__.util.SerializationConfig.NoSuchPropertyException;
+import me.main__.util.SerializationConfig.Property;
+import me.main__.util.SerializationConfig.SerializationConfig;
+import org.bukkit.Bukkit;
+
+/**
+ * Our configuration.
+ */
+public class MultiverseCoreConfiguration extends SerializationConfig implements MVConfig {
+    private static MultiverseCoreConfiguration instance;
+
+    /**
+     * Sets the statically saved instance.
+     * @param instance The new instance.
+     */
+    public static void setInstance(MultiverseCoreConfiguration instance) {
+        MultiverseCoreConfiguration.instance = instance;
+    }
+
+    /**
+     * @return True if the static instance of config is set.
+     */
+    public static boolean isSet() {
+        return instance != null;
+    }
+
+    /**
+     * Gets the statically saved instance.
+     * @return The statically saved instance.
+     */
+    @Deprecated
+    public static MultiverseCoreConfiguration getInstance() {
+        if (instance == null)
+            throw new IllegalStateException("The instance wasn't set!");
+        return instance;
+    }
+
+    @Property
+    private volatile boolean enforceaccess;
+    @Property
+    private volatile boolean prefixchat;
+    @Property
+    private volatile String prefixchatformat;
+    @Property
+    private volatile boolean teleportintercept;
+    @Property
+    private volatile boolean firstspawnoverride;
+    @Property
+    private volatile boolean displaypermerrors;
+    @Property
+    private volatile int globaldebug;
+    @Property
+    private volatile boolean silentstart;
+    @Property
+    private volatile double version;
+    @Property
+    private volatile String firstspawnworld;
+    @Property
+    private volatile boolean defaultportalsearch;
+    @Property
+    private volatile int portalsearchradius;
+    @Property
+    private volatile boolean autopurge;
+    @Property
+    private volatile boolean idonotwanttodonate;
+
+    public MultiverseCoreConfiguration() {
+        super();
+        MultiverseCoreConfiguration.setInstance(this);
+    }
+
+    public MultiverseCoreConfiguration(Map<String, Object> values) {
+        super(values);
+        MultiverseCoreConfiguration.setInstance(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void setDefaults() {
+        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+        enforceaccess = false;
+        prefixchat = false;
+        prefixchatformat = "[%world%]%chat%";
+        teleportintercept = true;
+        firstspawnoverride = true;
+        displaypermerrors = true;
+        globaldebug = 0;
+        this.version = 2.9;
+        silentstart = false;
+        defaultportalsearch = true;
+        portalsearchradius = 128;
+        autopurge = true;
+        idonotwanttodonate = false;
+        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean setConfigProperty(String property, String value) {
+        try {
+            return this.setProperty(property, value, true);
+        } catch (NoSuchPropertyException e) {
+            return false;
+        }
+    }
+
+    // And here we go:
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getEnforceAccess() {
+        return this.enforceaccess;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setEnforceAccess(boolean enforceAccess) {
+        this.enforceaccess = enforceAccess;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getPrefixChat() {
+        return this.prefixchat;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setPrefixChat(boolean prefixChat) {
+        this.prefixchat = prefixChat;
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getPrefixChatFormat() {
+        return this.prefixchatformat;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setPrefixChatFormat(String prefixChatFormat) {
+        this.prefixchatformat = prefixChatFormat;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getTeleportIntercept() {
+        return this.teleportintercept;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setTeleportIntercept(boolean teleportIntercept) {
+        this.teleportintercept = teleportIntercept;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getFirstSpawnOverride() {
+        return this.firstspawnoverride;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setFirstSpawnOverride(boolean firstSpawnOverride) {
+        this.firstspawnoverride = firstSpawnOverride;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getDisplayPermErrors() {
+        return this.displaypermerrors;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDisplayPermErrors(boolean displayPermErrors) {
+        this.displaypermerrors = displayPermErrors;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getGlobalDebug() {
+        return this.globaldebug;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setGlobalDebug(int globalDebug) {
+        this.globaldebug = globalDebug;
+        Logging.setDebugLevel(globalDebug);
+        Bukkit.getPluginManager().callEvent(new MVDebugModeEvent(globalDebug));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public double getVersion() {
+        return this.version;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setVersion(int version) {
+        this.version = version;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getFirstSpawnWorld() {
+        return this.firstspawnworld;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setFirstSpawnWorld(String firstSpawnWorld) {
+        this.firstspawnworld = firstSpawnWorld;
+    }
+
+    @Override
+    public void setSilentStart(boolean silentStart) {
+        Logging.setShowingConfig(!silentStart);
+        this.silentstart = silentStart;
+    }
+
+    @Override
+    public boolean getSilentStart() {
+        return silentstart;
+    }
+
+    @Override
+    public void setUseDefaultPortalSearch(boolean useDefaultPortalSearch) {
+        defaultportalsearch = useDefaultPortalSearch;
+    }
+
+    @Override
+    public boolean isUsingDefaultPortalSearch() {
+        return defaultportalsearch;
+    }
+
+    @Override
+    public void setPortalSearchRadius(int searchRadius) {
+        this.portalsearchradius = searchRadius;
+    }
+
+    @Override
+    public int getPortalSearchRadius() {
+        return portalsearchradius;
+    }
+
+    @Override
+    public boolean isAutoPurgeEnabled() {
+        return autopurge;
+    }
+
+    @Override
+    public void setAutoPurgeEnabled(boolean autopurge) {
+        this.autopurge = autopurge;
+    }
+
+    @Override
+    public boolean isShowingDonateMessage() {
+        return !idonotwanttodonate;
+    }
+
+    @Override
+    public void setShowDonateMessage(boolean showDonateMessage) {
+        this.idonotwanttodonate = !showDonateMessage;
+    }
+}

src/main/java/com/onarandombox/MultiverseCore/anchor/AnchorManager.java

@@ -5,7 +5,15 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package org.mvplugins.multiverse.core.anchor;
+package com.onarandombox.MultiverseCore.anchor;
+
+import com.dumptruckman.minecraft.util.Logging;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.Location;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,43 +22,18 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
-import com.dumptruckman.minecraft.util.Logging;
-import jakarta.inject.Inject;
-import org.bukkit.Location;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.jvnet.hk2.annotations.Service;
-
-import org.mvplugins.multiverse.core.MultiverseCore;
-import org.mvplugins.multiverse.core.api.LocationManipulation;
-import org.mvplugins.multiverse.core.config.MVCoreConfig;
+import java.util.logging.Level;
 
 /**
  * Manages anchors.
  */
-@Service
 public class AnchorManager {
+    private MultiverseCore plugin;
     private Map<String, Location> anchors;
     private FileConfiguration anchorConfig;
 
-    private final Plugin plugin;
-    private final LocationManipulation locationManipulation;
-    private final MVCoreConfig config;
-
-    @Inject
-    public AnchorManager(
-            MultiverseCore plugin,
-            LocationManipulation locationManipulation,
-            MVCoreConfig config
-    ) {
+    public AnchorManager(MultiverseCore plugin) {
         this.plugin = plugin;
-        this.locationManipulation = locationManipulation;
-        this.config = config;
-
         this.anchors = new HashMap<String, Location>();
     }
 
@@ -65,7 +48,7 @@ public class AnchorManager {
         Set<String> anchorKeys = anchorsSection.getKeys(false);
         for (String key : anchorKeys) {
             //world:x,y,z:pitch:yaw
-            Location anchorLocation = this.locationManipulation.stringToLocation(anchorsSection.getString(key, ""));
+            Location anchorLocation = plugin.getLocationManipulation().stringToLocation(anchorsSection.getString(key, ""));
             if (anchorLocation != null) {
                 Logging.config("Loading anchor:  '%s'...", key);
                 this.anchors.put(key, anchorLocation);
@@ -115,7 +98,7 @@ public class AnchorManager {
      * @return True if the anchor was successfully saved.
      */
     public boolean saveAnchorLocation(String anchor, String location) {
-        Location parsed = this.locationManipulation.stringToLocation(location);
+        Location parsed = plugin.getLocationManipulation().stringToLocation(location);
         return parsed != null && this.saveAnchorLocation(anchor, parsed);
     }
 
@@ -129,7 +112,7 @@ public class AnchorManager {
         if (l == null) {
             return false;
         }
-        this.anchorConfig.set("anchors." + anchor, this.locationManipulation.locationToString(l));
+        this.anchorConfig.set("anchors." + anchor, plugin.getLocationManipulation().locationToString(l));
         this.anchors.put(anchor, l);
         return this.saveAnchors();
     }
@@ -161,8 +144,8 @@ public class AnchorManager {
             // Add to the list if we're not enforcing access
             // OR
             // We are enforcing access and the user has the permission.
-            if (!config.getEnforceAccess() ||
-                    (config.getEnforceAccess() && p.hasPermission(worldPerm))) {
+            if (!this.plugin.getMVConfig().getEnforceAccess() ||
+                    (this.plugin.getMVConfig().getEnforceAccess() && p.hasPermission(worldPerm))) {
                 myAnchors.add(anchor);
             } else {
                 Logging.finer(String.format("Not adding anchor %s to the list, user %s doesn't have the %s " +

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

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

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

@@ -1,16 +1,13 @@
-package org.mvplugins.multiverse.core.api;
+package com.onarandombox.MultiverseCore.api;
 
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Vehicle;
-import org.jetbrains.annotations.Nullable;
-import org.jvnet.hk2.annotations.Contract;
 
 /**
  * Used to get block/location-related information.
  */
-@Contract
 public interface BlockSafety {
     /**
      * This function checks whether the block at the given coordinates are above air or not.
@@ -38,35 +35,8 @@ public interface BlockSafety {
      */
     boolean playerCanSpawnHereSafely(Location l);
 
-    /**
-     * Finds a portal-block next to the specified {@link Location}.
-     *
-     * @param location  The {@link Location}
-     * @return The next portal-block's {@link Location}.
-     */
-    Location findPortalBlockNextTo(Location location);
-
-    /**
-     * Gets the next safe location around the given location.
-     *
-     * @param location  A {@link Location}.
-     * @return A safe {@link Location}.
-     */
-    @Nullable Location getSafeLocation(Location location);
-
-    /**
-     * Gets the next safe location around the given location.
-     *
-     * @param location  A {@link Location}.
-     * @param tolerance The tolerance of how far up and down to search.
-     * @param radius    The radius around given location to search.
-     * @return A safe {@link Location}.
-     */
-    @Nullable Location getSafeLocation(Location location, int tolerance, int radius);
-
     /**
      * Gets a safe bed spawn location OR null if the bed is invalid.
-     *
      * @param l The location of the bead head (block with the pillow on it).
      * @return Safe location around the bed or null if no location was found.
      */
@@ -74,7 +44,6 @@ public interface BlockSafety {
 
     /**
      * Gets the location of the top block at the specified {@link Location}.
-     *
      * @param l Any {@link Location}.
      * @return The {@link Location} of the top-block.
      */
@@ -82,7 +51,6 @@ public interface BlockSafety {
 
     /**
      * Gets the location of the top block at the specified {@link Location}.
-     *
      * @param l Any {@link Location}.
      * @return The {@link Location} of the top-block.
      */
@@ -90,7 +58,6 @@ public interface BlockSafety {
 
     /**
      * Checks if an entity would be on track at the specified {@link Location}.
-     *
      * @param l The {@link Location}.
      * @return True if an entity would be on tracks at the specified {@link Location}.
      */
@@ -98,7 +65,6 @@ public interface BlockSafety {
 
     /**
      * Checks if the specified {@link Minecart} can spawn safely.
-     *
      * @param cart The {@link Minecart}.
      * @return True if the minecart can spawn safely.
      */
@@ -106,7 +72,6 @@ public interface BlockSafety {
 
     /**
      * Checks if the specified {@link Vehicle} can spawn safely.
-     *
      * @param vehicle The {@link Vehicle}.
      * @return True if the vehicle can spawn safely.
      */

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

@@ -1,13 +1,11 @@
-package org.mvplugins.multiverse.core.api;
+package com.onarandombox.MultiverseCore.api;
 
 import java.util.Collection;
 
 import co.aikar.commands.BukkitCommandIssuer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jvnet.hk2.annotations.Contract;
 
-@Contract
 public interface Destination<T extends DestinationInstance> {
     /**
      * Returns the identifier or prefix that is required for this destination.
@@ -45,4 +43,14 @@ public interface Destination<T extends DestinationInstance> {
      * @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,4 +1,4 @@
-package org.mvplugins.multiverse.core.api;
+package com.onarandombox.MultiverseCore.api;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;

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

@@ -1,14 +1,12 @@
-package org.mvplugins.multiverse.core.api;
+package com.onarandombox.MultiverseCore.api;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.util.Vector;
-import org.jvnet.hk2.annotations.Contract;
 
 /**
  * Used to manipulate locations.
  */
-@Contract
 public interface LocationManipulation {
     /**
      * Convert a Location into a Colon separated string to allow us to store it in text.

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

@@ -1,87 +1,66 @@
-package org.mvplugins.multiverse.core.api;
+package com.onarandombox.MultiverseCore.api;
 
-import io.vavr.control.Try;
-import org.jvnet.hk2.annotations.Contract;
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
 
-import org.mvplugins.multiverse.core.configuration.handle.StringPropertyHandle;
-import org.mvplugins.multiverse.core.placeholders.MultiverseCorePlaceholders;
-
-@Contract
-public interface MVConfig {
+/**
+ * The configuration of MultiverseCore.
+ */
+public interface MVConfig extends ConfigurationSerializable {
+    /**
+     * Sets a property using a {@link String}.
+     * @param property The name of the property.
+     * @param value The value.
+     * @return True on success, false if the operation failed.
+     */
+    boolean setConfigProperty(String property, String value);
 
     /**
-     * Loads the config from disk.
-     * @return True if the config was loaded successfully.
+     * Sets firstSpawnWorld.
+     * @param firstSpawnWorld The new value.
      */
-    Try<Void> load();
+    void setFirstSpawnWorld(String firstSpawnWorld);
 
     /**
-     * Whether the config has been loaded.
-     * @return True if the config has been loaded.
+     * Gets firstSpawnWorld.
+     * @return firstSpawnWorld.
      */
-    boolean isLoaded();
+    String getFirstSpawnWorld();
 
     /**
-     * Saves the config to disk.
+     * Sets version.
+     * @param version The new value.
      */
-    Try<Void> save();
+    void setVersion(int version);
 
     /**
-     * Gets the handler for managing config with string names and values.
-     *
-     * @return The config handle for string properties.
+     * Gets version.
+     * @return version.
      */
-    StringPropertyHandle getStringPropertyHandle();
+    double getVersion();
 
     /**
-     * Sets world access permissions should be enforced.
-     * @param enforceAccess The new value.
+     * Sets globalDebug.
+     * @param globalDebug The new value.
      */
-    void setEnforceAccess(boolean enforceAccess);
+    void setGlobalDebug(int globalDebug);
 
     /**
-     * Gets enforceAccess.
-     * @return enforceAccess.
+     * Gets globalDebug.
+     * @return globalDebug.
      */
-    boolean getEnforceAccess();
+    int getGlobalDebug();
 
     /**
-     * Sets whether the game mode should be enforced.
-     * @param enforceGameMode The new value.
+     * Sets displayPermErrors.
+     * @param displayPermErrors The new value.
      */
-    void setEnforceGameMode(boolean enforceGameMode);
+    void setDisplayPermErrors(boolean displayPermErrors);
 
     /**
-     * Gets enforceGameMode value.
-     * @return True if game mode should be enforced.
+     * Gets displayPermErrors.
+     * @return displayPermErrors.
      */
-    boolean getEnforceGameMode();
-
-    /**
-     * Sets whether or not the automatic purge of entities is enabled.
-     *
-     * @param autopurge True if automatic purge should be enabled.
-     */
-    void setAutoPurgeEntities(boolean autopurge);
-
-    /**
-     * Gets whether or not the automatic purge of entities is enabled.
-     *
-     * @return True if automatic purge is enabled.
-     */
-    boolean isAutoPurgeEntities();
-
-    /**
-     * Sets teleportIntercept.
-     * @param teleportIntercept The new value.
-     */
-    void setTeleportIntercept(boolean teleportIntercept);
-
-    /**
-     * Gets teleportIntercept.
-     * @return teleportIntercept.
-     */
-    boolean getTeleportIntercept();
+    boolean getDisplayPermErrors();
 
     /**
      * Sets firstSpawnOverride.
@@ -96,81 +75,29 @@ public interface MVConfig {
     boolean getFirstSpawnOverride();
 
     /**
-     * Sets firstSpawnWorld.
-     * @param firstSpawnWorld The new value.
+     * Sets teleportIntercept.
+     * @param teleportIntercept The new value.
      */
-    void setFirstSpawnLocation(String firstSpawnWorld);
+    void setTeleportIntercept(boolean teleportIntercept);
 
     /**
-     * Gets firstSpawnWorld.
-     * @return firstSpawnWorld.
+     * Gets teleportIntercept.
+     * @return teleportIntercept.
      */
-    String getFirstSpawnLocation();
-
-    /**
-     * Sets whether join destination should be enabled.
-     * @param enableJoinDestination The new value
-     */
-    void setEnableJoinDestination(boolean enableJoinDestination);
-
-    /**
-     * Gets enableJoinDestination.
-     * @return enableJoinDestination
-     */
-    boolean getEnableJoinDestination();
-
-    /**
-     * Sets alwaysSpawnDestination.
-     * @param alwaysSpawnDestination The new value
-     */
-    void setJoinDestination(String alwaysSpawnDestination);
-
-    /**
-     * Gets alwaysSpawnDestination.
-     * @return alwaysSpawnLocation
-     */
-    String getJoinDestination();
-
-    /**
-     * Sets whether or not to let Bukkit determine portal search radius on its own or if Multiverse should give input.
-     *
-     * @param useDefaultPortalSearch True to let Bukkit determine portal search radius on its own.
-     */
-    void setUseCustomPortalSearch(boolean useDefaultPortalSearch);
-
-    /**
-     * Gets whether or not Bukkit will be determining portal search radius on its own or if Multiverse should help.
-     *
-     * @return True means Bukkit will use its own default values.
-     */
-    boolean isUsingCustomPortalSearch();
-
-    /**
-     * Sets the radius at which vanilla style portals will be searched for to connect to worlds together.
-     *
-     * @param searchRadius The portal search radius.
-     */
-    void setCustomPortalSearchRadius(int searchRadius);
-
-    /**
-     * Gets the radius at which vanilla style portals will be searched for to connect to worlds together.
-     *
-     * @return The portal search radius.
-     */
-    int getCustomPortalSearchRadius();
+    boolean getTeleportIntercept();
 
     /**
      * Sets prefixChat.
      * @param prefixChat The new value.
      */
-    void setEnablePrefixChat(boolean prefixChat);
+    void setPrefixChat(boolean prefixChat);
 
     /**
      * Gets prefixChat.
      * @return prefixChat.
      */
-    boolean isEnablePrefixChat();
-
+    boolean getPrefixChat();
+    
     /**
      * Sets prefixChatFormat.
      * @param prefixChatFormat The new value.
@@ -184,28 +111,16 @@ public interface MVConfig {
     String getPrefixChatFormat();
 
     /**
-     * Sets whether to register the {@link MultiverseCorePlaceholders} class with PlaceholderAPI plugin.
-     * @param registerPapiHook The new value.
+     * Sets enforceAccess.
+     * @param enforceAccess The new value.
      */
-    void setRegisterPapiHook(boolean registerPapiHook);
+    void setEnforceAccess(boolean enforceAccess);
 
     /**
-     * Gets whether to register the {@link MultiverseCorePlaceholders} class with PlaceholderAPI plugin.
-     * @return registerPapiHook.
+     * Gets enforceAccess.
+     * @return enforceAccess.
      */
-    boolean isRegisterPapiHook();
-
-    /**
-     * Sets globalDebug.
-     * @param globalDebug The new value.
-     */
-    void setGlobalDebug(int globalDebug);
-
-    /**
-     * Gets globalDebug.
-     * @return globalDebug.
-     */
-    int getGlobalDebug();
+    boolean getEnforceAccess();
 
     /**
      * Sets whether to suppress startup messages.
@@ -222,11 +137,46 @@ public interface MVConfig {
     boolean getSilentStart();
 
     /**
-     * Sets whether or not the donation/patreon messages are shown.
+     * Sets whether or not to let Bukkit determine portal search radius on its own or if Multiverse should give input.
      *
-     * @param idonotwanttodonate True if donation/patreon messages should be shown.
+     * @param useDefaultPortalSearch True to let Bukkit determine portal search radius on its own.
      */
-    void setShowDonateMessage(boolean idonotwanttodonate);
+    void setUseDefaultPortalSearch(boolean useDefaultPortalSearch);
+
+    /**
+     * Gets whether or not Bukkit will be determining portal search radius on its own or if Multiverse should help.
+     *
+     * @return True means Bukkit will use its own default values.
+     */
+    boolean isUsingDefaultPortalSearch();
+
+    /**
+     * Sets the radius at which vanilla style portals will be searched for to connect to worlds together.
+     *
+     * @param searchRadius The portal search radius.
+     */
+    void setPortalSearchRadius(int searchRadius);
+
+    /**
+     * Gets the radius at which vanilla style portals will be searched for to connect to worlds together.
+     *
+     * @return The portal search radius.
+     */
+    int getPortalSearchRadius();
+
+    /**
+     * Gets whether or not the automatic purge of entities is enabled.
+     *
+     * @return True if automatic purge is enabled.
+     */
+    boolean isAutoPurgeEnabled();
+
+    /**
+     * Sets whether or not the automatic purge of entities is enabled.
+     *
+     * @param autopurge True if automatic purge should be enabled.
+     */
+    void setAutoPurgeEnabled(boolean autopurge);
 
     /**
      * Gets whether or not the donation/patreon messages are shown.
@@ -234,4 +184,11 @@ public interface MVConfig {
      * @return True if donation/patreon messages should be shown.
      */
     boolean isShowingDonateMessage();
+
+    /**
+     * Sets whether or not the donation/patreon messages are shown.
+     *
+     * @param idonotwanttodonate True if donation/patreon messages should be shown.
+     */
+    void setShowDonateMessage(boolean idonotwanttodonate);
 }

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

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

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

@@ -0,0 +1,142 @@
+/******************************************************************************
+ * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
+ * Multiverse 2 is licensed under the BSD License.                            *
+ * For more information please check the README.md file included              *
+ * with this project.                                                         *
+ ******************************************************************************/
+
+package com.onarandombox.MultiverseCore.api;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.util.Vector;
+
+/**
+ * A destination API for Multiverse
+ * Any plugin can add these to MV and when they are, any action that uses them (portals, MVTP, etc.) can use them!
+ */
+@Deprecated
+public interface MVDestination {
+    /**
+     * Returns the identifier or prefix that is required for this destination.
+     * <p>
+     * Portals have a prefix of "p" for example and OpenWarp (third party plugin) uses "ow". This is derived from a
+     * hash and cannot have duplicate values. Read that as your plugin cannot use 'p' because it's already used.
+     * Please check the wiki when adding a custom destination!
+     *
+     * @return The identifier or prefix that is required for this destination.
+     */
+    String getIdentifier();
+
+    /**
+     * Allows you to determine if a Destination is valid for the type it thinks it is.
+     * <p>
+     * An example of this would be the exact destination. A valid string would be: e:0,0,0 where an invalid one would
+     * be e:1:2:3. The first string would return true the second would return false. This is simply a convenience
+     * method
+     * and does not even NEED to be called, but it's highly recommended if you're teleporting, but it's mainly for
+     * Multiverse Internal use.
+     *
+     * @param plugin      The plugin who the type belongs to.
+     * @param destination The destination string. ex: p:MyPortal:nw
+     *
+     * @return True if the destination is valid, false if not.
+     */
+    boolean isThisType(JavaPlugin plugin, String destination);
+
+    /**
+     * Returns the location a specific entity will spawn at when being teleported to this Destination.
+     * <p>
+     * To just retrieve the location as it is stored you can just pass null, but be warned some destinations may return
+     * null back to you if you do this. It is always safer to pass an actual entity. This is used so things like
+     * minecarts can be teleported.
+     * <p>
+     * Do not forget to use {@link #getVelocity()} as destinations can use this too!
+     *
+     * @param entity The entity to be teleported.
+     *
+     * @return The location of the entity.
+     */
+    Location getLocation(Entity entity);
+
+    /**
+     * Returns the velocity vector for this destination.
+     * <p>
+     * Plugins wishing to fully support MVDestinations MUST implement this.
+     *
+     * @return A vector representing the speed/direction the player should travel when arriving
+     */
+    Vector getVelocity();
+
+    /**
+     * Sets the destination string.
+     * <p>
+     * This should be used when you want to tell this destination object about a change in where it should take people.
+     * The destination param should be match the result from {@link #getIdentifier()}. A valid example would be that if
+     * {@link #getIdentifier()} returned "ow" our destination string could be "ow:TownCenter" but could not be
+     * "p:HomePortal"
+     *
+     * @param plugin      The plugin who the type belongs to.
+     * @param destination The destination string. ex: p:MyPortal:nw
+     */
+    void setDestination(JavaPlugin plugin, String destination);
+
+    /**
+     * Returns true if the destination is valid and players will be taken to it.
+     * <p>
+     * Even if destinations are in the correct format (p:MyPortal) MyPortal may not exist, and therefore this would
+     * return false.
+     *
+     * @return True if the destination is valid; false if not.
+     */
+    boolean isValid();
+
+    /**
+     * Gives you a general friendly description of the type of destination.
+     * <p>
+     * For example, the PlayerDestination sets this to "Player". You can use this to show where a player will be taken.
+     *
+     * @return A friendly string description of the type of destination.
+     */
+    String getType();
+
+    /**
+     * Gives you a specific name of the destination.
+     * <p>
+     * For example, the PlayerDestination sets this to The Player's Name.
+     *
+     * @return A friendly string stating the name of the destination.
+     */
+    String getName();
+
+    /**
+     * Returns a string that can easily be saved in the config that contains all the details needed to rebuild this
+     * destination.
+     * <p>
+     * ex: e:0,0,0:50:50
+     *
+     * @return The savable config string.
+     */
+    String toString();
+
+    /**
+     * Returns the permissions string required to go here.
+     * <p>
+     * ex: multiverse.access.world
+     * <p>
+     * NOTE: This is NOT the permission to use the teleport command.
+     *
+     * @return the permissions string required to go here.
+     */
+    String getRequiredPermission();
+
+    /**
+     * Should the Multiverse SafeTeleporter be used?
+     * <p>
+     * If not, MV will blindly take people to the location specified.
+     *
+     * @return True if the SafeTeleporter will be used, false if not.
+     */
+    boolean useSafeTeleporter();
+}

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

@@ -5,7 +5,7 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package org.mvplugins.multiverse.core.api;
+package com.onarandombox.MultiverseCore.api;
 
 /**
  * This interface is implemented by every official Multiverse-plugin.
@@ -14,7 +14,7 @@ public interface MVPlugin {
     /**
      * Gets the reference to MultiverseCore.
      *
-     * @return A valid {@link org.mvplugins.multiverse.core.MultiverseCore}.
+     * @return A valid {@link com.onarandombox.MultiverseCore}.
      */
     MVCore getCore();
 

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

@@ -0,0 +1,675 @@
+/******************************************************************************
+ * 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 java.util.List;
+
+import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
+import com.onarandombox.MultiverseCore.world.configuration.AddProperties;
+import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType;
+import com.onarandombox.MultiverseCore.world.configuration.EnglishChatColor;
+import org.bukkit.ChatColor;
+import org.bukkit.Difficulty;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.WorldType;
+import org.bukkit.permissions.Permission;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * The API for a Multiverse Handled World.
+ */
+public interface MVWorld {
+    /**
+     * Returns the Bukkit world object that this world describes.
+     *
+     * @return A {@link World}
+     */
+    World getCBWorld();
+
+    /**
+     * Gets the name of this world. The name cannot be changed.
+     * <p>
+     * Note for plugin developers: Usually {@link #getAlias()}
+     * is what you want to use instead of this method.
+     *
+     * @return The name of the world as a String.
+     */
+    String getName();
+
+    /**
+     * Gets the type of this world. As of 1.2 this will be:
+     * FLAT, NORMAL or VERSION_1_1
+     * <p>
+     * This is <b>not</b> the generator.
+     *
+     * @return The Type of this world.
+     */
+    WorldType getWorldType();
+
+    /**
+     * Gets the environment of this world.
+     *
+     * @return A {@link org.bukkit.World.Environment}.
+     */
+    World.Environment getEnvironment();
+
+    /**
+     * Sets the environment of a world.
+     * <p>
+     * Note: This will ONLY take effect once the world is unloaded/reloaded.
+     *
+     * @param environment A {@link org.bukkit.World.Environment}.
+     */
+    void setEnvironment(World.Environment environment);
+
+    /**
+     * Gets the difficulty of this world.
+     *
+     * @return The difficulty of this world.
+     */
+    Difficulty getDifficulty();
+
+    /**
+     * Sets the difficulty of this world and returns true if success.
+     * Valid string values are either an integer of difficulty(0-3) or
+     * the name that resides in the Bukkit enum, ex. {@code PEACEFUL}
+     *
+     * @param difficulty The difficulty to set the world to as a string.
+     * @return True if success, false if the provided string
+     *         could not be translated to a difficulty.
+     * @deprecated Use {@link #setDifficulty(Difficulty)} or, if you have to
+     * pass a string, use {@link #setPropertyValue(String, String)} instead.
+     */
+    @Deprecated
+    boolean setDifficulty(String difficulty);
+
+    /**
+     * Sets the difficulty of this world and returns {@code true} on success.
+     * Valid string values are either an integer of difficulty(0-3) or
+     * the name that resides in the Bukkit enum, ex. PEACEFUL
+     *
+     * @param difficulty The new difficulty.
+     * @return True if success, false if the operation failed... for whatever reason.
+     */
+    boolean setDifficulty(Difficulty difficulty);
+
+    /**
+     * Gets the world seed of this world.
+     *
+     * @return The Long version of the seed.
+     */
+    long getSeed();
+
+    /**
+     * Sets the seed of this world.
+     *
+     * @param seed A Long that is the seed.
+     */
+    void setSeed(long seed);
+
+    /**
+     * Gets the generator of this world.
+     *
+     * @return The name of the generator.
+     */
+    String getGenerator();
+
+    /**
+     * Sets the generator of this world.
+     *
+     * @param generator The new generator's name.
+     */
+    void setGenerator(String generator);
+
+    /**
+     * Gets the help-message for a property.
+     * @param property The name of the property.
+     * @return The help-message.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found.
+     */
+    String getPropertyHelp(String property) throws PropertyDoesNotExistException;
+
+    /**
+     * Gets a property as {@link String}.
+     *
+     * @param property The name of a world property to get.
+     * @return The string-representation of that property.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     */
+    String getPropertyValue(String property) throws PropertyDoesNotExistException;
+
+    /**
+     * Sets a property to a given value.
+     *
+     * @param property The name of a world property to set.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @return True if the value was set, false if not.
+     * @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
+     */
+    boolean setPropertyValue(String property, String value) throws PropertyDoesNotExistException;
+
+    /**
+     * Adds a value to the given property. The property must be a {@link AddProperties}.
+     *
+     * @param property The name of a {@link AddProperties} to add a value to.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @return True if the value was added, false if not.
+     * @deprecated We changed the entire world-config-system. This is not compatible any more.
+     */
+    @Deprecated
+    boolean addToVariable(String property, String value);
+
+    /**
+     * Removes a value from the given property. The property must be a {@link AddProperties}.
+     *
+     * @param property The name of a {@link AddProperties} to remove a value
+     *                 from.
+     * @param value    A value in string representation, it will be parsed to the correct type.
+     * @return True if the value was removed, false if not.
+     * @deprecated We changed the entire world-config-system. This is not compatible any more.
+     */
+    @Deprecated
+    boolean removeFromVariable(String property, String value);
+
+    /**
+     * Removes all values from the given property. The property must be a {@link AddProperties}.
+     *
+     * @param property The name of a {@link AddProperties} to clear.
+     * @return True if it was cleared, false if not.
+     * @deprecated We changed the entire world-config-system. This is not compatible any more.
+     */
+    @Deprecated
+    boolean clearVariable(String property);
+
+    /**
+     * Clears a list property (sets it to []).
+     *
+     * @param property The property to clear.
+     * @return True if success, false if fail.
+     * @deprecated We changed the entire world-config-system. This is not compatible any more.
+     */
+    @Deprecated
+    boolean clearList(String property);
+    // end of old config stuff
+
+    // permission stuff
+    /**
+     * Gets the lowercased name of the world. This method is required, since the permissables
+     * lowercase all permissions when recalculating.
+     * <p>
+     * Note: This also means if a user has worlds named: world and WORLD, that they can both
+     * exist, and both be teleported to independently, but their permissions **cannot** be
+     * uniqueified at this time. See bug report #.
+     *
+     * @return The lowercased name of the world.
+     */
+    String getPermissibleName();
+
+    /**
+     * Gets the permission required to enter this world.
+     *
+     * @return The permission required to be exempt from charges to/from this world.
+     */
+    Permission getAccessPermission();
+
+    /**
+     * Gets the permission required to be exempt when entering.
+     *
+     * @return The permission required to be exempt when entering.
+     */
+    Permission getExemptPermission();
+    // end of permission stuff
+
+    /**
+     * Gets the alias of this world.
+     * <p>
+     * This alias allows users to have a world named "world" but show up in the list as "FernIsland"
+     *
+     * @return The alias of the world as a String.
+     */
+    String getAlias();
+
+    /**
+     * Sets the alias of the world.
+     *
+     * @param alias A string that is the new alias.
+     */
+    void setAlias(String alias);
+
+    /**
+     * Gets the color that this world's name/alias will display as.
+     *
+     * @return The color of this world.
+     */
+    ChatColor getColor();
+
+    /**
+     * Sets the color that this world's name/alias will display as.
+     *
+     * @param color A valid color name.
+     * @return True if the color was set, false if not.
+     */
+    boolean setColor(String color);
+
+    /**
+     * Gets the style that this world's name/alias will display as.
+     *
+     * @return The style of this world. {@code null} for "normal" style.
+     */
+    ChatColor getStyle();
+
+    /**
+     * Sets the style that this world's name/alias will display as.
+     *
+     * @param style A valid style name.
+     * @return True if the style was set, false if not.
+     */
+    boolean setStyle(String style);
+
+    /**
+     * Tells you if someone entered a valid color.
+     *
+     * @param color A string that may translate to a color.
+     * @return True if it is a color, false if not.
+     *
+     * @deprecated This has been moved: {@link EnglishChatColor#isValidAliasColor(String)}
+     */
+    @Deprecated
+    boolean isValidAliasColor(String color);
+
+    /**
+     * Returns a very nicely colored string (using Alias and Color if they are set).
+     *
+     * @return A nicely colored string.
+     */
+    String getColoredWorldString();
+
+    // animals&monster stuff
+    /**
+     * Gets whether or not animals are allowed to spawn in this world.
+     *
+     * @return True if ANY animal can, false if no animals can spawn.
+     */
+    boolean canAnimalsSpawn();
+
+    /**
+     * Sets whether or not animals can spawn.
+     * If there are values in {@link #getAnimalList()} and this is false,
+     * those animals become the exceptions, and will spawn
+     *
+     * @param allowAnimalSpawn True to allow spawning of monsters, false to prevent.
+     */
+    void setAllowAnimalSpawn(boolean allowAnimalSpawn);
+
+    /**
+     * Returns a list of animals. This list always negates the {@link #canAnimalsSpawn()} result.
+     *
+     * @return A list of animals that will spawn if {@link #canAnimalsSpawn()} is false.
+     */
+    List<String> getAnimalList();
+
+    /**
+     * Gets whether or not monsters are allowed to spawn in this world.
+     *
+     * @return True if ANY monster can, false if no monsters can spawn.
+     */
+    boolean canMonstersSpawn();
+
+    /**
+     * Sets whether or not monsters can spawn.
+     * If there are values in {@link #getMonsterList()} and this is false,
+     * those monsters become the exceptions, and will spawn
+     *
+     * @param allowMonsterSpawn True to allow spawning of monsters, false to prevent.
+     */
+    void setAllowMonsterSpawn(boolean allowMonsterSpawn);
+
+    /**
+     * Returns a list of monsters. This list always negates the {@link #canMonstersSpawn()} result.
+     *
+     * @return A list of monsters that will spawn if {@link #canMonstersSpawn()} is false.
+     */
+    List<String> getMonsterList();
+    // end of animal&monster stuff
+
+    /**
+     * Gets whether or not PVP is enabled in this world in some form (fake or not).
+     *
+     * @return True if players can take damage from other players.
+     */
+    boolean isPVPEnabled();
+
+    /**
+     * Turn pvp on or off. This setting is used to set the world's PVP mode.
+     *
+     * @param pvpMode True to enable PVP damage, false to disable it.
+     */
+    void setPVPMode(boolean pvpMode);
+
+    /**
+     * Turn pvp on or off. This setting is used to set the world's PVP mode, and thus relies on fakePVP
+     *
+     * @return True if this world has fakepvp on
+     * @deprecated This is deprecated.
+     */
+    @Deprecated
+    boolean getFakePVP();
+
+    /**
+     * Gets whether or not this world will display in chat, mvw and mvl regardless if a user has the
+     * access permissions to go to this world.
+     *
+     * @return True if the world will be hidden, false if not.
+     */
+    boolean isHidden();
+
+    /**
+     * Sets whether or not this world will display in chat, mvw and mvl regardless if a user has the
+     * access permissions to go to this world.
+     *
+     * @param hidden Set
+     */
+    void setHidden(boolean hidden);
+
+    /**
+     * Gets whether weather is enabled in this world.
+     *
+     * @return True if weather events will occur, false if not.
+     */
+    boolean isWeatherEnabled();
+
+    /**
+     * Sets whether or not there will be weather events in a given world.
+     * If set to false, Multiverse will disable the weather in the world immediately.
+     *
+     * @param enableWeather True if weather events should occur in a world, false if not.
+     */
+    void setEnableWeather(boolean enableWeather);
+
+    /**
+     * Gets whether or not CraftBukkit is keeping the chunks for this world in memory.
+     *
+     * @return True if CraftBukkit is keeping spawn chunks in memory.
+     */
+    boolean isKeepingSpawnInMemory();
+
+    /**
+     * If true, tells Craftbukkit to keep a worlds spawn chunks loaded in memory (default: true)
+     * If not, CraftBukkit will attempt to free memory when players have not used that world.
+     * This will not happen immediately.
+     *
+     * @param keepSpawnInMemory If true, CraftBukkit will keep the spawn chunks loaded in memory.
+     */
+    void setKeepSpawnInMemory(boolean keepSpawnInMemory);
+
+    /**
+     * Gets the spawn location of this world.
+     *
+     * @return The spawn location of this world.
+     */
+    Location getSpawnLocation();
+
+    /**
+     * Sets the spawn location for a world.
+     *
+     * @param spawnLocation The spawn location for a world.
+     */
+    void setSpawnLocation(Location spawnLocation);
+
+    /**
+     * Gets whether or not the hunger level of players will go down in a world.
+     *
+     * @return True if it will go down, false if it will remain steady.
+     */
+    boolean getHunger();
+
+    /**
+     * Sets whether or not the hunger level of players will go down in a world.
+     *
+     * @param hungerEnabled True if hunger will go down, false to keep it at
+     *                      the level they entered a world with.
+     */
+    void setHunger(boolean hungerEnabled);
+
+    /**
+     * Gets the GameMode of this world.
+     *
+     * @return The GameMode of this world.
+     */
+    GameMode getGameMode();
+
+    /**
+     * Sets the game mode of this world.
+     *
+     * @param gameMode A valid game mode string (either
+     *                 an int ex. 0 or a string ex. creative).
+     * @return True if the game mode was successfully changed, false if not.
+     * @deprecated Use {@link #setGameMode(GameMode)} instead. If you have to
+     * pass a string, use {@link #setPropertyValue(String, String)}.
+     */
+    @Deprecated
+    boolean setGameMode(String gameMode);
+
+    /**
+     * Sets the game mode of this world.
+     *
+     * @param gameMode The new {@link GameMode}.
+     * @return True if the game mode was successfully changed, false if not.
+     */
+    boolean setGameMode(GameMode gameMode);
+
+    /**
+     * Gets the amount of currency it requires to enter this world.
+     *
+     * @return The amount it costs to enter this world.
+     */
+    double getPrice();
+
+    /**
+     * Sets the price for entry to this world.
+     * You can think of this like an amount.
+     * The type can be set with {@link #setCurrency(Material)}
+     *
+     * @param price The Amount of money/item to enter the world.
+     */
+    void setPrice(double price);
+
+    /**
+     * Gets the type of currency that will be used when users enter this world. A value of null indicates a non-item
+     * based currency is used.
+     *
+     * @return The type of currency that will be used when users enter this world.
+     */
+    @Nullable
+    Material getCurrency();
+
+    /**
+     * Sets the type of item that will be required given the price is not 0.
+     * Use a value of null to specify a non-item based currency.
+     *
+     * @param item The Type of currency that will be used when users enter this world.
+     */
+    void setCurrency(@Nullable Material item);
+
+    /**
+     * Gets the world players will respawn in if they die in this one.
+     *
+     * @return A world that exists on the server.
+     */
+    World getRespawnToWorld();
+
+    /**
+     * Sets the world players will respawn in if they die in this one.
+     * Returns true upon success, false upon failure.
+     *
+     * @param respawnWorld The name of a world that exists on the server.
+     * @return True if respawnWorld existed, false if not.
+     */
+    boolean setRespawnToWorld(String respawnWorld);
+
+    /**
+     * Gets the scaling value of this world.Really only has an effect if you use
+     * Multiverse-NetherPortals.
+     *
+     * @return This world's non-negative, non-zero scale.
+     */
+    double getScaling();
+
+    /**
+     * Sets the scale of this world. Really only has an effect if you use
+     * Multiverse-NetherPortals.
+     *
+     * @param scaling A scaling value, cannot be negative or 0.
+     * @return Whether the scale was set successfully.
+     */
+    boolean setScaling(double scaling);
+
+    /**
+     * Gets whether or not a world will auto-heal players if the difficulty is on peaceful.
+     *
+     * @return True if the world should heal (default), false if not.
+     */
+    boolean getAutoHeal();
+
+    /**
+     * Sets whether or not a world will auto-heal players if the difficulty is on peaceful.
+     *
+     * @param heal True if the world will heal.
+     */
+    void setAutoHeal(boolean heal);
+
+    /**
+     * Gets whether or not Multiverse should auto-adjust the spawn for this world.
+     *
+     * @return True if Multiverse should adjust the spawn, false if not.
+     */
+    boolean getAdjustSpawn();
+
+    /**
+     * Sets whether or not Multiverse should auto-adjust the spawn for this world.
+     *
+     * @param adjust True if multiverse should adjust the spawn, false if not.
+     */
+    void setAdjustSpawn(boolean adjust);
+
+    /**
+     * Gets whether or not Multiverse should auto-load this world.
+     *
+     * @return True if Multiverse should auto-load this world.
+     */
+    boolean getAutoLoad();
+
+    /**
+     * Sets whether or not Multiverse should auto-load this world.
+     * <p>
+     * True is default.
+     *
+     * @param autoLoad True if multiverse should autoload this world the spawn, false if not.
+     */
+    void setAutoLoad(boolean autoLoad);
+
+    /**
+     * Gets whether or not a player who dies in this world will respawn in their
+     * bed or follow the normal respawn pattern.
+     *
+     * @return True if players dying in this world should respawn at their bed.
+     */
+    boolean getBedRespawn();
+
+    /**
+     * Sets whether or not a player who dies in this world will respawn in their
+     * bed or follow the normal respawn pattern.
+     * <p>
+     * True is default.
+     *
+     * @param autoLoad True if players dying in this world respawn at their bed.
+     */
+    void setBedRespawn(boolean autoLoad);
+
+    /**
+     * Sets the player limit for this world after which players without an override
+     * permission node will not be allowed in. A value of -1 or less signifies no limit
+     *
+     * @param limit The new limit
+     */
+    void setPlayerLimit(int limit);
+
+    /**
+     * Gets the player limit for this world after which players without an override
+     * permission node will not be allowed in. A value of -1 or less signifies no limit
+     *
+     * @return The player limit
+     */
+    int getPlayerLimit();
+
+    /**
+     * Same as {@link #getTime()}, but returns a string.
+     * @return The time as a short string: 12:34pm
+     */
+    String getTime();
+
+    /**
+     * Sets the current time in a world.
+     * <p>
+     * This method will take the following formats:
+     * 11:37am
+     *  4:30p
+     *  day(morning), night, noon, midnight
+     *
+     * @param timeAsString The formatted time to set the world to.
+     * @return True if the time was set, false if not.
+     */
+    boolean setTime(String timeAsString);
+
+    /**
+     * Sets The types of portals that are allowed in this world.
+     *
+     * @param type The type of portals allowed in this world.
+     */
+    void allowPortalMaking(AllowedPortalType type);
+
+    /**
+     * Gets which type(s) of portals are allowed to be constructed in this world.
+     *
+     * @return The type of portals that are allowed.
+     */
+    AllowedPortalType getAllowedPortals();
+
+    // properties that are not "getter+setter" style
+    /**
+     * Gets a list of all the worlds that players CANNOT travel to from this world,
+     * regardless of their access permissions.
+     *
+     * @return A List of world names.
+     */
+    List<String> getWorldBlacklist();
+
+    /**
+     * Gets all the names of all properties that can be SET.
+     *
+     * @return All property names, with alternating colors.
+     */
+    String getAllPropertyNames();
+
+    /**
+     * Whether or not players are allowed to fly in this world.
+     *
+     * @return True if players allowed to fly in this world.
+     */
+    boolean getAllowFlight();
+
+    /**
+     * Sets whether or not players are allowed to fly in this world.
+     *
+     * @param allowFlight True to allow flight in this world.
+     */
+    void setAllowFlight(final boolean allowFlight);
+}

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

@@ -0,0 +1,335 @@
+/******************************************************************************
+ * 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 java.io.File;
+import java.util.Collection;
+import java.util.List;
+
+import com.onarandombox.MultiverseCore.world.SimpleWorldPurger;
+import org.bukkit.World;
+import org.bukkit.World.Environment;
+import org.bukkit.WorldType;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.generator.ChunkGenerator;
+
+/**
+ * Multiverse 2 World Manager API
+ * <p>
+ * This API contains all of the world managing
+ * functions that your heart desires!
+ */
+public interface MVWorldManager {
+    /**
+     * Add a new World to the Multiverse Setup.
+     *
+     * @param name               World Name
+     * @param env                Environment Type
+     * @param seedString         The seed in the form of a string.
+     *                             If the seed is a Long,
+     *                             it will be interpreted as such.
+     * @param type               The Type of the world to be made.
+     * @param generateStructures If true, this world will get NPC villages.
+     * @param generator          The Custom generator plugin to use.
+     * @return True if the world is added, false if not.
+     */
+    boolean addWorld(String name, Environment env, String seedString, WorldType type, Boolean generateStructures,
+                     String generator);
+
+    /**
+     * Add a new World to the Multiverse Setup.
+     *
+     * @param name               World Name
+     * @param env                Environment Type
+     * @param seedString         The seed in the form of a string.
+     *                             If the seed is a Long,
+     *                             it will be interpreted as such.
+     * @param type               The Type of the world to be made.
+     * @param generateStructures If true, this world will get NPC villages.
+     * @param generator          The Custom generator plugin to use.
+     * @param useSpawnAdjust If true, multiverse will search for a safe spawn. If not, It will not modify the level.dat.
+     * @return True if the world is added, false if not.
+     */
+    boolean addWorld(String name, Environment env, String seedString, WorldType type, 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
+     * @return True if the world is copied successfully, false if not.
+     */
+    boolean cloneWorld(String oldName, String newName);
+
+    /**
+     * Remove the world from the Multiverse list, from the config and deletes
+     * the folder.
+     *
+     * @param name
+     *            The name of the world to remove
+     * @return True if success, false if failure.
+     */
+    boolean deleteWorld(String name);
+
+    /**
+     * Remove the world from the Multiverse list, from the
+     * config if wanted, and deletes the folder.
+     *
+     * @param name         The name of the world to remove
+     * @param removeConfig If true(default), we'll remove the entries from the
+     *                     config. If false, they'll stay and the world may come back.
+     * @return True if success, false if failure.
+     */
+    boolean deleteWorld(String name, boolean removeConfig);
+
+    /**
+     *
+     * @param name The name of the world to remove
+     * @param removeFromConfig If true(default), we'll remove the entries from the
+     *                         config. If false, they'll stay and the world may come back.
+     * @param deleteWorldFolder If true the world folder will be completely deleted. If false
+     *                          only the contents of the world folder will be deleted
+     * @return True if success, false if failure.
+     */
+    boolean deleteWorld(String name, boolean removeFromConfig, boolean deleteWorldFolder);
+
+    /**
+     * Unload a world from Multiverse.
+     *
+     * @param name Name of the world to unload
+     * @return True if the world was unloaded, false if not.
+     */
+    boolean unloadWorld(String name);
+
+    /**
+     * Unload a world from Multiverse with option to prevent calling unloadWorld in Bukkit.
+     *
+     * @param name Name of the world to unload
+     * @param unloadBukkit True if Bukkit world should be unloaded
+     * @return True if the world was unloaded, false if not.
+     */
+    boolean unloadWorld(String name, boolean unloadBukkit);
+
+    /**
+     * Loads the world. Only use this if the world has been
+     * unloaded with {@link #unloadWorld(String)}.
+     *
+     * @param name The name of the world to load
+     * @return True if success, false if failure.
+     */
+    boolean loadWorld(String name);
+
+    /**
+     * Removes all players from the specified world.
+     *
+     * @param name World to remove players from.
+     */
+    void removePlayersFromWorld(String name);
+
+    /**
+     * Test if a given chunk generator is valid.
+     *
+     * @param generator   The generator name.
+     * @param generatorID The generator id.
+     * @param worldName   The worldName to use as the default.
+     * @return A {@link ChunkGenerator} or null
+     */
+    ChunkGenerator getChunkGenerator(String generator, String generatorID, String worldName);
+
+    /**
+     * Returns a list of all the worlds Multiverse knows about.
+     *
+     * @return A list of {@link MVWorld}.
+     */
+    Collection<MVWorld> getMVWorlds();
+
+
+    /**
+     * Returns a {@link MVWorld} if it exists, and null if it does not.
+     * This will search name AND alias.
+     *
+     * @param name The name or alias of the world to get.
+     * @return A {@link MVWorld} or null.
+     */
+    MVWorld getMVWorld(String name);
+
+    /**
+     * Returns a {@link MVWorld} if the world with name given exists, and null if it does not.
+     * This will search optionally for alias names.
+     *
+     * @param name          The name or optionally the alias of the world to get.
+     * @param checkAliases  Indicates whether to check for world alias name.
+     * @return A {@link MVWorld} or null.
+     */
+    MVWorld getMVWorld(String name, boolean checkAliases);
+
+    /**
+     * Returns a {@link MVWorld} if it exists, and null if it does not.
+     *
+     * @param world The Bukkit world to check.
+     * @return A {@link MVWorld} or null.
+     */
+    MVWorld getMVWorld(World world);
+
+    /**
+     * Checks to see if the given name is a valid {@link MVWorld}
+     * Searches based on world name AND alias.
+     *
+     * @param name The name or alias of the world to check.
+     * @return True if the world exists, false if not.
+     */
+    boolean isMVWorld(String name);
+
+    /**
+     * Checks to see if the given name is a valid {@link MVWorld}.
+     * Optionally searches by alias is specified.
+     *
+     * @param name          The name or alias of the world to check.
+     * @param checkAliases  Indicates whether to check for world alias name.
+     * @return True if the world exists, false if not.
+     */
+    boolean isMVWorld(String name, boolean checkAliases);
+
+    /**
+     * Checks to see if the given world is a valid {@link MVWorld}.
+     *
+     * @param world The Bukkit world to check.
+     * @return True if the world has been loaded into MV2, false if not.
+     */
+    boolean isMVWorld(World world);
+
+    /**
+     * Load the Worlds &amp; Settings from the configuration file.
+     *
+     * @param forceLoad If set to true, this will perform a total
+     *                  reset and not just load new worlds.
+     */
+    void loadWorlds(boolean forceLoad);
+
+    /**
+     * Loads the Worlds &amp; Settings for any worlds that bukkit loaded before us.
+     * <p>
+     * This way people will _always_ have some worlds in the list.
+     */
+    void loadDefaultWorlds();
+
+    /**
+     * Gets the {@link WorldPurger}.
+     * <p>
+     * @return The {@link WorldPurger} this {@link MVWorldManager} is using.
+     * @see WorldPurger
+     * @see SimpleWorldPurger
+     */
+    WorldPurger getTheWorldPurger();
+
+    /**
+     * Gets the world players will spawn in on first join.
+     * Currently this always returns worlds.get(0) from Bukkit.
+     *
+     * @return A Multiverse world that players will spawn in or null if no MV world has been set.
+     */
+    MVWorld getSpawnWorld();
+
+    /**
+     * Gets the list of worlds in the config, but unloaded.
+     *
+     * @return A List of worlds as strings.
+     */
+    List<String> getUnloadedWorlds();
+
+    /**
+     * This method populates an internal list and needs to be called after multiverse initialization.
+     */
+    void getDefaultWorldGenerators();
+
+    /**
+     * Load the config from a file.
+     *
+     * @param file The file to load.
+     * @return A loaded configuration.
+     */
+    FileConfiguration loadWorldConfig(File file);
+
+    /**
+     * Saves the world config to disk.
+     *
+     * @return True if success, false if fail.
+     */
+    boolean saveWorldsConfig();
+
+    /**
+     * Remove the world from the Multiverse list and from the config.
+     *
+     * @param name The name of the world to remove
+     * @return True if success, false if failure.
+     */
+    boolean removeWorldFromConfig(String name);
+
+    /**
+     * Sets the initial spawn world for new players.
+     *
+     * @param world The World new players should spawn in.
+     */
+    void setFirstSpawnWorld(String world);
+
+    /**
+     * Gets the world players should spawn in first.
+     *
+     * @return The {@link MVWorld} new players should spawn in.
+     */
+    MVWorld getFirstSpawnWorld();
+
+    /**
+     * Regenerates a world.
+     *
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
+     *
+     * @return True if success, false if fail.
+     */
+    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed);
+
+    /**
+     * Regenerates a world.
+     *
+     * @param name          Name of the world to regenerate
+     * @param useNewSeed    If a new seed should be used
+     * @param randomSeed    If the new seed should be random
+     * @param seed          The seed of the world.
+     * @param keepGameRules If GameRules should be kept on world regen.
+     *
+     * @return True if success, false if fail.
+     */
+    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed, boolean keepGameRules);
+
+    boolean isKeepingSpawnInMemory(World world);
+    
+    /**
+     * Checks whether Multiverse knows about a provided unloaded world. This
+     * method will check the parameter against the alias mappings.
+     *
+     * @param name The name of the unloaded world
+     * @param includeLoaded The value to return if the world is loaded
+     *
+     * @return True if the world exists and is unloaded. False if the world
+     * does not exist. {@code includeLoaded} if the world exists and is loaded.
+     */
+    boolean hasUnloadedWorld(String name, boolean includeLoaded);
+
+    /**
+     * Get all the possible worlds that Multiverse has detected to be importable.
+     *
+     * @return A collection of world names that are deemed importable.
+     */
+    Collection<String> getPotentialWorlds();
+}

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

@@ -0,0 +1,72 @@
+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;
+
+/**
+ * Used to safely teleport people.
+ */
+public interface SafeTTeleporter extends Teleporter {
+
+    /**
+     * Gets the next safe location around the given location.
+     * @param l A {@link Location}.
+     * @return A safe {@link Location}.
+     */
+    Location getSafeLocation(Location l);
+
+    /**
+     * Gets the next safe location around the given location.
+     * @param l A {@link Location}.
+     * @param tolerance The tolerance.
+     * @param radius The radius.
+     * @return A safe {@link Location}.
+     */
+    Location getSafeLocation(Location l, int tolerance, int radius);
+
+    /**
+     * Safely teleport the entity to the MVDestination. This will perform checks to see if the place is safe, and if
+     * it's not, will adjust the final destination accordingly.
+     *
+     * @param teleporter    Person who performed the teleport command.
+     * @param teleportee    Entity to teleport
+     * @param destination   Destination to teleport them to
+     * @return true for success, false for failure
+     */
+    TeleportResult safelyTeleport(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination<?> destination);
+
+    /**
+     * Safely teleport the entity to the Location. This may perform checks to
+     * see if the place is safe, and if
+     * it's not, will adjust the final destination accordingly.
+     *
+     * @param teleporter Person who issued the teleport command.
+     * @param teleportee Entity to teleport.
+     * @param location   Location to teleport them to.
+     * @param safely     Should the destination be checked for safety before teleport?
+     * @return true for success, false for failure.
+     */
+    TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, Location location,
+            boolean safely);
+
+    /**
+     * Returns a safe location for the entity to spawn at.
+     *
+     * @param entity        The entity to spawn
+     * @param destination   The MVDestination to take the entity to.
+     * @return A new location to spawn the entity at.
+     */
+    Location getSafeLocation(Entity entity, DestinationInstance destination);
+
+    /**
+     * Finds a portal-block next to the specified {@link Location}.
+     * @param l The {@link Location}
+     * @return The next portal-block's {@link Location}.
+     */
+    Location findPortalBlockNextTo(Location l);
+
+}

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

@@ -0,0 +1,18 @@
+package com.onarandombox.MultiverseCore.api;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import com.onarandombox.MultiverseCore.teleportation.TeleportResult;
+import org.bukkit.entity.Entity;
+
+public interface Teleporter {
+    /**
+     * Teleport the entity to the Multiverse Destination.
+     *
+     * @param teleporter    Person who performed the teleport command.
+     * @param teleportee    Entity to teleport
+     * @param destination   Destination to teleport them to
+     * @return true for success, false for failure
+     */
+    TeleportResult teleport(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination<?> destination);
+}

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

@@ -0,0 +1,68 @@
+package com.onarandombox.MultiverseCore.api;
+
+import java.util.List;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+
+/**
+ * Used to remove animals from worlds that don't belong there.
+ */
+public interface WorldPurger {
+    /**
+     * Synchronizes the given worlds with their settings.
+     *
+     * @param worlds A list of {@link MVWorld}
+     */
+    void purgeWorlds(List<MVWorld> worlds);
+
+    /**
+     * Convenience method for {@link #purgeWorld(MVWorld, java.util.List, boolean, boolean)} that takes the settings from the world-config.
+     *
+     * @param world The {@link MVWorld}.
+     */
+    void purgeWorld(MVWorld world);
+
+    /**
+     * Clear all animals/monsters that do not belong to a world according to the config.
+     *
+     * @param mvworld The {@link MVWorld}.
+     * @param thingsToKill A {@link List} of animals/monsters to be killed.
+     * @param negateAnimals Whether the monsters in the list should be negated.
+     * @param negateMonsters Whether the animals in the list should be negated.
+     */
+    void purgeWorld(MVWorld mvworld, List<String> thingsToKill, boolean negateAnimals,
+                    boolean negateMonsters);
+
+    /**
+     * Clear all animals/monsters that do not belong to a world according to the config.
+     *
+     * @param mvworld The {@link MVWorld}.
+     * @param thingsToKill A {@link List} of animals/monsters to be killed.
+     * @param negateAnimals Whether the monsters in the list should be negated.
+     * @param negateMonsters Whether the animals in the list should be negated.
+     * @param sender The {@link CommandSender} that initiated the action. He will/should be notified.
+     */
+    void purgeWorld(MVWorld mvworld, List<String> thingsToKill, boolean negateAnimals,
+                    boolean negateMonsters, CommandSender sender);
+
+    /**
+     * Determines whether the specified creature should be killed.
+     *
+     * @param e The creature.
+     * @param thingsToKill A {@link List} of animals/monsters to be killed.
+     * @param negateAnimals Whether the monsters in the list should be negated.
+     * @param negateMonsters Whether the animals in the list should be negated.
+     * @return {@code true} if the creature should be killed, otherwise {@code false}.
+     */
+    boolean shouldWeKillThisCreature(Entity e, List<String> thingsToKill, boolean negateAnimals, boolean negateMonsters);
+
+    /**
+     * Determines whether the specified creature should be killed and automatically reads the params from a world object.
+     *
+     * @param w The world.
+     * @param e The creature.
+     * @return {@code true} if the creature should be killed, otherwise {@code false}.
+     */
+    boolean shouldWeKillThisCreature(MVWorld w, Entity e);
+}

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

@@ -2,4 +2,4 @@
  * The Multiverse-API, containing lots of interfaces that can be quite useful for other
  * plugins when interacting with Multiverse.
  */
-package org.mvplugins.multiverse.core.api;
+package com.onarandombox.MultiverseCore.api;

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

@@ -0,0 +1,40 @@
+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 org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+@CommandAlias("mv")
+public class CheckCommand extends MultiverseCoreCommand {
+    public CheckCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+    }
+
+    @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,
+
+                               @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);
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.onarandombox.MultiverseCore.commands;
+
+import co.aikar.commands.CommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Conditions;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Single;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import org.bukkit.ChatColor;
+import org.jetbrains.annotations.NotNull;
+
+@CommandAlias("mv")
+public class CloneCommand extends MultiverseCoreCommand {
+    public CloneCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+    }
+
+    @Subcommand("clone")
+    @CommandPermission("multiverse.core.clone")
+    @CommandCompletion("@mvworlds:scope=both @empty")
+    @Syntax("<world> <new world name>")
+    @Description("Clones a world.")
+    public void onCloneCommand(CommandIssuer issuer,
+
+                               @Conditions("validWorldName:scope=both")
+                               @Syntax("<world>")
+                               @Description("The target world to clone.")
+                               String worldName,
+
+                               @Single
+                               @Conditions("validWorldName:scope=new")
+                               @Syntax("<new world name>")
+                               @Description("The new cloned world name.")
+                               String newWorldName
+    ) {
+        issuer.sendMessage(String.format("Cloning world '%s' to '%s'...", worldName, newWorldName));
+
+        if (!this.plugin.getMVWorldManager().cloneWorld(worldName, newWorldName)) {
+            issuer.sendMessage(String.format("%sWorld could not be cloned! See console for more details.", ChatColor.RED));
+            return;
+        }
+        issuer.sendMessage(String.format("%sCloned world '%s'!", ChatColor.GREEN, newWorldName));
+    }
+}

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

@@ -0,0 +1,23 @@
+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;
+
+@CommandAlias("mv")
+public class ConfirmCommand extends MultiverseCoreCommand {
+    public ConfirmCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+    }
+
+    @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());
+    }
+}

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

@@ -0,0 +1,127 @@
+package com.onarandombox.MultiverseCore.commands;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+import java.util.stream.Collectors;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.InvalidCommandArgument;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Conditions;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.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;
+
+@CommandAlias("mv")
+public class CreateCommand extends MultiverseCoreCommand {
+    public CreateCommand(@NotNull 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());
+    }
+
+    @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);
+            return;
+        }
+        issuer.sendInfo(MVCorei18n.CREATE_SUCCESS, "{worldName}", worldName);
+    }
+}

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

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.commands;
+package com.onarandombox.MultiverseCore.commands;
 
 import co.aikar.commands.BukkitCommandIssuer;
 import co.aikar.commands.annotation.CommandAlias;
@@ -8,31 +8,20 @@ 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 jakarta.inject.Inject;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.locale.MVCorei18n;
 import org.jetbrains.annotations.NotNull;
-import org.jvnet.hk2.annotations.Service;
 
-import org.mvplugins.multiverse.core.commandtools.MVCommandManager;
-import org.mvplugins.multiverse.core.commandtools.MultiverseCommand;
-import org.mvplugins.multiverse.core.config.MVCoreConfig;
-import org.mvplugins.multiverse.core.utils.MVCorei18n;
-
-@Service
 @CommandAlias("mv")
-class DebugCommand extends MultiverseCommand {
-
-    private final MVCoreConfig config;
-
-    @Inject
-    DebugCommand(@NotNull MVCommandManager commandManager, @NotNull MVCoreConfig config) {
-        super(commandManager);
-        this.config = config;
+public class DebugCommand extends MultiverseCoreCommand {
+    public DebugCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
     }
 
     @Subcommand("debug")
     @CommandPermission("multiverse.core.debug")
     @Description("{@@mv-core.debug.info.description}")
-    void onShowDebugCommand(BukkitCommandIssuer issuer) {
+    public void onShowDebugCommand(BukkitCommandIssuer issuer) {
         this.displayDebugMode(issuer);
     }
 
@@ -41,20 +30,19 @@ class DebugCommand extends MultiverseCommand {
     @CommandCompletion("@range:3")
     @Syntax("<{@@mv-core.debug.change.syntax}>")
     @Description("{@@mv-core.debug.change.description}")
-    void onChangeDebugCommand(
-            BukkitCommandIssuer issuer,
+    public void onChangeDebugCommand(BukkitCommandIssuer issuer,
 
-            @Syntax("<{@@mv-core.debug.change.syntax}>")
-            @Description("{@@mv-core.debug.change.level.description}")
-            int level) {
+                                     @Syntax("<{@@mv-core.debug.change.syntax}>")
+                                     @Description("{@@mv-core.debug.change.level.description}")
+                                     int level) {
 
-        config.setGlobalDebug(level);
-        config.save();
+        this.plugin.getMVConfig().setGlobalDebug(level);
+        this.plugin.saveAllConfigs();
         this.displayDebugMode(issuer);
     }
 
     private void displayDebugMode(BukkitCommandIssuer issuer) {
-        final int debugLevel = config.getGlobalDebug();
+        final int debugLevel = this.plugin.getMVConfig().getGlobalDebug();
         if (debugLevel == 0) {
             issuer.sendInfo(MVCorei18n.DEBUG_INFO_OFF);
             return;

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

@@ -0,0 +1,49 @@
+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.jetbrains.annotations.NotNull;
+
+@CommandAlias("mv")
+public class DeleteCommand extends MultiverseCoreCommand {
+    public DeleteCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+    }
+
+    @Subcommand("delete")
+    @CommandPermission("multiverse.core.delete")
+    @CommandCompletion("@mvworlds:scope=both")
+    @Syntax("<world>")
+    @Description("Deletes a world on your server PERMANENTLY.")
+    public void onDeleteCommand(BukkitCommandIssuer issuer,
+
+                                @Single
+                                @Conditions("validWorldName:scope=both")
+                                @Syntax("<world>")
+                                @Description("The world you want to delete.")
+                                String worldName
+    ) {
+        this.plugin.getMVCommandManager().getCommandQueueManager().addToQueue(new QueuedCommand(
+                issuer.getIssuer(),
+                () -> {
+                    issuer.sendMessage(String.format("Deleting world '%s'...", worldName));
+                    if (!this.plugin.getMVWorldManager().deleteWorld(worldName)) {
+                        issuer.sendMessage(String.format("%sThere was an issue deleting '%s'! Please check console for errors.", ChatColor.RED, worldName));
+                        return;
+                    }
+                    issuer.sendMessage(String.format("%sWorld %s was deleted!", ChatColor.GREEN, worldName));
+                },
+                "Are you sure you want to delete world '" + worldName + "'?"
+        ));
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.onarandombox.MultiverseCore.commands;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Flags;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MVWorld;
+import com.onarandombox.MultiverseCore.commandtools.context.GameRuleValue;
+import org.bukkit.ChatColor;
+import org.bukkit.GameRule;
+import org.jetbrains.annotations.NotNull;
+
+@CommandAlias("mv")
+public class GameruleCommand extends MultiverseCoreCommand {
+    public GameruleCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+    }
+
+    @Subcommand("gamerule")
+    @CommandPermission("multiverse.core.gamerule")
+    @CommandCompletion("@gamerules true|false|@range:1-10 @mvworlds:multiple|*")
+    @Syntax("<Gamerule> <Gamerule value> [World or *]")
+    @Description("Changes a gamerule in one or more worlds")
+    public void onGameruleCommand(BukkitCommandIssuer issuer,
+
+                                  @Syntax("<Gamerule>")
+                                  @Description("Gamerule to set")
+                                  GameRule gamerule,
+
+                                  @Syntax("<Value>")
+                                  @Description("Value of gamerule")
+                                  GameRuleValue gameRuleValue,
+
+                                  @Flags("resolve=issuerAware")
+                                  @Syntax("[World or *]")
+                                  @Description("World to apply gamerule to, current world by default")
+                                  MVWorld[] worlds
+    ) {
+        Object value = gameRuleValue.getValue();
+        boolean success = true;
+        for(MVWorld world : worlds) {
+            // Set gamerules and add false to list if it fails
+            if (!world.getCBWorld().setGameRule(gamerule, value)) {
+                issuer.sendMessage(ChatColor.RED + "Failed to set gamerule " + gamerule.getName() + " to " + value + " in " + world.getName() + ". It should be a " + gamerule.getType());
+                success = false;
+            }
+        }
+        // Tell user if it was successful
+        if (success) {
+            if (worlds.length == 1) {
+                issuer.sendMessage(ChatColor.GREEN + "Successfully set " + gamerule.getName() + " to " + value + " in " + worlds[0].getName());
+            }
+            else if (worlds.length > 1) {
+                issuer.sendMessage(ChatColor.GREEN + "Successfully set " + gamerule.getName() + " to " + value + " in " + worlds.length + " worlds.");
+            }
+        }
+    }
+}

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

@@ -0,0 +1,88 @@
+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 org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+@CommandAlias("mv")
+public class ImportCommand extends MultiverseCoreCommand {
+    public ImportCommand(@NotNull 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());
+    }
+
+    @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,
+
+                                @Conditions("validWorldName:scope=new")
+                                @Syntax("<name>")
+                                @Description("Name of the world folder.")
+                                String worldName,
+
+                                @Syntax("<env>")
+                                @Description("The world's environment. See: /mv env")
+                                World.Environment environment,
+
+                                @Optional
+                                @Syntax("--generator [generator[:id]] --adjust-spawn")
+                                @Description("Other world settings. See: https://gg.gg/nn8c2")
+                                String[] flags) {
+
+        ParsedCommandFlags parsedFlags = parseFlags(flags);
+
+        issuer.sendMessage(String.format("Starting import of world '%s'...", worldName));
+
+        if (!this.worldManager.addWorld(
+                worldName, environment,
+                null,
+                null,
+                null,
+                parsedFlags.flagValue("--generator", String.class),
+                parsedFlags.hasFlag("--adjust-spawn"))
+        ) {
+            issuer.sendMessage(String.format("%sFailed! See console for more details.", ChatColor.RED));
+            return;
+        }
+        issuer.sendMessage(String.format("%sComplete!", ChatColor.GREEN));
+    }
+}

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

@@ -0,0 +1,42 @@
+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;
+
+@CommandAlias("mv")
+public class LoadCommand extends MultiverseCoreCommand {
+    public LoadCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+    }
+
+    @Subcommand("load")
+    @CommandPermission("multiverse.core.load")
+    @CommandCompletion("@mvworlds:scope=unloaded")
+    @Syntax("<world>")
+    @Description("Loads a world. World must be already in worlds.yml, else please use /mv import.")
+    public void onLoadCommand(BukkitCommandIssuer issuer,
+
+                              @Single
+                              @Conditions("validWorldName:scope=unloaded")
+                              @Syntax("<world>")
+                              @Description("Name of world you want to load.")
+                              String worldName
+    ) {
+        issuer.sendMessage(String.format("Loading world '%s'...", worldName));
+
+        if (!this.plugin.getMVWorldManager().loadWorld(worldName)) {
+            issuer.sendMessage(String.format("Error trying to load world '%s'!", worldName));
+            return;
+        }
+        issuer.sendMessage(String.format("Loaded world '%s'!", worldName));
+    }
+}

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

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

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

@@ -0,0 +1,79 @@
+package com.onarandombox.MultiverseCore.commands;
+
+import java.util.Collections;
+import java.util.Random;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Conditions;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Optional;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlag;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandFlagGroup;
+import com.onarandombox.MultiverseCore.commandtools.flags.CommandValueFlag;
+import com.onarandombox.MultiverseCore.commandtools.flags.ParsedCommandFlags;
+import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
+import org.bukkit.ChatColor;
+import org.jetbrains.annotations.NotNull;
+
+@CommandAlias("mv")
+public class RegenCommand extends MultiverseCoreCommand {
+    public RegenCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+
+        registerFlagGroup(CommandFlagGroup.builder("mvregen")
+                .add(CommandValueFlag.builder("--seed", String.class)
+                        .addAlias("-s")
+                        .completion(() -> Collections.singleton(String.valueOf(new Random().nextLong())))
+                        .optional()
+                        .build())
+                .add(CommandFlag.builder("--keep-gamerules")
+                        .addAlias("-k")
+                        .build())
+                .build());
+    }
+
+    @Subcommand("regen")
+    @CommandPermission("multiverse.core.regen")
+    @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,
+
+                               @Conditions("validWorldName:scope=both")
+                               @Syntax("<world>")
+                               @Description("World that you want to regen.")
+                               String worldName,
+
+                               @Optional
+                               @Syntax("--seed [seed] --keep-gamerules")
+                               @Description("Other world settings. See: http://gg.gg/nn8lk")
+                               String[] flags
+    ) {
+        ParsedCommandFlags parsedFlags = parseFlags(flags);
+
+        this.plugin.getMVCommandManager().getCommandQueueManager().addToQueue(new QueuedCommand(
+                issuer.getIssuer(),
+                () -> {
+                    issuer.sendMessage(String.format("Regenerating world '%s'...", worldName));
+                    if (!this.plugin.getMVWorldManager().regenWorld(
+                            worldName,
+                            parsedFlags.hasFlag("--seed"),
+                            !parsedFlags.hasFlagValue("--seed"),
+                            parsedFlags.flagValue("--seed", String.class),
+                            parsedFlags.hasFlag("--keep-gamerules")
+                    )) {
+                        issuer.sendMessage(String.format("%sThere was an issue regenerating '%s'! Please check console for errors.", ChatColor.RED, worldName));
+                        return;
+                    }
+                    issuer.sendMessage(String.format("%sWorld %s was regenerated!", ChatColor.GREEN, worldName));
+                },
+                "Are you sure you want to regenerate world '" + worldName + "'?"
+        ));
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.onarandombox.MultiverseCore.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Description;
+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;
+
+@CommandAlias("mv")
+public class ReloadCommand extends MultiverseCoreCommand {
+    public ReloadCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+    }
+
+    @Subcommand("reload")
+    @CommandPermission("multiverse.core.reload")
+    @Description("Reloads config files for all multiverse modules.")
+    public void onReloadCommand(@NotNull BukkitCommandIssuer issuer) {
+        issuer.sendMessage(ChatColor.GOLD + "Reloading all Multiverse Plugin configs...");
+        this.plugin.loadConfigs();
+        this.plugin.getAnchorManager().loadAnchors();
+        this.plugin.getMVWorldManager().loadWorlds(true);
+
+        List<String> configsLoaded = new ArrayList<>();
+        configsLoaded.add("Multiverse-Core - config.yml");
+        configsLoaded.add("Multiverse-Core - worlds.yml");
+        configsLoaded.add("Multiverse-Core - anchors.yml");
+
+        MVConfigReloadEvent configReload = new MVConfigReloadEvent(configsLoaded);
+        this.plugin.getServer().getPluginManager().callEvent(configReload);
+
+        configReload.getAllConfigsLoaded().forEach(issuer::sendMessage);
+        issuer.sendMessage(String.format("%sReload Complete!", ChatColor.GREEN));
+    }
+}

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

@@ -0,0 +1,41 @@
+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;
+
+@CommandAlias("mv")
+public class RemoveCommand extends MultiverseCoreCommand {
+    public RemoveCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+    }
+
+    @Subcommand("remove")
+    @CommandPermission("multiverse.core.remove")
+    @CommandCompletion("@mvworlds:scope=both")
+    @Syntax("<world>")
+    @Description("Unloads a world from Multiverse and removes it from worlds.yml, this does NOT DELETE the world folder.")
+    public void onRemoveCommand(BukkitCommandIssuer issuer,
+
+                                @Single
+                                @Conditions("mvworlds:scope=both")
+                                @Syntax("<world>")
+                                @Description("World you want to remove from mv's knowledge.")
+                                String worldName
+    ) {
+        if (!this.plugin.getMVWorldManager().removeWorldFromConfig(worldName)) {
+            issuer.sendMessage(String.format("%sError trying to remove world from config!", ChatColor.RED));
+            return;
+        }
+        issuer.sendMessage(String.format("World '%s' is removed from config!", worldName));
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.onarandombox.MultiverseCore.commands;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.CommandIssuer;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Flags;
+import co.aikar.commands.annotation.Subcommand;
+import co.aikar.commands.annotation.Syntax;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.destination.ParsedDestination;
+import org.bukkit.entity.Player;
+
+@CommandAlias("mv")
+public class TeleportCommand extends MultiverseCoreCommand {
+    public TeleportCommand(MultiverseCore plugin) {
+        super(plugin);
+    }
+
+    @Subcommand("teleport|tp")
+    @CommandCompletion("@players|@mvworlds:playerOnly|@destinations:playerOnly @mvworlds|@destinations")
+    @Syntax("[player] <destination>")
+    @Description("Allows you to the teleport to a location on your server!")
+    public void onTeleportCommand(BukkitCommandIssuer issuer,
+
+                                  @Flags("resolve=issuerAware")
+                                  @Syntax("[player]")
+                                  @Description("Target player to teleport.")
+                                  Player[] players,
+
+                                  @Syntax("<destination>")
+                                  @Description("Location, can be a world name.")
+                                  ParsedDestination<?> destination
+    ) {
+        // TODO Add warning if teleporting too many players at once.
+        for (Player player : players) {
+            issuer.sendMessage("Teleporting "
+                    + (issuer.getPlayer() == player ? "you" : player.getName())
+                    + " to " + destination + "...");
+            this.plugin.getDestinationsProvider().playerTeleport(issuer, player, destination);
+        }
+    }
+
+    @Override
+    public boolean hasPermission(CommandIssuer issuer) {
+        return this.plugin.getDestinationsProvider().hasAnyTeleportPermission(issuer);
+    }
+}

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

@@ -0,0 +1,40 @@
+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;
+
+@CommandAlias("mv")
+public class UnloadCommand extends MultiverseCoreCommand {
+    public UnloadCommand(@NotNull MultiverseCore plugin) {
+        super(plugin);
+    }
+
+    @Subcommand("unload")
+    @CommandPermission("multiverse.core.unload")
+    @CommandCompletion("@mvworlds")
+    @Syntax("<world>")
+    @Description("Unloads a world from Multiverse. This does NOT remove the world folder. This does NOT remove it from the config file.")
+    public void onUnloadCommand(BukkitCommandIssuer issuer,
+
+                                @Syntax("<world>")
+                                @Description("Name of the world you want to unload.")
+                                MVWorld world
+    ) {
+        issuer.sendMessage(String.format("Unloading world '%s'...", world.getColoredWorldString()));
+
+        //TODO API: Should be able to use MVWorld object directly
+        if (!this.plugin.getMVWorldManager().unloadWorld(world.getName())) {
+            issuer.sendMessage(String.format("Error unloading world '%s'! See console for more details.", world.getColoredWorldString()));
+            return;
+        }
+        issuer.sendMessage(String.format("Unloaded world '%s'!", world.getColoredWorldString()));
+    }
+}

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

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

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

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

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

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.commandtools;
+package com.onarandombox.MultiverseCore.commandtools;
 
 import co.aikar.commands.BukkitCommandExecutionContext;
 import co.aikar.commands.BukkitCommandIssuer;
@@ -6,54 +6,44 @@ import co.aikar.commands.BukkitConditionContext;
 import co.aikar.commands.CommandConditions;
 import co.aikar.commands.ConditionContext;
 import co.aikar.commands.ConditionFailedException;
-import org.jetbrains.annotations.NotNull;
-
-import org.mvplugins.multiverse.core.world.WorldNameChecker;
-import org.mvplugins.multiverse.core.world.WorldManager;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.world.WorldNameChecker;
 
 public class MVCommandConditions {
-    static void load(MVCommandManager commandManager, WorldManager worldManager, WorldNameChecker worldNameChecker) {
-        new MVCommandConditions(commandManager, worldManager, worldNameChecker);
+    static void load(MVCommandManager commandManager, MultiverseCore plugin) {
+        new MVCommandConditions(commandManager, plugin);
     }
 
-    private final WorldManager worldManager;
     private final MVCommandManager commandManager;
-    private final WorldNameChecker worldNameChecker;
+    private final MultiverseCore plugin;
 
-    private MVCommandConditions(
-            @NotNull MVCommandManager commandManager,
-            @NotNull WorldManager worldManager,
-            @NotNull WorldNameChecker worldNameChecker) {
-        this.worldManager = worldManager;
+    public MVCommandConditions(MVCommandManager commandManager, MultiverseCore plugin) {
         this.commandManager = commandManager;
-        this.worldNameChecker = worldNameChecker;
-        registerConditions();
-    }
+        this.plugin = plugin;
 
-    private void registerConditions() {
         CommandConditions<BukkitCommandIssuer, BukkitCommandExecutionContext, BukkitConditionContext> conditions
                 = commandManager.getCommandConditions();
 
-        conditions.addCondition(String.class, "worldname", this::checkWorldname);
+        conditions.addCondition(String.class, "validWorldName", this::checkValidWorldName);
     }
 
-    private void checkWorldname(
-            ConditionContext<BukkitCommandIssuer> context,
-            BukkitCommandExecutionContext executionContext,
-            String worldName) {
+    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.worldManager.isLoadedWorld(worldName)) {
+                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.worldManager.isUnloadedWorld(worldName)) {
-                    if (this.worldManager.isLoadedWorld(worldName)) {
+                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!");
@@ -61,20 +51,20 @@ public class MVCommandConditions {
                 break;
             // World that are loaded or unloaded
             case "both":
-                if (!this.worldManager.isWorld(worldName)) {
+                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.worldManager.isWorld(worldName)) {
+                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!");
+                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

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

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.commandtools;
+package com.onarandombox.MultiverseCore.commandtools;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -9,63 +9,35 @@ import co.aikar.commands.InvalidCommandArgument;
 import co.aikar.commands.PaperCommandContexts;
 import co.aikar.commands.contexts.ContextResolver;
 import com.google.common.base.Strings;
-import jakarta.inject.Inject;
+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;
-import org.jvnet.hk2.annotations.Service;
 
-import org.mvplugins.multiverse.core.commandtools.context.GameRuleValue;
-import org.mvplugins.multiverse.core.config.MVCoreConfig;
-import org.mvplugins.multiverse.core.destination.DestinationsProvider;
-import org.mvplugins.multiverse.core.destination.ParsedDestination;
-import org.mvplugins.multiverse.core.display.filters.ContentFilter;
-import org.mvplugins.multiverse.core.display.filters.DefaultContentFilter;
-import org.mvplugins.multiverse.core.display.filters.RegexContentFilter;
-import org.mvplugins.multiverse.core.utils.PlayerFinder;
-import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
-import org.mvplugins.multiverse.core.world.MultiverseWorld;
-import org.mvplugins.multiverse.core.world.WorldManager;
+public class MVCommandContexts extends PaperCommandContexts {
+    private final MultiverseCore plugin;
 
-@Service
-class MVCommandContexts extends PaperCommandContexts {
-
-    private final MVCommandManager mvCommandManager;
-    private final DestinationsProvider destinationsProvider;
-    private final WorldManager worldManager;
-    private final MVCoreConfig config;
-
-    @Inject
-    MVCommandContexts(
-            MVCommandManager mvCommandManager,
-            DestinationsProvider destinationsProvider,
-            WorldManager worldManager,
-            MVCoreConfig config) {
+    public MVCommandContexts(MVCommandManager mvCommandManager, MultiverseCore plugin) {
         super(mvCommandManager);
-        this.mvCommandManager = mvCommandManager;
-        this.destinationsProvider = destinationsProvider;
-        this.worldManager = worldManager;
-        this.config = config;
+        this.plugin = plugin;
 
         registerIssuerOnlyContext(BukkitCommandIssuer.class, BukkitCommandExecutionContext::getIssuer);
-        registerIssuerOnlyContext(MVCommandIssuer.class, this::parseMVCommandIssuer);
         registerOptionalContext(ContentFilter.class, this::parseContentFilter);
         registerContext(ParsedDestination.class, this::parseDestination);
         registerContext(GameRule.class, this::parseGameRule);
         registerContext(GameRuleValue.class, this::parseGameRuleValue);
-        registerIssuerAwareContext(LoadedMultiverseWorld.class, this::parseLoadedMultiverseWorld);
-        registerIssuerAwareContext(LoadedMultiverseWorld[].class, this::parseLoadedMultiverseWorldArray);
-        registerIssuerAwareContext(MultiverseWorld.class, this::parseMultiverseWorld);
+        registerIssuerAwareContext(MVWorld.class, this::parseMVWorld);
+        registerIssuerAwareContext(MVWorld[].class, this::parseMVWorldArray);
         registerIssuerAwareContext(Player.class, this::parsePlayer);
         registerIssuerAwareContext(Player[].class, this::parsePlayerArray);
     }
 
-    private MVCommandIssuer parseMVCommandIssuer(BukkitCommandExecutionContext context) {
-        if (context.getIssuer() instanceof MVCommandIssuer) {
-            return (MVCommandIssuer) context.getIssuer();
-        }
-        return mvCommandManager.getCommandIssuer(context.getSender());
-    }
-
     private ContentFilter parseContentFilter(BukkitCommandExecutionContext context) {
         if (Strings.isNullOrEmpty(context.getFirstArg())) {
             return DefaultContentFilter.get();
@@ -80,7 +52,7 @@ class MVCommandContexts extends PaperCommandContexts {
             throw new InvalidCommandArgument("No destination specified.");
         }
 
-        ParsedDestination<?> parsedDestination = destinationsProvider.parseDestination(destination);
+        ParsedDestination<?> parsedDestination = plugin.getDestinationsProvider().parseDestination(destination);
         if (parsedDestination == null) {
             throw new InvalidCommandArgument("The destination " + destination + " is not valid.");
         }
@@ -125,13 +97,13 @@ class MVCommandContexts extends PaperCommandContexts {
         return new GameRuleValue(resolvedValue);
     }
 
-    private LoadedMultiverseWorld parseLoadedMultiverseWorld(BukkitCommandExecutionContext context) {
+    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 worldManager.getLoadedWorld(context.getIssuer().getPlayer().getWorld()).getOrNull();
+                return plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
             }
             if (context.isOptional()) {
                 return null;
@@ -140,7 +112,7 @@ class MVCommandContexts extends PaperCommandContexts {
         }
 
         String worldName = context.getFirstArg();
-        LoadedMultiverseWorld world = worldManager.getLoadedWorld(worldName).getOrNull();
+        MVWorld world = plugin.getMVWorldManager().getMVWorld(worldName);
 
         // Get world based on input, fallback to sender if input is not a world
         if (resolve.equals("issuerAware")) {
@@ -149,7 +121,7 @@ class MVCommandContexts extends PaperCommandContexts {
                 return world;
             }
             if (context.getIssuer().isPlayer()) {
-                return worldManager.getLoadedWorld(context.getIssuer().getPlayer().getWorld()).getOrNull();
+                return plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
             }
             if (context.isOptional()) {
                 return null;
@@ -162,24 +134,24 @@ class MVCommandContexts extends PaperCommandContexts {
             context.popFirstArg();
             return world;
         }
-        if (context.isOptional()) {
+        if (!context.isOptional()) {
             return null;
         }
         throw new InvalidCommandArgument("World " + worldName + " is not a loaded multiverse world.");
     }
 
-    private LoadedMultiverseWorld[] parseLoadedMultiverseWorldArray(BukkitCommandExecutionContext context) {
+    private MVWorld[] parseMVWorldArray(BukkitCommandExecutionContext context) {
         String resolve = context.getFlagValue("resolve", "");
 
-        LoadedMultiverseWorld playerWorld = null;
+        MVWorld playerWorld = null;
         if (context.getIssuer().isPlayer()) {
-            playerWorld = worldManager.getLoadedWorld(context.getIssuer().getPlayer().getWorld()).getOrNull();
+            playerWorld = plugin.getMVWorldManager().getMVWorld(context.getIssuer().getPlayer().getWorld());
         }
 
         // Get world based on sender only
         if (resolve.equals("issuerOnly")) {
             if (playerWorld != null) {
-                return new LoadedMultiverseWorld[]{playerWorld};
+                return new MVWorld[]{playerWorld};
             }
             if (context.isOptional()) {
                 return null;
@@ -188,14 +160,14 @@ class MVCommandContexts extends PaperCommandContexts {
         }
 
         String worldStrings = context.getFirstArg();
-        String[] worldNames = worldStrings == null ? new String[0] : worldStrings.split(",");
-        Set<LoadedMultiverseWorld> worlds = new HashSet<>(worldNames.length);
+        String[] worldNames = worldStrings.split(",");
+        Set<MVWorld> worlds = new HashSet<>(worldNames.length);
         for (String worldName : worldNames) {
             if ("*".equals(worldName)) {
-                worlds.addAll(worldManager.getLoadedWorlds());
+                worlds.addAll(plugin.getMVWorldManager().getMVWorlds());
                 break;
             }
-            LoadedMultiverseWorld world = worldManager.getLoadedWorld(worldName).getOrNull();
+            MVWorld world = plugin.getMVWorldManager().getMVWorld(worldName);
             if (world == null) {
                 throw new InvalidCommandArgument("World " + worldName + " is not a loaded multiverse world.");
             }
@@ -206,10 +178,10 @@ class MVCommandContexts extends PaperCommandContexts {
         if (resolve.equals("issuerAware")) {
             if (!worlds.isEmpty()) {
                 context.popFirstArg();
-                return worlds.toArray(new LoadedMultiverseWorld[0]);
+                return worlds.toArray(new MVWorld[0]);
             }
             if (playerWorld != null) {
-                return new LoadedMultiverseWorld[]{playerWorld};
+                return new MVWorld[]{playerWorld};
             }
             if (context.isOptional()) {
                 return null;
@@ -220,57 +192,14 @@ class MVCommandContexts extends PaperCommandContexts {
         // Get world based on input only
         if (!worlds.isEmpty()) {
             context.popFirstArg();
-            return worlds.toArray(new LoadedMultiverseWorld[0]);
+            return worlds.toArray(new MVWorld[0]);
         }
-        if (context.isOptional()) {
+        if (!context.isOptional()) {
             return null;
         }
         throw new InvalidCommandArgument("World " + worldStrings + " is not a loaded multiverse world.");
     }
 
-    private MultiverseWorld parseMultiverseWorld(BukkitCommandExecutionContext context) {
-        String resolve = context.getFlagValue("resolve", "");
-
-        // Get world based on sender only
-        if (resolve.equals("issuerOnly")) {
-            if (context.getIssuer().isPlayer()) {
-                return worldManager.getWorld(context.getIssuer().getPlayer().getWorld()).getOrNull();
-            }
-            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();
-        MultiverseWorld world = worldManager.getWorld(worldName).getOrNull();
-
-        // 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 worldManager.getWorld(context.getIssuer().getPlayer().getWorld()).getOrNull();
-            }
-            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 Player parsePlayer(BukkitCommandExecutionContext context) {
         String resolve = context.getFlagValue("resolve", "");
 
@@ -309,7 +238,7 @@ class MVCommandContexts extends PaperCommandContexts {
             context.popFirstArg();
             return player;
         }
-        if (context.isOptional()) {
+        if (!context.isOptional()) {
             return null;
         }
         throw new InvalidCommandArgument("Player " + playerIdentifier + " not found.");
@@ -354,7 +283,7 @@ class MVCommandContexts extends PaperCommandContexts {
             context.popFirstArg();
             return players;
         }
-        if (context.isOptional()) {
+        if (!context.isOptional()) {
             return null;
         }
         throw new InvalidCommandArgument("Player " + playerIdentifier + " not found.");

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

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

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

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

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

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.commandtools.context;
+package com.onarandombox.MultiverseCore.commandtools.context;
 
 public class GameRuleValue {
     private final Object value;

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

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.commandtools.flags;
+package com.onarandombox.MultiverseCore.commandtools.flags;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,12 +26,11 @@ public class CommandFlag {
     /**
      * Creates a new flag.
      *
-     * @param key     The key for the new flag.
-     * @param aliases The aliases that also refer to this flag.
+     * @param builder The builder.
      */
-    protected CommandFlag(@NotNull String key, @NotNull List<String> aliases) {
-        this.key = key;
-        this.aliases = aliases;
+    protected CommandFlag(@NotNull Builder<?> builder) {
+        key = builder.key;
+        aliases = builder.aliases;
     }
 
     /**
@@ -52,25 +51,14 @@ public class CommandFlag {
         return aliases;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String toString() {
-        return "Builder{"
-                + "key='" + key + '\''
-                + ", aliases=" + aliases
-                + '}';
-    }
-
     /**
      * A builder for a flag.
      *
      * @param <S> The type of the builder.
      */
     public static class Builder<S extends Builder<?>> {
-        protected final String key;
-        protected final List<String> aliases;
+        private final String key;
+        private final List<String> aliases;
 
         /**
          * Create a new builder.
@@ -99,7 +87,7 @@ public class CommandFlag {
          * @return The flag.
          */
         public @NotNull CommandFlag build(){
-            return new CommandFlag(key, aliases);
+            return new CommandFlag(this);
         }
     }
 }

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

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.commandtools.flags;
+package com.onarandombox.MultiverseCore.commandtools.flags;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.commandtools.flags;
+package com.onarandombox.MultiverseCore.commandtools.flags;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -9,12 +9,10 @@ import java.util.Map;
 import co.aikar.commands.InvalidCommandArgument;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jvnet.hk2.annotations.Service;
 
 /**
  * Manages all the flag groups and parsing.
  */
-@Service
 public class CommandFlagsManager {
     private final Map<String, CommandFlagGroup> flagGroupMap;
 
@@ -60,9 +58,10 @@ public class CommandFlagsManager {
         Collection<String> suggestions = new ArrayList<>();
         CommandFlag currentFlag = (flags.length <= 1) ? null : flagGroup.getFlagByKey(flags[flags.length - 2]);
 
-        if (currentFlag instanceof CommandValueFlag<?> valueFlag) {
+        if (currentFlag instanceof CommandValueFlag) {
+            CommandValueFlag<?> valueFlag = (CommandValueFlag<?>) currentFlag;
             if (valueFlag.getCompletion() != null) {
-                suggestions.addAll(valueFlag.getCompletion().apply(flags[flags.length - 1]));
+                suggestions.addAll(valueFlag.getCompletion().get());
             }
             if (valueFlag.isOptional()) {
                 suggestions.addAll(flagGroup.getRemainingKeys(flags));

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

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.commandtools.flags;
+package com.onarandombox.MultiverseCore.commandtools.flags;
 
 import co.aikar.commands.InvalidCommandArgument;
 

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

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

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

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

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

@@ -2,4 +2,4 @@
  * This package contains all the flags parsing classes.
  *
  */
-package org.mvplugins.multiverse.core.commandtools.flags;
+package com.onarandombox.MultiverseCore.commandtools.flags;

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

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

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

@@ -5,24 +5,20 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package org.mvplugins.multiverse.core.commandtools.queue;
+package com.onarandombox.MultiverseCore.commandtools.queue;
 
 import java.util.Map;
 import java.util.WeakHashMap;
 
 import com.dumptruckman.minecraft.util.Logging;
-import jakarta.inject.Inject;
+import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.block.data.type.CommandBlock;
 import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.NotNull;
-import org.jvnet.hk2.annotations.Service;
-
-import org.mvplugins.multiverse.core.MultiverseCore;
 
 /**
  * <p>Manages the queuing of dangerous commands that require {@code /mv confirm} before executing.</p>
@@ -30,16 +26,14 @@ import org.mvplugins.multiverse.core.MultiverseCore;
  * <p>Each sender can only have one command in queue at any given time. When a queued command is added
  * for a sender that already has a command in queue, it will replace the old queued command.</p>
  */
-@Service
 public class CommandQueueManager {
 
     private static final long TICKS_PER_SECOND = 20;
     private static final DummyCommandBlockSender COMMAND_BLOCK = new DummyCommandBlockSender();
 
-    private final Plugin plugin;
+    private final MultiverseCore plugin;
     private final Map<CommandSender, QueuedCommand> queuedCommandMap;
 
-    @Inject
     public CommandQueueManager(@NotNull MultiverseCore plugin) {
         this.plugin = plugin;
         this.queuedCommandMap = new WeakHashMap<>();

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

@@ -1,7 +1,4 @@
-package org.mvplugins.multiverse.core.commandtools.queue;
-
-import java.util.Set;
-import java.util.UUID;
+package com.onarandombox.MultiverseCore.commandtools.queue;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
@@ -13,6 +10,9 @@ import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Set;
+import java.util.UUID;
+
 /**
  * Used by {@link CommandQueueManager}, so different commands block can be recognised as one.
  */

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

@@ -5,7 +5,7 @@
  * with this project.                                                         *
  ******************************************************************************/
 
-package org.mvplugins.multiverse.core.commandtools.queue;
+package com.onarandombox.MultiverseCore.commandtools.queue;
 
 import co.aikar.commands.BukkitCommandIssuer;
 import org.bukkit.command.CommandSender;

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

@@ -1,4 +1,4 @@
 /**
  * Manager queuing of dangerous commands in need of confirmation.
  */
-package org.mvplugins.multiverse.core.commandtools.queue;
+package com.onarandombox.MultiverseCore.commandtools.queue;

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

@@ -0,0 +1,208 @@
+package com.onarandombox.MultiverseCore.destination;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.CommandIssuer;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permission;
+import org.bukkit.plugin.PluginManager;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Provides destinations for teleportation.
+ */
+public class DestinationsProvider {
+    private static final String SEPARATOR = ":";
+    private static final String PERMISSION_PREFIX = "multiverse.teleport.";
+
+    private final MultiverseCore plugin;
+    private final Map<String, Destination<?>> destinationMap;
+
+    /**
+     * Creates a new destinations provider.
+     *
+     * @param plugin The plugin.
+     */
+    public DestinationsProvider(@NotNull MultiverseCore plugin) {
+        this.plugin = plugin;
+        this.destinationMap = new HashMap<>();
+    }
+
+    /**
+     * Adds a destination to the provider.
+     *
+     * @param destination The destination.
+     */
+    public void registerDestination(@NotNull Destination<?> destination) {
+        this.destinationMap.put(destination.getIdentifier(), destination);
+        this.registerDestinationPerms(destination);
+    }
+
+    private void registerDestinationPerms(@NotNull Destination<?> destination) {
+        PluginManager pluginManager = this.plugin.getServer().getPluginManager();
+        pluginManager.addPermission(new Permission(PERMISSION_PREFIX + "self." + destination.getIdentifier()));
+        pluginManager.addPermission(new Permission(PERMISSION_PREFIX + "other." + destination.getIdentifier()));
+    }
+
+    /**
+     * Suggest tab completions for a destination string.
+     *
+     * @param issuer     The command issuer.
+     * @param deststring The current destination string.
+     * @return A collection of tab completions.
+     */
+    public @NotNull Collection<String> suggestDestinations(@NotNull BukkitCommandIssuer issuer,
+                                                           @Nullable String deststring
+    ) {
+        return destinationMap.values().stream()
+                .filter(destination -> issuer.hasPermission(PERMISSION_PREFIX + "self." + destination.getIdentifier())
+                        || issuer.hasPermission(PERMISSION_PREFIX + "other." + destination.getIdentifier()))
+                .map(destination -> destination.suggestDestinations(issuer, deststring).stream()
+                        .map(s -> destination.getIdentifier() + SEPARATOR + s)
+                        .collect(Collectors.toList()))
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Converts a destination string to a destination object.
+     *
+     * @param destinationString The destination string.
+     * @return The destination object, or null if invalid format.
+     */
+    public ParsedDestination<?> parseDestination(String destinationString) {
+        String[] items = destinationString.split(SEPARATOR, 2);
+
+        String idString = items[0];
+        String destinationParams;
+        Destination<?> destination;
+
+        if (items.length < 2) {
+            // Assume world destination
+            destination = this.getDestinationById("w");
+            destinationParams = items[0];
+        } else {
+            destination = this.getDestinationById(idString);
+            destinationParams = items[1];
+        }
+
+        if (destination == null) {
+            return null;
+        }
+
+        DestinationInstance destinationInstance = destination.getDestinationInstance(destinationParams);
+        if (destinationInstance == null) {
+            return null;
+        }
+
+        return new ParsedDestination<>(destination, destinationInstance);
+    }
+
+    /**
+     * Gets a destination by its identifier.
+     *
+     * @param identifier The identifier.
+     * @return The destination, or null if not found.
+     */
+    public @Nullable Destination<?> getDestinationById(@Nullable String identifier) {
+        return this.destinationMap.get(identifier);
+    }
+
+    /**
+     * Teleports the teleportee to the destination.
+     *
+     * @param teleporter    The teleporter.
+     * @param teleportee    The teleportee.
+     * @param destination   The destination.
+     */
+    public void playerTeleport(@NotNull BukkitCommandIssuer teleporter,
+                               @NotNull Player teleportee,
+                               @NotNull ParsedDestination<?> destination
+    ) {
+        if (!checkTeleportPermissions(teleporter, teleportee, destination)) {
+            return;
+        }
+        teleport(teleporter, teleportee, destination);
+    }
+
+    /**
+     * Teleports the teleportee to the destination.
+     *
+     * @param teleporter    The teleporter.
+     * @param teleportee    The teleportee.
+     * @param destination   The destination.
+     */
+    public void teleport(@NotNull BukkitCommandIssuer teleporter,
+                         @NotNull Entity teleportee,
+                         @NotNull ParsedDestination<?> destination
+    ) {
+        Teleporter teleportHandler = destination.getDestination().getTeleporter();
+        if (teleportHandler == null) {
+            teleportHandler = this.plugin.getSafeTTeleporter();
+        }
+        teleportHandler.teleport(teleporter, teleportee, destination);
+    }
+
+    /**
+     * Checks if the teleporter has permission to teleport the teleportee to the destination.
+     *
+     * @param teleporter    The teleporter.
+     * @param teleportee    The teleportee.
+     * @param destination   The destination.
+     * @return True if the teleporter has permission, false otherwise.
+     */
+    public boolean checkTeleportPermissions(CommandIssuer teleporter, Entity teleportee, ParsedDestination<?> destination) {
+        //TODO Move permission checking to a separate class
+        String permission = PERMISSION_PREFIX
+                + (teleportee.equals(teleporter.getIssuer()) ? "self" : "other") + "."
+                + destination.getDestination().getIdentifier();
+        if (!teleporter.hasPermission(permission)) {
+            teleporter.sendMessage("You don't have permission to teleport to this destination.");
+            return false;
+        }
+
+        //TODO Config whether to use finer permission
+        String finerPermissionSuffix = destination.getDestinationInstance().getFinerPermissionSuffix();
+        if (finerPermissionSuffix == null || finerPermissionSuffix.isEmpty()) {
+            return true;
+        }
+
+        String finerPermission = permission + "." + finerPermissionSuffix;
+        if (!teleporter.hasPermission(finerPermission)) {
+            teleporter.sendMessage("You don't have permission to teleport to this destination.");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks if the issuer has permission to teleport to at least one destination.
+     *
+     * @param issuer The issuer.
+     * @return True if the issuer has permission, false otherwise.
+     */
+    public boolean hasAnyTeleportPermission(CommandIssuer issuer) {
+        for (Destination<?> destination : this.destinationMap.values()) {
+            String permission = PERMISSION_PREFIX + "self." + destination.getIdentifier();
+            if (issuer.hasPermission(permission)) {
+                return true;
+            }
+            permission = PERMISSION_PREFIX + "other." + destination.getIdentifier();
+            if (issuer.hasPermission(permission)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

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

@@ -1,13 +1,12 @@
-package org.mvplugins.multiverse.core.destination;
+package com.onarandombox.MultiverseCore.destination;
 
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import org.mvplugins.multiverse.core.api.Destination;
-import org.mvplugins.multiverse.core.api.DestinationInstance;
-
 /**
  * A parsed destination.
  *

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

@@ -1,28 +1,25 @@
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;
 
 import java.util.Collection;
 
 import co.aikar.commands.BukkitCommandIssuer;
-import jakarta.inject.Inject;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.Teleporter;
 import org.bukkit.Location;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jvnet.hk2.annotations.Service;
 
-import org.mvplugins.multiverse.core.anchor.AnchorManager;
-import org.mvplugins.multiverse.core.api.Destination;
-
-/**
- * {@link Destination} implementation for anchors.
- */
-@Service
 public class AnchorDestination implements Destination<AnchorDestinationInstance> {
+    private final MultiverseCore plugin;
 
-    private final AnchorManager anchorManager;
-
-    @Inject
-    AnchorDestination(AnchorManager anchorManager) {
-        this.anchorManager = anchorManager;
+    /**
+     * Constructor.
+     *
+     * @param plugin The MultiverseCore plugin.
+     */
+    public AnchorDestination(MultiverseCore plugin) {
+        this.plugin = plugin;
     }
 
     /**
@@ -38,7 +35,7 @@ public class AnchorDestination implements Destination<AnchorDestinationInstance>
      */
     @Override
     public @Nullable AnchorDestinationInstance getDestinationInstance(@Nullable String destinationParams) {
-        Location anchorLocation = this.anchorManager.getAnchorLocation(destinationParams);
+        Location anchorLocation = this.plugin.getAnchorManager().getAnchorLocation(destinationParams);
         if (anchorLocation == null) {
             return null;
         }
@@ -50,7 +47,7 @@ public class AnchorDestination implements Destination<AnchorDestinationInstance>
      */
     @Override
     public @NotNull Collection<String> suggestDestinations(@NotNull BukkitCommandIssuer issuer, @Nullable String destinationParams) {
-        return this.anchorManager.getAnchors(issuer.getPlayer());
+        return this.plugin.getAnchorManager().getAnchors(issuer.getPlayer());
     }
 
     /**
@@ -60,4 +57,12 @@ public class AnchorDestination implements Destination<AnchorDestinationInstance>
     public boolean checkTeleportSafety() {
         return true;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public @Nullable Teleporter getTeleporter() {
+        return null;
+    }
 }

src/main/java/com/onarandombox/MultiverseCore/destination/core/AnchorDestinationInstance.java

@@ -1,16 +1,12 @@
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;
 
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import org.mvplugins.multiverse.core.api.DestinationInstance;
-
-/**
- * Destination instance implementation for the {@link AnchorDestination}.
- */
 public class AnchorDestinationInstance implements DestinationInstance {
     private final String anchorName;
     private final Location anchorLocation;
@@ -21,7 +17,7 @@ public class AnchorDestinationInstance implements DestinationInstance {
      * @param anchorName        The name of the anchor.
      * @param anchorLocation    The location of the anchor.
      */
-    AnchorDestinationInstance(@NotNull String anchorName, @NotNull Location anchorLocation) {
+    public AnchorDestinationInstance(@NotNull String anchorName, @NotNull Location anchorLocation) {
         this.anchorName = anchorName;
         this.anchorLocation = anchorLocation;
     }

src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestination.java

@@ -1,27 +1,22 @@
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jvnet.hk2.annotations.Service;
 
-import org.mvplugins.multiverse.core.api.Destination;
-import org.mvplugins.multiverse.core.utils.PlayerFinder;
-
-/**
- * {@link Destination} implementation for beds.
- */
-@Service
 public class BedDestination implements Destination<BedDestinationInstance> {
-    static final String OWN_BED_STRING = "playerbed";
+    public static final String OWN_BED_STRING = "playerbed";
 
-    BedDestination() {
+    public BedDestination() {
     }
 
     /**
@@ -61,4 +56,12 @@ public class BedDestination implements Destination<BedDestinationInstance> {
     public boolean checkTeleportSafety() {
         return false;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public @Nullable Teleporter getTeleporter() {
+        return null;
+    }
 }

src/main/java/com/onarandombox/MultiverseCore/destination/core/BedDestinationInstance.java

@@ -1,5 +1,6 @@
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;
 
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -7,11 +8,6 @@ import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import org.mvplugins.multiverse.core.api.DestinationInstance;
-
-/**
- * Destination instance implementation for the {@link BedDestination}.
- */
 public class BedDestinationInstance implements DestinationInstance {
     private final Player player;
 
@@ -20,7 +16,7 @@ public class BedDestinationInstance implements DestinationInstance {
      *
      * @param player The player whose bed to use.
      */
-    BedDestinationInstance(Player player) {
+    public BedDestinationInstance(Player player) {
         this.player = player;
     }
 

src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestination.java

@@ -1,31 +1,27 @@
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import co.aikar.commands.BukkitCommandIssuer;
-import jakarta.inject.Inject;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.MVWorld;
+import com.onarandombox.MultiverseCore.api.Teleporter;
 import org.bukkit.Location;
-import org.bukkit.World;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jvnet.hk2.annotations.Service;
 
-import org.mvplugins.multiverse.core.api.Destination;
-import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
-import org.mvplugins.multiverse.core.world.WorldManager;
-
-/**
- * {@link Destination} implementation for cannons.
- */
-@Service
 public class CannonDestination implements Destination<CannonDestinationInstance> {
+    private final MultiverseCore plugin;
 
-    private final WorldManager worldManager;
-
-    @Inject
-    CannonDestination(WorldManager worldManager) {
-        this.worldManager = worldManager;
+    /**
+     * Constructor.
+     *
+     * @param plugin The MultiverseCore plugin.
+     */
+    public CannonDestination(MultiverseCore plugin) {
+        this.plugin = plugin;
     }
 
     /**
@@ -57,7 +53,7 @@ public class CannonDestination implements Destination<CannonDestinationInstance>
             return null;
         }
 
-        World world = this.worldManager.getLoadedWorld(worldName).map(LoadedMultiverseWorld::getBukkitWorld).getOrNull().getOrNull();
+        MVWorld world = this.plugin.getMVWorldManager().getMVWorld(worldName);
         if (world == null) {
             return null;
         }
@@ -66,7 +62,7 @@ public class CannonDestination implements Destination<CannonDestinationInstance>
         double dSpeed;
         try {
             location = new Location(
-                    world,
+                    world.getCBWorld(),
                     Double.parseDouble(coordinatesParams[0]),
                     Double.parseDouble(coordinatesParams[1]),
                     Double.parseDouble(coordinatesParams[2]),
@@ -96,4 +92,12 @@ public class CannonDestination implements Destination<CannonDestinationInstance>
     public boolean checkTeleportSafety() {
         return false;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public @Nullable Teleporter getTeleporter() {
+        return null;
+    }
 }

src/main/java/com/onarandombox/MultiverseCore/destination/core/CannonDestinationInstance.java

@@ -1,16 +1,12 @@
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;
 
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import org.mvplugins.multiverse.core.api.DestinationInstance;
-
-/**
- * Destination instance implementation for the {@link CannonDestination}.
- */
 public class CannonDestinationInstance implements DestinationInstance {
     private final Location location;
     private final double speed;
@@ -21,7 +17,7 @@ public class CannonDestinationInstance implements DestinationInstance {
      * @param location The location to teleport to.
      * @param speed The speed to fire the player at.
      */
-    CannonDestinationInstance(@NotNull Location location, double speed) {
+    public CannonDestinationInstance(@NotNull Location location, double speed) {
         this.location = location;
         this.speed = speed;
     }

src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestination.java

@@ -1,31 +1,27 @@
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import co.aikar.commands.BukkitCommandIssuer;
-import jakarta.inject.Inject;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.MVWorld;
+import com.onarandombox.MultiverseCore.api.Teleporter;
 import org.bukkit.Location;
-import org.bukkit.World;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jvnet.hk2.annotations.Service;
 
-import org.mvplugins.multiverse.core.api.Destination;
-import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
-import org.mvplugins.multiverse.core.world.WorldManager;
-
-/**
- * {@link Destination} implementation for exact locations.
- */
-@Service
 public class ExactDestination implements Destination<ExactDestinationInstance> {
+    private final MultiverseCore plugin;
 
-    private final WorldManager worldManager;
-
-    @Inject
-    public ExactDestination(WorldManager worldManager) {
-        this.worldManager = worldManager;
+    /**
+     * Constructor.
+     *
+     * @param plugin The MultiverseCore plugin.
+     */
+    public ExactDestination(MultiverseCore plugin) {
+        this.plugin = plugin;
     }
 
     /**
@@ -53,7 +49,7 @@ public class ExactDestination implements Destination<ExactDestinationInstance> {
             return null;
         }
 
-        World world = this.worldManager.getLoadedWorld(worldName).map(LoadedMultiverseWorld::getBukkitWorld).getOrNull().getOrNull();
+        MVWorld world = this.plugin.getMVWorldManager().getMVWorld(worldName);
         if (world == null) {
             return null;
         }
@@ -61,7 +57,7 @@ public class ExactDestination implements Destination<ExactDestinationInstance> {
         Location location;
         try {
             location = new Location(
-                    world,
+                    world.getCBWorld(),
                     Double.parseDouble(coordinatesParams[0]),
                     Double.parseDouble(coordinatesParams[1]),
                     Double.parseDouble(coordinatesParams[2])
@@ -99,4 +95,12 @@ public class ExactDestination implements Destination<ExactDestinationInstance> {
     public boolean checkTeleportSafety() {
         return false;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public @Nullable Teleporter getTeleporter() {
+        return null;
+    }
 }

src/main/java/com/onarandombox/MultiverseCore/destination/core/ExactDestinationInstance.java

@@ -1,16 +1,12 @@
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;
 
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import org.mvplugins.multiverse.core.api.DestinationInstance;
-
-/**
- * Destination instance implementation for the {@link ExactDestination}.
- */
 public class ExactDestinationInstance implements DestinationInstance {
     private final Location location;
 
@@ -19,7 +15,7 @@ public class ExactDestinationInstance implements DestinationInstance {
      *
      * @param location The location to teleport to.
      */
-    ExactDestinationInstance(Location location) {
+    public ExactDestinationInstance(Location location) {
         this.location = location;
     }
 

src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestination.java

@@ -1,27 +1,22 @@
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
 
 import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.Teleporter;
+import com.onarandombox.MultiverseCore.utils.PlayerFinder;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jvnet.hk2.annotations.Service;
 
-import org.mvplugins.multiverse.core.api.Destination;
-import org.mvplugins.multiverse.core.utils.PlayerFinder;
-
-/**
- * {@link Destination} implementation for players.s
- */
-@Service
 public class PlayerDestination implements Destination<PlayerDestinationInstance> {
     /**
      * Creates a new instance of the PlayerDestination.
      */
-    PlayerDestination() {
+    public PlayerDestination() {
     }
 
     /**
@@ -59,4 +54,12 @@ public class PlayerDestination implements Destination<PlayerDestinationInstance>
     public boolean checkTeleportSafety() {
         return true;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public @Nullable Teleporter getTeleporter() {
+        return null;
+    }
 }

src/main/java/com/onarandombox/MultiverseCore/destination/core/PlayerDestinationInstance.java

@@ -1,5 +1,6 @@
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;
 
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -7,11 +8,6 @@ import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import org.mvplugins.multiverse.core.api.DestinationInstance;
-
-/**
- * Destination instance implementation for the {@link PlayerDestination}.
- */
 public class PlayerDestinationInstance implements DestinationInstance {
     private final Player player;
 
@@ -20,7 +16,7 @@ public class PlayerDestinationInstance implements DestinationInstance {
      *
      * @param player The player whose location to go to.
      */
-    PlayerDestinationInstance(Player player) {
+    public PlayerDestinationInstance(Player player) {
         this.player = player;
     }
 

src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestination.java

@@ -1,32 +1,27 @@
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import co.aikar.commands.BukkitCommandIssuer;
-import jakarta.inject.Inject;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.Destination;
+import com.onarandombox.MultiverseCore.api.MVWorld;
+import com.onarandombox.MultiverseCore.api.Teleporter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jvnet.hk2.annotations.Service;
 
-import org.mvplugins.multiverse.core.api.Destination;
-import org.mvplugins.multiverse.core.api.LocationManipulation;
-import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
-import org.mvplugins.multiverse.core.world.WorldManager;
-
-/**
- * {@link Destination} implementation for exact locations.
- */
-@Service
 public class WorldDestination implements Destination<WorldDestinationInstance> {
 
-    private final WorldManager worldManager;
-    private final LocationManipulation locationManipulation;
+    private final MultiverseCore plugin;
 
-    @Inject
-    WorldDestination(WorldManager worldManager, LocationManipulation locationManipulation) {
-        this.worldManager = worldManager;
-        this.locationManipulation = locationManipulation;
+    /**
+     * Constructor.
+     *
+     * @param plugin The MultiverseCore plugin.
+     */
+    public WorldDestination(MultiverseCore plugin) {
+        this.plugin = plugin;
     }
 
     /**
@@ -48,13 +43,13 @@ public class WorldDestination implements Destination<WorldDestinationInstance> {
         }
 
         String worldName = items[0];
-        LoadedMultiverseWorld world = this.worldManager.getLoadedWorld(worldName).getOrNull();
+        MVWorld world = this.plugin.getMVWorldManager().getMVWorld(worldName);
         if (world == null) {
             return null;
         }
 
         String direction = (items.length == 2) ? items[1] : null;
-        float yaw = direction != null ? this.locationManipulation.getYaw(direction) : -1;
+        float yaw = direction != null ? this.plugin.getLocationManipulation().getYaw(direction) : -1;
 
         return new WorldDestinationInstance(world, direction, yaw);
     }
@@ -75,4 +70,12 @@ public class WorldDestination implements Destination<WorldDestinationInstance> {
     public boolean checkTeleportSafety() {
         return true;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public @Nullable Teleporter getTeleporter() {
+        return null;
+    }
 }

src/main/java/com/onarandombox/MultiverseCore/destination/core/WorldDestinationInstance.java

@@ -1,30 +1,24 @@
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;
 
+import com.onarandombox.MultiverseCore.api.DestinationInstance;
+import com.onarandombox.MultiverseCore.api.MVWorld;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import org.mvplugins.multiverse.core.api.DestinationInstance;
-import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
-
-/**
- * Destination instance implementation for the {@link WorldDestination}.
- */
 public class WorldDestinationInstance implements DestinationInstance {
-    private final LoadedMultiverseWorld world;
+    private final MVWorld world;
     private final String direction;
     private final float yaw;
 
     /**
      * Constructor.
      *
-     * @param world     The world to teleport to.
-     * @param direction The direction to face.
-     * @param yaw       The yaw to face.
+     * @param world The world to teleport to.
      */
-    WorldDestinationInstance(@NotNull LoadedMultiverseWorld world, @Nullable String direction, float yaw) {
+    public WorldDestinationInstance(@NotNull MVWorld world, @Nullable String direction, float yaw) {
         this.world = world;
         this.direction = direction;
         this.yaw = yaw;
@@ -65,8 +59,8 @@ public class WorldDestinationInstance implements DestinationInstance {
     @Override
     public @NotNull String serialise() {
         if (this.direction != null) {
-            return this.world.getName() + ":" + this.direction;
+            return this.world.getCBWorld().getName() + ":" + this.direction;
         }
-        return this.world.getName();
+        return this.world.getCBWorld().getName();
     }
 }

src/main/java/com/onarandombox/MultiverseCore/destination/core/package-info.java

@@ -1,4 +1,4 @@
 /**
  * This package contains the in-built implementations of the Destination interface.
  */
-package org.mvplugins.multiverse.core.destination.core;
+package com.onarandombox.MultiverseCore.destination.core;

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

@@ -1,4 +1,4 @@
 /**
  * This package contains all destination-types.
  */
-package org.mvplugins.multiverse.core.destination;
+package com.onarandombox.MultiverseCore.destination;

src/main/java/com/onarandombox/MultiverseCore/display/ContentDisplay.java

@@ -1,16 +1,15 @@
-package org.mvplugins.multiverse.core.display;
+package com.onarandombox.MultiverseCore.display;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
 import co.aikar.commands.BukkitCommandIssuer;
+import com.onarandombox.MultiverseCore.display.handlers.DefaultSendHandler;
+import com.onarandombox.MultiverseCore.display.handlers.SendHandler;
+import com.onarandombox.MultiverseCore.display.parsers.ContentProvider;
 import org.jetbrains.annotations.NotNull;
 
-import org.mvplugins.multiverse.core.display.handlers.DefaultSendHandler;
-import org.mvplugins.multiverse.core.display.handlers.SendHandler;
-import org.mvplugins.multiverse.core.display.parsers.ContentProvider;
-
 /**
  * Helps to display contents such as list and maps in a nicely formatted fashion.
  */
@@ -29,7 +28,7 @@ public class ContentDisplay {
     private final List<ContentProvider> contentParsers = new ArrayList<>();
     private SendHandler sendHandler = DefaultSendHandler.getInstance();
 
-    ContentDisplay() {
+    public ContentDisplay() {
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/display/filters/ContentFilter.java

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.display.filters;
+package com.onarandombox.MultiverseCore.display.filters;
 
 /**
  * Filter display content for it show only certain string.

src/main/java/com/onarandombox/MultiverseCore/display/filters/DefaultContentFilter.java

@@ -1,17 +1,12 @@
-package org.mvplugins.multiverse.core.display.filters;
+package com.onarandombox.MultiverseCore.display.filters;
 
 /**
  * Default implementation of {@link ContentFilter} that doesn't filter anything.
  */
-public final class DefaultContentFilter implements ContentFilter {
+public class DefaultContentFilter implements ContentFilter {
 
-    private static DefaultContentFilter instance;
+    public static DefaultContentFilter instance;
 
-    /**
-     * Gets the singleton instance of this class.
-     *
-     * @return The singleton instance of this class.
-     */
     public static DefaultContentFilter get() {
         if (instance == null) {
             instance = new DefaultContentFilter();

src/main/java/com/onarandombox/MultiverseCore/display/filters/RegexContentFilter.java

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.display.filters;
+package com.onarandombox.MultiverseCore.display.filters;
 
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -18,7 +18,7 @@ public class RegexContentFilter implements ContentFilter {
 
     /**
      * Compile regex pattern to create a regex filter.
-     * <br/>
+     *
      * When prefixed with 'r=', filter string is used as the full regex pattern.
      * Else, set to regex that contains the filterString.
      *
@@ -40,7 +40,7 @@ public class RegexContentFilter implements ContentFilter {
     private final String regexString;
     private Pattern regexPattern;
 
-    RegexContentFilter(@Nullable String regexString) {
+    public RegexContentFilter(@Nullable String regexString) {
         this.regexString = regexString;
         convertToPattern();
     }
@@ -85,29 +85,14 @@ public class RegexContentFilter implements ContentFilter {
         return hasValidRegex();
     }
 
-    /**
-     * Check if the regex is valid.
-     *
-     * @return True if the regex is valid.
-     */
     public boolean hasValidRegex() {
         return regexPattern != null;
     }
 
-    /**
-     * Get the regex string.
-     *
-     * @return The regex string.
-     */
     public String getRegexString() {
         return regexString;
     }
 
-    /**
-     * Get the compiled regex pattern.
-     *
-     * @return The compiled regex pattern.
-     */
     public Pattern getRegexPattern() {
         return regexPattern;
     }

src/main/java/com/onarandombox/MultiverseCore/display/filters/package-info.java

@@ -1,4 +1,4 @@
 /**
  * This package contains all the filters that can be used to choose specific data to display.
  */
-package org.mvplugins.multiverse.core.display.filters;
+package com.onarandombox.MultiverseCore.display.filters;

src/main/java/com/onarandombox/MultiverseCore/display/handlers/BaseSendHandler.java

@@ -1,17 +1,16 @@
-package org.mvplugins.multiverse.core.display.handlers;
+package com.onarandombox.MultiverseCore.display.handlers;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 import co.aikar.commands.BukkitCommandIssuer;
 import com.google.common.base.Strings;
+import com.onarandombox.MultiverseCore.display.filters.ContentFilter;
+import com.onarandombox.MultiverseCore.display.filters.DefaultContentFilter;
 import org.bukkit.ChatColor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import org.mvplugins.multiverse.core.display.filters.ContentFilter;
-import org.mvplugins.multiverse.core.display.filters.DefaultContentFilter;
-
 /**
  * Base implementation of {@link SendHandler} with some common parameters.
  *
@@ -19,19 +18,8 @@ import org.mvplugins.multiverse.core.display.filters.DefaultContentFilter;
  */
 public abstract class BaseSendHandler<T extends BaseSendHandler<?>> implements SendHandler {
 
-    /**
-     * Header to be displayed.
-     */
     protected String header = "";
-
-    /**
-     * Filter to keep only contents that matches the filter.
-     */
     protected ContentFilter filter = DefaultContentFilter.get();
-
-    /**
-     * Fallback message to be displayed when there is no content to display.
-     */
     protected String noContentMessage = String.format("%sThere is no content to display.", ChatColor.RED);
 
     /**
@@ -87,9 +75,9 @@ public abstract class BaseSendHandler<T extends BaseSendHandler<?>> implements S
      * @param replacements  String formatting replacements.
      * @return Same {@link T} for method chaining.
      */
-    public T withHeader(@NotNull String header, @NotNull Object... replacements) {
+    public T withHeader(@NotNull String header, @NotNull Object...replacements) {
         this.header = String.format(header, replacements);
-        return getT();
+        return (T) this;
     }
 
     /**
@@ -100,7 +88,7 @@ public abstract class BaseSendHandler<T extends BaseSendHandler<?>> implements S
      */
     public T withFilter(@NotNull ContentFilter filter) {
         this.filter = filter;
-        return getT();
+        return (T) this;
     }
 
     /**
@@ -111,11 +99,6 @@ public abstract class BaseSendHandler<T extends BaseSendHandler<?>> implements S
      */
     public T noContentMessage(@Nullable String message) {
         this.noContentMessage = message;
-        return getT();
-    }
-
-    @SuppressWarnings("unchecked")
-    private @NotNull T getT() {
         return (T) this;
     }
 

src/main/java/com/onarandombox/MultiverseCore/display/handlers/DefaultSendHandler.java

@@ -1,22 +1,14 @@
-package org.mvplugins.multiverse.core.display.handlers;
+package com.onarandombox.MultiverseCore.display.handlers;
 
 import java.util.List;
 
 import co.aikar.commands.BukkitCommandIssuer;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * Most basic implementation of {@link SendHandler} that just sends content with no formatting.
- */
-public final class DefaultSendHandler implements SendHandler {
+public class DefaultSendHandler implements SendHandler {
 
     private static DefaultSendHandler instance;
 
-    /**
-     * Gets the singleton instance of this class.
-     *
-     * @return The singleton instance of this class.
-     */
     public static DefaultSendHandler getInstance() {
         if (instance == null) {
             instance = new DefaultSendHandler();

src/main/java/com/onarandombox/MultiverseCore/display/handlers/InlineSendHandler.java

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.display.handlers;
+package com.onarandombox.MultiverseCore.display.handlers;
 
 import java.util.List;
 
@@ -23,7 +23,7 @@ public class InlineSendHandler extends BaseSendHandler<InlineSendHandler> {
     private String delimiter = ChatColor.WHITE + ", ";
     private String prefix = null;
 
-    InlineSendHandler() {
+    public InlineSendHandler() {
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/display/handlers/PagedSendHandler.java

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.display.handlers;
+package com.onarandombox.MultiverseCore.display.handlers;
 
 import java.util.List;
 
@@ -24,10 +24,10 @@ public class PagedSendHandler extends BaseSendHandler<PagedSendHandler> {
     private boolean paginate = true;
     private boolean paginateInConsole = false;
     private boolean padEnd = true;
-    private int linesPerPage = 8; // SUPPRESS CHECKSTYLE: MagicNumberCheck
+    private int linesPerPage = 8;
     private int targetPage = 1;
 
-    PagedSendHandler() {
+    public PagedSendHandler() {
     }
 
     /**
@@ -99,7 +99,7 @@ public class PagedSendHandler extends BaseSendHandler<PagedSendHandler> {
 
     /**
      * Sets whether display output should be paginated if is for console output.
-     * This option will be useless if {@link PagedSendHandler#paginate} is set to false.
+     * This option will be useless of {@link PagedSendHandler#paginate} is set to false.
      *
      * @param paginateInConsole State of doing pagination in console.
      * @return Same {@link PagedSendHandler} for method chaining.

src/main/java/com/onarandombox/MultiverseCore/display/handlers/SendHandler.java

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.display.handlers;
+package com.onarandombox.MultiverseCore.display.handlers;
 
 import java.util.List;
 

src/main/java/com/onarandombox/MultiverseCore/display/handlers/package-info.java

@@ -1,4 +1,4 @@
 /**
  * This package contains all the handlers for the display system.
  */
-package org.mvplugins.multiverse.core.display.handlers;
+package com.onarandombox.MultiverseCore.display.handlers;

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

@@ -1,4 +1,4 @@
 /**
  * This package contains all the classes that are used to display nicely formatted information to the user.
  */
-package org.mvplugins.multiverse.core.display;
+package com.onarandombox.MultiverseCore.display;

src/main/java/com/onarandombox/MultiverseCore/display/parsers/ContentProvider.java

@@ -1,4 +1,4 @@
-package org.mvplugins.multiverse.core.display.parsers;
+package com.onarandombox.MultiverseCore.display.parsers;
 
 import java.util.Collection;
 
@@ -14,7 +14,6 @@ public interface ContentProvider {
      * Parse the object to string(s) and add it to the content.
      *
      * @param issuer    The target which the content will be displayed to.
-     * @return          The parsed content list.
      */
     Collection<String> parse(@NotNull BukkitCommandIssuer issuer);
 }