fix: Properly handle spawn radius

.github/workflows/build.yml

@@ -0,0 +1,22 @@
+name: Maven CI/CD
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build_and_test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

.github/workflows/call.github_release.yml

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

.github/workflows/call.platform_uploads.yml

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

.github/workflows/dispatch.platform_uploads.yml

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

.github/workflows/dispatch.promote_release.yml

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

.github/workflows/generic.checkstyle.yml

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

.github/workflows/generic.github_release.yml

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

.github/workflows/generic.platform_uploads.yml

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

.github/workflows/generic.test.yml

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

.github/workflows/main.prerelease.yml

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

.github/workflows/pr.checkstyle.yml

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

.github/workflows/pr.require_label.yml

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

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

.gitignore

@@ -43,6 +43,3 @@ debug.log
 # Doxygen
 /docs/html
 debug.txt
-
-# Gradle
-.gradle

README.md

@@ -1,50 +1,44 @@
-<p align="center">
-<img src="config/multiverse2-long.png" alt="Multiverse Logo">
-</p>
+![Multiverse 2](config/multiverse2-long.png)
 
-[![Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/modrinth_vector.svg)](https://modrinth.com/plugin/multiverse-core)
-[![hangar](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/hangar_vector.svg)](https://hangar.papermc.io/Multiverse/Multiverse-Core)
-[![bukkit](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/bukkit_vector.svg)](https://dev.bukkit.org/projects/multiverse-core)
-[![Spigot](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/spigot_vector.svg)](https://www.spigotmc.org/resources/multiverse-core.390/)
-
-[![Release](https://img.shields.io/nexus/r/com.onarandombox.multiversecore/multiverse-core?server=https%3A%2F%2Frepo.onarandombox.com&label=release&color=dark-green)](https://dev.bukkit.org/projects/multiverse-core)
-[![Dev builds](https://img.shields.io/nexus/s/com.onarandombox.multiversecore/multiverse-core?server=https%3A%2F%2Frepo.onarandombox.com&label=prerelease&color=orange)](https://ci.onarandombox.com/job/Multiverse-Core/)
+[![Maven CI/CD](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml/badge.svg)](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml)
+[![Release](https://img.shields.io/nexus/r/com.onarandombox.multiversecore/Multiverse-Core?label=release&server=https%3A%2F%2Frepo.onarandombox.com%2F)](https://dev.bukkit.org/projects/multiverse-core)
+[![Dev builds](https://img.shields.io/nexus/s/com.onarandombox.multiversecore/Multiverse-Core?label=dev%20builds&server=http%3A%2F%2Frepo.onarandombox.com%2F)](https://ci.onarandombox.com/job/Multiverse-Core/)
 [![Discord](https://img.shields.io/discord/325459248047980545?label=discord&logo=discord)](https://discord.gg/NZtfKky)
-[![Support us on Patreon](https://img.shields.io/badge/donate-patreon-white?logo=patreon)](https://patreon.com/dumptruckman)
-[![License](https://img.shields.io/github/license/Multiverse/Multiverse-Core?color=blue)](LICENSE.md)
-
-
-# About
+[![Support me on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Ddumptruckman%26type%3Dpatrons&style=flat)](https://patreon.com/dumptruckman)
+[![License](https://img.shields.io/github/license/Multiverse/Multiverse-Core)](LICENSE.md)
 
+About
+========
 [Multiverse](https://dev.bukkit.org/projects/multiverse-core) was created at the dawn of Bukkit multiworld support. It has since then grown into a **complete world management solution!** Multiverse provides the easiest to use world management solution for your Minecraft server, big or small, and with great addons like [Portals](https://dev.bukkit.org/projects/multiverse-portals) and [NetherPortals](https://dev.bukkit.org/projects/multiverse-netherportals/), what's not to love!
-
+<br><br>
 Now it's time to create your very own Multiverse server, do check out our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) and [Usage Guide](https://github.com/Multiverse/Multiverse-Core/wiki/Basics) to get started. Feel free to hop onto our [Discord](https://discord.gg/NZtfKky) if you have any question or just want to have a chat with us!
 
-## Amazing sub-modules available:
-
+### Amazing sub-modules available:
 * [Multiverse-NetherPortals](https://github.com/Multiverse/Multiverse-NetherPortals) -> Have separate nether and end worlds for each of your overworlds!
 * [Multiverse-Portals](https://github.com/Multiverse/Multiverse-Portals) -> Make custom portals to go to any destination!
 * [Multiverse-Inventories](https://github.com/Multiverse/Multiverse-Inventories) -> Have separated players stats and inventories per world or per group of worlds.
-* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleporters!
+* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleprompters!
 
-## Building
-Simply build the source with Gradle:
+Building
+========
+Simply build the source with maven:
 ```
-./gradlew build
+$ mvn install
 ```
 More details are available on the [build instructions wiki page](https://github.com/Multiverse/Multiverse-Core/wiki/Building).
 
 
-## Contributing
-
+Contributing
+=======
 **Want to help improve Multiverse?** There are several ways you can support and contribute to the project.
 * Take a look at our "Bug: Unconfirmed" issues, where you can find issues that need extra testing and investigation.
 * Want others to love Multiverse too? You can join the [Multiverse Discord community](https://discord.gg/NZtfKky) and help others with issues and setup!
 * A Multiverse guru? You can update our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) with your latest tip, tricks and guides! The wiki open for all to edit and improve.
 * Love coding? You could look at ["State: Open to PR"](https://github.com/Multiverse/Multiverse-Core/labels/State%3A%20Open%20to%20PR) and ["Resolution: Accepted"](https://github.com/Multiverse/Multiverse-Core/labels/Resolution%3A%20Accepted) issues. We're always happy to receive bug fixes and feature additions as [pull requests](https://www.freecodecamp.org/news/how-to-make-your-first-pull-request-on-github-3/).
-* If you'd like to make a financial contribution to the project, do consider joining our [Patreon](https://www.patreon.com/dumptruckman) or make a one-time donation [here](https://paypal.me/dumptruckman)!
+* If you'd like to make a financial contribution to the project, do consider joining our [patreon](https://www.patreon.com/dumptruckman) or make a one-time donation [here](https://paypal.me/dumptruckman)!
 
 Additionally, we would like to give a big thanks to everyone that has supported Multiverse over the years, as well as those in the years to come. Thank you!
 
-## License
+License
+=======
 Multiverse-Core is licensed under BSD-3-Clause License. Please see [LICENSE.md](LICENSE.md) for more info.

build.gradle

@@ -1,187 +0,0 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
-plugins {
-    id 'java-library'
-    id 'maven-publish'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
-}
-
-version = System.getenv('GITHUB_VERSION') ?: 'local'
-group = 'com.onarandombox.multiversecore'
-description = 'Multiverse-Core'
-
-java.sourceCompatibility = JavaVersion.VERSION_11
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-
-    maven {
-        url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
-    }
-
-    maven {
-        url = uri('https://repo.onarandombox.com/content/groups/public')
-    }
-
-    maven {
-        url = uri('https://hub.spigotmc.org/nexus/content/groups/public/')
-    }
-
-    maven {
-        url = uri('https://jitpack.io')
-    }
-
-    maven {
-        url = uri('https://repo.minebench.de/')
-    }
-
-    maven {
-        url = uri('https://repo.maven.apache.org/maven2/')
-    }
-}
-
-dependencies {
-    implementation 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT'
-
-    implementation('com.github.MilkBowl:VaultAPI:1.7') {
-        exclude group: 'org.bukkit', module: 'bukkit'
-    }
-
-    compileOnly('me.main__.util:SerializationConfig:1.7') {
-        exclude group: 'org.bukkit', module: 'bukkit'
-    }
-    compileOnly('com.pneumaticraft.commandhandler:CommandHandler:11') {
-        exclude group: 'org.bukkit', module: 'bukkit'
-        exclude group: 'junit', module: 'junit'
-    }
-    compileOnly 'com.dumptruckman.minecraft:buscript:2.0-SNAPSHOT'
-    compileOnly 'org.bstats:bstats-bukkit:2.2.1'
-    compileOnly('com.dumptruckman.minecraft:Logging:1.1.1') {
-        exclude group: 'junit', module: 'junit'
-    }
-    compileOnly 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
-    compileOnly 'org.jetbrains:annotations:16.0.2'
-
-    testImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT'
-    testImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
-        exclude group: 'junit', module: 'junit'
-    }
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:3.11.2'
-    testImplementation 'commons-io:commons-io:2.4'
-}
-
-
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
-
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-}
-
-tasks.withType(Javadoc) {
-    options.encoding = 'UTF-8'
-}
-
-
-configurations {
-    [apiElements, runtimeElements].each {
-        it.outgoing.artifacts.removeIf { it.buildDependencies.getDependencies(null).contains(jar) }
-        it.outgoing.artifact(shadowJar)
-    }
-
-    testCompileOnly.extendsFrom compileOnly
-    testRuntimeOnly.extendsFrom testCompileOnly
-
-    shadowed.extendsFrom compileOnly {
-        canBeResolved = true
-    }
-}
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-
-            pom.withXml {
-                asNode().dependencies.'*'.findAll() {
-                    it.scope.text() == 'runtime'  && project.configurations.implementation.allDependencies.find { dep ->
-                        dep.name == it.artifactId.text()
-                    }
-                }.each() {
-                    it.scope*.value = 'provided'
-                }
-            }
-        }
-    }
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = "https://maven.pkg.github.com/Multiverse/Multiverse-Core"
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
-}
-
-
-ext.bitlyAccessToken = System.getenv('BITLY_ACCESS_TOKEN') ?: 'bitly-access-token'
-
-task prepareSource(type: Sync) {
-    inputs.property 'bitlyAccessToken', bitlyAccessToken
-    from sourceSets.main.java
-    into "$buildDir/src"
-    filter(ReplaceTokens, tokens: [
-            'bitly-access-token': bitlyAccessToken,
-    ])
-}
-
-compileJava {
-    source = prepareSource.outputs
-}
-
-processResources {
-    def props = [version: "${project.version}"]
-    inputs.properties props
-    filteringCharset 'UTF-8'
-    filesMatching('plugin.yml') {
-        expand props
-    }
-
-    // This task should never be skipped. The tests depend on this having been run but we want the new version number
-    // that is created after tests are run and before we run again to publish.
-    outputs.upToDateWhen { false }
-}
-
-
-javadoc {
-    source = sourceSets.main.allJava
-    classpath = configurations.compileClasspath
-}
-
-
-project.configurations.api.canBeResolved = true
-
-shadowJar {
-    relocate 'me.main__.util', 'com.onarandombox.serializationconfig'
-    relocate 'com.pneumaticraft.commandhandler', 'com.onarandombox.commandhandler'
-    relocate 'buscript', 'com.onarandombox.buscript'
-    relocate 'org.bstats', 'com.onarandombox.bstats'
-    relocate 'com.dumptruckman.minecraft.util.Logging', 'com.onarandombox.MultiverseCore.utils.CoreLogging'
-    relocate 'com.dumptruckman.minecraft.util.DebugLog', 'com.onarandombox.MultiverseCore.utils.DebugFileLogger'
-    relocate 'org.codehaus.jettison', 'com.onarandombox.jettison'
-    relocate 'de.themoep.idconverter', 'com.onarandombox.idconverter'
-
-    configurations = [project.configurations.shadowed]
-
-    archiveFileName = "$baseName-$version.$extension"
-    classifier = ''
-}
-
-build.dependsOn shadowJar
-jar.enabled = false

config/mv_checks.xml

@@ -6,372 +6,136 @@
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
 <!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <!-- Future reference: valid severity values are 'ignore', 'info', 'warning', 'error' -->
 <module name="Checker">
-
-    <!-- Javadoc Comments -->
-    <module name="JavadocPackage"/><!-- require package-info.java file -->
-
-    <!-- Miscellaneous -->
+    <module name="JavadocPackage">
+        <property name="allowLegacy" value="true"/>
+    </module>
     <module name="NewlineAtEndOfFile" />
-    <module name="OrderedProperties"/>
     <module name="Translation"/>
-    <module name="UniqueProperties"/>
-
-    <!-- Regexp -->
+    <module name="FileLength"/>
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+    </module>
     <module name="RegexpSingleline">
         <property name="message" value="Line has trailing spaces."/>
         <property name="format" value="\s+$"/>
     </module>
-
-    <!-- Size Violations -->
-    <module name="FileLength">
-        <property name="max" value="2000"/>
+    <module name="SuppressWithNearbyCommentFilter">
+        <property name="commentFormat" value="SUPPRESS CHECKSTYLE: (\w+)"/>
+        <property name="checkFormat" value="$1"/>
     </module>
-    <module name="LineLength">
-        <property name="fileExtensions" value="java"/>
-        <property name="max" value="160"/>
-        <property name="severity" value="warning"/>
+    <module name="SuppressionCommentFilter">
+           <property name="offCommentFormat" value="BEGIN CHECKSTYLE-SUPPRESSION\: (\w+)"/>
+           <property name="onCommentFormat" value="END CHECKSTYLE-SUPPRESSION\: (\w+)"/>
+           <property name="checkFormat" value="$1"/>
     </module>
-
-    <!-- Whitespace -->
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
+    <module name="SuppressionCommentFilter">
+           <property name="offCommentFormat" value="BEGIN CHECKSTYLE-SUPPRESSION\: ALL"/>
+           <property name="onCommentFormat" value="END CHECKSTYLE-SUPPRESSION\: ALL"/>
     </module>
-
     <module name="TreeWalker">
         <!-- Make suppression possible -->
-        <module name="SuppressWithNearbyCommentFilter">
-            <property name="commentFormat" value="SUPPRESS CHECKSTYLE: (\w+)"/>
-            <property name="checkFormat" value="$1"/>
-        </module>
-        <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat" value="BEGIN CHECKSTYLE-SUPPRESSION\: (\w+)"/>
-            <property name="onCommentFormat" value="END CHECKSTYLE-SUPPRESSION\: (\w+)"/>
-            <property name="checkFormat" value="$1"/>
-        </module>
-        <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat" value="BEGIN CHECKSTYLE-SUPPRESSION\: ALL"/>
-            <property name="onCommentFormat" value="END CHECKSTYLE-SUPPRESSION\: ALL"/>
-        </module>
-
+        <module name="FileContentsHolder"/>
         <!-- Actual checks -->
-
-        <!-- Annotations -->
-        <module name="AnnotationLocation"/>
-        <module name="AnnotationUseStyle"/>
-        <module name="MissingDeprecated"/>
-        <module name="MissingOverride"/>
-
-        <!-- Block Checks -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
-        <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="ignore"/>
-        </module>
-        <module name="LeftCurly">
-            <property name="ignoreEnums" value="false"/>
-        </module>
-        <module name="NeedBraces">
-            <property name="tokens" value="LITERAL_IF"/>
-            <property name="allowSingleLineStatement" value="true"/>
-        </module>
-        <module name="NeedBraces">
-            <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FOR,LITERAL_WHILE"/>
-        </module>
-        <module name="RightCurly"/>
-
-        <!-- Class Design -->
-        <module name="DesignForExtension">
-            <property name="severity" value="info"/>
-        </module>
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <module name="InnerTypeLast"/>
-        <module name="InterfaceIsType"/>
-        <module name="MutableException"/>
-        <module name="OneTopLevelClass"/>
-        <module name="ThrowsCount">
-            <property name="max" value="0"/>
-        </module>
-        <module name="VisibilityModifier">
-            <property name="protectedAllowed" value="true"/>
-        </module>
-
-        <!-- Coding -->
-        <module name="ArrayTrailingComma"/>
-        <module name="AvoidDoubleBraceInitialization"/>
-        <module name="AvoidNoArgumentSuperConstructorCall"/>
-        <module name="CovariantEquals"/>
-        <module name="DeclarationOrder"/>
-        <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"/>
-        </module>
-        <module name="IllegalCatch"/>
-        <module name="IllegalThrows"/>
-        <module name="IllegalToken"/>
-        <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 name="MultipleVariableDeclarations"/>
-        <module name="NestedForDepth">
+        <module name="LineLength">
+            <property name="max" value="160"/>
             <property name="severity" value="warning"/>
         </module>
-        <module name="NestedIfDepth"/>
-        <module name="NestedTryDepth"/>
-        <module name="NoClone"/>
-        <module name="NoFinalizer"/>
-        <module name="OneStatementPerLine"/>
-        <module name="PackageDeclaration"/>
-        <module name="ParameterAssignment"/>
-        <module name="RequireThis"/>
-        <module name="ReturnCount"/>
-        <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"/>
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-        <!-- Javadoc Comments -->
-        <module name="AtclauseOrder"/>
-        <module name="InvalidJavadocPosition"/>
-        <module name="JavadocBlockTagLocation"/>
-        <module name="JavadocContentLocationCheck"/>
         <module name="JavadocMethod">
-            <property name="accessModifiers" value="public, protected, package"/>
-            <property name="tokens" value="METHOD_DEF"/>
+            <property name="scope" value="package"/><!-- We don't need javadoc for private methods -->
+            <property name="tokens" value="METHOD_DEF"/><!-- We don't need javadoc for constructors -->
         </module>
-        <module name="JavadocMethod">
-            <property name="accessModifiers" value="public"/>
-        </module>
-        <module name="JavadocMissingLeadingAsterisk"/>
-        <module name="JavadocMissingWhitespaceAfterAsterisk"/>
-        <module name="JavadocParagraph">
-            <property name="allowNewlineParagraph" value="true"/>
-        </module>
-        <module name="JavadocStyle">
-            <property name="scope" value="package"/>
-        </module>
-        <module name="JavadocTagContinuationIndentation"/>
         <module name="JavadocType"/>
         <module name="JavadocVariable">
-            <property name="scope" value="package"/>
+            <property name="scope" value="package"/><!-- We don't need javadoc for private variables -->
         </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"/>
-        <module name="NonEmptyAtclauseDescription"/>
-        <module name="RequireEmptyLineBeforeBlockTagGroup"/>
-        <module name="SingleLineJavadoc"/>
-        <module name="SummaryJavadoc"/>
+        <module name="JavadocStyle"/>
         <module name="WriteTag">
             <property name="tag" value="@author"/>
             <property name="tagFormat" value="\S"/>
             <property name="severity" value="ignore"/>
             <property name="tagSeverity" value="warning"/>
         </module>
-
-        <!-- Metrics -->
-        <module name="BooleanExpressionComplexity"/>
-        <module name="ClassDataAbstractionCoupling">
-            <property name="max" value="7"/>
-            <property name="excludedClasses" value="ArrayIndexOutOfBoundsException, ArrayList, Boolean, Byte, Character, Class, Collection, Deprecated, Deque, Double, DoubleStream, EnumSet, Exception, Float, FunctionalInterface, HashMap, HashSet, IllegalArgumentException, IllegalStateException, IndexOutOfBoundsException, IntStream, Integer, LinkedHashMap, LinkedHashSet, LinkedList, List, Long, LongStream, Map, NullPointerException, Object, Optional, OptionalDouble, OptionalInt, OptionalLong, Override, Queue, RuntimeException, SafeVarargs, SecurityException, Set, Short, SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder, SuppressWarnings, Throwable, TreeMap, TreeSet, UnsupportedOperationException, Void, boolean, byte, char, double, float, int, long, short, var, void"/>
-        </module>
-        <module name="ClassFanOutComplexity">
-            <property name="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"/>
-        </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="allowNonPrintableEscapes" value="true"/>
-        </module>
-        <module name="CommentsIndentation"/>
-        <module name="Indentation">
-            <property name="basicOffset" value="4"/>
-            <property name="braceAdjustment" value="0"/>
-            <property name="caseIndent" value="4"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="arrayInitIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
-            <property name="forceStrictCondition" value="true"/>
-        </module>
-        <module name="NoCodeInFile"/>
-        <module name="OuterTypeFilename"/>
-        <module name="TodoComment">
-            <property name="format" value="TODO"/>
-            <property name="severity" value="warning"/>
-        </module>
-        <module name="TrailingComment"/>
-        <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="allowedAbbreviations" value="MV"/>
-        </module>
-        <module name="AbstractClassName"/>
-        <module name="CatchParameterName"/>
-        <module name="ClassTypeParameterName">
-            <property name="format" value="^[A-Z]{1,3}$"/>
-        </module>
         <module name="ConstantName"/>
-        <module name="IllegalIdentifierName"/>
-        <module name="InterfaceTypeParameterName">
-            <property name="format" value="^[A-Z]{1,3}$"/>
-        </module>
-        <module name="LambdaParameterName"/>
-        <module name="LocalFinalVariableName"/>
         <module name="LocalVariableName"/>
         <module name="MemberName"/>
         <module name="MethodName"/>
-        <module name="MethodTypeParameterName">
-            <property name="format" value="^[A-Z]{1,3}$"/>
-        </module>
         <module name="PackageName"/>
         <module name="ParameterName"/>
-        <module name="PatternVariableName"/>
-        <module name="RecordComponentName"/>
-        <module name="RecordTypeParameterName">
-            <property name="format" value="^[A-Z]{1,3}$"/>
-        </module>
         <module name="StaticVariableName"/>
         <module name="TypeName"/>
-
-        <!-- Size Violations -->
-        <module name="AnonInnerLength">
-            <property name="max" value="20"/>
+        <module name="AvoidStarImport">
+            <property name="severity" value="warning"/>
+            <property name="excludes" value="com.onarandombox.MultiverseCore.utils,com.onarandombox.MultiverseCore.configuration,com.onarandombox.MultiverseCore.commands,com.onarandombox.MultiverseCore.destination"/>
         </module>
-        <module name="ExecutableStatementCount">
-            <property name="max" value="30"/>
-        </module>
-        <module name="LambdaBodyLength">
-            <property name="max" value="10"/>
-        </module>
-        <module name="MethodCount">
-            <property name="maxTotal" value="100"/>
-            <property name="maxPrivate" value="100"/>
-            <property name="maxPackage" value="100"/>
-            <property name="maxProtected" value="100"/>
-            <property name="maxPublic" value="100"/>
+        <module name="IllegalImport"/>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports">
+            <property name="processJavadoc" value="true"/>
         </module>
         <module name="MethodLength">
-            <property name="max" value="50"/>
             <property name="severity" value="warning"/>
+            <property name="countEmpty" value="false"/>
         </module>
-        <module name="OuterTypeNumber">
-            <property name="max" value="1"/>
-        </module>
-        <module name="ParameterNumber">
-            <property name="max" value="3"/>
-            <property name="ignoreOverriddenMethods" value="true"/>
-            <property name="severity" value="warning"/>
-        </module>
-        <module name="RecordComponentNumber">
-            <property name="max" value="8"/>
-        </module>
-
-        <!-- Whitespace -->
-        <module name="EmptyForInitializerPad"/>
+        <module name="ParameterNumber"/>
         <module name="EmptyForIteratorPad"/>
-        <module name="EmptyLineSeparator">
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-            <property name="allowMultipleEmptyLines" value="false"/>
-            <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
-        </module>
-        <module name="GenericWhitespace"/>
         <module name="MethodParamPad"/>
-        <module name="NoLineWrap"/>
         <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="tokens" value="COMMA,SEMI,POST_INC,POST_DEC,DOT,GENERIC_START,GENERIC_END,ELLIPSIS,LABELED_STAT,METHOD_REF"/>
-        </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"/>
+            <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
         </module>
+        <module name="NoWhitespaceBefore"/>
+        <module name="OperatorWrap"/>
         <module name="ParenPad"/>
-        <module name="SeparatorWrap">
-            <property name="option" value="nl"/>
-            <property name="tokens" value="DOT,AT,RPAREN,METHOD_REF"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="option" value="eol"/>
-            <property name="tokens" value="COMMA,SEMI,ELLIPSIS,LPAREN,ARRAY_DECLARATOR,RBRACK"/>
-        </module>
-        <module name="SingleSpaceSeparator"/>
         <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround"/>
+        <module name="WhitespaceAfter">
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="WhitespaceAround">
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+        <module name="AvoidNestedBlocks"/>
+        <module name="EmptyBlock">
+            <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_FOR,LITERAL_TRY,LITERAL_WHILE,INSTANCE_INIT,STATIC_INIT"/>
+        </module>
+        <module name="LeftCurly"/>
+        <module name="RightCurly"/>
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="HiddenField">
+            <property name="tokens" value="VARIABLE_DEF"/><!-- We don't care if parameters hide fields. -->
+        </module>
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+        <module name="MagicNumber">
+            <property name="ignoreNumbers" value="-1, 0, 0.5, 1, 2, 3"/>
+        </module>
+        <module name="MissingSwitchDefault"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <!-- Don't like errors for `final` missing
+        <module name="DesignForExtension"/>
+        <module name="FinalClass"/>
+        -->
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <module name="VisibilityModifier">
+            <property name="protectedAllowed" value="true"/>
+        </module>
+        <module name="ArrayTypeStyle"/>
+        <!-- Don't like errors for `final` missing
+        <module name="FinalParameters"/>
+        -->
+        <module name="TodoComment">
+            <property name="severity" value="info"/>
+        </module>
+        <module name="UpperEll"/>
+        <module name="Indentation"/>
+        <module name="MissingDeprecated"/>
+        <module name="MissingOverride"/>
     </module>
 </module>

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,244 +0,0 @@
-#!/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

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

@@ -0,0 +1,371 @@
+<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>4.3.2-SNAPSHOT</version>
+    <name>Multiverse-Core</name>
+    <description>World Management Plugin</description>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.number>UNKNOWN</project.build.number>
+        <project.bitly-access-token>bitly-access-token</project.bitly-access-token>
+    </properties>
+
+    <repositories>
+      <!-- Spigot -->
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+            <id>onarandombox</id>
+            <url>https://repo.onarandombox.com/content/groups/public</url>
+        </repository>
+        <repository>
+            <id>spigot</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+        <repository>
+            <id>minebench-repo</id>
+            <url>https://repo.minebench.de/</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>doodleproject-repo</id>
+            <name>DoodleProject Maven 2 Repository</name>
+            <url>https://doodleproject.sourceforge.net/maven2/release</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <ciManagement>
+        <system>jenkins</system>
+        <url>https://ci.onarandombox.com</url>
+    </ciManagement>
+
+    <!-- Profiles are used to detect whether this is a local or Jenkins build
+         and adjust the build number accordingly -->
+    <profiles>
+        <profile>
+            <id>jenkins</id>
+            <activation>
+                <property>
+                    <name>env.BUILD_NUMBER</name>
+                </property>
+            </activation>
+            <properties>
+                <project.build.number>${env.BUILD_NUMBER}</project.build.number>
+            </properties>
+        </profile>
+        <profile>
+            <id>bitly</id>
+            <activation>
+                <property>
+                    <name>env.BITLY_ACCESS_TOKEN</name>
+                </property>
+            </activation>
+            <properties>
+                <project.bitly-access-token>${env.BITLY_ACCESS_TOKEN}</project.bitly-access-token>
+            </properties>
+        </profile>
+    </profiles>
+
+    <build>
+        <defaultGoal>clean package</defaultGoal>
+        <plugins>
+            <!-- Compiler -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>maven-replacer-plugin</artifactId>
+                <version>1.4.1</version>
+                <executions>
+                    <execution>
+                        <id>replace-bitly-access-token</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                        <configuration>
+                            <basedir>${project.build.sourceDirectory}</basedir>
+                            <includes>
+                                <include>com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java</include>
+                            </includes>
+                            <replacements>
+                                <replacement>
+                                    <token>bitly-access-token</token>
+                                    <value>${project.bitly-access-token}</value>
+                                </replacement>
+                            </replacements>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>replace-maven-version-number</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                        <configuration>
+                            <basedir>${project.build.directory}/classes</basedir>
+                            <includes>
+                                <include>plugin.yml</include>
+                            </includes>
+                            <replacements>
+                                <replacement>
+                                    <token>maven-version-number</token>
+                                    <value>${project.version}-b${project.build.number}</value>
+                                </replacement>
+                            </replacements>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Jar Plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M3</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/TestCommandSender.java</exclude>
+                        <exclude>**/TestInstanceCreator.java</exclude>
+                    </excludes>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>3.0.0-M3</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.17</version>
+                <configuration>
+                    <enableRulesSummary>true</enableRulesSummary>
+                    <configLocation>${project.basedir}/config/mv_checks.xml</configLocation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <executions>
+                    <execution>
+                        <id>javadoc-jar</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <failOnError>false</failOnError>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <minimizeJar>true</minimizeJar>
+                            <relocations>
+                                <relocation>
+                                    <pattern>me.main__.util</pattern>
+                                    <shadedPattern>com.onarandombox.serializationconfig</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.pneumaticraft.commandhandler</pattern>
+                                    <shadedPattern>com.onarandombox.commandhandler</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>buscript</pattern>
+                                    <shadedPattern>com.onarandombox.buscript</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.bstats</pattern>
+                                    <shadedPattern>com.onarandombox.bstats</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.dumptruckman.minecraft.util.Logging</pattern>
+                                    <shadedPattern>com.onarandombox.MultiverseCore.utils.CoreLogging</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.dumptruckman.minecraft.util.DebugLog</pattern>
+                                    <shadedPattern>com.onarandombox.MultiverseCore.utils.DebugFileLogger</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.codehaus.jettison</pattern>
+                                    <shadedPattern>com.onarandombox.jettison</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>de.themoep.idconverter</pattern>
+                                    <shadedPattern>com.onarandombox.idconverter</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>se.eris</groupId>
+                <artifactId>notnull-instrumenter-maven-plugin</artifactId>
+                <version>1.1.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>instrument</goal>
+                            <goal>tests-instrument</goal>
+                        </goals>
+                        <configuration>
+                            <notNull>
+                                <param>org.jetbrains.annotations.NotNull</param>
+                                <param>javax.validation.constraints.NotNull</param>
+                            </notNull>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+           <groupId>org.bukkit</groupId>
+           <artifactId>bukkit</artifactId>
+           <version>1.13.2-R0.1-SNAPSHOT</version>
+           <scope>provided</scope>
+        </dependency>
+        <!-- SerializationConfig Dependency -->
+        <dependency>
+            <groupId>me.main__.util</groupId>
+            <artifactId>SerializationConfig</artifactId>
+            <version>1.7</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- End of SerializationConfig Dependency -->
+        <!-- Start of Economy Dependency -->
+        <dependency>
+            <groupId>com.github.MilkBowl</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.7</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- End of Economy Dependency -->
+        <!-- Start of CommandHandler Dependency -->
+        <dependency>
+            <groupId>com.pneumaticraft.commandhandler</groupId>
+            <artifactId>CommandHandler</artifactId>
+            <version>11</version>
+        </dependency>
+        <dependency>
+            <groupId>com.dumptruckman.minecraft</groupId>
+            <artifactId>buscript</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.dumptruckman.minecraft</groupId>
+            <artifactId>Logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>16.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>de.themoep.idconverter</groupId>
+            <artifactId>mappings</artifactId>
+            <version>1.2-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Start of Test Dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.11.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <distributionManagement>
+        <repository>
+            <id>OnARandomBox</id>
+            <url>https://repo.onarandombox.com/content/repositories/multiverse</url>
+        </repository>
+        <snapshotRepository>
+            <id>OnARandomBox</id>
+            <url>https://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+</project>

settings.gradle

@@ -1,11 +0,0 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-    }
-}
-
-rootProject.name = 'multiverse-core'

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

@@ -40,13 +40,10 @@ public class RegenCommand extends MultiverseCommand {
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
         String worldName = args.get(0);
-        boolean useseed = CommandHandler.hasFlag("-s", args);
-        String seedflag = CommandHandler.getFlag("-s", args);
+        boolean useseed = (!(args.size() == 1));
+        boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s"));
+        String seed = (args.size() == 3) ? args.get(2) : "";
         boolean keepGamerules = CommandHandler.hasFlag("--keep-gamerules", args);
-
-        boolean randomseed = seedflag == null || seedflag.isEmpty() || seedflag.equalsIgnoreCase("--keep-gamerules");
-        String seed = randomseed ? "" : seedflag;
-
         this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
                 sender,
                 doWorldRegen(sender, worldName, useseed, randomseed, seed, keepGamerules),

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

@@ -16,7 +16,7 @@ import java.util.Collection;
 public interface DisplayHandler<T> {
 
     /**
-     * Formats the raw content into a {@link Collection} for displaying to the given sender.
+     * Formats the raw content into a {@link Collection<String>} for displaying to the given sender.
      *
      * @param sender The {@link CommandSender} who will the content will be displayed to.
      * @param display The responsible {@link ContentDisplay}.

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

@@ -16,6 +16,7 @@ import com.onarandombox.MultiverseCore.event.MVRespawnEvent;
 import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
 import org.bukkit.GameMode;
+import org.bukkit.GameRule;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -32,6 +33,7 @@ import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -96,6 +98,9 @@ public class MVPlayerListener implements Listener {
         }
         // World has been set to the appropriate world
         Location respawnLocation = getMostAccurateRespawnLocation(world);
+        respawnLocation = adjustForSpawnRadius(world, respawnLocation);
+
+        Logging.fine("Spawning %s at %s", event.getPlayer().getName(), respawnLocation.toString());
 
         MVRespawnEvent respawnEvent = new MVRespawnEvent(respawnLocation, event.getPlayer(), "compatability");
         this.plugin.getServer().getPluginManager().callEvent(respawnEvent);
@@ -110,6 +115,26 @@ public class MVPlayerListener implements Listener {
         return w.getSpawnLocation();
     }
 
+    private Location adjustForSpawnRadius(World world, Location location) {
+        Location respawnLocation = location.clone();
+        int spawnRadius = Optional.ofNullable(world.getGameRuleValue(GameRule.SPAWN_RADIUS)).orElse(1);
+
+        if (spawnRadius > 1) {
+            // Math formula from https://stackoverflow.com/a/5838055
+            double t = 2 * Math.PI * Math.random();
+            double u = (Math.random() + Math.random()) * spawnRadius;
+            double r = u > spawnRadius ? (2 * spawnRadius) - u : u;
+            double x = r * Math.cos(t);
+            double z = r * Math.sin(t);
+
+            Logging.fine("Adjust spawn radius with offset: %f, %f", x, z);
+            respawnLocation.add(x, 0, z);
+        }
+
+        return Optional.ofNullable(this.plugin.getSafeTTeleporter().getSafeLocation(respawnLocation, 48, 16))
+                .orElse(respawnLocation);
+    }
+
     /**
      * This method is called when a player joins the server.
      * @param event The Event that was fired.
@@ -170,7 +195,7 @@ public class MVPlayerListener implements Listener {
             return;
         }
         Player teleportee = event.getPlayer();
-        CommandSender teleporter = teleportee;
+        CommandSender teleporter = null;
         String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName());
         if (teleporterName != null) {
             if (teleporterName.equals("CONSOLE")) {

src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java

@@ -11,7 +11,7 @@ import java.util.Map;
  * A {@link URLShortener} using {@code bit.ly}. Requires an access token.
  */
 class BitlyURLShortener extends URLShortener {
-    private static final String ACCESS_TOKEN = "Bearer @bitly-access-token@";
+    private static final String ACCESS_TOKEN = "Bearer bitly-access-token";
     private static final String BITLY_POST_REQUEST = "https://api-ssl.bitly.com/v4/shorten";
 
     BitlyURLShortener() {

src/main/resources/plugin.yml

@@ -4,7 +4,7 @@ authors: ['dumptruckman', 'Rigby', 'fernferret', 'lithium3141', 'main--']
 website: 'https://dev.bukkit.org/projects/multiverse-core'
 softdepend: ['Vault']
 api-version: 1.13
-version: ${version}
+version: maven-version-number
 commands:
   mv:
     description: Generic Multiverse Command