Merge pull request #3338 from Multiverse/feat/relative-positioning

Add back support for relative position with ~ in destination coordinates

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: Multiverse
+open_collective: multiverse-plugins

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,77 @@
+name: 🐛 Report a Bug
+description: Report a problem with Multiverse-Core.
+title: "[Bug]: "
+labels: ["Bug: Unconfirmed"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+        If you are having issues with other submodules of Multiverse, please go to their respective git repo:
+            Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues/new/choose
+            Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues/new/choose
+            Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues/new/choose
+            Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues/new/choose
+
+        Not sure if this is a bug with Multiverse-Core? Feel free to ask on our Discord server: https://discord.gg/NZtfKky
+
+        When completing the report, please ensure all fields are filled with the correct details requested. Failure to do so will result in your issue being closed.
+  - type: input
+    id: multiverse-version-info
+    attributes:
+      label: '`/mv dumps` output'
+      description: Run `/mv dumps` in the console, then copy and paste the link from the output of the command into this box. If `/mv dumps` command is not available, update multiverse to v5.
+    validations:
+      required: true
+  - type: input
+    id: server-logs
+    attributes:
+      label: Server logs
+      description: >
+        Include full startup log and console error (if any). upload all relevant logs to either https://pastes.dev
+        or https://gist.github.com, save and the paste the link in this box.
+    validations:
+      required: true
+  - type: textarea
+    id: server-version
+    attributes:
+      label: Server Version
+      description: Output of `/version` command.
+      placeholder: server version info
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: Bug Description
+      description: Describe in detail what the bug is about. Include the expected behaviour and actual behaviour.
+      placeholder: "Example: When running `/mv` it cause the server to crash..."
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce-steps
+    attributes:
+      label: Steps to reproduce
+      description: Provide detailed instructions to trigger the bug.
+      placeholder: |
+        Example:
+          1. Start a server with only multiverse installed.
+          2. Run `/mv` command.
+          3. Players all get kicked with a "server closed" message.
+          ...
+    validations:
+      required: true
+  - type: checkboxes
+    id: agreements
+    attributes:
+      label: Agreements
+      description: Ensure you have done the following being submitting this issue.
+      options:
+        - label: I have searched for and ensured there isn't already an open or resolved issue(s) regarding this.
+          required: true
+        - label: >
+            I was able to reproduce my issue on a freshly setup and up-to-date server with the latest
+            version of Multiverse plugins with no other plugins and with no kinds of other server or client mods.
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 💬 Multiverse Discord Server
+    url: https://discord.gg/NZtfKky
+    about: Need help with using Multiverse-Core or just want to chat with the devs? Join the Multiverse Discord Server for help!

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,41 @@
+name: 💡 Request a Feature
+description: Suggest a feature you want to see in Multiverse-Core!
+title: "[Idea]: "
+labels: ["Type: Idea"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to share your ideas!
+
+        If you are look for other submodules of Multiverse, go to their respective git repo:
+            Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues/new/choose
+            Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues/new/choose
+            Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues/new/choose
+            Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues/new/choose
+
+        Not sure if your feature fits in Multiverse-Core? Feel free to ask on our Discord server: https://discord.gg/NZtfKky
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Describe the feature
+      description: What feature are you suggesting?
+      placeholder: "Example: I hope multiverse can implement random teleport feature..."
+    validations:
+      required: true
+  - type: textarea
+    id: feature-reasoning
+    attributes:
+      label: How is the feature useful to all Multiverse users?
+      description: How is the feature useful to all players, server owners and/or developers?
+      placeholder: "Example: Random teleporting can be integrated into many multiverse modules such as mv-portals..."
+    validations:
+      required: true
+  - type: checkboxes
+    id: agreements
+    attributes:
+      label: Agreements
+      description: Ensure you have done the following being submitting this issue.
+      options:
+        - label: I have searched for and ensured there isn't already an open issue regarding this.
+          required: true

.github/workflows/call.github_release.yml

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

.github/workflows/call.platform_uploads.yml

@@ -0,0 +1,83 @@
+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.create_release.yml

@@ -0,0 +1,39 @@
+name: 'Dispatch: Create Release'
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_type:
+        description: 'Stable or pre-release'
+        required: true
+        type: choice
+        options:
+          - prerelease
+          - release
+      version_bump:
+        description: 'Version bump type'
+        required: true
+        type: choice
+        options:
+          - major
+          - minor
+          - patch
+
+jobs:
+  github_release:
+    uses: ./.github/workflows/call.github_release.yml
+    secrets: inherit
+    with:
+      release_mode: ${{ inputs.release_type }}
+      version_bump: ${{ inputs.version_bump }}
+
+  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: 'false'
+      upload_hangar: 'false'

.github/workflows/dispatch.javadoc.yml

@@ -0,0 +1,55 @@
+name: 'Dispatch: Deploy Javadoc'
+
+on:
+  workflow_dispatch:
+    inputs:
+      target_tag:
+        description: 'Version to generate javadoc'
+        required: true
+      replace_latest:
+        description: 'Replace the latest folder'
+        type: boolean
+
+jobs:
+  javadocs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.target_tag }}
+
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: build javadoc
+        run: ./gradlew javadoc
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_VERSION: ${{ inputs.target_tag }}
+
+      - name: Copy javadoc to deploy folder
+        run: |
+          mkdir -p build/docs/javadoc-deploy/${{ inputs.target_tag }}
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy/${{ inputs.target_tag }}
+
+      - name: Copy javadoc to latest folder
+        if: inputs.replace_latest
+        run: |
+          mkdir -p build/docs/javadoc-deploy/latest
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy/latest
+
+      - name: Deploy javadoc to gh pages
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          folder: build/docs/javadoc-deploy
+          branch: javadoc
+          target-folder: javadoc
+          clean: false
+          commit-message: Deploy javadoc for ${{ inputs.target_tag }}

.github/workflows/dispatch.platform_uploads.yml

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

.github/workflows/dispatch.promote_release.yml

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

.github/workflows/generic.checkstyle.yml

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

@@ -0,0 +1,131 @@
+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@v4
+        with:
+          ref: ${{ inputs.promote_from }}
+
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Build to test
+        id: test
+        run: ./gradlew clean build -x assemble -x shadowJar
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create release
+        id: release
+        if: steps.test.outcome == 'success'
+        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'
+        run: >
+          ./gradlew publish -x test
+          -PmultiverseUsername=${{ secrets.REPOSILITE_REPO_USERNAME }}
+          -PmultiversePassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
+        env:
+          GITHUB_VERSION: ${{ steps.release.outputs.publish_version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build for upload
+        id: build
+        if: steps.release.outputs.release_created == 'true'
+        run: ./gradlew build -x test
+        env:
+          GITHUB_VERSION: ${{ steps.release.outputs.tag_name }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload release artifact
+        if: steps.build.outcome == 'success'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: build/libs/${{ inputs.plugin_name }}-${{ steps.release.outputs.tag_name }}.jar
+          asset_name: ${{ inputs.plugin_name }}-${{ steps.release.outputs.tag_name }}.jar
+          tag: ${{ steps.release.outputs.tag_name }}
+
+      - name: Generate javadoc
+        id: javadoc
+        if: steps.build.outcome == 'success'
+        run: ./gradlew javadoc -x test
+        env:
+          GITHUB_VERSION: ${{ steps.release.outputs.publish_version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload javadoc
+        if: steps.javadoc.outcome == 'success'
+        run: |
+          mkdir -p build/docs/javadoc-deploy/${{ steps.release.outputs.publish_version }}
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy/${{ steps.release.outputs.publish_version }}
+
+      - name: Override latest javadoc for stable release
+        if: steps.javadoc.outcome == 'success' && steps.release.outputs.release_type == 'release'
+        run: |
+          mkdir -p build/docs/javadoc-deploy/latest
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy/latest
+
+      - name: Deploy javadoc to gh pages
+        if: steps.javadoc.outcome == 'success'
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          folder: build/docs/javadoc-deploy
+          branch: javadoc
+          target-folder: javadoc
+          clean: false
+          commit-message: Deploy javadoc for ${{ steps.release.outputs.tag_name }}

.github/workflows/generic.platform_uploads.yml

@@ -0,0 +1,140 @@
+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.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2
+        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.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2
+        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.18.2-1.21.8"]}'
+        plugin_dependencies: ${{ inputs.hangar_plugin_dependencies }}

.github/workflows/generic.test.yml

@@ -0,0 +1,48 @@
+name: 'Generic: Test'
+
+on:
+  workflow_call:
+    inputs:
+      plugin_name:
+        description: 'Plugin name'
+        required: true
+        type: string
+
+jobs:
+  test-and-artifact:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Run unit tests
+        run: ./gradlew build
+        env:
+          GITHUB_VERSION: pr${{ github.event.pull_request.number }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Artifact output
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.plugin_name }}-pr${{ github.event.pull_request.number }}
+          path: build/libs/${{ inputs.plugin_name }}-pr${{ github.event.pull_request.number }}.jar
+
+  comment-artifact:
+    needs: test-and-artifact
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: benwoo1110/artifact-comment-action@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/main.prerelease.yml

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

.github/workflows/pr.checkstyle.yml

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

.github/workflows/pr.require_label.yml

@@ -0,0 +1,18 @@
+name: 'PR: Require Label'
+
+on:
+  pull_request:
+    types: [opened, labeled, unlabeled, synchronize]
+    branches: [main]
+
+jobs:
+  require_label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mheap/github-action-required-labels@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          mode: exactly
+          count: 1
+          labels: "release:major, release:minor, release:patch, no release"

.github/workflows/pr.test.yml

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

.gitignore

@@ -2,6 +2,7 @@
 /.classpath
 /.project
 /.settings
+/.checkstyle
 
 # netbeans
 /nbproject
@@ -11,6 +12,7 @@
 
 # maven
 /target
+dependency-reduced-pom.xml
 
 # vim
 .*.sw[a-p]
@@ -30,4 +32,17 @@
 *.iml
 *.ipr
 *.iws
-.idea/
+.idea/
+
+# Fern's utils
+uploadtoserver.sh
+
+# Testing files:
+debug.log
+
+# Doxygen
+/docs/html
+debug.txt
+
+# Gradle
+.gradle

.gitmodules

@@ -1,7 +0,0 @@
-[submodule "lib/allpay"]
-	path = lib/allpay
-	url = git://github.com/FernFerret/AllPay.git
-[submodule "lib/commandhandler"]
-	path = lib/commandhandler
-	url = git://github.com/PneumatiCraft/CommandHandler.git
-        branch = notrie

LICENSE.md

@@ -0,0 +1,6 @@
+Copyright (c) 2011, The Multiverse Team All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the The Multiverse Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

README.md

@@ -1,5 +1,51 @@
-Copyright (c) 2011, The Multiverse Team All rights reserved.
+<p align="center">
+<img src="config/multiverse-banner.png" alt="Multiverse Logo">
+</p>
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+[![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://raw.githubusercontent.com/intergrav/devins-badges/refs/heads/v3/assets/cozy/available/bukkit_vector.svg)](https://dev.bukkit.org/projects/multiverse-core)
+[![Spigot](https://raw.githubusercontent.com/intergrav/devins-badges/refs/heads/v3/assets/cozy/available/spigot_vector.svg)](https://www.spigotmc.org/resources/multiverse-core.390/)
 
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the The Multiverse Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+[![Release](https://img.shields.io/github/v/release/multiverse/multiverse-core)](https://github.com/Multiverse/Multiverse-Core/releases/latest)
+[![Pre-Release](https://img.shields.io/github/v/release/multiverse/multiverse-core?include_prereleases&label=Pre-release)](https://github.com/Multiverse/Multiverse-Core/releases)
+[![Discord](https://img.shields.io/discord/325459248047980545?label=Discord&logo=discord)](https://discord.gg/NZtfKky)
+[![Donate on Github Sponsor](https://img.shields.io/badge/Github%20Sponsor-Donate-pink?logo=githubsponsors)](https://github.com/sponsors/Multiverse)
+[![Donate on Open Collective](https://img.shields.io/badge/Open%20Collective-Donate-blue?style=flat&logo=opencollective)](https://opencollective.com/multiverse-plugins)
+
+# About
+
+[Multiverse](https://modrinth.com/plugin/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!
+
+Now it's time to create your very own Multiverse server, do check out our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) and [Usage Guide](https://github.com/Multiverse/Multiverse-Core/wiki/Basics) to get started. Feel free to hop onto our [Discord](https://discord.gg/NZtfKky) if you have any question or just want to have a chat with us!
+
+## Amazing sub-modules available:
+
+* [Multiverse-NetherPortals](https://github.com/Multiverse/Multiverse-NetherPortals) -> Have separate nether and end worlds for each of your overworlds!
+* [Multiverse-Portals](https://github.com/Multiverse/Multiverse-Portals) -> Make custom portals to go to any destination!
+* [Multiverse-Inventories](https://github.com/Multiverse/Multiverse-Inventories) -> Have separated players stats and inventories per world or per group of worlds.
+* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleporters!
+
+## Usage Guide
+
+We have a cool new website hosting our Wiki: https://mvplugins.org
+
+## Building
+Simply build the source with Gradle:
+```
+./gradlew build
+```
+
+## 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-web) 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 donating to our [Github Sponsors](https://github.com/sponsors/Multiverse) or [Open Collective](https://opencollective.com/multiverse-plugins)!
+
+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
+Multiverse-Core is licensed under BSD-3-Clause License. Please see [LICENSE.md](LICENSE.md) for more info.

build.gradle

@@ -0,0 +1,117 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+plugins {
+    id 'org.mvplugins.multiverse-plugin' version '1.2.1'
+}
+
+group = 'org.mvplugins.multiverse.core'
+description = 'Multiverse-Core'
+
+repositories {
+    maven {
+        name = 'aikar repo'
+        url = uri('https://repo.aikar.co/content/groups/aikar/')
+    }
+
+    maven {
+        name = 'glaremasters repo'
+        url = 'https://repo.glaremasters.me/repository/towny/'
+    }
+
+    maven {
+        name = "helpchatRepoReleases"
+        url = uri("https://repo.helpch.at/releases/")
+    }
+}
+
+configure(apiDependencies) {
+    serverApiVersion = '1.21.8-R0.1-SNAPSHOT'
+    mockBukkitServerApiVersion = '1.21'
+    mockBukkitVersion = '4.69.2'
+}
+
+dependencies {
+    // Economy
+    externalPlugin('com.github.MilkBowl:VaultAPI:1.7.1') {
+        exclude group: 'org.bukkit', module: 'bukkit'
+    }
+
+    // PlaceholderAPI
+    externalPlugin 'me.clip:placeholderapi:2.11.6'
+
+    // Command Framework
+    shadowed 'co.aikar:acf-paper:0.5.1-SNAPSHOT'
+
+    // Config
+    shadowed('io.github.townyadvanced.commentedconfiguration:CommentedConfiguration:1.0.1') {
+        exclude group: 'org.spigotmc', module: 'spigot-api'
+    }
+
+    // Utils
+    shadowed 'io.vavr:vavr:0.10.7'
+    shadowed 'org.glassfish.hk2:hk2-locator:3.1.1'
+    shadowed('org.glassfish.hk2:hk2-inhabitant-generator:3.1.1') {
+        exclude group: 'org.apache.maven', module: 'maven-core'
+    }
+    shadowed('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:3.1.0') {
+        exclude group: 'org.bukkit', module: 'bukkit'
+    }
+    shadowed 'net.minidev:json-smart:2.5.2'
+    shadowed 'org.jetbrains:annotations:26.0.2'
+    shadowed 'io.papermc:paperlib:1.0.8'
+
+    // Tests
+    testImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
+        exclude group: 'junit', module: 'junit'
+    }
+    testImplementation("org.hamcrest:hamcrest:3.0")
+}
+
+ext.bitlyAccessToken = System.getenv('BITLY_ACCESS_TOKEN') ?: 'bitly-access-token'
+
+tasks.register('prepareSource', Sync) {
+    inputs.property 'bitlyAccessToken', bitlyAccessToken
+    from sourceSets.main.java
+    into "$buildDir/src"
+    filter(ReplaceTokens, tokens: [
+            'bitly-access-token': bitlyAccessToken,
+    ])
+}
+
+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 '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'
+}
+
+publishing {
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = "https://maven.pkg.github.com/Multiverse/Multiverse-Core"
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}

config/.gitignore

@@ -0,0 +1 @@
+out.txt

config/convert-locale-enum.py

@@ -0,0 +1,20 @@
+filepath = "../src/main/resources/multiverse-core_en.properties"
+
+enumList = []
+
+with open(filepath) as f:
+    for line in f:
+        line = line.strip()
+        if len(line) == 0:
+            enumList.append("")
+        elif line.startswith("#"):
+            enumList.append(line.replace("#", "//"))
+        else:
+            parts = line.split("=")
+            if (len(parts) < 2):
+                continue
+            parts = parts[0].split(".")[1:]
+            enumList.append("_".join([p.upper() for p in parts]) + ",")
+
+with open("out.txt", "w") as f:
+    f.write("\n".join(enumList))

config/mv_checks.xml

@@ -0,0 +1,665 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ 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.                                                        ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE module PUBLIC
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/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="NewlineAtEndOfFile" />
+    <module name="OrderedProperties"/>
+    <module name="Translation"/>
+    <module name="UniqueProperties"/>
+
+    <!-- Regexp -->
+    <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>
+    <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>
+
+    <!-- Whitespace -->
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+    </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>
+
+        <!-- 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="2"/>
+        </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">
+            <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"/>
+        </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 )"/>
+        </module>
+        <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"/>
+            <property name="severity" value="warning"/>
+        </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="false"/>
+        </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>
+        <module name="MethodLength">
+            <property name="max" value="50"/>
+            <property name="severity" value="warning"/>
+        </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="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="NoWhitespaceAfter">
+            <property name="tokens"
+                      value="AT, INC, DEC, UNARY_MINUS,UNARY_PLUS,BNOT,LNOT,DOT,ARRAY_DECLARATOR,INDEX_OP,LITERAL_SYNCHRONIZED,METHOD_REF"/>
+        </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="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"/>
+        </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."/>
+        </module>
+    </module>
+</module>

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,244 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

pom.xml

@@ -1,160 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.onarandombox.multiversecore</groupId>
-	<artifactId>Multiverse-Core</artifactId>
-	<version>2.0</version>
-	<name>Multiverse-Core</name>
-	<description>World Management Plugin</description>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.build.number>UNKNOWN</project.build.number>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>OnARandomBox</id>
-			<url>http://repo.onarandombox.com/artifactory/repo</url>
-		</repository>
-	</repositories>
-
-	<build>
-		<defaultGoal>clean package</defaultGoal>
-		<plugins>
-			<!-- Compiler -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-			<!-- Build Helper - Additional Source Folders -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-					<execution>
-						<id>add-wsdl-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${project.basedir}/lib/allpay/src</source>
-								<source>${project.basedir}/lib/commandhandler/src</source>
-								<source>${project.basedir}/lib/commandhandler/lib/ShellParser/src</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>com.google.code.maven-replacer-plugin</groupId>
-				<artifactId>maven-replacer-plugin</artifactId>
-				<version>1.3.8</version>
-				<executions>
-					<execution>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>replace</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<file>target/classes/plugin.yml</file>
-					<replacements>
-						<replacement>
-							<token>maven-version-number</token>
-							<value>${project.version}-${project.build.number}</value>
-						</replacement>
-					</replacements>
-				</configuration>
-			</plugin>
-			<!-- Jar Plugin -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.1</version>
-				<configuration>
-					<archive>
-						<manifestEntries>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<!-- Bukkit Dependency -->
-		<dependency>
-			<groupId>org.bukkit</groupId>
-			<artifactId>bukkit</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<!-- Bukkit Dependency -->
-
-		<!-- Start of Economy Dependencies -->
-		<dependency>
-			<groupId>cosine.boseconomy</groupId>
-			<artifactId>BOSEconomy</artifactId>
-			<version>0.6.2</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>fr.crafter.tickleman.RealShop</groupId>
-			<artifactId>RealShop</artifactId>
-			<version>0.63</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.iConomy</groupId>
-			<artifactId>iConomy</artifactId>
-			<version>5.0</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.nijiko.coelho.iConomy</groupId>
-			<artifactId>iConomy</artifactId>
-			<version>4.65</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.earth2me.essentials</groupId>
-			<artifactId>Essentials</artifactId>
-			<version>2.4.2</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<!-- End of Economy Dependencies -->
-
-		<!-- Start of Permissions Dependencies -->
-		<dependency>
-			<groupId>com.nijikokun.bukkit</groupId>
-			<artifactId>Permissions</artifactId>
-			<version>3.2</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.2</version>
-		</dependency>
-		<!-- End of Permissions Dependencies -->
-	</dependencies>
-</project>

settings.gradle

@@ -0,0 +1,14 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            url = uri('https://repo.onarandombox.com/multiverse-releases')
+        }
+    }
+}
+
+rootProject.name = 'multiverse-core'

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

@@ -1,11 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-import java.util.logging.Level;
-
-import org.bukkit.Server;
-
-public interface LoggablePlugin {
-    public void log(Level level, String msg);
-
-    public Server getServer();
-}

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

@@ -1,176 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-import java.util.List;
-import java.util.logging.Level;
-
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.nijiko.permissions.PermissionHandler;
-import com.nijikokun.bukkit.Permissions.Permissions;
-import com.onarandombox.utils.MVDestination;
-import com.pneumaticraft.commandhandler.PermissionsInterface;
-
-public class MVPermissions implements PermissionsInterface {
-
-    private MultiverseCore plugin;
-    private PermissionHandler permissions = null;
-
-    /**
-     * Constructor FTW
-     * 
-     * @param plugin Pass along the Core Plugin.
-     */
-    public MVPermissions(MultiverseCore plugin) {
-        this.plugin = plugin;
-        // We have to see if permissions was loaded before MV was
-        if (this.plugin.getServer().getPluginManager().getPlugin("Permissions") != null) {
-            this.setPermissions(((Permissions) this.plugin.getServer().getPluginManager().getPlugin("Permissions")).getHandler());
-            this.plugin.log(Level.INFO, "- Attached to Permissions");
-        }
-    }
-
-    /**
-     * Check if a Player can teleport to the Destination world from there current world.
-     * 
-     * @param p
-     * @param w
-     * @return
-     */
-    public Boolean canTravelFromWorld(Player p, MVWorld w) {
-        List<String> blackList = w.getWorldBlacklist();
-
-        boolean returnValue = true;
-
-        for (String s : blackList) {
-            if (s.equalsIgnoreCase(p.getWorld().getName())) {
-                returnValue = false;
-                break;
-            }
-        }
-
-        return returnValue;
-    }
-
-    public boolean canTravelFromLocation(Player teleporter, Location location) {
-        if (!this.plugin.isMVWorld(location.getWorld().getName())) {
-            return false;
-        }
-        return canTravelFromWorld(teleporter, this.plugin.getMVWorld(location.getWorld().getName()));
-    }
-
-    /**
-     * Check if the Player has the permissions to enter this world.
-     * 
-     * @param p
-     * @param w
-     * @return
-     */
-    public Boolean canEnterWorld(Player p, MVWorld w) {
-        return this.hasPermission(p, "multiverse.access." + w.getName(), false);
-    }
-
-    public Boolean canEnterLocation(Player p, Location l) {
-        if (l == null) {
-            return false;
-        }
-        String worldName = l.getWorld().getName();
-        if (!this.plugin.isMVWorld(worldName)) {
-            return false;
-        }
-        return this.hasPermission(p, "multiverse.access." + worldName, false);
-    }
-
-    public Boolean canEnterDestination(Player p, MVDestination d) {
-        if (d == null || d.getLocation(p) == null) {
-            return false;
-        }
-        String worldName = d.getLocation(p).getWorld().getName();
-        if (!this.plugin.isMVWorld(worldName)) {
-            return false;
-        }
-        if(!canEnterLocation(p, d.getLocation(p))) {
-            return false;
-        }
-        return this.hasPermission(p, d.getRequiredPermission(), false);
-    }
-
-    public void setPermissions(PermissionHandler handler) {
-        this.permissions = handler;
-    }
-
-    public boolean hasPermission(CommandSender sender, String node, boolean isOpRequired) {
-
-        if (!(sender instanceof Player)) {
-            return true;
-        }
-        
-        // NO one can access a null permission (mainly used for destinations):w
-        if(node == null) {
-            return false;
-        }
-        // Everyone can access an empty permission
-        // Currently used for the PlayerDestination
-        if(node.equals("")) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-
-        boolean opFallback = this.plugin.getConfig().getBoolean("opfallback", true);
-        if (this.permissions != null && this.permissions.has(player, node)) {
-            // If Permissions is enabled we check against them.
-            // this.plugin.log(Level.WARNING, "Allowed by P3/P2 ");
-            return true;
-        } else if (sender.hasPermission(node)) {
-            // If Now check the bukkit permissions
-            // this.plugin.log(Level.WARNING, "Allowed by BukkitPerms");
-            return true;
-        } else if (player.isOp() && opFallback) {
-            // If Player is Op we always let them use it if they have the fallback enabled!
-            // this.plugin.log(Level.WARNING, "Allowed by OP");
-            return true;
-        }
-
-        // If the Player doesn't have Permissions and isn't an Op then
-        // we return true if OP is not required, otherwise we return false
-        // This allows us to act as a default permission guidance
-
-        // If they have the op fallback disabled, NO commands will work without a permissions plugin.
-        return !isOpRequired && opFallback;
-
-    }
-
-    public String getType() {
-        String opsfallback = "";
-        if(this.plugin.getConfig().getBoolean("opfallback", true)) {
-            opsfallback = " WITH OPs.txt fallback";    
-        }
-        if (this.permissions != null) {
-            return "Permissions " + this.plugin.getServer().getPluginManager().getPlugin("Permissions").getDescription().getVersion() + opsfallback;
-        }
-        
-        return "Bukkit Permissions" + opsfallback;
-    }
-
-    public boolean hasAnyPermission(CommandSender sender, List<String> nodes, boolean isOpRequired) {
-        for (String node : nodes) {
-            if (this.hasPermission(sender, node, isOpRequired)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean hasAllPermission(CommandSender sender, List<String> nodes, boolean isOpRequired) {
-        for (String node : nodes) {
-            if (!this.hasPermission(sender, node, isOpRequired)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-}

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

@@ -1,96 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-import java.util.Date;
-
-import org.bukkit.entity.Player;
-import org.bukkit.util.config.Configuration;
-
-public class MVPlayerSession {
-
-    private Player player; // Player holder, may be unnecessary.
-
-    private Long teleportLast = 0L; // Timestamp for the Players last Portal Teleportation.
-    private Long messageLast = 0L; // Timestamp for the Players last Alert Message.
-
-    // private Location bedSpawn;
-    //
-    // // Beds are 2 blocks, thus we need to store both places
-    // private Location bedA;
-    // private Location bedB;
-
-    private Configuration config; // Configuration file to find out Cooldown Timers.
-
-    public MVPlayerSession(Player player, Configuration config, MultiverseCore multiVerseCore) {
-        this.player = player;
-        this.config = config;
-        // this.bedSpawn = null;
-    }
-
-    /**
-     * Update the Teleport time.
-     */
-    public void teleport() {
-        this.teleportLast = (new Date()).getTime();
-    }
-
-    /**
-     * Grab whether the cooldown on Portal use has expired or not.
-     * 
-     * @return
-     */
-    public boolean getTeleportable() {
-        Long time = (new Date()).getTime();
-        if ((time - this.teleportLast) > this.config.getInt("portalcooldown", 5000)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Send a Message to the Player as long as enough time has passed since the last message.
-     * 
-     * @param msg
-     */
-    public void message(String msg) {
-        Long time = (new Date()).getTime();
-        if ((time - this.messageLast) > this.config.getInt("messagecooldown", 2000)) {
-            this.player.sendMessage(msg);
-            this.messageLast = time;
-        }
-    }
-    
-    // Commented out bed code, i'll get rid of it soon.
-    // --FF
-    
-    // public void setRespawnLocation(Location location) {
-    // this.bedSpawn = location;
-    // }
-
-    // // This one simply spawns the player closer to the bed.
-    // public Location getBedRespawnLocation() {
-    // // There is a bedrespawn set
-    // if (this.bedSpawn != null) {
-    // if (!this.bs.playerCanSpawnHereSafely(this.bedSpawn) || !bedStillExists(this.bedSpawn)) {
-    // this.bedSpawn = null;
-    // return this.bedSpawn;
-    // }
-    // Location actualRespawn = this.bedSpawn;
-    // Location bedRespawn = new Location(actualRespawn.getWorld(), actualRespawn.getX(), actualRespawn.getY(), actualRespawn.getZ());
-    // bedRespawn.setY(bedRespawn.getY() - .25);
-    // return bedRespawn;
-    // }
-    // return null;
-    // }
-    //
-    // private boolean bedStillExists(Location bedSpawn) {
-    // //System.out.print("Dangers:");
-    // //this.bs.showDangers(bedSpawn);
-    // Location locationDown = new Location(bedSpawn.getWorld(), bedSpawn.getX(), bedSpawn.getY(), bedSpawn.getZ());
-    // locationDown.setY(locationDown.getY() - 1);
-    // if (locationDown.getBlock().getType() != Material.BED_BLOCK) {
-    // return false;
-    // }
-    // return true;
-    // }
-}

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

@@ -1,7 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-public interface MVPlugin extends LoggablePlugin {
-    public String dumpVersionInfo(String buffer);
-    public MultiverseCore getCore();
-    public void setCore(MultiverseCore core);
-}

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

@@ -1,216 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-import java.util.logging.Level;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Minecart;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Vehicle;
-
-import com.onarandombox.utils.BlockSafety;
-
-public class MVTeleport {
-
-    MultiverseCore plugin;
-
-    BlockSafety bs = new BlockSafety();
-
-    public MVTeleport(MultiverseCore plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * This method will be specific to beds, and check on top of the bed then around it.
-     * 
-     * @return
-     */
-    public Location getSafeBedDestination(Location bedLocation) {
-        // System.out.print(bedLocation);
-        Location idealLocation = bedLocation;
-        idealLocation.setY(idealLocation.getY() + 1);
-        idealLocation.setX(idealLocation.getX() + .5);
-        idealLocation.setZ(idealLocation.getZ() + .5);
-        // System.out.print(idealLocation);
-        if (this.bs.playerCanSpawnHereSafely(idealLocation)) {
-            // System.out.print(idealLocation);
-            return bedLocation;
-        }
-        return null;
-    }
-
-    private Location getSafeLocation(Location l) {
-
-        // Check around the player first in a configurable radius:
-        // TODO: Make this configurable
-        Location safe = checkAboveAndBelowLocation(l, 6, 9);
-        if (safe != null) {
-            safe.setX(safe.getBlockX() + .5);
-            safe.setZ(safe.getBlockZ() + .5);
-        }
-        return safe;
-    }
-
-    private Location checkAboveAndBelowLocation(Location l, int tolerance, int radius) {
-        // Tolerance must be an even number:
-        if (tolerance % 2 != 0) {
-            tolerance += 1;
-        }
-        // We want half of it, so we can go up and down
-        tolerance /= 2;
-
-        // For now this will just do a straight up block.
-        Location locToCheck = l.clone();
-        // Check the main level
-        Location safe = this.checkAroundLocation(locToCheck, radius);
-        if (safe != null) {
-            return safe;
-        }
-        // We've already checked zero right above this.
-        int currentLevel = 1;
-        while (currentLevel <= tolerance) {
-            // Check above
-            locToCheck = l.clone();
-            locToCheck.add(0, currentLevel, 0);
-            safe = this.checkAroundLocation(locToCheck, radius);
-            if (safe != null) {
-                return safe;
-            }
-
-            // Check below
-            locToCheck = l.clone();
-            locToCheck.subtract(0, currentLevel, 0);
-            safe = this.checkAroundLocation(locToCheck, radius);
-            if (safe != null) {
-                return safe;
-            }
-            currentLevel++;
-        }
-
-        return null;
-    }
-
-    /**
-     * For my crappy algorithm, radius MUST be odd
-     * 
-     * @param l
-     * @param radius
-     * @return
-     */
-    private Location checkAroundLocation(Location l, int diameter) {
-        if (diameter % 2 == 0) {
-            diameter += 1;
-        }
-        Location checkLoc = l.clone();
-
-        // Start at 3, the min diameter around a block
-        int loopcounter = 3;
-        while (loopcounter <= diameter) {
-            boolean foundSafeArea = checkAroundSpecificDiameter(checkLoc, loopcounter);
-            // If a safe area was found:
-            if (foundSafeArea) {
-                // Return the checkLoc, it is the safe location.
-                return checkLoc;
-            }
-            // Otherwise, let's reset our location
-            checkLoc = l.clone();
-            // And increment the radius
-            loopcounter += 2;
-        }
-        return null;
-    }
-
-    private boolean checkAroundSpecificDiameter(Location checkLoc, int circle) {
-        // Adjust the circle to get how many blocks to step out.
-        // A radius of 3 makes the block step 1
-        // A radius of 5 makes the block step 2
-        // A radius of 7 makes the block step 3
-        // ...
-        int adjustedCircle = ((circle - 1) / 2);
-        checkLoc.add(adjustedCircle, 0, 0);
-        if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-            return true;
-        }
-        // Now we go to the right that adjustedCircle many
-        for (int i = 0; i < adjustedCircle; i++) {
-            checkLoc.add(0, 0, 1);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-
-        // Then down adjustedCircle *2
-        for (int i = 0; i < adjustedCircle * 2; i++) {
-            checkLoc.add(-1, 0, 0);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-
-        // Then left adjustedCircle *2
-        for (int i = 0; i < adjustedCircle * 2; i++) {
-            checkLoc.add(0, 0, -1);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-
-        // Then up Then left adjustedCircle *2
-        for (int i = 0; i < adjustedCircle * 2; i++) {
-            checkLoc.add(1, 0, 0);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-
-        // Then finish up by doing adjustedCircle - 1
-        for (int i = 0; i < adjustedCircle - 1; i++) {
-            checkLoc.add(0, 0, 1);
-            if (this.bs.playerCanSpawnHereSafely(checkLoc)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean safelyTeleport(Entity e, Location l) {
-        if (this.bs.playerCanSpawnHereSafely(l)) {
-            e.teleport(l);
-            //this.plugin.log(Level.WARNING, "The first location you gave me was safe.");
-            return true;
-        }
-        if(e instanceof Minecart) {
-            Minecart m = (Minecart)e;
-            if(!this.bs.canSpawnCartSafely(m)) {
-                return false;
-            }
-        }
-        else if(e instanceof Vehicle) {
-            Vehicle v = (Vehicle)e;
-            if(!this.bs.canSpawnVehicleSafely(v)) {
-                return false;
-            }
-        }
-        Location safeLocation = this.getSafeLocation(l);
-        if (safeLocation != null) {
-            // Add offset to account for a vehicle on dry land!
-            if (!this.bs.isEntitiyOnTrack(e, safeLocation)) {
-                safeLocation.setY(safeLocation.getBlockY() + .5);
-            }
-            e.teleport(safeLocation);
-            //this.plugin.log(Level.WARNING, "Had to look for a bit, but I found a safe place for ya!");
-            return true;
-        }
-        if (e instanceof Player) {
-            Player p = (Player) e;
-            p.sendMessage("No safe locations found!");
-        }
-        else if (e.getPassenger() instanceof Player) {
-            Player p = (Player) e.getPassenger();
-            p.sendMessage("No safe locations found!");
-        }
-        this.plugin.log(Level.WARNING, "Sorry champ, you're basically trying to teleport into a minefield. I should just kill you now.");
-        return false;
-    }
-
-}

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

@@ -1,645 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.World.Environment;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-import org.bukkit.util.config.Configuration;
-
-enum EnglishChatColor {
-    AQUA("AQUA", ChatColor.AQUA),
-    BLACK("BLACK", ChatColor.BLACK),
-    BLUE("BLUE", ChatColor.BLUE),
-    DARKAQUA("DARKAQUA", ChatColor.DARK_AQUA),
-    DARKBLUE("DARKBLUE", ChatColor.DARK_BLUE),
-    DARKGRAY("DARKGRAY", ChatColor.DARK_GRAY),
-    DARKGREEN("DARKGREEN", ChatColor.DARK_GREEN),
-    DARKPURPLE("DARKPURPLE", ChatColor.DARK_PURPLE),
-    DARKRED("DARKRED", ChatColor.DARK_RED),
-    GOLD("GOLD", ChatColor.GOLD),
-    GRAY("GRAY", ChatColor.GRAY),
-    GREEN("GREEN", ChatColor.GREEN),
-    LIGHTPURPLE("LIGHTPURPLE", ChatColor.LIGHT_PURPLE),
-    RED("RED", ChatColor.RED),
-    YELLOW("YELLOW", ChatColor.YELLOW),
-    WHITE("WHITE", ChatColor.WHITE);
-    private ChatColor color;
-    private String text;
-
-    EnglishChatColor(String name, ChatColor color) {
-        this.color = color;
-        this.text = name;
-    }
-
-    public String getText() {
-        return this.text;
-    }
-
-    public ChatColor getColor() {
-        return this.color;
-    }
-
-    public static EnglishChatColor fromString(String text) {
-        if (text != null) {
-            for (EnglishChatColor c : EnglishChatColor.values()) {
-                if (text.equalsIgnoreCase(c.text)) {
-                    return c;
-                }
-            }
-        }
-        return EnglishChatColor.WHITE;
-    }
-}
-
-public class MVWorld {
-
-    private MultiverseCore plugin; // Hold the Plugin Instance.
-    private Configuration config; // Hold the Configuration File.
-
-    private World world; // The World Instance.
-    private Environment environment; // Hold the Environment type EG Environment.NETHER / Environment.NORMAL
-    private Long seed;
-
-    private String name; // The Worlds Name, EG its folder name.
-    private String alias = ""; // Short Alias for the World, this will be used in Chat Prefixes.
-    private ChatColor aliasColor; // Color for this world
-
-    private boolean allowAnimals; // Does this World allow Animals to Spawn?
-    private boolean allowMonsters; // Does this World allow Monsters to Spawn?
-
-    private boolean keepSpawnInMemory; // Does the World have the spawn loaded all the time?
-
-    private Boolean pvp; // Does this World allow PVP?
-    private Boolean fakepvp; // Should this world have fakePVP on? (used for PVP zones)
-
-    private String respawnWorld; // Contains the name of the World to respawn the player to
-
-    private List<Integer> blockBlacklist; // Contain a list of Blocks which we won't allow on this World.
-
-    private HashMap<String, List<String>> masterList;
-
-    private Double scaling; // How stretched/compressed distances are
-    private Double price; // How much does it cost to enter this world
-    private int currency = -1; // What is the currency
-    /**
-     * The generator as a string. This is used only for reporting. ex: BukkitFullOfMoon:GenID
-     */
-    private String generator;
-    private Permission permission;
-    private Permission exempt;
-
-    private boolean canSave = false; // Prevents all the setters from constantly saving to the config when being called from the constructor.
-    private boolean allowWeather;
-
-    public MVWorld(World world, Configuration config, MultiverseCore instance, Long seed, String generatorString) {
-        this.config = config;
-        this.plugin = instance;
-
-        // Set local values that CANNOT be changed by user
-        this.world = world;
-        this.name = world.getName();
-        this.generator = generatorString;
-        this.seed = seed;
-        this.environment = world.getEnvironment();
-
-        // Initialize our lists
-        this.initLists();
-
-        // Write these files to the config (once it's saved)
-        if (generatorString != null) {
-            config.setProperty("worlds." + this.name + ".generator", this.generator);
-        }
-        if (seed != null) {
-            config.setProperty("worlds." + this.name + ".seed", this.seed);
-        }
-        config.setProperty("worlds." + this.name + ".environment", this.environment.toString());
-
-        // Set local values that CAN be changed by the user
-        this.setAlias(config.getString("worlds." + this.name + ".alias.name", ""));
-        this.setAliasColor(config.getString("worlds." + this.name + ".alias.color", ChatColor.WHITE.toString()));
-        this.setPvp(config.getBoolean("worlds." + this.name + ".pvp", true));
-        this.setScaling(config.getDouble("worlds." + this.name + ".scale", 1.0));
-        this.setRespawnToWorld(config.getString("worlds." + this.name + ".respawnworld", ""));
-        this.setEnableWeather(config.getBoolean("worlds." + this.name + ".allowweather", true));
-
-        this.setAnimals(config.getBoolean("worlds." + this.name + ".animals.spawn", true));
-        this.setMonsters(config.getBoolean("worlds." + this.name + ".monsters.spawn", true));
-        this.setPrice(config.getDouble("worlds." + this.name + ".entryfee.amount", 0.0));
-        this.setCurrency(config.getInt("worlds." + this.name + ".entryfee.currency", -1));
-        this.getMobExceptions();
-
-        this.setSpawnInMemory(config.getBoolean("worlds." + this.name + ".keepspawninmemory", true));
-
-        this.getWorldBlacklist().addAll(config.getStringList("worlds." + this.name + ".worldblacklist", new ArrayList<String>()));
-        this.getBlockBlacklist().addAll(config.getIntList("worlds." + this.name + ".blockblacklist", new ArrayList<Integer>()));
-        this.translateTempSpawn(config);
-
-        this.canSave = true;
-        saveConfig();
-
-        this.permission = new Permission("multiverse.access." + this.getName(), "Allows access to " + this.getName(), PermissionDefault.TRUE);
-        this.exempt = new Permission("multiverse.exempt." + this.getName(), "A player who has this does not pay to enter this world, or use any MV portals in it " + this.getName(), PermissionDefault.OP);
-        try {
-            this.plugin.getServer().getPluginManager().addPermission(this.permission);
-            this.plugin.getServer().getPluginManager().addPermission(this.exempt);
-            addToUpperLists(this.permission);
-        } catch (IllegalArgumentException e) {
-        }
-    }
-
-    private void setEnableWeather(boolean weather) {
-        this.allowWeather = weather;
-        // Disable any current weather
-        if (!weather) {
-            this.getCBWorld().setStorm(false);
-            this.getCBWorld().setThundering(false);
-        }
-        this.config.setProperty("worlds." + this.name + ".allowweather", weather);
-        saveConfig();
-    }
-
-    private void addToUpperLists(Permission permission) {
-        Permission all = this.plugin.getServer().getPluginManager().getPermission("multiverse.*");
-        Permission allWorlds = this.plugin.getServer().getPluginManager().getPermission("multiverse.access.*");
-        Permission allExemption = this.plugin.getServer().getPluginManager().getPermission("multiverse.exempt.*");
-
-        if (allWorlds == null) {
-            allWorlds = new Permission("multiverse.access.*");
-            this.plugin.getServer().getPluginManager().addPermission(allWorlds);
-        }
-        allWorlds.getChildren().put(permission.getName(), true);
-        if (allExemption == null) {
-            allExemption = new Permission("multiverse.exempt.*");
-            this.plugin.getServer().getPluginManager().addPermission(allExemption);
-        }
-        allExemption.getChildren().put(this.exempt.getName(), true);
-        if (all == null) {
-            all = new Permission("multiverse.*");
-            this.plugin.getServer().getPluginManager().addPermission(all);
-        }
-        all.getChildren().put("multiverse.access.*", true);
-        all.getChildren().put("multiverse.exempt.*", true);
-
-        this.plugin.getServer().getPluginManager().recalculatePermissionDefaults(all);
-        this.plugin.getServer().getPluginManager().recalculatePermissionDefaults(allWorlds);
-    }
-
-    private void translateTempSpawn(Configuration config) {
-        String tempspawn = config.getString("worlds." + this.name + ".tempspawn", "");
-        if (tempspawn.length() > 0) {
-            String[] coordsString = tempspawn.split(":");
-            if (coordsString.length >= 3) {
-                int[] coords = new int[3];
-                try {
-                    for (int i = 0; i < 3; i++) {
-
-                        coords[i] = Integer.parseInt(coordsString[i]);
-                    }
-                    this.world.setSpawnLocation(coords[0], coords[1], coords[2]);
-                } catch (NumberFormatException e) {
-                    this.plugin.log(Level.WARNING, "A MV1 spawn value was found, but it could not be migrated. Format Error. Sorry.");
-                }
-            } else {
-                this.plugin.log(Level.WARNING, "A MV1 spawn value was found, but it could not be migrated. Format Error. Sorry.");
-            }
-
-            this.config.removeProperty("worlds." + this.name + ".tempspawn");
-        }
-    }
-
-    public String getColoredWorldString() {
-        ChatColor color = this.getAliasColor();
-        if (color == null) {
-            if (this.environment == Environment.NETHER) {
-                color = ChatColor.RED;
-            } else if (this.environment == Environment.NORMAL) {
-                color = ChatColor.GREEN;
-            } else if (this.environment == Environment.SKYLANDS) {
-                color = ChatColor.AQUA;
-            }
-        }
-        return this.getAliasColor() + this.getAlias() + ChatColor.WHITE;
-    }
-
-    private void getMobExceptions() {
-        List<String> temp;
-        temp = this.config.getStringList("worlds." + this.name + ".animals.exceptions", new ArrayList<String>());
-        // Add Animals to the exclusion list
-
-        for (String s : temp) {
-            this.masterList.get("animals").add(s.toUpperCase());
-        }
-        temp = this.config.getStringList("worlds." + this.name + ".monsters.exceptions", new ArrayList<String>());
-        // Add Monsters to the exclusion list
-        for (String s : temp) {
-            this.masterList.get("monsters").add(s.toUpperCase());
-        }
-    }
-
-    public World getCBWorld() {
-        return this.world;
-    }
-
-    private void initLists() {
-        this.masterList = new HashMap<String, List<String>>();
-        this.blockBlacklist = new ArrayList<Integer>();
-        // Only int list, we don't need to add it to the masterlist
-        this.masterList.put("worldblacklist", new ArrayList<String>());
-        this.masterList.put("animals", new ArrayList<String>());
-        this.masterList.put("monsters", new ArrayList<String>());
-    }
-
-    public boolean clearVariable(String property) {
-        if (property.equalsIgnoreCase("blockblacklist")) {
-            this.blockBlacklist.clear();
-        } else if (this.masterList.keySet().contains(property)) {
-            this.masterList.get(property).clear();
-        } else {
-            return false;
-        }
-        this.config.setProperty("worlds." + this.name + "." + property.toLowerCase(), this.blockBlacklist);
-        this.saveConfig();
-        return true;
-    }
-
-    public boolean addToList(String list, String value) {
-        if (list.equalsIgnoreCase("blockblacklist")) {
-            try {
-                int intVal = Integer.parseInt(value);
-                return addToList(list, intVal);
-            } catch (Exception e) {
-            }
-        } else if (this.masterList.keySet().contains(list)) {
-
-            if (list.equalsIgnoreCase("animals") || list.equalsIgnoreCase("monsters")) {
-                this.masterList.get(list).add(value.toUpperCase());
-                this.config.setProperty("worlds." + this.name + "." + list.toLowerCase() + ".exceptions", this.masterList.get(list));
-                this.syncMobs();
-            } else {
-                this.masterList.get(list).add(value);
-                this.config.setProperty("worlds." + this.name + "." + list.toLowerCase(), this.masterList.get(list));
-            }
-            saveConfig();
-            return true;
-        }
-        return false;
-    }
-
-    public boolean removeFromList(String list, String value) {
-        if (list.equalsIgnoreCase("blockblacklist")) {
-            try {
-                int intVal = Integer.parseInt(value);
-                return removeFromList(list, intVal);
-            } catch (Exception e) {
-            }
-        }
-        if (this.masterList.keySet().contains(list)) {
-
-            if (list.equalsIgnoreCase("animals") || list.equalsIgnoreCase("monsters")) {
-                this.masterList.get(list).remove(value.toUpperCase());
-                this.config.setProperty("worlds." + this.name + "." + list.toLowerCase() + ".exceptions", this.masterList.get(list));
-                this.syncMobs();
-            } else {
-                this.masterList.get(list).remove(value);
-                this.config.setProperty("worlds." + this.name + "." + list.toLowerCase(), this.masterList.get(list));
-            }
-            saveConfig();
-            return true;
-        }
-        return false;
-    }
-
-    private void syncMobs() {
-
-        if (this.getAnimalList().isEmpty()) {
-            this.world.setSpawnFlags(this.world.getAllowMonsters(), this.allowAnimals);
-        } else {
-            this.world.setSpawnFlags(this.world.getAllowMonsters(), true);
-        }
-        if (this.getMonsterList().isEmpty()) {
-            this.world.setSpawnFlags(this.allowMonsters, this.world.getAllowAnimals());
-        } else {
-            this.world.setSpawnFlags(true, this.world.getAllowAnimals());
-        }
-        this.plugin.getWorldPurger().purgeWorld(null, this);
-    }
-
-    private boolean addToList(String list, Integer value) {
-        if (list.equalsIgnoreCase("blockblacklist")) {
-            this.blockBlacklist.add(value);
-            this.config.setProperty("worlds." + this.name + ".blockblacklist", this.blockBlacklist);
-            saveConfig();
-        }
-        return false;
-
-    }
-
-    private boolean removeFromList(String list, Integer value) {
-        if (list.equalsIgnoreCase("blockblacklist")) {
-            this.blockBlacklist.remove(value);
-            this.config.setProperty("worlds." + this.name + ".blockblacklist", this.blockBlacklist);
-            saveConfig();
-        }
-        return false;
-
-    }
-
-    private boolean setVariable(String name, boolean value) {
-        if (name.equalsIgnoreCase("pvp")) {
-            this.setPvp(value);
-        } else if (name.equalsIgnoreCase("animals")) {
-            this.setAnimals(value);
-        } else if (name.equalsIgnoreCase("monsters")) {
-            this.setMonsters(value);
-        } else if (name.equalsIgnoreCase("memory") || name.equalsIgnoreCase("spawnmemory")) {
-            this.setSpawnInMemory(value);
-        } else if (name.equalsIgnoreCase("weather") || name.equalsIgnoreCase("storm")) {
-            this.setEnableWeather(value);
-        } else {
-            return false;
-        }
-        return true;
-    }
-
-    private void setSpawnInMemory(boolean value) {
-        this.world.setKeepSpawnInMemory(value);
-        this.keepSpawnInMemory = value;
-        this.config.setProperty("worlds." + this.name + ".keepspawninmemory", value);
-        saveConfig();
-    }
-
-    private boolean setVariable(String name, double value) {
-        if (name.equalsIgnoreCase("scaling") || name.equalsIgnoreCase("scale")) {
-            this.setScaling(value);
-            return true;
-        }
-        if (name.equalsIgnoreCase("price")) {
-            this.setPrice(value);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * This is the one people have access to. It'll handle the rest.
-     * 
-     * @param name
-     * @param value
-     * @return
-     */
-    public boolean setVariable(String name, String value) {
-        if (name.equalsIgnoreCase("alias")) {
-            this.setAlias(value);
-            return true;
-        }
-        if (name.equalsIgnoreCase("respawn")) {
-            this.setRespawnToWorld(value);
-            return true;
-        }
-        if (name.equalsIgnoreCase("aliascolor") || name.equalsIgnoreCase("color")) {
-            this.setAliasColor(value);
-            return true;
-        }
-        if (name.equalsIgnoreCase("currency") || name.equalsIgnoreCase("curr")) {
-            try {
-                int intValue = Integer.parseInt(value);
-                this.setCurrency(intValue);
-                return true;
-            } catch (Exception e) {
-            }
-        }
-        if (name.equalsIgnoreCase("price")) {
-            try {
-                double doubValue = Double.parseDouble(value);
-                return this.setPrice(doubValue);
-            } catch (Exception e) {
-            }
-        }
-        try {
-            boolean boolValue = Boolean.parseBoolean(value);
-            return this.setVariable(name, boolValue);
-        } catch (Exception e) {
-        }
-
-        try {
-            double doubValue = Double.parseDouble(value);
-            return this.setVariable(name, doubValue);
-        } catch (Exception e) {
-        }
-
-        return false;
-    }
-
-    public Environment getEnvironment() {
-        return this.environment;
-    }
-
-    public void setEnvironment(Environment environment) {
-        this.environment = environment;
-    }
-
-    public Long getSeed() {
-        return this.seed;
-    }
-
-    public void setSeed(Long seed) {
-        this.seed = seed;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public String getAlias() {
-        if (this.alias == null || this.alias.length() == 0) {
-            return this.name;
-        }
-        return this.alias;
-
-    }
-
-    public void setAlias(String alias) {
-        this.alias = alias;
-        this.config.setProperty("worlds." + this.name + ".alias.name", alias);
-        saveConfig();
-    }
-
-    public Boolean allowAnimalSpawning() {
-        return this.allowAnimals;
-    }
-
-    private void setAnimals(Boolean animals) {
-        this.allowAnimals = animals;
-        // If animals are a boolean, then we can turn them on or off on the server
-        // If there are ANY exceptions, there will be something spawning, so turn them on
-        this.config.setProperty("worlds." + this.name + ".animals.spawn", animals);
-        saveConfig();
-        this.syncMobs();
-    }
-
-    public List<String> getAnimalList() {
-        return this.masterList.get("animals");
-    }
-
-    public Boolean allowMonsterSpawning() {
-        return this.allowMonsters;
-    }
-
-    private void setMonsters(Boolean monsters) {
-        this.allowMonsters = monsters;
-        // If monsters are a boolean, then we can turn them on or off on the server
-        // If there are ANY exceptions, there will be something spawning, so turn them on
-        this.config.setProperty("worlds." + this.name + ".monsters.spawn", monsters);
-        saveConfig();
-        this.syncMobs();
-    }
-
-    public List<String> getMonsterList() {
-        return this.masterList.get("monsters");
-    }
-
-    public Boolean getPvp() {
-        return this.pvp;
-    }
-
-    public void setPvp(Boolean pvp) {
-        this.fakepvp = this.plugin.getConfig().getBoolean("fakepvp", false);
-        if (this.fakepvp) {
-            this.world.setPVP(true);
-        } else {
-            this.world.setPVP(pvp);
-        }
-        this.pvp = pvp;
-        this.config.setProperty("worlds." + this.name + ".pvp", pvp);
-        saveConfig();
-
-    }
-
-    public List<Integer> getBlockBlacklist() {
-        return this.blockBlacklist;
-    }
-
-    public List<String> getWorldBlacklist() {
-        return this.masterList.get("worldblacklist");
-    }
-
-    public Double getScaling() {
-        return this.scaling;
-    }
-
-    public void setScaling(Double scaling) {
-        if (scaling <= 0) {
-            // Disallow negative or 0 scalings.
-            scaling = 1.0;
-        }
-        this.scaling = scaling;
-        this.config.setProperty("worlds." + this.name + ".scaling", scaling);
-        saveConfig();
-    }
-
-    /**
-     * Sets the chat color from a string.
-     * 
-     * @param aliasColor
-     */
-    public void setAliasColor(String aliasColor) {
-        EnglishChatColor color = EnglishChatColor.fromString(aliasColor);
-        if (color == null) {
-            color = EnglishChatColor.WHITE;
-        }
-        this.aliasColor = color.getColor();
-        this.config.setProperty("worlds." + this.name + ".alias.color", color.getText());
-        saveConfig();
-        return;
-    }
-
-    public boolean isValidAliasColor(String aliasColor) {
-        return (EnglishChatColor.fromString(aliasColor) != null);
-    }
-
-    public ChatColor getAliasColor() {
-        return this.aliasColor;
-    }
-
-    public boolean clearList(String property) {
-        if (property.equalsIgnoreCase("blockblacklist")) {
-            this.blockBlacklist.clear();
-            this.config.setProperty("worlds." + this.name + ".blockblacklist", this.blockBlacklist);
-            saveConfig();
-            return true;
-        } else if (this.masterList.containsKey(property)) {
-            this.masterList.get(property).clear();
-            this.config.setProperty("worlds." + this.name + "." + property.toLowerCase(), this.masterList.get(property));
-            this.syncMobs();
-            saveConfig();
-            return true;
-        }
-        return false;
-    }
-
-    public boolean getFakePVP() {
-        return this.fakepvp;
-    }
-
-    public String getRespawnToWorld() {
-        return this.respawnWorld;
-    }
-
-    public void setRespawnToWorld(String respawnToWorld) {
-        this.respawnWorld = respawnToWorld;
-        this.config.setProperty("worlds." + this.name + ".respawnworld", respawnToWorld);
-        saveConfig();
-    }
-
-    public Permission getPermission() {
-        return this.permission;
-    }
-
-    public int getCurrency() {
-        return this.currency;
-    }
-
-    public double getPrice() {
-        return this.price;
-    }
-
-    private boolean setCurrency(int currency) {
-        this.currency = currency;
-        config.getInt("worlds." + this.name + ".entryfee.currency", currency);
-        saveConfig();
-        return true;
-    }
-
-    private boolean setPrice(double price) {
-        this.price = price;
-        config.setProperty("worlds." + this.name + ".entryfee.amount", price);
-        saveConfig();
-        return true;
-    }
-
-    public boolean isExempt(Player p) {
-        return (this.plugin.getPermissions().hasPermission(p, this.exempt.getName(), true));
-    }
-
-    public Permission getExempt() {
-        return this.exempt;
-    }
-
-    private void saveConfig() {
-        if (this.canSave) {
-            this.config.save();
-        }
-    }
-
-    public boolean getWeatherEnabled() {
-        return this.allowWeather;
-    }
-}

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

@@ -1,817 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.World.Environment;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.generator.ChunkGenerator;
-import org.bukkit.permissions.Permission;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.config.Configuration;
-
-import com.fernferret.allpay.AllPay;
-import com.fernferret.allpay.GenericBank;
-import com.onarandombox.MultiverseCore.commands.ConfirmCommand;
-import com.onarandombox.MultiverseCore.commands.CoordCommand;
-import com.onarandombox.MultiverseCore.commands.CreateCommand;
-import com.onarandombox.MultiverseCore.commands.DeleteCommand;
-import com.onarandombox.MultiverseCore.commands.EnvironmentCommand;
-import com.onarandombox.MultiverseCore.commands.HelpCommand;
-import com.onarandombox.MultiverseCore.commands.ImportCommand;
-import com.onarandombox.MultiverseCore.commands.InfoCommand;
-import com.onarandombox.MultiverseCore.commands.ListCommand;
-import com.onarandombox.MultiverseCore.commands.ModifyAddCommand;
-import com.onarandombox.MultiverseCore.commands.ModifyClearCommand;
-import com.onarandombox.MultiverseCore.commands.ModifyCommand;
-import com.onarandombox.MultiverseCore.commands.ModifyRemoveCommand;
-import com.onarandombox.MultiverseCore.commands.ModifySetCommand;
-import com.onarandombox.MultiverseCore.commands.PurgeCommand;
-import com.onarandombox.MultiverseCore.commands.ReloadCommand;
-import com.onarandombox.MultiverseCore.commands.RemoveCommand;
-import com.onarandombox.MultiverseCore.commands.SetSpawnCommand;
-import com.onarandombox.MultiverseCore.commands.SleepCommand;
-import com.onarandombox.MultiverseCore.commands.SpawnCommand;
-import com.onarandombox.MultiverseCore.commands.TeleportCommand;
-import com.onarandombox.MultiverseCore.commands.UnloadCommand;
-import com.onarandombox.MultiverseCore.commands.VersionCommand;
-import com.onarandombox.MultiverseCore.commands.WhoCommand;
-import com.onarandombox.MultiverseCore.configuration.DefaultConfig;
-import com.onarandombox.MultiverseCore.configuration.MVConfigMigrator;
-import com.onarandombox.MultiverseCore.configuration.MVCoreConfigMigrator;
-import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
-import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
-import com.onarandombox.MultiverseCore.listeners.MVPluginListener;
-import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
-import com.onarandombox.utils.CannonDestination;
-import com.onarandombox.utils.DebugLog;
-import com.onarandombox.utils.DestinationFactory;
-import com.onarandombox.utils.ExactDestination;
-import com.onarandombox.utils.PlayerDestination;
-import com.onarandombox.utils.PurgeWorlds;
-import com.onarandombox.utils.UpdateChecker;
-import com.onarandombox.utils.WorldDestination;
-import com.pneumaticraft.commandhandler.CommandHandler;
-
-public class MultiverseCore extends JavaPlugin implements LoggablePlugin {
-
-    // Useless stuff to keep us going.
-    private static final Logger log = Logger.getLogger("Minecraft");
-    private static DebugLog debugLog;
-    public static boolean MobsDisabledInDefaultWorld = false;
-
-    // Debug Mode
-    private boolean debug;
-
-    // Setup our Map for our Commands using the CommandHandler.
-    private CommandHandler commandHandler;
-
-    private final String tag = "[Multiverse-Core]";
-
-    // Multiverse Permissions Handler
-    private MVPermissions ph;
-
-    // Configurations
-    private Configuration configMV = null;
-    private Configuration configWorlds = null;
-
-    // Setup the block/player/entity listener.
-    private MVPlayerListener playerListener = new MVPlayerListener(this);
-
-    private MVEntityListener entityListener = new MVEntityListener(this);
-    private MVPluginListener pluginListener = new MVPluginListener(this);
-    private MVWeatherListener weatherListener = new MVWeatherListener(this);
-
-    public UpdateChecker updateCheck;
-
-    // HashMap to contain all the Worlds which this Plugin will manage.
-    private HashMap<String, MVWorld> worlds = new HashMap<String, MVWorld>();
-
-    // HashMap to contain information relating to the Players.
-    private HashMap<String, MVPlayerSession> playerSessions;
-    private PurgeWorlds worldPurger;
-    private GenericBank bank = null;
-    private AllPay banker = new AllPay(this, tag + " ");
-    protected MVConfigMigrator migrator = new MVCoreConfigMigrator(this);
-    protected int pluginCount;
-    private DestinationFactory destFactory;
-
-    @Override
-    public void onLoad() {
-        // Create our DataFolder
-        getDataFolder().mkdirs();
-        // Setup our Debug Log
-        debugLog = new DebugLog("Multiverse-Core", getDataFolder() + File.separator + "debug.log");
-
-    }
-
-    public Configuration getConfig() {
-        return this.configMV;
-    }
-
-    public GenericBank getBank() {
-        return this.bank;
-    }
-
-    public void onEnable() {
-        // Output a little snippet to show it's enabled.
-        this.log(Level.INFO, "- Version " + this.getDescription().getVersion() + " Enabled - By " + getAuthors());
-        this.checkServerProps();
-        // Setup all the Events the plugin needs to Monitor.
-        this.initializeDestinationFactory();
-        this.registerEvents();
-        // Setup Permissions, we'll do an initial check for the Permissions plugin then fall back on isOP().
-        this.ph = new MVPermissions(this);
-
-        this.bank = this.banker.loadEconPlugin();
-
-        // Setup the command manager
-        this.commandHandler = new CommandHandler(this, this.ph);
-        // Setup the world purger
-        this.worldPurger = new PurgeWorlds(this);
-        // Call the Function to assign all the Commands to their Class.
-        this.registerCommands();
-
-        this.playerSessions = new HashMap<String, MVPlayerSession>();
-
-        // Start the Update Checker
-        // updateCheck = new UpdateChecker(this.getDescription().getName(), this.getDescription().getVersion());
-
-        // Call the Function to load all the Worlds and setup the HashMap
-        // When called with null, it tries to load ALL
-        // this function will be called every time a plugin registers a new envtype with MV
-        // Setup & Load our Configuration files.
-        loadConfigs();
-        if (this.configMV != null) {
-
-            this.loadWorlds(true);
-        } else {
-            this.log(Level.SEVERE, "Your configs were not loaded. Very little will function in Multiverse.");
-        }
-    }
-
-    private void initializeDestinationFactory() {
-        this.destFactory = new DestinationFactory(this);
-        this.destFactory.registerDestinationType(WorldDestination.class, "");
-        this.destFactory.registerDestinationType(WorldDestination.class, "w");
-        this.destFactory.registerDestinationType(ExactDestination.class, "e");
-        this.destFactory.registerDestinationType(PlayerDestination.class, "pl");
-        this.destFactory.registerDestinationType(CannonDestination.class, "ca");
-    }
-
-    /**
-     * Function to Register all the Events needed.
-     */
-    private void registerEvents() {
-        PluginManager pm = getServer().getPluginManager();
-        // pm.registerEvent(Event.Type.PLAYER_MOVE, playerListener, Priority.Highest, this); // Low so it acts above any other.
-        pm.registerEvent(Event.Type.PLAYER_TELEPORT, this.playerListener, Priority.Highest, this); // Cancel Teleports if needed.
-        pm.registerEvent(Event.Type.PLAYER_JOIN, this.playerListener, Priority.Normal, this); // To create the Player Session
-        pm.registerEvent(Event.Type.PLAYER_QUIT, this.playerListener, Priority.Normal, this); // To remove Player Sessions
-        pm.registerEvent(Event.Type.PLAYER_RESPAWN, this.playerListener, Priority.Low, this); // Let plugins which specialize in (re)spawning carry more weight.
-        pm.registerEvent(Event.Type.PLAYER_CHAT, this.playerListener, Priority.Normal, this); // To prepend the world name
-
-        pm.registerEvent(Event.Type.ENTITY_REGAIN_HEALTH, this.entityListener, Priority.Normal, this);
-        pm.registerEvent(Event.Type.ENTITY_DAMAGE, this.entityListener, Priority.Normal, this); // To Allow/Disallow fake PVP
-        pm.registerEvent(Event.Type.CREATURE_SPAWN, this.entityListener, Priority.Normal, this); // To prevent all or certain animals/monsters from spawning.
-
-        pm.registerEvent(Event.Type.PLUGIN_ENABLE, this.pluginListener, Priority.Monitor, this);
-        pm.registerEvent(Event.Type.PLUGIN_DISABLE, this.pluginListener, Priority.Monitor, this);
-
-        pm.registerEvent(Event.Type.WEATHER_CHANGE, this.weatherListener, Priority.Normal, this);
-        pm.registerEvent(Event.Type.THUNDER_CHANGE, this.weatherListener, Priority.Normal, this);
-    }
-
-    /**
-     * Load the Configuration files OR create the default config files.
-     */
-    public void loadConfigs() {
-
-        // Call the defaultConfiguration class to create the config files if they don't already exist.
-        new DefaultConfig(getDataFolder(), "config.yml", this.migrator);
-        new DefaultConfig(getDataFolder(), "worlds.yml", this.migrator);
-        // Now grab the Configuration Files.
-        this.configMV = new Configuration(new File(getDataFolder(), "config.yml"));
-        this.configWorlds = new Configuration(new File(getDataFolder(), "worlds.yml"));
-
-        // Now attempt to Load the configurations.
-        try {
-            this.configMV.load();
-            log(Level.INFO, "- Multiverse Config -- Loaded");
-        } catch (Exception e) {
-            log(Level.INFO, "- Failed to load config.yml");
-        }
-
-        try {
-            this.configWorlds.load();
-            log(Level.INFO, "- World Config -- Loaded");
-        } catch (Exception e) {
-            log(Level.INFO, "- Failed to load worlds.yml");
-        }
-
-        // Setup the Debug option, we'll default to false because this option will not be in the default config.
-        this.debug = this.configMV.getBoolean("debug", false);
-    }
-
-    /**
-     * Register Multiverse-Core commands to Command Manager.
-     */
-    private void registerCommands() {
-        // Intro Commands
-        this.commandHandler.registerCommand(new HelpCommand(this));
-        this.commandHandler.registerCommand(new VersionCommand(this));
-        this.commandHandler.registerCommand(new ListCommand(this));
-        this.commandHandler.registerCommand(new InfoCommand(this));
-        this.commandHandler.registerCommand(new CreateCommand(this));
-        this.commandHandler.registerCommand(new ImportCommand(this));
-        this.commandHandler.registerCommand(new ReloadCommand(this));
-        this.commandHandler.registerCommand(new SetSpawnCommand(this));
-        this.commandHandler.registerCommand(new CoordCommand(this));
-        this.commandHandler.registerCommand(new TeleportCommand(this));
-        this.commandHandler.registerCommand(new WhoCommand(this));
-        this.commandHandler.registerCommand(new SpawnCommand(this));
-        // Dangerous Commands
-        this.commandHandler.registerCommand(new UnloadCommand(this));
-        this.commandHandler.registerCommand(new RemoveCommand(this));
-        this.commandHandler.registerCommand(new DeleteCommand(this));
-        this.commandHandler.registerCommand(new ConfirmCommand(this));
-        // Modification commands
-        this.commandHandler.registerCommand(new ModifyCommand(this));
-        this.commandHandler.registerCommand(new PurgeCommand(this));
-        this.commandHandler.registerCommand(new ModifyAddCommand(this));
-        this.commandHandler.registerCommand(new ModifySetCommand(this));
-        this.commandHandler.registerCommand(new ModifyRemoveCommand(this));
-        this.commandHandler.registerCommand(new ModifyClearCommand(this));
-
-        // Misc Commands
-        this.commandHandler.registerCommand(new EnvironmentCommand(this));
-        this.commandHandler.registerCommand(new SleepCommand(this));
-
-    }
-
-    /**
-     * Load the Worlds & Settings from the configuration file.
-     */
-    public void loadWorlds(boolean forceLoad) {
-        // Basic Counter to count how many Worlds we are loading.
-        int count = 0;
-        // Grab all the Worlds from the Config.
-        List<String> worldKeys = this.configWorlds.getKeys("worlds");
-
-        // Force the worlds to be loaded, ie don't just load new worlds.
-        if (forceLoad) {
-            // Remove all world permissions.
-            Permission allAccess = this.getServer().getPluginManager().getPermission("multiverse.access.*");
-            Permission allExempt = this.getServer().getPluginManager().getPermission("multiverse.exempt.*");
-            for (MVWorld w : this.worlds.values()) {
-                // Remove this world from the master list
-                if (allAccess != null) {
-                    allAccess.getChildren().remove(w.getPermission().getName());
-                }
-                if (allExempt != null) {
-                    allExempt.getChildren().remove(w.getPermission().getName());
-                }
-                this.getServer().getPluginManager().removePermission(w.getPermission().getName());
-                this.getServer().getPluginManager().removePermission(w.getExempt().getName());
-            }
-            // Recalc the all permission
-            this.getServer().getPluginManager().recalculatePermissionDefaults(allAccess);
-            this.getServer().getPluginManager().recalculatePermissionDefaults(allExempt);
-            this.worlds.clear();
-        }
-
-        // Check that the list is not null.
-        if (worldKeys != null) {
-            for (String worldKey : worldKeys) {
-                // Check if the World is already loaded within the Plugin.
-                if (this.worlds.containsKey(worldKey)) {
-                    continue;
-                }
-                // Grab the initial values from the config file.
-                String environment = this.configWorlds.getString("worlds." + worldKey + ".environment", "NORMAL"); // Grab the Environment as a String.
-                String seedString = this.configWorlds.getString("worlds." + worldKey + ".seed", "");
-
-                String generatorstring = this.configWorlds.getString("worlds." + worldKey + ".generator");
-
-                addWorld(worldKey, getEnvFromString(environment), seedString, generatorstring);
-
-                // Increment the world count
-                count++;
-            }
-        }
-
-        // Ensure that the worlds created by the default server were loaded into MV, useful for first time runs
-        // count += loadDefaultWorlds();
-        // TODO: This was taken out because some people don't want nether! Instead show a message to people who have MVImport
-        // and tell them to do MVImports for their worlds!
-
-        // Simple Output to the Console to show how many Worlds were loaded.
-        log(Level.INFO, count + " - World(s) loaded.");
-    }
-
-    /**
-     * Add a new World to the Multiverse Setup.
-     * <p/>
-     * Isn't there a prettier way to do this??!!?!?!
-     * 
-     * @param name World Name
-     * @param env Environment Type
-     */
-    public boolean addWorld(String name, Environment env, String seedString, String generator) {
-        this.debugLog(Level.CONFIG, "Adding world with: " + name + ", " + env.toString() + ", " + seedString + ", " + generator);
-        Long seed = null;
-        if (seedString != null && seedString.length() > 0) {
-            try {
-                seed = Long.parseLong(seedString);
-            } catch (NumberFormatException numberformatexception) {
-                seed = (long) seedString.hashCode();
-            }
-        }
-
-        String generatorID = null;
-        String generatorName = null;
-        if (generator != null) {
-            String[] split = generator.split(":", 2);
-            String id = (split.length > 1) ? split[1] : null;
-            generatorName = split[0];
-            generatorID = id;
-        }
-
-        ChunkGenerator customGenerator = getChunkGenerator(generatorName, generatorID, name);
-
-        if (customGenerator == null && generator != null && (generator.length() > 0)) {
-            if (!pluginExists(generatorName)) {
-                log(Level.WARNING, "Could not find plugin: " + generatorName);
-            } else {
-                log(Level.WARNING, "Found plugin: " + generatorName + ", but did not find generatorID: " + generatorID);
-
-            }
-
-            return false;
-        }
-
-        World world = null;
-        if (seed != null) {
-            if (customGenerator != null) {
-                world = getServer().createWorld(name, env, seed, customGenerator);
-                log(Level.INFO, "Loading World & Settings - '" + name + "' - " + env + " with seed: " + seed + " & Custom Generator: " + generator);
-            } else {
-                world = getServer().createWorld(name, env, seed);
-                log(Level.INFO, "Loading World & Settings - '" + name + "' - " + env + " with seed: " + seed);
-            }
-        } else {
-            if (customGenerator != null) {
-                world = getServer().createWorld(name, env, customGenerator);
-                log(Level.INFO, "Loading World & Settings - '" + name + "' - " + env + " & Custom Generator: " + generator);
-            } else {
-                world = getServer().createWorld(name, env);
-                log(Level.INFO, "Loading World & Settings - '" + name + "' - " + env);
-            }
-        }
-
-        if (world == null) {
-            log(Level.SEVERE, "Failed to Create/Load the world '" + name + "'");
-            return false;
-        }
-
-        MVWorld mvworld = new MVWorld(world, this.configWorlds, this, seed, generator);
-        this.worldPurger.purgeWorld(null, mvworld);
-        this.worlds.put(name, mvworld);
-        return true;
-    }
-
-    private boolean pluginExists(String generator) {
-        Plugin plugin = getServer().getPluginManager().getPlugin(generator);
-        return plugin != null;
-    }
-
-    private ChunkGenerator getChunkGenerator(String generator, String generatorID, String worldName) {
-        if (generator == null) {
-            return null;
-        }
-
-        Plugin plugin = getServer().getPluginManager().getPlugin(generator);
-        if (plugin == null) {
-            return null;
-        } else {
-            return plugin.getDefaultWorldGenerator(worldName, generatorID);
-
-        }
-    }
-
-    /**
-     * Remove the world from the Multiverse list
-     * 
-     * @param name The name of the world to remove
-     * @return True if success, false if failure.
-     */
-    public boolean removeWorldFromList(String name) {
-
-        if (this.worlds.containsKey(name)) {
-            this.worlds.remove(name);
-            this.log(Level.INFO, "World " + name + " was unloaded from memory.");
-            this.unloadWorld(name, true);
-            return true;
-        } else if (this.getServer().getWorld(name) != null) {
-            this.log(Level.WARNING, "Hmm Multiverse does not know about this world but it's still loaded in memory.");
-            this.log(Level.WARNING, "To be on the safe side, you should import it then try unloading again...");
-        } else {
-            this.log(Level.INFO, "The world " + name + " was already unloaded/did not exist.");
-        }
-        return false;
-    }
-
-    /**
-     * 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.
-     */
-    public boolean removeWorldFromConfig(String name) {
-        if (this.configWorlds.getProperty("worlds." + name) != null) {
-            removeWorldFromList(name);
-            this.log(Level.INFO, "World " + name + " was removed from config.yml");
-            this.configWorlds.removeProperty("worlds." + name);
-            this.configWorlds.save();
-            return true;
-        } else {
-            this.log(Level.INFO, "World " + name + " was already removed from config.yml");
-        }
-        return false;
-    }
-
-    /**
-     * 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.
-     */
-    public Boolean deleteWorld(String name) {
-        
-        if (this.getServer().getWorld(name) != null) {
-            if(!unloadWorld(name, false)) {
-                // If the world was loaded, and we couldn't unload it, return false. DON"T DELTEE
-                return false;
-            }
-        }
-        removeWorldFromConfig(name);
-        try {
-            File serverFolder = new File(this.getDataFolder().getAbsolutePath()).getParentFile().getParentFile();
-            File worldFile = new File(serverFolder.getAbsolutePath() + File.separator + name);
-            if (name.equalsIgnoreCase("plugins")) {
-                this.log(Level.SEVERE, "Really? Are you high? This would delete your plugins folder. Luckily the MV2 devs are crazy smart or you're server would be ended...");
-                return false;
-            } else if (name.toLowerCase().contains("plugins")) {
-                this.log(Level.SEVERE, "I'm sorry, did you mean to type: 'rm plugins" + File.separator + "Essential*'? I could do that for you if you'd like...");
-                return false;
-            } else if (name.contains("..")) {
-                this.log(Level.SEVERE, "Uh yea... No way i'm going to delete a parent directory for you. You can go do 'rm -rf *.*' on your own time...");
-                return false;
-            } else if (name.equals(".")) {
-                this.log(Level.SEVERE, "Why on earth would you want to use Multiverse-Core to delete your Bukkit Server! How many beers have you had tonight... Give the keys to a friend.");
-                return false;
-            } else if (!worldFile.isDirectory()) {
-                this.log(Level.SEVERE, "C'mon man... Really?!?! Multiverse-Core is a great way to get players from A to B, but not to manage your files. To delete this file type:");
-                this.log(Level.SEVERE, "stop");
-                this.log(Level.SEVERE, "rm " + worldFile.getAbsolutePath());
-                return false;
-            }
-            boolean deletedWorld = deleteFolder(worldFile);
-            if (deletedWorld)
-            {
-                this.log(Level.INFO, "World " + name + " was DELETED.");
-            } else {
-                this.log(Level.SEVERE, "World " + name + " was NOT deleted.");
-                this.log(Level.SEVERE, "Are you sure the folder " + name + " exists?");
-                this.log(Level.SEVERE, "Please check your file permissions on " + name);
-            }
-            return deletedWorld;
-        } catch (Exception e) {
-            this.log(Level.SEVERE, "Hrm, something didn't go as planned. Here's an exception for ya.");
-            this.log(Level.SEVERE, "You can go politely explain your situation in #multiverse on esper.net");
-            this.log(Level.SEVERE, "But from here, it looks like your folder is oddly named.");
-            this.log(Level.SEVERE, "This world has been removed from Multiverse-Core so your best bet is to go delete the folder by hand. Sorry.");
-            System.out.print(e);
-            return false;
-        }
-    }
-
-    private boolean unloadWorld(String name, boolean safely) {
-        this.removePlayersFromWorld(name);
-        return getServer().unloadWorld(name, safely);
-    }
-
-    private void removePlayersFromWorld(String name) {
-        World w = this.getServer().getWorld(name);
-        if (w != null) {
-            World safeWorld = this.getServer().getWorlds().get(0);
-            List<Player> ps = w.getPlayers();
-            for (Player p : ps) {
-                p.teleport(safeWorld.getSpawnLocation());
-            }
-        }
-    }
-
-    /**
-     * Delete a folder Courtesy of: lithium3141
-     * 
-     * @param file The folder to delete
-     * @return true if success
-     */
-    private boolean deleteFolder(File file) {
-        if (file.exists()) {
-            // If the file exists, and it has more than one file in it.
-            if (file.isDirectory()) {
-                for (File f : file.listFiles()) {
-                    if (!this.deleteFolder(f)) {
-                        return false;
-                    }
-                }
-            }
-            file.delete();
-            return !file.exists();
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * What happens when the plugin gets disabled...
-     */
-    public void onDisable() {
-        debugLog.close();
-        this.ph.setPermissions(null);
-        this.banker = null;
-        this.bank = null;
-        log(Level.INFO, "- Disabled");
-    }
-
-    /**
-     * Grab the players session if one exists, otherwise create a session then return it.
-     * 
-     * @param player
-     * @return
-     */
-    public MVPlayerSession getPlayerSession(Player player) {
-        if (this.playerSessions.containsKey(player.getName())) {
-            return this.playerSessions.get(player.getName());
-        } else {
-            this.playerSessions.put(player.getName(), new MVPlayerSession(player, this.configMV, this));
-            return this.playerSessions.get(player.getName());
-        }
-    }
-
-    /**
-     * Grab and return the Teleport class.
-     * 
-     * @return
-     */
-    public MVTeleport getTeleporter() {
-        return new MVTeleport(this);
-    }
-
-    /**
-     * Grab the Permissions Handler for MultiVerse
-     */
-    public MVPermissions getPermissions() {
-        return this.ph;
-    }
-
-    public PurgeWorlds getWorldPurger() {
-        return this.worldPurger;
-    }
-
-    /**
-     * onCommand
-     */
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args) {
-        if (this.isEnabled() == false) {
-            sender.sendMessage("This plugin is Disabled!");
-            return true;
-        }
-        ArrayList<String> allArgs = new ArrayList<String>(Arrays.asList(args));
-        allArgs.add(0, command.getName());
-        return this.commandHandler.locateAndRunCommand(sender, allArgs);
-    }
-
-    /**
-     * Print messages to the server Log as well as to our DebugLog. 'debugLog' is used to seperate Heroes information from the Servers Log Output.
-     * 
-     * @param level
-     * @param msg
-     */
-    public void log(Level level, String msg) {
-        log.log(level, this.tag + " " + msg);
-        debugLog.log(level, this.tag + " " + msg);
-    }
-
-    /**
-     * Print messages to the Debug Log, if the servers in Debug Mode then we also wan't to print the messages to the standard Server Console.
-     * 
-     * @param level
-     * @param msg
-     */
-    public void debugLog(Level level, String msg) {
-        if (this.debug) {
-            log.log(level, "[Debug] " + msg);
-        }
-        debugLog.log(level, "[Debug] " + msg);
-    }
-
-    /**
-     * Parse the Authors Array into a readable String with ',' and 'and'.
-     * 
-     * @return
-     */
-    private String getAuthors() {
-        String authors = "";
-        ArrayList<String> auths = this.getDescription().getAuthors();
-
-        if (auths.size() == 1) {
-            return auths.get(0);
-        }
-
-        for (int i = 0; i < auths.size(); i++) {
-            if (i == this.getDescription().getAuthors().size() - 1) {
-                authors += " and " + this.getDescription().getAuthors().get(i);
-            } else {
-                authors += ", " + this.getDescription().getAuthors().get(i);
-            }
-        }
-        return authors.substring(2);
-    }
-
-    public CommandHandler getCommandHandler() {
-        return this.commandHandler;
-    }
-
-    public String getTag() {
-        return this.tag;
-    }
-
-    /**
-     * This code should get moved somewhere more appropriate, but for now, it's here.
-     * 
-     * @param env
-     * @return
-     */
-    public Environment getEnvFromString(String env) {
-        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
-        if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER"))
-            env = "NETHER";
-
-        if (env.equalsIgnoreCase("SKYLANDS") || env.equalsIgnoreCase("SKYLAND") || env.equalsIgnoreCase("STARWARS"))
-            env = "SKYLANDS";
-
-        if (env.equalsIgnoreCase("NORMAL") || env.equalsIgnoreCase("WORLD"))
-            env = "NORMAL";
-
-        try {
-            return Environment.valueOf(env);
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
-    }
-
-    // TODO: Find out where to put these next 3 methods! I just stuck them here for now --FF
-
-    public Collection<MVWorld> getMVWorlds() {
-        return this.worlds.values();
-    }
-
-    public MVWorld getMVWorld(String name) {
-        if (this.worlds.containsKey(name)) {
-            return this.worlds.get(name);
-        }
-        return this.getMVWorldByAlias(name);
-    }
-
-    private MVWorld getMVWorldByAlias(String alias) {
-        for (MVWorld w : this.worlds.values()) {
-            if (w.getAlias().equalsIgnoreCase(alias)) {
-                return w;
-            }
-        }
-        return null;
-    }
-
-    public boolean isMVWorld(String name) {
-        return (this.worlds.containsKey(name) || isMVWorldAlias(name));
-    }
-
-    /**
-     * This method ONLY checks the alias of each world.
-     * 
-     * @param name
-     * @return
-     */
-    private boolean isMVWorldAlias(String name) {
-        for (MVWorld w : this.worlds.values()) {
-            if (w.getAlias().equalsIgnoreCase(name)) {
-
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void showNotMVWorldMessage(CommandSender sender, String worldName) {
-        sender.sendMessage("Multiverse doesn't know about " + ChatColor.DARK_AQUA + worldName + ChatColor.WHITE + " yet.");
-        sender.sendMessage("Type " + ChatColor.DARK_AQUA + "/mv import ?" + ChatColor.WHITE + " for help!");
-    }
-
-    public void removePlayerSession(Player player) {
-        if (this.playerSessions.containsKey(player.getName())) {
-            this.playerSessions.remove(player.getName());
-        }
-    }
-
-    /**
-     * Returns the number of plugins that have specifically hooked into core.
-     * 
-     * @return
-     */
-    public int getPluginCount() {
-        return this.pluginCount;
-    }
-
-    /**
-     * Increments the number of plugins that have specifically hooked into core.
-     */
-    public void incrementPluginCount() {
-        this.pluginCount += 1;
-    }
-
-    /**
-     * Decrements the number of plugins that have specifically hooked into core.
-     */
-    public void decrementPluginCount() {
-        this.pluginCount -= 1;
-    }
-
-    public AllPay getBanker() {
-        return this.banker;
-    }
-
-    public void setBank(GenericBank bank) {
-        this.bank = bank;
-    }
-
-    public DestinationFactory getDestinationFactory() {
-        return this.destFactory;
-    }
-
-    /**
-     * This is a convenience method to allow the QueuedCommand system to call it. You should NEVER call this directly.
-     * 
-     * @param p Player
-     * @param l The potentially unsafe location.
-     */
-    public void teleportPlayer(Player p, Location l) {
-        p.teleport(l);
-    }
-
-    private void checkServerProps() {
-        File serverFolder = new File(this.getDataFolder().getAbsolutePath()).getParentFile().getParentFile();
-        File serverProperties = new File(serverFolder.getAbsolutePath() + File.separator + "server.properties");
-        try {
-            FileInputStream fileStream = new FileInputStream(serverProperties);
-            DataInputStream in = new DataInputStream(fileStream);
-            BufferedReader br = new BufferedReader(new InputStreamReader(in));
-            String propLine;
-            while ((propLine = br.readLine()) != null) {
-                // Print the content on the console
-                if (propLine.matches(".*spawn-monsters.*") && !propLine.matches(".*spawn-monsters\\s*=\\s*true.*")) {
-                    this.log(Level.SEVERE, "Monster spawning has been DISABLED.");
-                    this.log(Level.SEVERE, "In order to let Multiverse fully control your worlds:");
-                    this.log(Level.SEVERE, "Please set 'spawn-monsters=true' in your server.properties file!");
-                    MultiverseCore.MobsDisabledInDefaultWorld = true;
-                }
-            }
-        } catch (IOException e) {
-            // This should never happen...
-            this.log(Level.SEVERE, e.getMessage());
-        }
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class ConfirmCommand extends MultiverseCommand {
-
-    public ConfirmCommand(MultiverseCore plugin) {
-        super(plugin);
-        // Any command that is dangerous should require op
-        this.setName("Confirms a command that could destroy life, the universe and everything.");
-        this.setCommandUsage("/mv confirm");
-        this.setArgRange(0, 0);
-        this.addKey("mvconfirm");
-        this.addKey("mv confirm");
-        this.setPermission("multiverse.core.confirm", "If you have not been prompted to use this, it will not do anything.", PermissionDefault.OP);
-        
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        this.plugin.getCommandHandler().confirmQueuedCommand(sender);
-    }
-
-}

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

@@ -1,57 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.utils.LocationManipulation;
-
-public class CoordCommand extends MultiverseCommand {
-
-    private LocationManipulation locMan = new LocationManipulation();
-
-    public CoordCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Coordinates");
-        this.setCommandUsage("/mv coord");
-        this.setArgRange(0, 0);
-        this.addKey("mv coord");
-        this.addKey("mvcoord");
-        this.addKey("mvco");
-        this.setPermission("multiverse.core.coord", "Returns detailed information on the Players where abouts.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // Check if the command was sent from a Player.
-        if (sender instanceof Player) {
-            Player p = (Player) sender;
-            World world = p.getWorld();
-            
-            if(!this.plugin.isMVWorld(world.getName())) {
-                this.plugin.showNotMVWorldMessage(sender, world.getName());
-                return;
-            }
-            
-            MVWorld mvworld = this.plugin.getMVWorld(world.getName());
-            // TODO: Convert to fancy stuff
-            
-            p.sendMessage(ChatColor.AQUA + "--- Location Information ---");
-            p.sendMessage(ChatColor.AQUA + "World: " + ChatColor.WHITE + world.getName());
-            p.sendMessage(ChatColor.AQUA + "Alias: " + mvworld.getColoredWorldString());
-            p.sendMessage(ChatColor.AQUA + "World Scale: " + ChatColor.WHITE + mvworld.getScaling());
-            p.sendMessage(ChatColor.AQUA + "Coordinates: " + ChatColor.WHITE + this.locMan.strCoords(p.getLocation()));
-            p.sendMessage(ChatColor.AQUA + "Direction: " + ChatColor.WHITE + LocationManipulation.getDirection(p.getLocation()));
-            p.sendMessage(ChatColor.AQUA + "Block: " + ChatColor.WHITE + Material.getMaterial(world.getBlockTypeIdAt(p.getLocation())));
-        } else {
-            sender.sendMessage("This command needs to be used from a Player.");
-        }
-    }
-}

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

@@ -1,63 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.io.File;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.World.Environment;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.pneumaticraft.commandhandler.CommandHandler;
-
-public class CreateCommand extends MultiverseCommand {
-
-    public CreateCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Create World");
-        this.setCommandUsage("/mv create" + ChatColor.GREEN + " {NAME} {ENV}" + ChatColor.GOLD + " -s [SEED] -g [GENERATOR[:ID]]");
-        this.setArgRange(2, 6);
-        this.addKey("mvcreate");
-        this.addKey("mvc");
-        this.addKey("mv create");
-        this.setPermission("multiverse.core.create", "Creates a new world and loads it.", PermissionDefault.OP);
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "world" + ChatColor.GREEN + " normal");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "lavaland" + ChatColor.RED + " nether");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "starwars" + ChatColor.AQUA + " skylands");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "gargamel" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -s gargamel");
-        this.addCommandExample("/mv create " + ChatColor.GOLD + "moonworld" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -g BukkitFullOfMoon");
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (args.size() % 2 != 0) {
-            sender.sendMessage("You must preface your SEED with -s OR your GENERATOR with -g. Type /mv for help");
-            return;
-        }
-        String worldName = args.get(0);
-        String env = args.get(1);
-        String seed = CommandHandler.getFlag("-s", args);
-        String generator = CommandHandler.getFlag("-g", args);
-
-        if (new File(worldName).exists() || this.plugin.isMVWorld(worldName)) {
-            sender.sendMessage(ChatColor.RED + "A Folder/World already exists with this name!");
-            sender.sendMessage(ChatColor.RED + "If you are confident it is a world you can import with /mvimport");
-            return;
-        }
-
-        Environment environment = this.plugin.getEnvFromString(env);
-        if (environment == null) {
-            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
-            EnvironmentCommand.showEnvironments(sender);
-            return;
-        }
-        sender.sendMessage(ChatColor.AQUA + "Starting world creation...");
-        if (this.plugin.addWorld(worldName, environment, seed, generator)) {
-            sender.sendMessage(ChatColor.GREEN + "Complete!");
-        } else {
-            sender.sendMessage(ChatColor.RED + "FAILED.");
-        }
-        return;
-    }
-}

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

@@ -1,30 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class DeleteCommand extends MultiverseCommand {
-
-    public DeleteCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Delete World");
-        this.setCommandUsage("/mv delete" + ChatColor.GREEN + " {WORLD}");
-        this.setArgRange(1, 1);
-        this.addKey("mvdelete");
-        this.addKey("mv delete");
-        this.setPermission("multiverse.core.delete", "Deletes a world on your server. " + ChatColor.RED + "PERMANENTLY.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Class<?> paramTypes[] = { String.class };
-        List<Object> objectArgs = new ArrayList<Object>(args);
-        this.plugin.getCommandHandler().queueCommand(sender, "mvdelete", "deleteWorld", objectArgs, paramTypes, ChatColor.GREEN + "World Deleted!", ChatColor.RED + "World could NOT be deleted!");
-    }
-}

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

@@ -1,38 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-
-public class EnvironmentCommand extends MultiverseCommand {
-
-    public EnvironmentCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("List Environments");
-        this.setCommandUsage("/mv env");
-        this.setArgRange(0, 0);
-        this.addKey("mvenv");
-        this.addKey("mv env");
-        this.addKey("mv environment");
-        this.addKey("mv environments");
-        this.setPermission("multiverse.core.list.environments", "Lists valid known environments.", PermissionDefault.OP);
-    }
-
-
-    public static void showEnvironments(CommandSender sender) {
-        sender.sendMessage(ChatColor.YELLOW + "Valid Environments are:");
-        sender.sendMessage(ChatColor.GREEN + "NORMAL");
-        sender.sendMessage(ChatColor.RED + "NETHER");
-        sender.sendMessage(ChatColor.AQUA + "SKYLANDS");
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        EnvironmentCommand.showEnvironments(sender);
-    }
-}

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

@@ -1,128 +0,0 @@
-// This file is no longer licensed under that silly CC license. I have blanked it out and will start implementaiton of my own in a few days. For now there is no help.
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.pneumaticraft.commandhandler.Command;
-
-public class HelpCommand extends MultiverseCommand {
-    private static final int CMDS_PER_PAGE = 7;
-
-    public HelpCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Get Help with Multiverse");
-        this.setCommandUsage("/mv " + ChatColor.GOLD + "[FILTER] [PAGE #]");
-        this.setArgRange(0, 2);
-        this.addKey("mv");
-        this.addKey("mvh");
-        this.addKey("mvhelp");
-        this.addKey("mv help");
-        this.addKey("mvsearch");
-        this.addKey("mv search");
-        this.setPermission("multiverse.help", "Displays a nice help menu.", PermissionDefault.TRUE);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        sender.sendMessage(ChatColor.AQUA + "====[ Multiverse Help ]====");
-
-        int page = 1;
-
-        String filter = "";
-
-        if (args.size() == 0)
-        {
-            filter = "";
-            page = 1;
-        } else if (args.size() == 1) {
-            try {
-                page = Integer.parseInt(args.get(0));
-            } catch (NumberFormatException ex) {
-                filter = args.get(0);
-                page = 1;
-            }
-        } else if (args.size() == 2) {
-            filter = args.get(0);
-            try {
-                page = Integer.parseInt(args.get(1));
-            } catch (NumberFormatException ex) {
-                page = 1;
-            }
-        }
-
-        List<Command> availableCommands = new ArrayList<Command>(this.plugin.getCommandHandler().getCommands(sender));
-        if (filter.length() > 0) {
-            availableCommands = this.getFilteredCommands(availableCommands, filter);
-            if (availableCommands.size() == 0) {
-                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE + "No commands matched your filter: " + ChatColor.AQUA + filter);
-                return;
-            }
-        }
-
-        if (!(sender instanceof Player)) {
-            sender.sendMessage(ChatColor.AQUA + " Add a '" + ChatColor.DARK_PURPLE + "?" + ChatColor.AQUA + "' after a command to see more about it.");
-            for (Command c : availableCommands) {
-                sender.sendMessage(ChatColor.AQUA + c.getCommandUsage());
-            }
-            return;
-        }
-
-        int totalPages = (int) Math.ceil(availableCommands.size() / (CMDS_PER_PAGE + 0.0));
-
-        if (page > totalPages) {
-            page = totalPages;
-        }
-
-        sender.sendMessage(ChatColor.AQUA + " Page " + page + " of " + totalPages);
-        sender.sendMessage(ChatColor.AQUA + " Add a '" + ChatColor.DARK_PURPLE + "?" + ChatColor.AQUA + "' after a command to see more about it.");
-
-        this.showPage(page, sender, availableCommands);
-
-    }
-
-    private List<Command> getFilteredCommands(List<Command> availableCommands, String filter) {
-        List<Command> filtered = new ArrayList<Command>();
-
-        for (Command c : availableCommands) {
-            if (stitchThisString(c.getKeyStrings()).matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else if (c.getCommandName().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            } else if (c.getCommandDesc().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);
-            }else if (c.getCommandUsage().matches("(?i).*" + filter + ".*")) {
-                filtered.add(c);    
-            }
-        }
-        return filtered;
-    }
-
-    private String stitchThisString(List<String> list) {
-        String returnstr = "";
-        for (String s : list) {
-            returnstr += s + " ";
-        }
-        return returnstr;
-    }
-
-    private void showPage(int page, CommandSender sender, List<Command> cmds) {
-        int start = (page - 1) * CMDS_PER_PAGE;
-        int end = start + CMDS_PER_PAGE;
-        for (int i = start; i < end; i++) {
-            // For consistancy, print some extra lines if it's a player:
-            if (i < cmds.size()) {
-                sender.sendMessage(ChatColor.AQUA + cmds.get(i).getCommandUsage());
-            } else if (sender instanceof Player) {
-                sender.sendMessage(" ");
-            }
-        }
-    }
-
-}

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

@@ -1,61 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.io.File;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.World.Environment;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class ImportCommand extends MultiverseCommand {
-
-    public ImportCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Import World");
-        this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV} " + ChatColor.GOLD + "[GENERATOR[:ID]]");
-        this.setArgRange(2, 3);
-        this.addKey("mvimport");
-        this.addKey("mvim");
-        this.addKey("mv import");
-        this.setPermission("multiverse.core.import", "Imports a new world of the specified type.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        String worldName = args.get(0);
-        if (this.plugin.isMVWorld(worldName) && new File(worldName).exists()) {
-            sender.sendMessage(ChatColor.RED + "Multiverse already knows about this world!");
-            return;
-        }
-
-        String generator = null;
-        if (args.size() == 3) {
-            generator = args.get(2);
-        }
-
-        String env = args.get(1);
-        Environment environment = this.plugin.getEnvFromString(env);
-        if (environment == null) {
-            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
-            EnvironmentCommand.showEnvironments(sender);
-            return;
-        }
-
-        if (new File(worldName).exists() && env != null) {
-            sender.sendMessage(ChatColor.AQUA + "Starting world import...");
-            this.plugin.addWorld(worldName, environment, null, generator);
-            sender.sendMessage(ChatColor.GREEN + "Complete!");
-            return;
-        } else if (env == null) {
-            sender.sendMessage(ChatColor.RED + "FAILED.");
-            sender.sendMessage("That world type did not exist.");
-            sender.sendMessage("For a list of available world types, type: /mvenv");
-        } else {
-            sender.sendMessage(ChatColor.RED + "FAILED.");
-            sender.sendMessage("That world folder does not exist...");
-        }
-    }
-}

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

@@ -1,226 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.utils.FancyColorScheme;
-import com.onarandombox.utils.FancyHeader;
-import com.onarandombox.utils.FancyMessage;
-import com.onarandombox.utils.FancyText;
-
-public class InfoCommand extends MultiverseCommand {
-
-    public InfoCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("World Information");
-        this.setCommandUsage("/mv info" + ChatColor.GOLD + " [WORLD] [PAGE]");
-        this.setArgRange(0, 2);
-        this.addKey("mvinfo");
-        this.addKey("mvi");
-        this.addKey("mv info");
-        this.setPermission("multiverse.core.info", "Returns detailed information on the world.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // Check if the command was sent from a Player.
-        String worldName = "";
-        int pageNum = 0;
-
-        if (args.size() == 0) {
-            if (sender instanceof Player) {
-                Player p = (Player) sender;
-                worldName = p.getWorld().getName();
-            } else {
-                sender.sendMessage("You must enter a" + ChatColor.LIGHT_PURPLE + " world" + ChatColor.WHITE + " from the console!");
-                return;
-            }
-        }
-        else if (args.size() == 1) {
-            if (this.plugin.getMVWorld(args.get(0)) != null) {
-                // then we have a world!
-                worldName = args.get(0);
-            } else {
-                if (sender instanceof Player) {
-                    Player p = (Player) sender;
-                    worldName = p.getWorld().getName();
-                    try {
-                        pageNum = Integer.parseInt(args.get(0)) - 1;
-                    } catch (NumberFormatException e) {
-                        pageNum = 0;
-                    }
-                } else {
-                    sender.sendMessage("You must enter a" + ChatColor.LIGHT_PURPLE + " world" + ChatColor.WHITE + " from the console!");
-                    return;
-                }
-            }
-        }
-        else if (args.size() == 2) {
-            worldName = args.get(0);
-            try {
-                pageNum = Integer.parseInt(args.get(1)) - 1;
-            } catch (NumberFormatException e) {
-                pageNum = 0;
-            }
-        }
-
-        if (this.plugin.isMVWorld(worldName)) {
-            showPage(pageNum, sender, this.buildEntireCommand(this.plugin.getMVWorld(worldName)));
-        } else if (this.plugin.getServer().getWorld(worldName) != null) {
-            sender.sendMessage("That world exists, but multiverse does not know about it!");
-            sender.sendMessage("You can import it with" + ChatColor.AQUA + "/mv import " + ChatColor.GREEN + worldName + ChatColor.LIGHT_PURPLE + "{ENV}");
-            sender.sendMessage("For available environments type " + ChatColor.GREEN + "/mv env");
-        }
-    }
-
-    private List<List<FancyText>> buildEntireCommand(MVWorld world) {
-        List<FancyText> message = new ArrayList<FancyText>();
-        List<List<FancyText>> worldInfo = new ArrayList<List<FancyText>>();
-        // Page 1
-        FancyColorScheme colors = new FancyColorScheme(ChatColor.AQUA, ChatColor.AQUA, ChatColor.GOLD, ChatColor.WHITE);
-        message.add(new FancyHeader("General Info", colors));
-        message.add(new FancyMessage("World Name: ", world.getName(), colors));
-        message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
-        message.add(new FancyMessage("Seed: ", world.getCBWorld().getSeed() + "", colors));
-        Location spawn = world.getCBWorld().getSpawnLocation();
-        message.add(new FancyMessage("Spawn Location: ", "(" + spawn.getBlockX() + ", " + spawn.getBlockY() + ", " + spawn.getBlockZ() + ")", colors));
-        message.add(new FancyMessage("World Scale: ", world.getScaling().toString(), colors));
-        if (world.getPrice() > 0) {
-            message.add(new FancyMessage("Price to enter this world: ", this.plugin.getBank().getFormattedAmount(world.getPrice(), world.getCurrency()), colors));
-        } else {
-            message.add(new FancyMessage("Price to enter this world: ", ChatColor.GREEN + "FREE!", colors));
-        }
-
-        if (world.getRespawnToWorld() != null) {
-            MVWorld respawn = this.plugin.getMVWorld(world.getRespawnToWorld());
-            if (respawn != null) {
-                message.add(new FancyMessage("Players will respawn in: ", respawn.getColoredWorldString(), colors));
-            } else {
-                message.add(new FancyMessage("Players will respawn in: ", ChatColor.RED + "!!INVALID!!", colors));
-            }
-
-        }
-
-        worldInfo.add(message);
-        // Page 2
-        message = new ArrayList<FancyText>();
-        message.add(new FancyHeader("PVP Settings", colors));
-        message.add(new FancyMessage("Multiverse Setting: ", world.getPvp().toString(), colors));
-        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getPVP() + "", colors));
-        message.add(new FancyMessage("Fake PVP Enabled: ", world.getFakePVP() + "", colors));
-        worldInfo.add(message);
-        // Page 3
-        message = new ArrayList<FancyText>();
-        message.add(new FancyHeader("Monster Settings", colors));
-        message.add(new FancyMessage("Multiverse Setting: ", world.allowMonsterSpawning().toString(), colors));
-        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getAllowMonsters() + "", colors));
-        if (MultiverseCore.MobsDisabledInDefaultWorld) {
-            message.add(new FancyMessage(ChatColor.RED + "WARNING: ", "Monsters WILL NOT SPAWN IN THIS WORLD.", colors));
-            message.add(new FancyMessage(ChatColor.RED + "WARNING: ", "Check your server log for more details.", colors));
-        }
-        if (world.getMonsterList().size() > 0) {
-            if (world.allowMonsterSpawning()) {
-                message.add(new FancyMessage("Monsters that" + ChatColor.RED + " CAN NOT " + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getMonsterList()), colors));
-            } else {
-                message.add(new FancyMessage("Monsters that" + ChatColor.GREEN + " CAN SPAWN: ", toCommaSeperated(world.getMonsterList()), colors));
-            }
-        } else {
-            message.add(new FancyMessage("Monsters that CAN spawn: ", world.allowMonsterSpawning() ? "ALL" : "NONE", colors));
-        }
-        worldInfo.add(message);
-
-        // Page 4
-        message = new ArrayList<FancyText>();
-        message.add(new FancyHeader("Animal Settings", colors));
-        message.add(new FancyMessage("Multiverse Setting: ", world.allowAnimalSpawning().toString(), colors));
-        message.add(new FancyMessage("Bukkit Setting: ", world.getCBWorld().getAllowAnimals() + "", colors));
-        if (world.getMonsterList().size() > 0) {
-            if (world.allowMonsterSpawning()) {
-                message.add(new FancyMessage("Animals that" + ChatColor.RED + " CAN NOT " + ChatColor.GREEN + "spawn: ", toCommaSeperated(world.getAnimalList()), colors));
-            } else {
-                message.add(new FancyMessage("Animals that" + ChatColor.GREEN + " CAN SPAWN: ", toCommaSeperated(world.getAnimalList()), colors));
-            }
-        } else {
-            message.add(new FancyMessage("Animals that CAN spawn: ", world.allowAnimalSpawning() ? "ALL" : "NONE", colors));
-        }
-        worldInfo.add(message);
-
-        return worldInfo;
-    }
-
-    private String toCommaSeperated(List<String> list) {
-        if(list == null || list.size() == 0) {
-            return "";
-        }
-        if(list.size() == 1) {
-            return list.get(0);
-        }
-        String result = list.get(0);
-
-        for (int i = 1; i < list.size() - 1; i++) {
-            result += ", " + list.get(i);
-        }
-        result += " and " + list.get(list.size() - 1);
-        return result;
-    }
-
-    protected ChatColor getChatColor(boolean positive) {
-        return positive ? ChatColor.GREEN : ChatColor.RED;
-    }
-
-    private void showPage(int page, CommandSender sender, List<List<FancyText>> doc) {
-        page = page < 0 ? 0 : page;
-        page = page > doc.size() - 1 ? doc.size() - 1 : page;
-        boolean altColor = false;
-        boolean appendedPageNum = false;
-        if (sender instanceof Player) {
-            List<FancyText> list = doc.get(page);
-            for (FancyText fancyT : list) {
-                if (fancyT instanceof FancyMessage) {
-                    FancyMessage text = (FancyMessage) fancyT;
-                    text.setAltColor(altColor);
-                    altColor = !altColor;
-                    sender.sendMessage(text.getFancyText());
-                } else if (fancyT instanceof FancyHeader) {
-                    FancyHeader text = (FancyHeader) fancyT;
-                    if (!appendedPageNum) {
-                        text.appendText(ChatColor.DARK_PURPLE + " [ Page " + (page + 1) + " of " + doc.size() + " ]");
-                        appendedPageNum = true;
-                    }
-                    sender.sendMessage(text.getFancyText());
-                    altColor = false;
-                }
-            }
-
-        } else {
-            for (List<FancyText> list : doc) {
-                for (FancyText fancyT : list) {
-                    if (fancyT instanceof FancyMessage) {
-                        FancyMessage text = (FancyMessage) fancyT;
-                        text.setAltColor(altColor);
-                        altColor = !altColor;
-                        sender.sendMessage(text.getFancyText());
-                    } else {
-                        FancyText text = fancyT;
-                        if (appendedPageNum) {
-                            sender.sendMessage(" ");
-                        } else {
-                            appendedPageNum = true;
-                        }
-                        sender.sendMessage(text.getFancyText());
-                        altColor = false;
-                    }
-                }
-            }
-        }
-    }
-
-}

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

@@ -1,58 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.World.Environment;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class ListCommand extends MultiverseCommand {
-
-    public ListCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("World Listing");
-        this.setCommandUsage("/mv list");
-        this.setArgRange(0, 0);
-        this.addKey("mvlist");
-        this.addKey("mvl");
-        this.addKey("mv list");
-        this.setPermission("multiverse.core.list.worlds", "Displays a listing of all worlds that you can enter.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-
-        String output = ChatColor.LIGHT_PURPLE + "Worlds which you can view:\n";
-        for (MVWorld world : this.plugin.getMVWorlds()) {
-
-            if (p != null && (!this.plugin.getPermissions().canEnterWorld(p, world))) {
-                continue;
-            }
-
-            ChatColor color = ChatColor.GOLD;
-            Environment env = world.getEnvironment();
-            if (env == Environment.NETHER) {
-                color = ChatColor.RED;
-            } else if (env == Environment.NORMAL) {
-                color = ChatColor.GREEN;
-            } else if (env == Environment.SKYLANDS) {
-                color = ChatColor.AQUA;
-            }
-            output += world.getColoredWorldString() + ChatColor.WHITE + " - " + color + world.getEnvironment() + " \n";
-
-        }
-        String[] response = output.split("\n");
-        for (String msg : response) {
-            sender.sendMessage(msg);
-        }
-    }
-}

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

@@ -1,73 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-// This will contain all the properties that support the ADD/REMOVE
-// Anything not in here will only support the SET action
-
-public class ModifyAddCommand extends MultiverseCommand {
-
-    public ModifyAddCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Modify a World (Add a value)");
-        this.setCommandUsage("/mv modify " + ChatColor.GREEN + "add {VALUE} {PROPERTY}" + ChatColor.GOLD + " [WORLD] ");
-        this.setArgRange(2, 3);
-        this.addKey("mvm add");
-        this.addKey("mvmadd");
-        this.addKey("mv modify add");
-        this.addKey("mvmodify add");
-        this.setPermission("multiverse.core.modify.add", "Modify various aspects of worlds. See the help wiki for how to use this command properly. If you do not include a world, the current world will be used.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // We NEED a world from the command line
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-
-        if (args.size() == 2 && p == null) {
-            sender.sendMessage(ChatColor.RED + "From the console, WORLD is required.");
-            sender.sendMessage(this.getCommandDesc());
-            sender.sendMessage(this.getCommandUsage());
-            sender.sendMessage("Nothing changed.");
-            return;
-        }
-
-        MVWorld world;
-        String value = args.get(0);
-        String property = args.get(1);
-
-        if (args.size() == 2) {
-            world = this.plugin.getMVWorld(p.getWorld().getName());
-        } else {
-            world = this.plugin.getMVWorld(args.get(2));
-        }
-
-        if (world == null) {
-            sender.sendMessage("That world does not exist!");
-            return;
-        }
-
-        if (!ModifyCommand.validateAction(Action.Add, property)) {
-            sender.sendMessage("Sorry, you can't ADD to " + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/4W8cY");
-            return;
-        }
-
-        if (world.addToList(property, value)) {
-            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + value + ChatColor.WHITE + " was " + ChatColor.GREEN + "added to " + ChatColor.GREEN + property);
-        } else {
-            sender.sendMessage(value + " could not be added to " + property);
-        }
-    }
-}

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

@@ -1,69 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class ModifyClearCommand extends MultiverseCommand {
-
-    public ModifyClearCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Modify a World (Clear a property)");
-        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " clear {PROPERTY}" + ChatColor.GOLD + " [WORLD]");
-        this.setArgRange(1, 2);
-        this.addKey("mvm clear");
-        this.addKey("mvmclear");
-        this.addKey("mv modify clear");
-        this.addKey("mvmodify clear");
-        this.setPermission("multiverse.core.modify.clear", "Removes all values from a property. This will work on properties that contain lists.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // We NEED a world from the command line
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-        if (args.size() == 1 && p == null) {
-            sender.sendMessage(ChatColor.RED + "From the console, WORLD is required.");
-            sender.sendMessage(this.getCommandDesc());
-            sender.sendMessage(this.getCommandUsage());
-            sender.sendMessage("Nothing changed.");
-            return;
-        }
-
-        MVWorld world;
-        String property = args.get(0);
-
-        if (args.size() == 1) {
-            world = this.plugin.getMVWorld(p.getWorld().getName());
-        } else {
-            world = this.plugin.getMVWorld(args.get(1));
-        }
-
-        if (world == null) {
-            sender.sendMessage("That world does not exist!");
-            return;
-        }
-
-        if (!ModifyCommand.validateAction(Action.Clear, property)) {
-            sender.sendMessage("Sorry, you can't use CLEAR with " + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/cgB2B");
-            return;
-        }
-        if (world.clearList(property)) {
-            sender.sendMessage(property + " was cleared. It contains 0 values now.");
-            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + property + ChatColor.WHITE + " was " + ChatColor.GREEN + "CLEARED" + ChatColor.WHITE + ". It contains " + ChatColor.LIGHT_PURPLE + "0" + ChatColor.WHITE + " values now.");
-        } else {
-            sender.sendMessage(ChatColor.RED + "Error: " + ChatColor.GOLD + property + ChatColor.WHITE + " was " + ChatColor.GOLD + "NOT" + ChatColor.WHITE + " cleared.");
-        }
-    }
-
-}

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

@@ -1,72 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-enum AddProperties {
-    blockblacklist, playerwhitelist, playerblacklist, worldblacklist, animals, monsters
-}
-
-enum Action {
-    Set, Add, Remove, Clear
-}
-
-// Color == Aliascolor
-enum SetProperties {
-    alias, animals, monsters, pvp, scaling, aliascolor, color, respawn, currency, curr, price, scale, spawnmemory, memory, weather, storm
-}
-
-public class ModifyCommand extends MultiverseCommand {
-
-    public ModifyCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Modify a World");
-        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " {set|add|remove|clear} ...");
-        this.setArgRange(2, 3);
-        this.addKey("mvm");
-        this.addKey("mvmodify");
-        this.addKey("mv modify");
-        Map<String, Boolean> children = new HashMap<String, Boolean>();
-        children.put("multiverse.core.modify.add", true);
-        children.put("multiverse.core.modify.modify", true);
-        children.put("multiverse.core.modify.clear", true);
-        children.put("multiverse.core.modify.remove", true);
-        Permission modify = new Permission("multiverse.core.modify", "Modify various aspects of worlds. See the help wiki for how to use this command properly. If you do not include a world, the current world will be used.", PermissionDefault.OP, children);
-        this.setPermission(modify);
-    }
-
-    protected static boolean validateAction(Action action, String property) {
-        if (action == Action.Set) {
-            try {
-                SetProperties.valueOf(property);
-                return true;
-            } catch (IllegalArgumentException e) {
-                return false;
-            }
-        } else {
-            try {
-                AddProperties.valueOf(property);
-                return true;
-            } catch (IllegalArgumentException e) {
-                return false;
-            }
-        }
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // This is just a place holder. The real commands are in:
-        // ModifyAddCommand
-        // ModifyRemoveCommand
-        // ModifySetCommand
-        // ModifyClearCommand
-    }
-}

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

@@ -1,74 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class ModifyRemoveCommand extends MultiverseCommand {
-
-    public ModifyRemoveCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Modify a World (Remove a value)");
-        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " remove {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
-        this.setArgRange(2, 3);
-        this.addKey("mvm remove");
-        this.addKey("mvmremove");
-        this.addKey("mv modify remove");
-        this.addKey("mvmodify remove");
-        this.addKey("mvm delete");
-        this.addKey("mvmdelete");
-        this.addKey("mv modify delete");
-        this.addKey("mvmodify delete");
-        this.setPermission("multiverse.core.modify.remove", "Modify various aspects of worlds. See the help wiki for how to use this command properly. If you do not include a world, the current world will be used.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // We NEED a world from the command line
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-
-        if (args.size() == 2 && p == null) {
-            sender.sendMessage(ChatColor.RED + "From the console, WORLD is required.");
-            sender.sendMessage(this.getCommandDesc());
-            sender.sendMessage(this.getCommandUsage());
-            sender.sendMessage("Nothing changed.");
-            return;
-        }
-
-        MVWorld world;
-        String value = args.get(0);
-        String property = args.get(1);
-
-        if (args.size() == 2) {
-            world = this.plugin.getMVWorld(p.getWorld().getName());
-        } else {
-            world = this.plugin.getMVWorld(args.get(2));
-        }
-
-        if (world == null) {
-            sender.sendMessage("That world does not exist!");
-            return;
-        }
-
-        if (!ModifyCommand.validateAction(Action.Remove, property)) {
-            sender.sendMessage("Sorry, you can't REMOVE anything from" + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/4W8cY");
-            return;
-        }
-        if (world.removeFromList(property, value)) {
-            sender.sendMessage(ChatColor.GREEN + "Success! " + ChatColor.AQUA + value + ChatColor.WHITE + " was " + ChatColor.RED + "removed from " + ChatColor.GREEN + property);
-        } else {
-            sender.sendMessage(ChatColor.RED + "There was an error removing " + ChatColor.GRAY + value + ChatColor.WHITE + " from " + ChatColor.GOLD + property);
-        }
-    }
-
-}

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

@@ -1,71 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class ModifySetCommand extends MultiverseCommand {
-
-    public ModifySetCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Modify a World (Set a value)");
-        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " set {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
-        this.setArgRange(2, 3);
-        this.addKey("mvm set");
-        this.addKey("mvmset");
-        this.addKey("mv modify set");
-        this.addKey("mvmodify set");
-        this.setPermission("multiverse.core.modify.set", "Modify various aspects of worlds. See the help wiki for how to use this command properly. If you do not include a world, the current world will be used.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // We NEED a world from the command line
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-
-        if (args.size() == 2 && p == null) {
-            sender.sendMessage("From the command line, WORLD is required.");
-            sender.sendMessage(this.getCommandDesc());
-            sender.sendMessage(this.getCommandUsage());
-            sender.sendMessage("Nothing changed.");
-            return;
-        }
-
-        MVWorld world;
-        String value = args.get(1);
-        String property = args.get(0);
-
-        if (args.size() == 2) {
-            world = this.plugin.getMVWorld(p.getWorld().getName());
-        } else {
-            world = this.plugin.getMVWorld(args.get(2));
-        }
-
-        if (world == null) {
-            sender.sendMessage("That world does not exist!");
-            return;
-        }
-
-        if (!ModifyCommand.validateAction(Action.Set, property)) {
-            sender.sendMessage("Sorry, you can't SET " + property);
-            sender.sendMessage("Please visit our Github Wiki for more information: http://goo.gl/l54PH");
-            return;
-        }
-        if ((property.equalsIgnoreCase("aliascolor") || property.equalsIgnoreCase("color")) && !world.isValidAliasColor(value)) {
-            sender.sendMessage(value + " is not a valid color. Please see our Github Wiki for the complete color list.");
-        } else if (world.setVariable(property, value)) {
-            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Property " + ChatColor.AQUA + property + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
-        } else {
-            sender.sendMessage(ChatColor.RED + "There was an error setting " + ChatColor.GRAY + property);
-        }
-    }
-}

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

@@ -1,21 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.command.CommandSender;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.pneumaticraft.commandhandler.Command;
-
-public abstract class MultiverseCommand extends Command {
-
-    protected MultiverseCore plugin;
-    public MultiverseCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.plugin = plugin;
-    }
-
-    @Override
-    public abstract void runCommand(CommandSender sender, List<String> args);
-
-}

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

@@ -1,77 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.utils.PurgeWorlds;
-
-public class PurgeCommand extends MultiverseCommand {
-
-    public PurgeCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Purge World of Creatures");
-        this.setCommandUsage("/mv purge" + ChatColor.GOLD + " [WORLD|all] " + ChatColor.GREEN + "{all|animals|monsters|MOBNAME}");
-        this.setArgRange(1, 2);
-        this.addKey("mvpurge");
-        this.addKey("mv purge");
-        this.setPermission("multiverse.core.purge", "Removed the specified type of mob from the specified world.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-        if (args.size() == 1 && p == null) {
-            sender.sendMessage("This command requires a WORLD when being run from the console!");
-            sender.sendMessage(this.getCommandUsage());
-            return;
-        }
-        String worldName = null;
-        String deathName = null;
-        if (args.size() == 1) {
-            worldName = p.getWorld().getName();
-            deathName = args.get(0);
-        } else {
-            worldName = args.get(0);
-            deathName = args.get(1);
-        }
-
-        if (!worldName.equalsIgnoreCase("all") && !this.plugin.isMVWorld(worldName)) {
-            ((MultiverseCore)this.plugin).showNotMVWorldMessage(sender, worldName);
-            sender.sendMessage("It cannot be purged.");
-            return;
-        }
-
-        List<MVWorld> worldsToRemoveEntitiesFrom = new ArrayList<MVWorld>();
-        // Handle all case any user who names a world "all" should know better...
-        if (worldName.equalsIgnoreCase("all")) {
-            worldsToRemoveEntitiesFrom.addAll(this.plugin.getMVWorlds());
-        } else {
-            worldsToRemoveEntitiesFrom.add(this.plugin.getMVWorld(worldName));
-        }
-
-        PurgeWorlds purger = this.plugin.getWorldPurger();
-        ArrayList<String> thingsToKill = new ArrayList<String>();
-        if (deathName.equalsIgnoreCase("all") || deathName.equalsIgnoreCase("animals") || deathName.equalsIgnoreCase("monsters")) {
-            thingsToKill.add(deathName.toUpperCase());
-        } else {
-            Collections.addAll(thingsToKill, deathName.toUpperCase().split(","));
-        }
-        for (MVWorld w : worldsToRemoveEntitiesFrom) {
-            purger.purgeWorld(sender, w, thingsToKill, false, false);
-        }
-
-        return;
-    }
-
-}

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

@@ -1,44 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.event.MVConfigReloadEvent;
-
-public class ReloadCommand extends MultiverseCommand {
-
-    public ReloadCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Reload Configs");
-        this.setCommandUsage("/mv reload");
-        this.setArgRange(0, 0);
-        this.addKey("mvreload");
-        this.addKey("mv reload");
-        this.setPermission("multiverse.core.reload", "Reloads worlds.yml and config.yml.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        sender.sendMessage(ChatColor.GOLD + "Reloading all Multiverse Plugin configs...");
-        this.plugin.loadConfigs();
-        this.plugin.loadWorlds(true);
-        
-        // Create the event
-        List<String> configsLoaded = new ArrayList<String>();
-        configsLoaded.add("Multiverse-Core - config.yml");
-        configsLoaded.add("Multiverse-Core - worlds.yml");
-        MVConfigReloadEvent configReload = new MVConfigReloadEvent(configsLoaded);
-        this.plugin.getServer().getPluginManager().callEvent(configReload);
-        for(String s : configReload.getAllConfigsLoaded()) {
-            sender.sendMessage(s);
-        }
-        
-        sender.sendMessage(ChatColor.GREEN + "Reload Complete!");
-    }
-
-}

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

@@ -1,31 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class RemoveCommand extends MultiverseCommand {
-
-    public RemoveCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Remove World");
-        this.setCommandUsage("/mv remove" + ChatColor.GREEN + " {WORLD}");
-        this.setArgRange(1, 1);
-        this.addKey("mvremove");
-        this.addKey("mv remove");
-        this.setPermission("multiverse.core.remove", "Unloads a world from Multiverse and removes it from worlds.yml, this does NOT remove the world folder.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (this.plugin.removeWorldFromConfig(args.get(0))) {
-            sender.sendMessage("World removed from config!");
-        } else {
-            sender.sendMessage("Error trying to remove world from config!");
-        }
-    }
-}

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

@@ -1,40 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class SetSpawnCommand extends MultiverseCommand {
-
-    public SetSpawnCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Set World Spawn");
-        this.setCommandUsage("/mv setspawn");
-        this.setArgRange(0, 0);
-        this.addKey("mvsetspawn");
-        this.addKey("mvss");
-        this.addKey("mv set spawn");
-        this.addKey("mv setspawn");
-        this.addKey("mvset spawn");
-        this.setPermission("multiverse.core.spawn.set", "Sets the spawn for the current world.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (sender instanceof Player) {
-            Player p = (Player) sender;
-            Location l = p.getLocation();
-            World w = p.getWorld();
-            w.setSpawnLocation(l.getBlockX(), l.getBlockY(), l.getBlockZ());
-            p.sendMessage(w.getName() + " - Spawn set to X: " + l.getBlockX() + "  Y: " + l.getBlockY() + " Z: " + l.getBlockZ());
-        } else {
-            sender.sendMessage("You cannot use this command from the console.");
-        }
-    }
-}

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

@@ -1,41 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class SleepCommand extends MultiverseCommand {
-
-    public SleepCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Go to Sleep");
-        this.setCommandUsage("/mv sleep");
-        this.setArgRange(0, 0);
-        this.addKey("mv sleep");
-        this.setPermission("multiverse.core.sleep", "Takes you the latest bed you've slept in (Currently BROKEN).", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Player p = null;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-        }
-
-        if (p == null) {
-            return;
-        }
-//        MVPlayerSession session = this.plugin.getPlayerSession(p);
-//        if (session.getBedRespawnLocation() != null) {
-//            p.teleport(session.getBedRespawnLocation());
-//        } else {
-//            sender.sendMessage("Hmm this is awkward...");
-//            sender.sendMessage("Something is wrong with your bed.");
-//            sender.sendMessage("It has either been destroyed or obstructed.");
-//        }
-    }
-}

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

@@ -1,66 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class SpawnCommand extends MultiverseCommand {
-
-    public SpawnCommand(MultiverseCore plugin) {
-        super(plugin);
-        Permission otherPerm = new Permission("multiverse.core.spawn.other", "Teleports another player to the spawn of the world they are in.", PermissionDefault.OP);
-        this.setName("Spawn");
-        this.setCommandUsage("/mv spawn" + ChatColor.GOLD + " [PLAYER]");
-        this.setArgRange(0, 1);
-        this.addKey("mvspawn");
-        this.addKey("mv spawn");
-        this.addKey("mvs");
-        this.setPermission("multiverse.core.spawn.self", "Teleports you to the Spawn Point of the world you are in.", PermissionDefault.OP);
-        this.addAdditonalPermission(otherPerm);
-        
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-        // If a persons name was passed in, you must be A. the console, or B have permissions
-        if (args.size() == 1) {
-            if (player != null && !this.plugin.getPermissions().hasPermission(player, "multiverse.core.spawn.other", true)) {
-                sender.sendMessage("You don't have permission to teleport another player to spawn. (multiverse.core.spawn.other)");
-                return;
-            }
-            Player target = this.plugin.getServer().getPlayer(args.get(0));
-            if (target != null) {
-                target.sendMessage("Teleporting to this world's spawn...");
-                target.teleport(target.getWorld().getSpawnLocation());
-                if (player != null) {
-                    target.sendMessage("You were teleported by: " + ChatColor.YELLOW + player.getName());
-                } else {
-                    target.sendMessage("You were teleported by: " + ChatColor.LIGHT_PURPLE + "the console");
-                }
-            } else {
-                sender.sendMessage(args.get(0) + " is not logged on right now!");
-            }
-        } else {
-            if (player != null && !this.plugin.getPermissions().hasPermission(player, "multiverse.core.spawn.self", true)) {
-                sender.sendMessage("You don't have permission to teleport yourself to spawn. (multiverse.core.spawn.self)");
-                return;
-            }
-            if (player != null) {
-                player.sendMessage("Teleporting to this world's spawn...");
-                player.teleport(player.getWorld().getSpawnLocation());
-            } else {
-                sender.sendMessage("From the console, you must provide a PLAYER.");
-            }
-        }
-    }
-}

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

@@ -1,118 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MVTeleport;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.utils.MVDestination;
-import com.onarandombox.utils.DestinationFactory;
-import com.onarandombox.utils.InvalidDestination;
-
-public class TeleportCommand extends MultiverseCommand {
-    private MVTeleport playerTeleporter;
-
-    public TeleportCommand(MultiverseCore plugin) {
-        super(plugin);
-        Permission self = new Permission("multiverse.core.tp.self", "Allows you to teleport yourself to other worlds.", PermissionDefault.OP);
-        Permission other = new Permission("multiverse.core.tp.other", "Allows you to teleport others to other worlds.", PermissionDefault.OP);
-
-        this.setName("Teleport");
-        this.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {WORLD}");
-        this.setArgRange(1, 2);
-        this.addKey("mvtp");
-        this.addKey("mv tp");
-        this.playerTeleporter = new MVTeleport(this.plugin);
-        // setPermission in some for is REQUIRED
-        this.setPermission(self);
-        this.addAdditonalPermission(other);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // Check if the command was sent from a Player.
-        Player teleporter = null;
-        Player teleportee = null;
-        if (sender instanceof Player) {
-            teleporter = (Player) sender;
-        }
-
-        String destinationName;
-
-        if (args.size() == 2) {
-            if (teleporter != null && !this.plugin.getPermissions().hasPermission(sender, "multiverse.core.tp.other", true)) {
-                sender.sendMessage("You don't have permission to teleport another player. (multiverse.core.tp.other)");
-                return;
-            }
-            teleportee = this.plugin.getServer().getPlayer(args.get(0));
-            if (teleportee == null) {
-                sender.sendMessage("Sorry, I couldn't find player: " + args.get(0));
-                return;
-            }
-            destinationName = args.get(1);
-
-        } else {
-            destinationName = args.get(0);
-            if (teleporter != null && !this.plugin.getPermissions().hasPermission(sender, "multiverse.core.tp.self", true)) {
-                sender.sendMessage("You don't have permission to teleport yourself between worlds. (multiverse.core.tp.self)");
-                return;
-            }
-
-            if (!(sender instanceof Player)) {
-                sender.sendMessage("From the console, you must specifiy a player to teleport");
-                return;
-            }
-            teleporter = (Player) sender;
-            teleportee = (Player) sender;
-        }
-
-        DestinationFactory df = this.plugin.getDestinationFactory();// .parseDestination(worldName, (MultiverseCore) this.plugin);
-        MVDestination d = df.getDestination(destinationName);
-        if (d != null && d instanceof InvalidDestination) {
-            sender.sendMessage("Multiverse does not know how to take you to: " + ChatColor.RED + destinationName);
-            return;
-        }
-
-        if (teleporter != null && !this.plugin.getPermissions().canEnterDestination(teleporter, d)) {
-            if (teleportee.equals(teleporter)) {
-                teleporter.sendMessage("Doesn't look like you're allowed to go " + ChatColor.RED + "there...");
-            } else {
-                teleporter.sendMessage("Doesn't look like you're allowed to send " + ChatColor.GOLD + teleportee.getName() + ChatColor.WHITE + " to " + ChatColor.RED + "there...");
-            }
-            return;
-        } else if (teleporter != null && !this.plugin.getPermissions().canTravelFromLocation(teleporter, d.getLocation(teleportee))) {
-            if (teleportee.equals(teleporter)) {
-                teleporter.sendMessage("DOH! Doesn't look like you can get to " + ChatColor.RED + "THERE from " + ChatColor.GREEN + teleporter.getWorld().getName());
-            } else {
-                teleporter.sendMessage("DOH! Doesn't look like " + ChatColor.GREEN + teleporter.getWorld().getName() + " can get to " + ChatColor.RED + "THERE from where they are...");
-            }
-            return;
-        }
-        Location l = d.getLocation(teleportee);
-        if (l == null) {
-            teleporter.sendMessage("Sorry Boss, I tried everything, but just couldn't teleport ya there!");
-            return;
-        }
-        if (!this.playerTeleporter.safelyTeleport(teleportee, l)) {
-            Class<?> paramTypes[] = { Player.class, Location.class };
-            List<Object> items = new ArrayList<Object>();
-            items.add(teleportee);
-            items.add(l);
-            String player = "you";
-            if (!teleportee.equals(teleporter)) {
-                player = teleportee.getName();
-            }
-            String message = ChatColor.GREEN + "Multiverse" + ChatColor.WHITE + " did not teleport " + ChatColor.AQUA + player + ChatColor.WHITE + " to " + ChatColor.DARK_AQUA + d.getName() + ChatColor.WHITE + " because it was unsafe.";
-            this.plugin.getCommandHandler().queueCommand(sender, "mvteleport", "teleportPlayer", items, paramTypes, message, "Would you like to try anyway?", "", "", 15);
-        } else {
-            teleportee.setVelocity(d.getVelocity());
-        }
-    }
-}

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

@@ -1,31 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class UnloadCommand extends MultiverseCommand {
-
-    public UnloadCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Unload World");
-        this.setCommandUsage("/mv unload" + ChatColor.GREEN + " {WORLD}");
-        this.setArgRange(1, 1);
-        this.addKey("mvunload");
-        this.addKey("mv unload");
-        this.setPermission("multiverse.core.unload", "Unloads a world from Multiverse. This does NOT remove the world folder. This does NOT remove it from the config file.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        if (this.plugin.removeWorldFromList(args.get(0))) {
-            sender.sendMessage("World Unloaded!");
-        } else {
-            sender.sendMessage("Error trying to unload world!");
-        }
-    }
-}

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

@@ -1,100 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.event.MVVersionRequestEvent;
-
-public class VersionCommand extends MultiverseCommand {
-
-    public VersionCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Multiverse Version");
-        this.setCommandUsage("/mv version " + ChatColor.GOLD + "-p");
-        this.setArgRange(0, 1);
-        this.addKey("mv version");
-        this.addKey("mvv");
-        this.addKey("mvversion");
-        this.setPermission("multiverse.core.version", "Dumps version info to the console, optionally to pastebin.com with a -p.", PermissionDefault.TRUE);
-    }
-
-    private String pasteBinBuffer = "";
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // Check if the command was sent from a Player.
-        if (sender instanceof Player) {
-            sender.sendMessage("Version info dumped to console. Please check your server logs.");
-        }
-
-        logAndAddToPasteBinBuffer("Multiverse-Core Version: " + this.plugin.getDescription().getVersion());
-        logAndAddToPasteBinBuffer("Bukkit Version: " + this.plugin.getServer().getVersion());
-        logAndAddToPasteBinBuffer("Loaded Worlds: " + this.plugin.getMVWorlds().size());
-        logAndAddToPasteBinBuffer("Multiverse Plugins Loaded: " + this.plugin.getPluginCount());
-        logAndAddToPasteBinBuffer("Economy being used: " + this.plugin.getBank().getEconUsed());
-        logAndAddToPasteBinBuffer("Permissions Plugin: " + this.plugin.getPermissions().getType());
-        logAndAddToPasteBinBuffer("Dumping Config Values: (version " + this.plugin.getConfig().getString("version", "NOT SET") + ")");
-        logAndAddToPasteBinBuffer("messagecooldown: " + this.plugin.getConfig().getString("messagecooldown", "NOT SET"));
-        logAndAddToPasteBinBuffer("teleportcooldown: " + this.plugin.getConfig().getString("teleportcooldown", "NOT SET"));
-        logAndAddToPasteBinBuffer("worldnameprefix: " + this.plugin.getConfig().getString("worldnameprefix", "NOT SET"));
-        logAndAddToPasteBinBuffer("opfallback: " + this.plugin.getConfig().getString("opfallback", "NOT SET"));
-        logAndAddToPasteBinBuffer("disableautoheal: " + this.plugin.getConfig().getString("disableautoheal", "NOT SET"));
-        logAndAddToPasteBinBuffer("fakepvp: " + this.plugin.getConfig().getString("fakepvp", "NOT SET"));
-        logAndAddToPasteBinBuffer("Special Code: FRN001");
-        
-        MVVersionRequestEvent versionEvent = new MVVersionRequestEvent(pasteBinBuffer);
-        this.plugin.getServer().getPluginManager().callEvent(versionEvent);
-        pasteBinBuffer = versionEvent.getPasteBinBuffer();
-        
-        if (args.size() == 1 && args.get(0).equalsIgnoreCase("-p")) {
-            String pasteBinUrl = postToPasteBin();
-            sender.sendMessage("Version info dumped here: " + ChatColor.GREEN + pasteBinUrl);
-            this.plugin.log(Level.INFO, "Version info dumped here: " + pasteBinUrl);
-        }
-    }
-
-    private void logAndAddToPasteBinBuffer(String string) {
-        this.pasteBinBuffer += "[Multiverse-Core] " + string + "\n";
-        this.plugin.log(Level.INFO, string);
-    }
-
-    private String postToPasteBin() {
-        try {
-            String data = URLEncoder.encode("api_dev_key", "UTF-8") + "=" + URLEncoder.encode("33ab32380506d99d872b69d35dc9d007", "UTF-8");
-            data += "&" + URLEncoder.encode("api_option", "UTF-8") + "=" + URLEncoder.encode("paste", "UTF-8");
-            data += "&" + URLEncoder.encode("api_paste_code", "UTF-8") + "=" + URLEncoder.encode(this.pasteBinBuffer, "UTF-8");
-
-            URL url = new URL("http://pastebin.com/api/api_post.php");
-            URLConnection conn = url.openConnection();
-            conn.setDoOutput(true);
-            OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
-            wr.write(data);
-            wr.flush();
-
-            BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            String line;
-            String pasteBinUrl = "";
-            while ((line = rd.readLine()) != null) {
-                pasteBinUrl = line;
-            }
-            wr.close();
-            rd.close();
-            return pasteBinUrl;
-        } catch (Exception e) {
-            System.out.print(e);
-            return "Error Posting to pastebin.com";
-        }
-    }
-}

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

@@ -1,88 +0,0 @@
-package com.onarandombox.MultiverseCore.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class WhoCommand extends MultiverseCommand {
-
-    public WhoCommand(MultiverseCore plugin) {
-        super(plugin);
-        this.setName("Who?");
-        this.setCommandUsage("/mv who" + ChatColor.GOLD + " [WORLD]");
-        this.setArgRange(0, 1);
-        this.addKey("mv who");
-        this.addKey("mvw");
-        this.addKey("mvwho");
-        this.setPermission("multiverse.core.list.who", "States who is in what world.", PermissionDefault.OP);
-    }
-
-    @Override
-    public void runCommand(CommandSender sender, List<String> args) {
-        // If this command was sent from a Player then we need to check Permissions
-        Player p = null;
-        // By default, show all from the console
-        boolean showAll = true;
-        if (sender instanceof Player) {
-            p = (Player) sender;
-            showAll = false;
-        }
-
-        List<MVWorld> worlds = new ArrayList<MVWorld>();
-
-        if (args.size() > 0) {
-            if (args.get(0).equalsIgnoreCase("--all") || args.get(0).equalsIgnoreCase("-a")) {
-                showAll = true;
-                worlds = new ArrayList<MVWorld>(this.plugin.getMVWorlds());
-            } else if (this.plugin.isMVWorld(args.get(0))) {
-                worlds.add(this.plugin.getMVWorld(args.get(0)));
-            } else {
-                sender.sendMessage(ChatColor.RED + "World does not exist");
-                return;
-            }
-        } else {
-            worlds = new ArrayList<MVWorld>(this.plugin.getMVWorlds());
-        }
-
-        if (worlds.size() == 0) {
-            sender.sendMessage("Multiverse does not know about any of your worlds :(");
-        } else if (worlds.size() == 1) {
-            sender.sendMessage(ChatColor.AQUA + "--- " + "Players in" + ChatColor.YELLOW + worlds.get(0) + ChatColor.AQUA + " ---");
-        } else {
-            sender.sendMessage(ChatColor.AQUA + "--- There are players in ---");
-        }
-
-        for (MVWorld world : worlds) {
-            if (!(this.plugin.isMVWorld(world.getName()))) {
-                continue;
-            }
-
-            if (p != null && (!this.plugin.getPermissions().canEnterWorld(p, world))) {
-                continue;
-            }
-            List<Player> players = world.getCBWorld().getPlayers();
-
-            String result = "";
-            if (players.size() <= 0 && !showAll) {
-                continue;
-            }
-
-            if (players.size() <= 0) {
-                result = "Empty";
-            } else {
-                for (Player player : players) {
-                    result += player.getName() + " ";
-                }
-            }
-
-            sender.sendMessage(world.getColoredWorldString() + ChatColor.WHITE + " - " + result);
-        }
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.onarandombox.MultiverseCore.configuration;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-public class DefaultConfig {
-
-    public DefaultConfig(File folder, String name, MVConfigMigrator migrator) {
-        File actual = new File(folder, name);
-        if (actual.exists() && migrator.createdDefaults.contains(name)) {
-            actual.delete();
-        }
-        // If defaults have been created, and we're being called again, we should try to migrate
-        if (!actual.exists() && !migrator.migrate(name, folder)) {
-
-            InputStream defConfig = this.getClass().getResourceAsStream("/defaults/" + name);
-            if (defConfig != null) {
-                FileOutputStream newConfig = null;
-
-                try {
-                    newConfig = new FileOutputStream(actual);
-                    byte[] buf = new byte[8192];
-                    int length = 0;
-
-                    while ((length = defConfig.read(buf)) > 0) {
-                        newConfig.write(buf, 0, length);
-                    }
-                    migrator.createdDefaults.add(name);
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                } finally {
-                    try {
-                        if (defConfig != null)
-                            defConfig.close();
-                    } catch (Exception e) {
-                    }
-
-                    try {
-                        if (newConfig != null)
-                            newConfig.close();
-                    } catch (Exception e) {
-
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -1,54 +0,0 @@
-package com.onarandombox.MultiverseCore.configuration;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.bukkit.plugin.Plugin;
-import org.bukkit.util.config.Configuration;
-
-import com.onarandombox.MultiverseCore.LoggablePlugin;
-
-public abstract class MVConfigMigrator {
-    public List<String> createdDefaults = new ArrayList<String>();
-    public abstract boolean migrate(String name, File folder);
-
-    protected final void migrateListItem(Configuration newConfig, Configuration oldConfig, String key, String oldProperty, String newProperty) {
-        List<String> list = Arrays.asList(oldConfig.getString("worlds." + key + oldProperty).split(","));
-        if (list.size() > 0) {
-            if (list.get(0).length() == 0) {
-                list = new ArrayList<String>();
-            }
-        }
-        newConfig.setProperty("worlds." + key + newProperty, list);
-    }
-    
-    protected final File detectMultiverseFolders(File folder, LoggablePlugin mvPlugin) {
-        File oldFolder = null;
-        mvPlugin.log(Level.INFO, "Starting Multiverse Configuration Migrator(MVCM)!");
-        // They still have MV 1 installed! Good!
-        if (mvPlugin.getServer().getPluginManager().getPlugin("MultiVerse") != null) {
-            mvPlugin.log(Level.INFO, "Found MultiVerse 1. Starting Config Migration...");
-            Plugin plugin = mvPlugin.getServer().getPluginManager().getPlugin("MultiVerse");
-            oldFolder = plugin.getDataFolder();
-        } else {
-            // They didn't have MV 1 enabled... let's try and find the folder...
-            File[] folders = folder.getParentFile().listFiles();
-            List<File> folderList = Arrays.asList(folders);
-            for (File f : folderList) {
-                if (f.getName().equalsIgnoreCase("MultiVerse")) {
-                    mvPlugin.log(Level.INFO, "Found the MultiVerse 1 config folder. Starting Config Migration...");
-                    oldFolder = f;
-                }
-            }
-            if (oldFolder == null) {
-                mvPlugin.log(Level.INFO, "Did not find the MV1 Folder. If you did not have MultiVerse 1 installed and this is the FIRST time you're running MV2, this message is GOOD. ");
-                mvPlugin.log(Level.INFO, "If you did, your configs were **NOT** migrated! Go Here: INSERTURLFORHELP");
-                return null;
-            }
-        }
-        return oldFolder;
-    }
-}

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

@@ -1,76 +0,0 @@
-package com.onarandombox.MultiverseCore.configuration;
-
-import java.io.File;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.bukkit.util.config.Configuration;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class MVCoreConfigMigrator extends MVConfigMigrator {
-    private MultiverseCore core;
-
-    public MVCoreConfigMigrator(MultiverseCore core) {
-        this.core = core;
-    }
-
-    public boolean migrate(String name, File folder) {
-        File oldFolder = this.detectMultiverseFolders(folder, core);
-
-        if (name.equalsIgnoreCase("worlds.yml")) {
-            return this.migrateWorlds(name, oldFolder, folder);
-        }
-
-        if (name.equalsIgnoreCase("config.yml")) {
-            return this.migrateMainConfig(name, oldFolder, folder);
-        }
-        return true;
-
-    }
-
-    private boolean migrateWorlds(String name, File oldFolder, File newFolder) {
-        Configuration newConfig = new Configuration(new File(newFolder, "worlds.yml"));
-        this.core.log(Level.INFO, "Trying to migrate worlds.yml...");
-        Configuration oldConfig = new Configuration(new File(oldFolder, "Worlds.yml"));
-        oldConfig.load();
-        List<String> keys = oldConfig.getKeys("worlds");
-        if (keys == null) {
-            this.core.log(Level.SEVERE, "Migration FAILURE!");
-            return false;
-        }
-        for (String key : keys) {
-            newConfig.setProperty("worlds." + key + ".animals.spawn", oldConfig.getProperty("worlds." + key + ".animals"));
-            newConfig.setProperty("worlds." + key + ".monsters.spawn", oldConfig.getProperty("worlds." + key + ".mobs"));
-            newConfig.setProperty("worlds." + key + ".pvp", oldConfig.getProperty("worlds." + key + ".pvp"));
-            newConfig.setProperty("worlds." + key + ".alias.name", oldConfig.getProperty("worlds." + key + ".alias"));
-            newConfig.setProperty("worlds." + key + ".tempspawn", oldConfig.getProperty("worlds." + key + ".spawn"));
-            newConfig.setProperty("worlds." + key + ".entryfee.amount", oldConfig.getProperty("worlds." + key + ".price"));
-            newConfig.setProperty("worlds." + key + ".entryfee.currency", -1);
-            newConfig.setProperty("worlds." + key + ".environment", oldConfig.getProperty("worlds." + key + ".environment"));
-            // Have to convert CSLs to arrays
-            migrateListItem(newConfig, oldConfig, key, ".blockBlacklist", ".blockblacklist");
-            migrateListItem(newConfig, oldConfig, key, ".worldBlacklist", ".worldblacklist");
-        }
-        newConfig.save();
-        this.core.log(Level.INFO, "Migration SUCCESS!");
-        return true;
-    }
-
-    private boolean migrateMainConfig(String name, File oldFolder, File newFolder) {
-        Configuration newConfig = new Configuration(new File(newFolder, "config.yml"));
-        this.core.log(Level.INFO, "Migrating config.yml...");
-        Configuration oldConfig = new Configuration(new File(oldFolder, "MultiVerse.yml"));
-        oldConfig.load();
-        newConfig.setProperty("worldnameprefix", oldConfig.getProperty("prefix"));
-        newConfig.setProperty("messagecooldown", oldConfig.getProperty("alertcooldown"));
-        // Default values:
-        newConfig.setProperty("opfallback", true);
-        newConfig.setProperty("disableautoheal", false);
-        newConfig.setProperty("fakepvp", false);
-        newConfig.setProperty("bedrespawn", true);
-        newConfig.setProperty("version", 2.2);
-        newConfig.save();
-        return true;
-    }
-}

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

@@ -1,23 +0,0 @@
-package com.onarandombox.MultiverseCore.event;
-
-import java.util.List;
-
-import org.bukkit.event.Event;
-
-public class MVConfigMigrateEvent extends Event {
-    private static final long serialVersionUID = 3647950355746345397L;
-    private List<String> configsLoaded;
-
-    public MVConfigMigrateEvent(List<String> configsLoaded) {
-        super("MVConfigMigrate");
-        this.configsLoaded = configsLoaded;
-    }
-    
-    public void addConfig(String config) {
-        this.configsLoaded.add(config);
-    }
-    
-    public List<String> getAllConfigsLoaded() {
-        return this.configsLoaded;
-    }
-}

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

@@ -1,23 +0,0 @@
-package com.onarandombox.MultiverseCore.event;
-
-import java.util.List;
-
-import org.bukkit.event.Event;
-
-public class MVConfigReloadEvent extends Event {
-    private static final long serialVersionUID = 3647950355746345397L;
-    private List<String> configsLoaded;
-
-    public MVConfigReloadEvent(List<String> configsLoaded) {
-        super("MVConfigReload");
-        this.configsLoaded = configsLoaded;
-    }
-    
-    public void addConfig(String config) {
-        this.configsLoaded.add(config);
-    }
-    
-    public List<String> getAllConfigsLoaded() {
-        return this.configsLoaded;
-    }
-}

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

@@ -1,36 +0,0 @@
-package com.onarandombox.MultiverseCore.event;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-
-public class MVRespawnEvent extends Event {
-    private static final long serialVersionUID = -2991894063331856687L;
-    private Player player;
-    private Location location;
-    private String respawnMethod;
-
-
-    public MVRespawnEvent(Location spawningAt, Player p, String respawnMethod) {
-        super("MVRespawn");
-        this.player = p;
-        this.location = spawningAt;
-        this.respawnMethod = respawnMethod;
-    }
-
-    public Player getPlayer() {
-        return this.player;
-    }
-
-    public String getRespawnMethod() {
-        return this.respawnMethod;
-    }
-
-    public Location getPlayersRespawnLocation() {
-        return this.location;
-    }
-
-    public void setRespawnLocation(Location l) {
-        this.location = l;
-    }
-}

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

@@ -1,33 +0,0 @@
-package com.onarandombox.MultiverseCore.event;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-
-import com.onarandombox.utils.MVDestination;
-
-public class MVTeleportEvent extends Event {
-    private static final long serialVersionUID = 854826818438649269L;
-    private Player player;
-    private MVDestination dest;
-    private String teleportString;
-
-
-    public MVTeleportEvent(MVDestination dest, Player p, String teleportString) {
-        super("MVTeleport");
-        this.player = p;
-        this.dest = dest;
-        this.teleportString = teleportString;
-    }
-
-    public Player getPlayer() {
-        return this.player;
-    }
-
-    public String getDestString() {
-        return this.teleportString;
-    }
-
-    public Class<? extends MVDestination> getDestType() {
-        return this.dest.getClass();
-    }
-}

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

@@ -1,19 +0,0 @@
-package com.onarandombox.MultiverseCore.event;
-
-import org.bukkit.event.Event;
-
-public class MVVersionRequestEvent extends Event {
-
-    private String pasteBinBuffer;
-    public MVVersionRequestEvent(String pasteBinBuffer) {
-        super("MVVersion");
-        this.pasteBinBuffer = pasteBinBuffer;
-    }
-
-    public String getPasteBinBuffer() {
-        return this.pasteBinBuffer;
-    }
-    public void setPasteBinBuffer(String buffer) {
-        this.pasteBinBuffer = buffer;
-    }
-}

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

@@ -1,47 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.event.block.BlockListener;
-import org.bukkit.event.block.BlockPhysicsEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-//import org.bukkit.event.block.BlockRightClickEvent;
-
-public class MVBlockListener extends BlockListener {
-
-    MultiverseCore plugin;
-
-    public MVBlockListener(MultiverseCore plugin) {
-        this.plugin = plugin;
-    }
-
-    // public void onBlockRightClicked(BlockRightClickEvent event){
-
-    // }
-
-    @Override
-    public void onBlockDamage(BlockDamageEvent event) {
-
-    }
-
-    @Override
-    public void onBlockPhysics(BlockPhysicsEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
-        int id = event.getChangedTypeId();
-
-        if (id == 90) { // && config.getBoolean("portalanywhere", false)
-            event.setCancelled(true);
-            return;
-        }
-    }
-
-    public void onBlockPlaced(BlockPlaceEvent event) {
-
-    }
-
-}

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

@@ -1,150 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.entity.Animals;
-import org.bukkit.entity.CreatureType;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Ghast;
-import org.bukkit.entity.Monster;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Slime;
-import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityListener;
-import org.bukkit.event.entity.EntityRegainHealthEvent;
-import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
-
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-//import org.bukkit.event.entity.ExplosionPrimedEvent;
-
-public class MVEntityListener extends EntityListener {
-
-    MultiverseCore plugin;
-
-    public MVEntityListener(MultiverseCore plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Event - When a Entity is Damaged, we first sort out whether it is of importance to us, such as EntityVSEntity or EntityVSProjectile. Then we grab the attacked and defender and check if its a player. Then deal with the PVP Aspect.
-     */
-    @Override
-    public void onEntityDamage(EntityDamageEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-        Entity attacker = null;
-        Entity defender = null;
-        if (event instanceof EntityDamageByEntityEvent) {
-            EntityDamageByEntityEvent sub = (EntityDamageByEntityEvent) event;
-            attacker = sub.getDamager();
-            defender = sub.getEntity();
-        } else {
-            return;
-        }
-        if (attacker == null || defender == null) {
-            return;
-        }
-        if (defender instanceof Player) {
-            Player player = (Player) defender;
-            World w = player.getWorld();
-
-            if (!this.plugin.isMVWorld(w.getName())) {
-                // if the world is not handled, we don't care
-                return;
-            }
-            MVWorld world = this.plugin.getMVWorld(w.getName());
-
-            if (attacker != null && attacker instanceof Player) {
-                Player pattacker = (Player) attacker;
-
-                if (!world.getPvp() && this.plugin.getConfig().getBoolean("fakepvp", false)) {
-                    pattacker.sendMessage(ChatColor.RED + "PVP is disabled in this World.");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onEntityRegainHealth(EntityRegainHealthEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-        RegainReason reason = event.getRegainReason();
-        if (reason == RegainReason.REGEN && this.plugin.getConfig().getBoolean("disableautoheal", false)) {
-            event.setCancelled(true);
-            return;
-        }
-    }
-
-    /**
-     * Handle Animal/Monster Spawn settings, seems like a more concrete method than using CraftBukkit.
-     */
-    @Override
-    public void onCreatureSpawn(CreatureSpawnEvent event) {
-
-        // Check to see if the Creature is spawned by a plugin, we don't want to prevent this behaviour.
-        if (event.getSpawnReason() == SpawnReason.CUSTOM) {
-            return;
-        }
-
-        World world = event.getEntity().getWorld();
-        if (event.isCancelled())
-            return;
-
-        // Check if it's a world which we are meant to be managing.
-        if (!(this.plugin.isMVWorld(world.getName())))
-            return;
-
-        CreatureType creature = event.getCreatureType();
-
-        MVWorld mvworld = this.plugin.getMVWorld(world.getName());
-
-        /**
-         * Animal Handling
-         */
-        if (event.getEntity() instanceof Animals) {
-            event.setCancelled(this.shouldWeKillThisCreature(mvworld.getAnimalList(), mvworld.allowAnimalSpawning(), creature.toString().toUpperCase()));
-        }
-        /**
-         * Monster Handling
-         */
-        if (event.getEntity() instanceof Monster || event.getEntity() instanceof Ghast || event.getEntity() instanceof Slime) {
-            event.setCancelled(this.shouldWeKillThisCreature(mvworld.getMonsterList(), mvworld.allowMonsterSpawning(), creature.toString().toUpperCase()));
-        }
-    }
-
-    private boolean shouldWeKillThisCreature(List<String> creatureList, boolean allowCreatureSpawning, String creature) {
-        if (creatureList.isEmpty() && allowCreatureSpawning) {
-            // 1. There are no exceptions and animals are allowed. Save it.
-            return false;
-        } else if (creatureList.isEmpty()) {
-            // 2. There are no exceptions and animals are NOT allowed. Kill it.
-            return true;
-        } else if (creatureList.contains(creature) && allowCreatureSpawning) {
-            // 3. There ARE exceptions and animals ARE allowed. Kill it.
-            return true;
-        } else if (!creatureList.contains(creature.toString().toUpperCase()) && allowCreatureSpawning) {
-            // 4. There ARE exceptions and animals ARE NOT allowed. SAVE it.
-            return false;
-        } else if (creatureList.contains(creature.toString().toUpperCase()) && !allowCreatureSpawning) {
-            // 5. No animals are allowed to be spawned, BUT this one can stay...
-            return false;
-        } else if (!creatureList.contains(creature.toString().toUpperCase()) && !allowCreatureSpawning) {
-            // 6. Animals are NOT allowed to spawn, and this creature is not in the save list... KILL IT
-            return true;
-        }
-        // This code should NEVER execute. I just left the verbose conditions in right now.
-        return false;
-    }
-
-}

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

@@ -1,135 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.event.player.PlayerChatEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerListener;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
-
-import com.fernferret.allpay.GenericBank;
-import com.onarandombox.MultiverseCore.MVTeleport;
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.event.MVRespawnEvent;
-
-public class MVPlayerListener extends PlayerListener {
-    MultiverseCore plugin;
-    MVTeleport mvteleporter;
-
-    public MVPlayerListener(MultiverseCore plugin) {
-        this.plugin = plugin;
-    }
-
-    // Taken out until we do persistance.
-    // @Override
-    // public void onPlayerBedLeave(PlayerBedLeaveEvent event) {
-    // Location bedLoc = event.getBed().getLocation();
-    // bedLoc = this.plugin.getTeleporter().getSafeBedDestination(bedLoc);
-    // this.plugin.getPlayerSession(event.getPlayer()).setRespawnLocation(bedLoc);
-    // event.getPlayer().sendMessage("You should come back here when you type '/mv sleep'!");
-    // }
-
-    @Override
-    public void onPlayerChat(PlayerChatEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-        // Check whether the Server is set to prefix the chat with the World name. If not we do nothing, if so we need to check if the World has an Alias.
-        if (this.plugin.getConfig().getBoolean("worldnameprefix", true)) {
-            this.plugin.getConfig().save();
-            String world = event.getPlayer().getWorld().getName();
-            String prefix = "";
-            // If we're not a MV world, don't do anything
-            if (!this.plugin.isMVWorld(world)) {
-                return;
-            }
-            MVWorld mvworld = this.plugin.getMVWorld(world);
-            prefix = mvworld.getColoredWorldString();
-            String format = event.getFormat();
-            event.setFormat("[" + prefix + "]" + format);
-        }
-    }
-
-    @Override
-    public void onPlayerRespawn(PlayerRespawnEvent event) {
-        // TODO: Reimplement bed respawning, needs to be a way to persist the bed location or something otherwise it's not very effective.
-
-        World world = event.getPlayer().getWorld();
-
-        // If it's not a World MV manages we stop.
-        if (!this.plugin.isMVWorld(world.getName())) {
-            return;
-        }
-
-        // Get the MVWorld
-        MVWorld mvWorld = this.plugin.getMVWorld(world.getName());
-        // Get the instance of the World the player should respawn at.
-        MVWorld respawnWorld = null;
-        if (this.plugin.isMVWorld(mvWorld.getRespawnToWorld())) {
-            respawnWorld = this.plugin.getMVWorld(mvWorld.getRespawnToWorld());
-        }
-
-        // If it's null then it either means the World doesn't exist or the value is blank, so we don't handle it.
-        if (respawnWorld == null) {
-            return;
-        }
-
-        Location respawnLocation = respawnWorld.getCBWorld().getSpawnLocation();
-
-        MVRespawnEvent respawnEvent = new MVRespawnEvent(respawnLocation, event.getPlayer(), "compatability");
-        this.plugin.getServer().getPluginManager().callEvent(respawnEvent);
-        event.setRespawnLocation(respawnEvent.getPlayersRespawnLocation());
-    }
-
-    @Override
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        if (this.plugin.getMVWorlds().size() == 0 && this.plugin.getPermissions().hasPermission(event.getPlayer(), "multiverse.core.import", true)) {
-            event.getPlayer().sendMessage("You don't have any worlds imported into Multiverse!");
-            event.getPlayer().sendMessage("You can import your current worlds with " + ChatColor.AQUA + "/mvimport");
-            event.getPlayer().sendMessage("or you can create new ones with " + ChatColor.GOLD + "/mvcreate");
-            event.getPlayer().sendMessage("If you just wanna see all of the Multiverse Help, type: " + ChatColor.GREEN + "/mv");
-        }
-    }
-
-    @Override
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        this.plugin.removePlayerSession(event.getPlayer());
-    }
-
-    @Override
-    public void onPlayerTeleport(PlayerTeleportEvent event) {
-        MVWorld fromWorld = this.plugin.getMVWorld(event.getTo().getWorld().getName());
-        MVWorld toWorld = this.plugin.getMVWorld(event.getTo().getWorld().getName());
-        if (toWorld != null) {
-            if (!this.plugin.getPermissions().canEnterWorld(event.getPlayer(), toWorld)) {
-                event.getPlayer().sendMessage("You don't have access to go here...");
-                event.setCancelled(true);
-                return;
-            }
-        }
-        if (fromWorld != null) {
-            if (fromWorld.getWorldBlacklist().contains(toWorld.getName())) {
-                event.getPlayer().sendMessage("You don't have access to go to " + toWorld.getColoredWorldString() + " from " + fromWorld.getColoredWorldString());
-                event.setCancelled(true);
-                return;
-            }
-        }
-        // Only check payments if it's a different world:
-        if (!event.getTo().getWorld().equals(event.getFrom().getWorld())) {
-            // If the player does not have to pay, return now.
-            if(toWorld.isExempt(event.getPlayer())) {
-                return;
-            }
-            GenericBank bank = plugin.getBank();
-            if (!bank.hasEnough(event.getPlayer(), toWorld.getPrice(), toWorld.getCurrency(), "You need " + bank.getFormattedAmount(toWorld.getPrice(), toWorld.getCurrency()) + " to enter " + toWorld.getColoredWorldString())) {
-                event.setCancelled(true);
-            } else {
-                bank.pay(event.getPlayer(), toWorld.getPrice(), toWorld.getCurrency());
-            }
-        }
-    }
-}

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

@@ -1,61 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import java.util.Arrays;
-import java.util.logging.Level;
-
-import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.event.server.PluginEnableEvent;
-import org.bukkit.event.server.ServerListener;
-
-import com.fernferret.allpay.AllPay;
-import com.nijikokun.bukkit.Permissions.Permissions;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class MVPluginListener extends ServerListener {
-
-    MultiverseCore plugin;
-
-    public MVPluginListener(MultiverseCore plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Keep an eye out for Plugins which we can utilize.
-     */
-    @Override
-    public void onPluginEnable(PluginEnableEvent event) {
-        /**
-         * Check to see if Permissions was just enabled
-         */
-        if (event.getPlugin().getDescription().getName().equals("Permissions")) {
-            this.plugin.getPermissions().setPermissions(((Permissions) this.plugin.getServer().getPluginManager().getPlugin("Permissions")).getHandler());
-            this.plugin.log(Level.INFO, "- Attached to Permissions");
-        }
-        // Let AllPay handle all econ plugin loadings, only go for econ plugins we support
-        if (Arrays.asList(AllPay.validEconPlugins).contains(event.getPlugin().getDescription().getName())) {
-            this.plugin.setBank(this.plugin.getBanker().loadEconPlugin());
-        }
-        if (event.getPlugin().getDescription().getName().equals("MultiVerse")) {
-            if (event.getPlugin().isEnabled()) {
-                this.plugin.getServer().getPluginManager().disablePlugin(event.getPlugin());
-                this.plugin.log(Level.WARNING, "I just disabled the old version of Multiverse for you. You should remove the JAR now, your configs have been migrated.");
-            }
-        }
-    }
-
-    /**
-     * We'll check if any of the plugins we rely on decide to Disable themselves.
-     */
-    @Override
-    public void onPluginDisable(PluginDisableEvent event) {
-        /**
-         * Check to see if Permissions just disabled.
-         */
-        if (event.getPlugin().getDescription().getName().equals("Permissions")) {
-            this.plugin.log(Level.INFO, "Permissions disabled");
-            this.plugin.getPermissions().setPermissions(null);
-        }
-        // TODO: Disable econ when it disables.
-    }
-
-}

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

@@ -1,36 +0,0 @@
-package com.onarandombox.MultiverseCore.listeners;
-
-import org.bukkit.event.weather.ThunderChangeEvent;
-import org.bukkit.event.weather.WeatherChangeEvent;
-import org.bukkit.event.weather.WeatherListener;
-
-import com.onarandombox.MultiverseCore.MVWorld;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class MVWeatherListener extends WeatherListener {
-    private MultiverseCore plugin;
-
-    public MVWeatherListener(MultiverseCore plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public void onWeatherChange(WeatherChangeEvent event) {
-
-        MVWorld world = this.plugin.getMVWorld(event.getWorld().getName());
-        if (world != null) {
-            // If it's going to start raining and we have weather disabled
-            event.setCancelled((event.toWeatherState() && !world.getWeatherEnabled()));
-        }
-    }
-
-    @Override
-    public void onThunderChange(ThunderChangeEvent event) {
-
-        MVWorld world = this.plugin.getMVWorld(event.getWorld().getName());
-        if (world != null) {
-            // If it's going to start raining and we have weather disabled
-            event.setCancelled((event.toThunderState() && !world.getWeatherEnabled()));
-        }
-    }
-}

src/main/java/com/onarandombox/utils/BlockSafety.java

@@ -1,188 +0,0 @@
-package com.onarandombox.utils;
-
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Minecart;
-import org.bukkit.entity.Vehicle;
-
-public class BlockSafety {
-    /**
-     * This function checks whether the block at the given coordinates are above air or not.
-     * 
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     * @return
-     */
-    public boolean isBlockAboveAir(Location l) {
-        Location downOne = new Location(l.getWorld(), l.getX(), l.getY(), l.getZ());
-        downOne.setY(downOne.getY() - 1);
-        return (downOne.getBlock().getType() == Material.AIR);
-    }
-
-    public boolean blockIsNotSafe(World world, double x, double y, double z) {
-        Location l = new Location(world, x, y, z);
-        return !playerCanSpawnHereSafely(l);
-    }
-
-    /**
-     * This function checks whether the block at the coordinates given is safe or not by checking for Laval/Fire/Air etc. This also ensures there is enough space for a player to spawn!
-     * 
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     * @return
-     */
-    public boolean playerCanSpawnHereSafely(Location l) {
-        Location actual = l.clone();
-        Location upOne = l.clone();
-        Location downOne = l.clone();
-        upOne.setY(upOne.getY() + 1);
-        downOne.setY(downOne.getY() - 1);
-
-        if (this.isSolidBlock(actual.getBlock().getType()) || this.isSolidBlock(upOne.getBlock().getType())) {
-            return false;
-        }
-
-        if (downOne.getBlock().getType() == Material.LAVA || downOne.getBlock().getType() == Material.STATIONARY_LAVA) {
-            return false;
-        }
-
-        if (downOne.getBlock().getType() == Material.FIRE) {
-            return false;
-        }
-
-        if (isBlockAboveAir(actual)) {
-            return this.hasTwoBlocksofWaterBelow(actual);
-        }
-        return true;
-    }
-
-    /**
-     * If someone has a better way of this... Please either tell us, or submit a pull request!
-     * 
-     * @param type
-     * @return
-     */
-    private boolean isSolidBlock(Material type) {
-        switch (type) {
-            case AIR:
-                return false;
-            case SNOW:
-                return false;
-            case TRAP_DOOR:
-                return false;
-            case TORCH:
-                return false;
-            case YELLOW_FLOWER:
-                return false;
-            case RED_ROSE:
-                return false;
-            case RED_MUSHROOM:
-                return false;
-            case BROWN_MUSHROOM:
-                return false;
-            case REDSTONE:
-                return false;
-            case REDSTONE_WIRE:
-                return false;
-            case RAILS:
-                return false;
-            case POWERED_RAIL:
-                return false;
-            case REDSTONE_TORCH_ON:
-                return false;
-            case REDSTONE_TORCH_OFF:
-                return false;
-            case DEAD_BUSH:
-                return false;
-            case SAPLING:
-                return false;
-            case STONE_BUTTON:
-                return false;
-            case LEVER:
-                return false;
-            case LONG_GRASS:
-                return false;
-            case PORTAL:
-                return false;
-            case STONE_PLATE:
-                return false;
-            case WOOD_PLATE:
-                return false;
-            case SEEDS:
-                return false;
-            case SUGAR_CANE_BLOCK:
-                return false;
-            case WALL_SIGN:
-                return false;
-            case SIGN_POST:
-                return false;
-        }
-        return true;
-    }
-
-    public boolean isEntitiyOnTrack(Entity e, Location l) {
-        Material currentBlock = l.getBlock().getType();
-        return (currentBlock == Material.POWERED_RAIL || currentBlock == Material.DETECTOR_RAIL || currentBlock == Material.RAILS);
-    }
-
-    public void showDangers(Location l) {
-        Location actual = new Location(l.getWorld(), l.getX(), l.getY(), l.getZ());
-        Location upOne = new Location(l.getWorld(), l.getX(), l.getY(), l.getZ());
-        Location downOne = new Location(l.getWorld(), l.getX(), l.getY(), l.getZ());
-        upOne.setY(upOne.getY() + 1);
-        downOne.setY(downOne.getY() - 1);
-
-        System.out.print("Location Up:   " + upOne.getBlock().getType());
-        System.out.print("               " + upOne);
-        System.out.print("Location:      " + actual.getBlock().getType());
-        System.out.print("               " + actual);
-        System.out.print("Location Down: " + downOne.getBlock().getType());
-        System.out.print("               " + downOne);
-    }
-    /**
-     * Checks recursively below location L for 2 blocks of water
-     * @param l
-     * @return
-     */
-    public boolean hasTwoBlocksofWaterBelow(Location l) {
-        if(l.getBlockY() < 0) {
-            return false;
-        }
-        Location oneBelow = l.clone();
-        oneBelow.subtract(0, 1, 0);
-        if(oneBelow.getBlock().getType() == Material.WATER || oneBelow.getBlock().getType() == Material.STATIONARY_WATER) {
-            Location twoBelow = oneBelow.clone();
-            twoBelow.subtract(0, 1, 0);
-            return (oneBelow.getBlock().getType() == Material.WATER || oneBelow.getBlock().getType() == Material.STATIONARY_WATER);
-        }
-        if(oneBelow.getBlock().getType() != Material.AIR) {
-            return false;
-        }
-        return hasTwoBlocksofWaterBelow(oneBelow);
-    }
-    
-    public boolean canSpawnCartSafely(Minecart cart) {
-        
-        if(this.isBlockAboveAir(cart.getLocation())) {
-            return true;
-        }
-        if(this.isEntitiyOnTrack(cart, LocationManipulation.getNextBlock(cart))) {
-           return true; 
-        }
-        return false;
-    }
-    
-    public boolean canSpawnVehicleSafely(Vehicle vehicle) {
-        if(this.isBlockAboveAir(vehicle.getLocation())) {
-            return true;
-        }
-        return false;
-    }
-
-}

src/main/java/com/onarandombox/utils/CannonDestination.java

@@ -1,170 +0,0 @@
-package com.onarandombox.utils;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class CannonDestination implements MVDestination {
-    private final String coordRegex = "(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*)";
-    private boolean isValid;
-    private Location location;
-    private double speed;
-
-    public Vector getVelocity() {
-        double pitchRadians = Math.toRadians(location.getPitch());
-        double yawRadians = Math.toRadians(location.getYaw());
-        double x = Math.sin(yawRadians) * speed * -1;
-        double y = Math.sin(pitchRadians) * speed * -1;
-        double z = Math.cos(yawRadians) * speed;
-        // Account for the angle they were pointed, and take away velocity
-        x = Math.cos(pitchRadians) * x;
-        z = Math.cos(pitchRadians) * z;
-        return new Vector(x, y, z);
-    }
-
-    @Override
-    public String getIdentifer() {
-        return "ca";
-    }
-
-    @Override
-    public boolean isThisType(JavaPlugin plugin, String destination) {
-        if (!(plugin instanceof MultiverseCore)) {
-            return false;
-        }
-        List<String> parsed = Arrays.asList(destination.split(":"));
-        // NEED ca:world:x,y,z:pitch:yaw:speed
-        // so basically 6
-        if (parsed.size() != 6) {
-            return false;
-        }
-        // If it's not an Cannon type
-        if (!parsed.get(0).equalsIgnoreCase("ca")) {
-            return false;
-        }
-
-        // If it's not a MV world
-        if (!((MultiverseCore) plugin).isMVWorld(parsed.get(1))) {
-            return false;
-        }
-        // Verify X,Y,Z are numbers
-        if (!parsed.get(2).matches(coordRegex)) {
-            return false;
-        }
-
-        try {
-            Float.parseFloat(parsed.get(3));
-            Float.parseFloat(parsed.get(4));
-            Float.parseFloat(parsed.get(5));
-        } catch (NumberFormatException e) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public Location getLocation(Entity e) {
-        return this.location;
-    }
-
-    @Override
-    public boolean isValid() {
-        return this.isValid;
-    }
-
-    @Override
-    public void setDestination(JavaPlugin plugin, String dest) {
-        if (!(plugin instanceof MultiverseCore)) {
-            return;
-        }
-        List<String> parsed = Arrays.asList(dest.split(":"));
-        // Need at least: e:world:x,y,z
-        // OR e:world:x,y,z:pitch:yaw
-        // so basically 3 or 5
-        if (parsed.size() != 6) {
-            this.isValid = false;
-            return;
-        }
-        if (!parsed.get(0).equalsIgnoreCase(this.getIdentifer())) {
-            this.isValid = false;
-            return;
-        }
-
-        if (!((MultiverseCore) plugin).isMVWorld(parsed.get(1))) {
-            this.isValid = false;
-            return;
-        }
-
-        this.location = new Location(((MultiverseCore) plugin).getMVWorld(parsed.get(1)).getCBWorld(), 0, 0, 0);
-
-        if (!parsed.get(2).matches(this.coordRegex)) {
-            this.isValid = false;
-            return;
-        }
-        double[] coords = new double[3];
-        String[] coordString = parsed.get(2).split(",");
-        for (int i = 0; i < 3; i++) {
-            try {
-                coords[i] = Double.parseDouble(coordString[i]);
-            } catch (NumberFormatException e) {
-                this.isValid = false;
-                return;
-            }
-        }
-        this.location.setX(coords[0]);
-        this.location.setY(coords[1]);
-        this.location.setZ(coords[2]);
-
-        try {
-            this.location.setPitch(Float.parseFloat(parsed.get(3)));
-            this.location.setYaw(Float.parseFloat(parsed.get(4)));
-            this.speed = Math.abs(Float.parseFloat(parsed.get(5)));
-        } catch (NumberFormatException e) {
-            this.isValid = false;
-            return;
-        }
-
-        this.isValid = true;
-
-    }
-
-    @Override
-    public String getType() {
-        return "Cannon!";
-    }
-
-    @Override
-    public String getName() {
-        return "Cannon (" + this.location.getX() + ", " + this.location.getY() + ", " + this.location.getZ() + ":" +
-                this.location.getPitch() + ":" + this.location.getYaw() + ":" + this.speed + ")";
-
-    }
-
-    public void setDestination(Location location, double speed) {
-        if (location != null) {
-            this.location = location;
-            this.speed = Math.abs(speed);
-            this.isValid = true;
-        }
-        this.isValid = false;
-    }
-
-    @Override
-    public String toString() {
-        if (isValid) {
-            return "ca:" + location.getWorld().getName() + ":" + location.getX() + "," + location.getY() + "," + location.getZ() + ":" + location.getPitch() + ":" + location.getYaw() + ":" + this.speed;
-        }
-        return "i:Invalid Destination";
-    }
-
-    @Override
-    public String getRequiredPermission() {
-        return "multiverse.access." + this.location.getWorld().getName();
-    }
-}

src/main/java/com/onarandombox/utils/DebugLog.java

@@ -1,82 +0,0 @@
-package com.onarandombox.utils;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.logging.FileHandler;
-import java.util.logging.Formatter;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-
-public class DebugLog {
-
-    private FileHandler fh;
-    private Logger log;
-
-    /**
-     * Creates a new debug logger.
-     *
-     * @param logger The name of the logger.
-     * @param file   The file to log to.
-     */
-    public DebugLog(String logger, String file) {
-        this.log = Logger.getLogger(logger);
-
-        try {
-            this.fh = new FileHandler(file, true);
-            this.log.setUseParentHandlers(false);
-            for (Handler handler : this.log.getHandlers()) {
-                this.log.removeHandler(handler);
-            }
-            this.log.addHandler(this.fh);
-            this.log.setLevel(Level.ALL);
-            this.fh.setFormatter(new LogFormatter());
-        } catch (SecurityException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Log a message at a certain level
-     *
-     * @param level
-     * @param msg
-     */
-    public void log(Level level, String msg) {
-        this.log.log(level, msg);
-    }
-
-    private class LogFormatter extends Formatter {
-        private final SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        @Override
-        public String format(LogRecord record) {
-            StringBuilder builder = new StringBuilder();
-            Throwable ex = record.getThrown();
-
-            builder.append(this.date.format(record.getMillis()));
-            builder.append(" [");
-            builder.append(record.getLevel().getLocalizedName().toUpperCase());
-            builder.append("] ");
-            builder.append(record.getMessage());
-            builder.append('\n');
-
-            if (ex != null) {
-                StringWriter writer = new StringWriter();
-                ex.printStackTrace(new PrintWriter(writer));
-                builder.append(writer);
-            }
-
-            return builder.toString();
-        }
-    }
-
-    public void close() {
-        this.fh.close();
-    }
-}

src/main/java/com/onarandombox/utils/DestinationFactory.java

@@ -1,46 +0,0 @@
-package com.onarandombox.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class DestinationFactory {
-    private MultiverseCore plugin;
-    private Map<String, Class<? extends MVDestination>> destList;
-
-    public DestinationFactory(MultiverseCore plugin) {
-        this.plugin = plugin;
-        this.destList = new HashMap<String, Class<? extends MVDestination>>();
-    }
-
-    public MVDestination getDestination(String dest) {
-        String idenChar = "";
-        if (dest.split(":").length > 1) {
-            idenChar = dest.split(":")[0];
-        }
-
-        if (this.destList.containsKey(idenChar)) {
-            Class<? extends MVDestination> myClass = this.destList.get(idenChar);
-            try {
-                MVDestination mydest = myClass.newInstance();
-                if (!mydest.isThisType((MultiverseCore) this.plugin, dest)) {
-                    return new InvalidDestination();
-                }
-                mydest.setDestination(this.plugin, dest);
-                return mydest;
-            } catch (InstantiationException e) {
-            } catch (IllegalAccessException e) {
-            }
-        }
-        return new InvalidDestination();
-    }
-
-    public boolean registerDestinationType(Class<? extends MVDestination> c, String identifier) {
-        if (this.destList.containsKey(identifier)) {
-            return false;
-        }
-        this.destList.put(identifier, c);
-        return true;
-    }
-}

src/main/java/com/onarandombox/utils/ExactDestination.java

@@ -1,165 +0,0 @@
-package com.onarandombox.utils;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-import com.onarandombox.MultiverseCore.MultiverseCore;
-
-public class ExactDestination implements MVDestination {
-    private final String coordRegex = "(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*)";
-    private boolean isValid;
-    private Location location;
-
-    @Override
-    public String getIdentifer() {
-        return "e";
-    }
-    
-    public Vector getVelocity() {
-        return new Vector(0,0,0);
-    }
-
-    @Override
-    public boolean isThisType(JavaPlugin plugin, String destination) {
-        if (!(plugin instanceof MultiverseCore)) {
-            return false;
-        }
-        List<String> parsed = Arrays.asList(destination.split(":"));
-        // Need at least: e:world:x,y,z
-        // OR e:world:x,y,z:pitch:yaw
-        // so basically 3 or 5
-        if (!(parsed.size() == 3 || parsed.size() == 5)) {
-            return false;
-        }
-        // If it's not an Exact type
-        if (!parsed.get(0).equalsIgnoreCase("e")) {
-            return false;
-        }
-
-        // If it's not a MV world
-        if (!((MultiverseCore) plugin).isMVWorld(parsed.get(1))) {
-            return false;
-        }
-
-        if (!parsed.get(2).matches(coordRegex)) {
-            return false;
-        }
-        // This is 1 now, because we've removed 2
-        if (parsed.size() == 3) {
-            return true;
-        }
-
-        try {
-            Float.parseFloat(parsed.get(3));
-            Float.parseFloat(parsed.get(4));
-        } catch (NumberFormatException e) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public Location getLocation(Entity e) {
-        return this.location;
-    }
-
-    @Override
-    public boolean isValid() {
-        return this.isValid;
-    }
-
-    @Override
-    public void setDestination(JavaPlugin plugin, String dest) {
-        if (!(plugin instanceof MultiverseCore)) {
-            return;
-        }
-        List<String> parsed = Arrays.asList(dest.split(":"));
-        // Need at least: e:world:x,y,z
-        // OR e:world:x,y,z:pitch:yaw
-        // so basically 3 or 5
-        if (!(parsed.size() == 3 || parsed.size() == 5)) {
-            this.isValid = false;
-            return;
-        }
-
-        if (!parsed.get(0).equalsIgnoreCase(this.getIdentifer())) {
-            this.isValid = false;
-            return;
-        }
-
-        if (!((MultiverseCore) plugin).isMVWorld(parsed.get(1))) {
-            this.isValid = false;
-            return;
-        }
-        this.location = new Location(((MultiverseCore) plugin).getMVWorld(parsed.get(1)).getCBWorld(), 0, 0, 0);
-
-        if (!parsed.get(2).matches(this.coordRegex)) {
-            this.isValid = false;
-            return;
-        }
-        double[] coords = new double[3];
-        String[] coordString = parsed.get(2).split(",");
-        for (int i = 0; i < 3; i++) {
-            try {
-                coords[i] = Double.parseDouble(coordString[i]);
-            } catch (NumberFormatException e) {
-                this.isValid = false;
-                return;
-            }
-        }
-        this.location.setX(coords[0]);
-        this.location.setY(coords[1]);
-        this.location.setZ(coords[2]);
-
-        if (parsed.size() == 3) {
-            this.isValid = true;
-            return;
-        }
-
-        try {
-            this.location.setPitch(Float.parseFloat(parsed.get(3)));
-            this.location.setYaw(Float.parseFloat(parsed.get(4)));
-        } catch (NumberFormatException e) {
-            this.isValid = false;
-            return;
-        }
-        this.isValid = true;
-
-    }
-
-    @Override
-    public String getType() {
-        return "Exact";
-    }
-
-    @Override
-    public String getName() {
-        return "Exact (" + this.location.getX() + ", " + this.location.getY() + ", " + this.location.getZ() + ":" + location.getPitch() + ":" + location.getYaw() + ")";
-    }
-
-    public void setDestination(Location location) {
-        if (location != null) {
-            this.location = location;
-            this.isValid = true;
-        }
-        this.isValid = false;
-    }
-
-    @Override
-    public String toString() {
-        if (isValid) {
-            return "e:" + location.getWorld().getName() + ":" + location.getX() + "," + location.getY() + "," + location.getZ() + ":" + location.getPitch() + ":" + location.getYaw();
-        }
-        return "i:Invalid Destination";
-    }
-
-    @Override
-    public String getRequiredPermission() {
-        return "multiverse.access." + this.location.getWorld().getName();
-    }
-}

src/main/java/com/onarandombox/utils/FancyColorScheme.java

@@ -1,37 +0,0 @@
-package com.onarandombox.utils;
-
-import org.bukkit.ChatColor;
-
-public class FancyColorScheme {
-    private ChatColor headerColor;
-    private ChatColor mainColor;
-    private ChatColor altColor;
-    private ChatColor defContentColor;
-    
-    public FancyColorScheme(ChatColor header, ChatColor main, ChatColor alt, ChatColor defaultColor) {
-        this.headerColor = header;
-        this.mainColor = main;
-        this.altColor = alt;
-        this.defContentColor = defaultColor;
-    }
-    
-    public ChatColor getHeader() {
-        return this.headerColor;
-    }
-    
-    public ChatColor getMain() {
-        return this.mainColor;
-    }
-    
-    public ChatColor getAlt() {
-        return this.altColor;
-    }
-    
-    public ChatColor getDefault() {
-        return this.defContentColor;
-    }
-    
-    public ChatColor getMain(boolean main) {
-        return main ? this.getMain() : this.getAlt();
-    }
-}

src/main/java/com/onarandombox/utils/FancyHeader.java

@@ -1,22 +0,0 @@
-package com.onarandombox.utils;
-
-public class FancyHeader implements FancyText {
-
-    private FancyColorScheme colors;
-    private String text;
-
-    public FancyHeader(String text, FancyColorScheme scheme) {
-        this.colors = scheme;
-        this.text = text;
-    }
-
-    @Override
-    public String getFancyText() {
-        return colors.getHeader() + "--- " + text + colors.getHeader() + " ---";
-    }
-
-    public void appendText(String string) {
-        this.text += string;
-    }
-
-}

src/main/java/com/onarandombox/utils/FancyMessage.java

@@ -1,34 +0,0 @@
-package com.onarandombox.utils;
-
-public class FancyMessage implements FancyText {
-    private String title;
-    private String message;
-    private boolean main = true;
-    private FancyColorScheme colors;
-    /**
-     * Allows easy creation of an alternating colored list
-     * @param title
-     * @param message
-     */
-    public FancyMessage(String title, String message, FancyColorScheme scheme) {
-        this.title = title;
-        this.message = message;
-        this.colors = scheme;
-    }
-    public void setColorMain() {
-        this.main = true;
-    }
-    public void setColorAlt() {
-        this.main = false;
-    }
-    @Override
-    public String getFancyText() {
-        return this.colors.getMain(this.main) + this.title + this.colors.getDefault() + message;
-    }
-    public void setAltColor(boolean altColor) {
-        this.main = !altColor;
-    }
-    public void setMainColor(boolean mainColor) {
-        this.main = mainColor;
-    }
-}

src/main/java/com/onarandombox/utils/FancyText.java

@@ -1,5 +0,0 @@
-package com.onarandombox.utils;
-
-public interface FancyText {
-    public String getFancyText();
-}

src/main/java/com/onarandombox/utils/InvalidDestination.java

@@ -1,59 +0,0 @@
-package com.onarandombox.utils;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-public class InvalidDestination implements MVDestination {
-
-    @Override
-    public String getIdentifer() {
-        return "i";
-    }
-
-    @Override
-    public boolean isThisType(JavaPlugin plugin, String dest) {
-        return false;
-    }
-
-    @Override
-    public Location getLocation(Entity e) {
-        return null;
-    }
-
-    @Override
-    public boolean isValid() {
-        return false;
-    }
-
-    @Override
-    public void setDestination(JavaPlugin plugin, String dest) {
-        // Nothing needed, it's invalid.
-    }
-
-    @Override
-    public String getType() {
-        return ChatColor.RED + "Invalid Destination";
-    }
-
-    @Override
-    public String getName() {
-        return ChatColor.RED + "Invalid Destination";
-    }
-
-    @Override
-    public String toString() {
-        return "i:Invalid Destination";
-    }
-
-    @Override
-    public String getRequiredPermission() {
-        return null;
-    }
-    public Vector getVelocity() {
-        return new Vector(0,0,0);
-    }
-
-}

src/main/java/com/onarandombox/utils/LocationManipulation.java

@@ -1,164 +0,0 @@
-package com.onarandombox.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Vehicle;
-import org.bukkit.util.Vector;
-
-public class LocationManipulation {
-    private static Map<String, Integer> orientationInts = new HashMap<String, Integer>();
-    static {
-        orientationInts.put("n", 180);
-        orientationInts.put("ne", 225);
-        orientationInts.put("e", 270);
-        orientationInts.put("se", 315);
-        orientationInts.put("s", 0);
-        orientationInts.put("sw", 45);
-        orientationInts.put("w", 90);
-        orientationInts.put("nw", 135);
-
-    }
-
-    /**
-     * Convert a Location into a Colon separated string to allow us to store it in text.
-     * 
-     * @param location
-     * @return
-     */
-    public String locationToString(Location location) {
-        StringBuilder l = new StringBuilder();
-        l.append(location.getBlockX() + ":");
-        l.append(location.getBlockY() + ":");
-        l.append(location.getBlockZ() + ":");
-        l.append(location.getYaw() + ":");
-        l.append(location.getPitch());
-        return l.toString();
-    }
-
-    /**
-     * Convert a String to a Location.
-     * 
-     * @param world
-     * @param xStr
-     * @param yStr
-     * @param zStr
-     * @param yawStr
-     * @param pitchStr
-     * @return
-     */
-    public Location stringToLocation(World world, String xStr, String yStr, String zStr, String yawStr, String pitchStr) {
-        double x = Double.parseDouble(xStr);
-        double y = Double.parseDouble(yStr);
-        double z = Double.parseDouble(zStr);
-        float yaw = Float.valueOf(yawStr).floatValue();
-        float pitch = Float.valueOf(pitchStr).floatValue();
-
-        return new Location(world, x, y, z, yaw, pitch);
-    }
-
-    /**
-     * Convert a Location to XYZ Coordinates.
-     * 
-     * @param l
-     * @return
-     */
-    public String strCoords(Location l) {
-        String result = "";
-        result += "X: " + l.getBlockX() + " ";
-        result += "Y: " + l.getBlockY() + " ";
-        result += "Z: " + l.getBlockZ() + " ";
-        return result;
-    }
-
-    /**
-     * Return the NESW Direction a Location is facing.
-     * 
-     * @param location
-     * @return
-     */
-    public static String getDirection(Location location) {
-        double r = (location.getYaw() % 360) + 180;
-        // Remember, these numbers are every 45 degrees with a 22.5 offset, to detect boundaries.
-        String dir;
-        if (r < 22.5)
-            dir = "n";
-        else if (r < 67.5)
-            dir = "ne";
-        else if (r < 112.5)
-            dir = "e";
-        else if (r < 157.5)
-            dir = "se";
-        else if (r < 202.5)
-            dir = "s";
-        else if (r < 247.5)
-            dir = "sw";
-        else if (r < 292.5)
-            dir = "w";
-        else if (r < 337.5)
-            dir = "nw";
-        else
-            dir = "n";
-
-        return dir;
-    }
-
-    public static float getYaw(String orientation) {
-        if (orientation == null) {
-            return 0;
-        }
-        if (orientationInts.containsKey(orientation.toLowerCase())) {
-            return orientationInts.get(orientation.toLowerCase());
-        }
-        return 0;
-    }
-
-    public static float getSpeed(Vector v) {
-        return (float) Math.sqrt(v.getX() * v.getX() + v.getZ() * v.getZ());
-    }
-
-    // X, Y, Z
-    // -W/+E,0, -N/+S
-    public static Vector getTranslatedVector(Vector v, String direction) {
-        if (direction == null) {
-            return v;
-        }
-        float speed = getSpeed(v);
-        float halfSpeed = (float) (speed / 2.0);
-        // TODO: Mathmatacize this:
-        if (direction.equalsIgnoreCase("n")) {
-            return new Vector(0, 0, -1 * speed);
-        } else if (direction.equalsIgnoreCase("ne")) {
-            return new Vector(halfSpeed, 0, -1 * halfSpeed);
-        } else if (direction.equalsIgnoreCase("e")) {
-            return new Vector(speed, 0, 0);
-        } else if (direction.equalsIgnoreCase("se")) {
-            return new Vector(halfSpeed, 0, halfSpeed);
-        } else if (direction.equalsIgnoreCase("s")) {
-            return new Vector(0, 0, speed);
-        } else if (direction.equalsIgnoreCase("sw")) {
-            return new Vector(-1 * halfSpeed, 0, halfSpeed);
-        } else if (direction.equalsIgnoreCase("w")) {
-            return new Vector(-1 * speed, 0, 0);
-        } else if (direction.equalsIgnoreCase("nw")) {
-            return new Vector(-1 * halfSpeed, 0, -1 * halfSpeed);
-        }
-        return v;
-    }
-
-    /**
-     * Returns the next Location that an entity is traveling at
-     * 
-     * @param v
-     * @return
-     */
-    public static Location getNextBlock(Vehicle v) {
-        Vector vector = v.getVelocity();
-        Location location = v.getLocation();
-        int x = vector.getX() < 0 ? vector.getX() == 0 ? 0 : -1 : 1;
-        int z = vector.getZ() < 0 ? vector.getZ() == 0 ? 0 : -1 : 1;
-        return location.add(x, 0, z);
-    }
-}

src/main/java/com/onarandombox/utils/MVDestination.java

@@ -1,19 +0,0 @@
-package com.onarandombox.utils;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-public interface MVDestination {
-    public String getIdentifer();
-    public boolean isThisType(JavaPlugin plugin, String dest);
-    public Location getLocation(Entity e);
-    public boolean isValid();
-    public void setDestination(JavaPlugin plugin, String dest);
-    public String getType();
-    public String getName();
-    public String toString();
-    public String getRequiredPermission();
-    public Vector getVelocity();
-}

src/main/java/com/onarandombox/utils/PlayerDestination.java

@@ -1,89 +0,0 @@
-package com.onarandombox.utils;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.Vector;
-
-public class PlayerDestination implements MVDestination {
-    String player;
-    private boolean isValid;
-    private JavaPlugin plugin;
-
-    @Override
-    public String getIdentifer() {
-        return "pl";
-    }
-
-    @Override
-    public boolean isThisType(JavaPlugin plugin, String dest) {
-        String[] items = dest.split(":");
-        if (items.length != 2) {
-            return false;
-        }
-        if (!items[0].equalsIgnoreCase("pl")) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public Location getLocation(Entity e) {
-        Player p = plugin.getServer().getPlayer(this.player);
-        Player plLoc = null;
-        if (e instanceof Player) {
-            plLoc = (Player) e;
-        } else if (e.getPassenger() instanceof Player) {
-            plLoc = (Player) e.getPassenger();
-        }
-
-        if (p != null && plLoc != null && !plLoc.getName().equalsIgnoreCase(p.getName())) {
-            return p.getLocation();
-        }
-        return null;
-    }
-
-    @Override
-    public boolean isValid() {
-        return this.isValid;
-    }
-
-    @Override
-    public void setDestination(JavaPlugin plugin, String dest) {
-        String[] items = dest.split(":");
-        if (items.length != 2) {
-            this.isValid = false;
-        }
-        if (!items[0].equalsIgnoreCase("pl")) {
-            this.isValid = false;
-        }
-        this.isValid = true;
-        this.player = items[1];
-        this.plugin = plugin;
-    }
-
-    @Override
-    public String getType() {
-        return "Player";
-    }
-
-    @Override
-    public String getName() {
-        return this.player;
-    }
-
-    @Override
-    public String toString() {
-        return "pl:" + this.player;
-    }
-
-    @Override
-    public String getRequiredPermission() {
-        return "";
-    }
-    public Vector getVelocity() {
-        return new Vector(0,0,0);
-    }
-
-}