Safer null checking with parsing enum value.

Implement new way of mapping enums with alias.
2021-07-22 11:42:54 +08:00 · 2021-07-22 11:39:39 +08:00
37 changed files with 771 additions and 1089 deletions
@@ -1,77 +0,0 @@
-name: 🐛 Report a Bug
-description: Report a problem with Multiverse-Core.
-title: "[Bug]: "
-labels: ["Bug: Unconfirmed"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-
-        If you are having issues with other submodules of Multiverse, please go to their respective git repo:
-            Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues/new/choose
-            Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues/new/choose
-            Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues/new/choose
-            Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues/new/choose
-
-        Not sure if this is a bug with Multiverse-Core? Feel free to ask on our Discord server: https://discord.gg/NZtfKky
-
-        When completing the report, please ensure all fields are filled with the correct details requested. Failure to do so will result in your issue being closed.
-  - type: input
-    id: mutliverse-version-info
-    attributes:
-      label: '`/mv version -p` output'
-      description: Run `/mv version -p` in the console, then copy and paste the link from the output of the command into this box.
-    validations:
-      required: true
-  - type: input
-    id: server-logs
-    attributes:
-      label: Server logs
-      description: >
-        Include full startup log and console error (if any). upload all relevant logs to either https://paste.gg
-        or https://gist.github.com, save and the paste the link in this box.
-    validations:
-      required: true
-  - type: textarea
-    id: server-version
-    attributes:
-      label: Server Version
-      description: Output of `/version` command.
-      placeholder: server version info
-      render: shell
-    validations:
-      required: true
-  - type: textarea
-    id: bug-description
-    attributes:
-      label: Bug Description
-      description: Describe in detail what the bug is about. Include the expected behaviour and actual behaviour.
-      placeholder: "Example: When running `/mv` it cause the server to crash..."
-    validations:
-      required: true
-  - type: textarea
-    id: reproduce-steps
-    attributes:
-      label: Steps to reproduce
-      description: Provide detailed intructions to trigger the bug.
-      placeholder: |
-        Example:
-          1. Start a server with only multiverse installed.
-          2. Run `/mv` command.
-          3. Players all get kicked with a "server closed" message.
-          ...
-    validations:
-      required: true
-  - type: checkboxes
-    id: agreements
-    attributes:
-      label: Agreements
-      description: Ensure you have done the following being submitting this issue.
-      options:
-        - label: I have searched for and ensured there isn't already an open or resolved issue(s) regarding this.
-          required: true
-        - label: >
-            I was able to reproduce my issue on a freshly setup and up-to-date server with the latest
-            version of Multiverse plugins with no other plugins and with no kinds of other server or client mods.
-          required: true
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 💬 Multiverse Discord Server
+  - name: 💬 Multiverse Discord Server
    url: https://discord.gg/NZtfKky
    about: Need help with using Multiverse-Core or just want to chat with the devs? Join the Multiverse Discord Server for help!
@@ -1,41 +0,0 @@
-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
@@ -0,0 +1,56 @@
+---
+name: ❓ Help!
+about: Encountered a problem with Multiverse-Core? Not sure how to fix it?
+title: ''
+labels: 'Type: Assistance'
+assignees: ''
+
+---
+
+<!-- Multiverse-Core help guide
+
+Don't write inside the arrows as they will be hidden when you post your issue.
+
+Get latest build from: http://ci.onarandombox.com/view/Multiverse/
+
+If you need help other submodules of Multiverse, go to their respective git repo:
+    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
+    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
+    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
+    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
+
+Or come join our Discord server to get help sooner: https://discord.gg/NZtfKky
+
+If you're happy to wait (or you were sent here from Discord), read on:
+
+1.  Check the Usage and FAQ pages to see if it answers your queries:
+      https://github.com/Multiverse/Multiverse-Core/wiki/Basics
+      https://github.com/Multiverse/Multiverse-Core/wiki/FAQ
+
+2.  Fill out the template.
+      This will help us understand what problem you've encountered and help us
+      find a solution.
+
+3.  When linking files, do not attach them to the post!
+      Copy and paste any logs into https://gist.github.com/ or other similar service.
+
+4.  Delete this line and all above lines before posting your issue!       -->
+
+### Information
+
+* **Server version:** <!-- Insert output of `/version` command -->
+
+* **Full output of `/mv version -p`:** <!-- Replace this with the command output's https://paste.gg/ link -->
+
+* **Server log:** <!-- Upload `logs/latest.log` to https://gist.github.com/ -->
+
+### Help request
+
+**Problem**
+<!-- What problem did you encounter? -->
+
+**What I have tried**
+<!-- What have you tried so far? -->
+
+**Screenshots**
+<!-- If relevant, include any screenshots here. -->
@@ -0,0 +1,59 @@
+---
+name: 🐛 Report a Bug
+about: Report a Multiverse-Core bug. Only use this if you're 100% sure it's something wrong with Multiverse-Core - otherwise, try "Help!".
+title: ''
+labels: 'Bug: Unconfirmed'
+assignees: ''
+
+---
+
+<!-- Multiverse-Core bug reporting guide
+
+Don't put anything inside this block, as it won't be included in the issue.
+
+Get latest build from: http://ci.onarandombox.com/view/Multiverse/
+
+If you are having issues with other submodules of Multiverse, go to their respective git repo:
+    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
+    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
+    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
+    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
+
+If you are reporting a bug, please follow the following steps:
+
+1.  Fill out the template in full.
+      Run the commands in the console. Don't just put "latest" as a version,
+      or we will ignore it.
+
+2.  When linking files, do not attach them to the post!
+      Copy and paste any logs into https://gist.github.com/, then paste a
+      link to them in the relevant parts of the template.
+      **DO NOT drag files into this box!**
+
+3.  Make sure not to write between the arrows, as anything there will be
+    hidden.
+
+4.  Delete this line and all above lines before posting your issue!       -->
+
+### Information
+
+* **Server version:** <!-- Insert output of `/version` command -->
+
+* **Full output of `/mv version -p`:** <!-- Replace this with the command output's https://paste.gg/ link -->
+
+* **Server log:** <!-- Upload `logs/latest.log` to https://gist.github.com/ -->
+
+### Details
+I was **`<able / not able>`** to reproduce my issue on a freshly setup and up-to-date server with the latest version of Multiverse plugins with no other plugins and with no kinds of other server or client mods.
+
+**Description**  
+<!-- Replace this with a brief summary of the bug. -->
+
+**Steps to reproduce**  
+<!-- Replace this with exactly what you did to cause the bug. -->
+
+**Expected behavior**  
+<!-- Replace this with what you expected to happen. -->
+
+**Screenshots**  
+<!-- Replace this with screenshots, if necessary. -->
@@ -0,0 +1,54 @@
+---
+name: 💡 Request a Feature
+about: Suggest a feature you want to see in Multiverse-Core!
+title: ''
+labels: 'Type: Idea'
+assignees: ''
+
+---
+
+<!-- Multiverse-Core feature request guide
+
+Fill out the template. Don't write inside the arrows as they will be hidden
+when you post your issue.
+
+Get latest build from: http://ci.onarandombox.com/view/Multiverse/
+
+If you are look for other submodules of Multiverse, go to their respective git repo:
+    Multiverse-Portals: https://github.com/Multiverse/Multiverse-Portals/issues
+    Multiverse-NetherPortals: https://github.com/Multiverse/Multiverse-NetherPortals/issues
+    Multiverse-Inventories: https://github.com/Multiverse/Multiverse-Inventories/issues
+    Multiverse-SignPortals: https://github.com/Multiverse/Multiverse-SignPortals/issues
+
+Not sure if your feature fits in Multiverse-Core? Feel free to ask on our Discord
+server: https://discord.gg/NZtfKky
+
+If you have a feature suggestion for Multiverse-Core, read the following tips:
+
+1.  Fill out the template.
+      This will help us understand what you're requesting and why you want us
+      to add it.
+
+2.  Keep it simple.
+      Make sure it's easy to understand what you're requesting. A good way is
+      to keep it to one request per GitHub issue, as we can then easily track
+      feature requests.
+
+3.  Check whether it has already been asked or added.
+      You can search the issue tracker to see if your feature has already been
+      requested at https://github.com/Multiverse/Multiverse-Core/issues.
+
+4.  Ask yourself: "Does this belong in Multiverse-Core?"
+      There are lots of features that we reject because most servers won't
+      need or use them. If your feature is very specific or already exists in
+      another plugin, it might not be a good fit for Multiverse-Core.
+
+5.  Delete this line and all above lines before posting your issue!       -->
+
+### Feature request
+
+**Feature description**
+<!-- What feature are you suggesting? -->
+
+**How the feature is useful**
+<!-- How is the feature useful to players, server owners and/or developers? -->
@@ -1,2 +0,0 @@
-prerelease:
-  - '*'
@@ -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
@@ -1,58 +0,0 @@
-name: Manually upload release to dev.bukkit.org
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Release to upload'
-        required: true
-
-jobs:
-  manually_upload_dbo_release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download release artifact
-        id: release-artifact
-        uses: dsaltares/fetch-gh-release-asset@master
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          version: tags/${{ github.event.inputs.version }}
-          file: multiverse-core-${{ github.event.inputs.version }}.jar
-
-      - name: Build DBO metadata
-        id: metadata
-        uses: nickofthyme/object-remap@v1
-        with:
-          changelog: ${{ toJson(steps.release-artifact.outputs.body) }}
-          changelog_type: markdown
-          release_type: release
-          display_name: ${{ github.event.inputs.version }}
-          game_versions: '[9994, 9974, 9973, 9561, 9560, 9261, 9190, 9016, 8897, 8849, 8503, 7915, 7667, 7330, 7105]'
-          relations.projects: '[{"slug": "multiverse-netherportals", "type": "optionalDependency"}, {"slug": "multiverse-portals", "type": "optionalDependency"}, {"slug": "multiverse-inventories", "type": "optionalDependency"}, {"slug": "multiverse-signportals", "type": "optionalDependency"}]'
-
-      - name: Upload to dev.bukkit.org
-        uses: Multiverse/http-request-action@debug
-        with:
-          url: https://dev.bukkit.org/api/projects/30765/upload-file
-          method: POST
-          contentType: multipart/form-data
-          customHeaders: '{ "X-Api-Token": "${{ secrets.DBO_UPLOAD_API_TOKEN }}" }'
-          files: '{ "file": "${{ github.workspace }}/multiverse-core-${{ github.event.inputs.version }}.jar" }'
-          data: '{ "metadata": ${{ toJson(steps.metadata.outputs.json) }} }'
-
-# Bukkit Version IDs
-# 9994: 1.20.1
-# 9974: 1.20
-# 9973: 1.19.4
-# 9561: 1.19.3
-# 9560: 1.19.2
-# 9261: 1.19.1
-# 9190: 1.19
-# 9016: 1.18.2
-# 8897: 1.18.1
-# 8849: 1.18
-# 8503: 1.17
-# 7915: 1.16
-# 7667: 1.15
-# 7330: 1.14
-# 7105: 1.13
@@ -1,17 +0,0 @@
-name: "Pull Request Labeler"
-
-on:
-  pull_request_target:
-    types: [opened]
-    branches: [main]
-
-jobs:
-  prerelease_labeler:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/labeler@v4
-        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
@@ -1,108 +0,0 @@
-name: Manually promote last prerelease to release
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version to promote'
-        required: true
-      version-bump:
-        description: 'Version bump to apply - should usually match the version bump used for the prerelease since last release'
-        required: true
-        type: choice
-        options:
-          - 'patch'
-          - 'minor'
-          - 'major'
-
-jobs:
-  manually_promote_release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Verify input version is prerelease
-        run: |
-          if [[ "${{ github.event.inputs.version }}" != *"pre"* ]]; then
-              echo "Version must be a prerelease"
-              exit 1
-          fi
-
-      - name: Get release info
-        id: get-release
-        uses: cardinalby/git-get-release-action@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          tag: ${{ github.event.inputs.version }}
-
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ steps.get-release.outputs.tag_name }}
-
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Remove prerelease tag
-        run: |
-          echo "Removing prerelease tag from version"
-          echo "VERSION=$(echo ${{ steps.get-release.outputs.tag_name }} | sed -E 's/-pre.*//')" >> $GITHUB_ENV
-
-      - name: Build
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: clean build -x test -x checkstyleMain -x checkstyleTest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_VERSION: ${{ env.VERSION }}
-
-      - name: Create release
-        id: release
-        uses: Multiverse/release-on-push-action@skip_prs
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          bump_version_scheme: ${{ github.event.inputs.version-bump }}
-          tag_prefix: ''
-          release_name: "<RELEASE_VERSION>"
-          use_github_release_notes: true
-          ref: ${{ steps.get-release.outputs.target_commitish }}
-          skip_prs: true
-
-      - name: Publish package
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: publish
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_VERSION: ${{ env.VERSION }}
-
-      - name: Upload release artifact
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: build/libs/multiverse-core-${{ env.VERSION }}.jar
-          asset_name: multiverse-core-${{ steps.release.outputs.tag_name }}.jar
-          tag: ${{ steps.release.outputs.tag_name }}
-
-      - name: Get Changelog
-        id: changelog
-        uses: cardinalby/git-get-release-action@1.2.4
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag: ${{ steps.release.outputs.tag_name }}
-
-      - name: Modrinth Upload
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build modrinth
-        env:
-          GITHUB_VERSION: ${{ env.VERSION }}
-          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-          CHANGELOG: ${{ steps.changelog.outputs.body }}
-          PRERELEASE: ${{ steps.changelog.outputs.prerelease }}
@@ -1,82 +0,0 @@
-name: Create Release Version & Publish Package
-
-on:
-  push:
-    branches: [main]
-
-jobs:
-  release_on_push:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Test & Build
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: clean build -x assemble -x shadowJar
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Create release
-        id: release
-        uses: Multiverse/release-on-push-action@support_prerelease
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          bump_version_scheme: norelease
-          tag_prefix: ''
-          release_name: "<RELEASE_VERSION>"
-          use_github_release_notes: true
-
-      - name: Modify version scheme
-        run: |
-            if [[ "${{ steps.release.outputs.tag_name }}" == *"pre"* ]]; then
-                echo "Replacing prerelease version scheme with SNAPSHOT"
-                echo "VERSION=$(echo ${{ steps.release.outputs.tag_name }} | sed -E 's/-pre.*/-SNAPSHOT/')" >> $GITHUB_ENV
-            else
-                echo "Using release version scheme"
-                echo "VERSION=${{ steps.release.outputs.tag_name }}" >> $GITHUB_ENV
-            fi
-
-      - name: Publish package
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: publish
-        env:
-          GITHUB_VERSION: ${{ env.VERSION }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload release artifact
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: build/libs/multiverse-core-${{ env.VERSION }}.jar
-          asset_name: multiverse-core-${{ steps.release.outputs.tag_name }}.jar
-          tag: ${{ steps.release.outputs.tag_name }}
-
-      - name: Get Changelog
-        id: changelog
-        uses: cardinalby/git-get-release-action@1.2.4
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag: ${{ steps.release.outputs.tag_name }}
-
-      - name: Modrinth Upload
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build modrinth
-        env:
-          GITHUB_VERSION: ${{ env.VERSION }}
-          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-          CHANGELOG: ${{ steps.changelog.outputs.body }}
-          PRERELEASE: ${{ steps.changelog.outputs.prerelease }}
@@ -1,18 +0,0 @@
-name: Require PR Labels
-
-on:
-  pull_request:
-    types: [opened, labeled, unlabeled, synchronize]
-    branches: [main]
-
-jobs:
-  require_label:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mheap/github-action-required-labels@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          mode: exactly
-          count: 1
-          labels: "release:major, release:minor, release:patch, no version bump"
@@ -1,36 +0,0 @@
-name: Run unit tests against all PRs
-
-on:
-  pull_request:
-    types: [opened, synchronize]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Run unit tests
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
-        env:
-          GITHUB_VERSION: pr${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Artifact output
-        uses: actions/upload-artifact@v3
-        with:
-          name: multiverse-core-pr${{ github.event.pull_request.number }}
-          path: build/libs/multiverse-core-pr${{ github.event.pull_request.number }}.jar
@@ -43,6 +43,3 @@ debug.log
 # Doxygen
 /docs/html
 debug.txt
-
-# Gradle
-.gradle
@@ -1,48 +1,47 @@
-<p align="center">
-<img src="config/multiverse2-long.png" alt="Multiverse Logo">
-</p>
-
-[![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/)
+![Multiverse 2](config/multiverse2-long.png)

+[![Maven CI/CD](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml/badge.svg)](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml)
 [![Release](https://img.shields.io/nexus/r/com.onarandombox.multiversecore/Multiverse-Core?label=release&server=https%3A%2F%2Frepo.onarandombox.com%2F)](https://dev.bukkit.org/projects/multiverse-core)
 [![Dev builds](https://img.shields.io/nexus/s/com.onarandombox.multiversecore/Multiverse-Core?label=dev%20builds&server=http%3A%2F%2Frepo.onarandombox.com%2F)](https://ci.onarandombox.com/job/Multiverse-Core/)
 [![Discord](https://img.shields.io/discord/325459248047980545?label=discord&logo=discord)](https://discord.gg/NZtfKky)
-[![Support us on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Ddumptruckman%26type%3Dpatrons&style=flat)](https://patreon.com/dumptruckman)
-[![License](https://img.shields.io/github/license/Multiverse/Multiverse-Core)](LICENSE.md)
-
-
-# About
+[![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)

+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
-Multiverse-Core is licensed under BSD-3-Clause License. Please see [LICENSE.md](LICENSE.md) for more info.
+License
+=======
+Copyright (c) 2011, The Multiverse Team All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the The Multiverse Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -1,196 +0,0 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
-plugins {
-    id 'java-library'
-    id 'maven-publish'
-    id 'checkstyle'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
-    id "com.modrinth.minotaur" version "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 {
-    compileOnly 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT'
-
-    implementation('com.github.MilkBowl:VaultAPI:1.7') {
-        exclude group: 'org.bukkit', module: 'bukkit'
-    }
-
-    api('me.main__.util:SerializationConfig:1.7') {
-        exclude group: 'org.bukkit', module: 'bukkit'
-    }
-    api('com.pneumaticraft.commandhandler:CommandHandler:11') {
-        exclude group: 'org.bukkit', module: 'bukkit'
-        exclude group: 'junit', module: 'junit'
-    }
-    api 'com.dumptruckman.minecraft:buscript:2.0-SNAPSHOT'
-    api 'org.bstats:bstats-bukkit:2.2.1'
-    api('com.dumptruckman.minecraft:Logging:1.1.1') {
-        exclude group: 'junit', module: 'junit'
-    }
-    api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
-    api '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)
-    }
-}
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-        }
-    }
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = "https://maven.pkg.github.com/Multiverse/Multiverse-Core"
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
-}
-
-
-ext.bitlyAccessToken = System.getenv('BITLY_ACCESS_TOKEN') ?: 'bitly-access-token'
-
-task prepareSource(type: Sync) {
-    inputs.property 'bitlyAccessToken', bitlyAccessToken
-    from sourceSets.main.java
-    into "$buildDir/src"
-    filter(ReplaceTokens, tokens: [
-            'bitly-access-token': bitlyAccessToken,
-    ])
-}
-
-compileJava {
-    source = prepareSource.outputs
-}
-
-processResources {
-    def props = [version: "${project.version}"]
-    inputs.properties props
-    filteringCharset 'UTF-8'
-    filesMatching('plugin.yml') {
-        expand props
-    }
-
-    // This task should never be skipped. The tests depend on this having been run but we want the new version number
-    // that is created after tests are run and before we run again to publish.
-    outputs.upToDateWhen { false }
-}
-
-
-checkstyle {
-    toolVersion = '6.1.1'
-    configFile file('config/mv_checks.xml')
-    ignoreFailures = true
-}
-
-
-javadoc {
-    source = sourceSets.main.allJava
-    classpath = configurations.compileClasspath
-}
-
-
-project.configurations.api.canBeResolved = true
-
-shadowJar {
-    relocate '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.api]
-
-    archiveFileName = "$baseName-$version.$extension"
-    classifier = ''
-}
-
-build.dependsOn shadowJar
-jar.enabled = false
-
-modrinth {
-    token = System.getenv("MODRINTH_TOKEN")
-    projectId = "multiverse-core"
-    versionNumber = version
-
-    if(System.getenv("PRERELEASE")) {
-        versionType = "beta"
-    } else {
-        versionType = "release"
-    }
-
-    uploadFile = jar
-    gameVersions = ["1.20.1", "1.20", "1.19.4", "1.19.3", "1.19.2", "1.19.1", "1.19", "1.18.2", "1.18.1", "1.18", "1.17.1", "1.17", "1.16.5", "1.16.4", "1.16.3", "1.16.2", "1.16.1", "1.16", "1.15.2", "1.15.1", "1.15", "1.14.4", "1.14.3", "1.14.2", "1.14.1", "1.14", "1.13.2", "1.13.1", "1.13"]
-    loaders = ["bukkit", "spigot", "paper"]
-    changelog = System.getenv("CHANGELOG")
-}
@@ -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
@@ -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" "$@"
@@ -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
@@ -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.1-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.0.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>instrument</goal>
+                            <goal>tests-instrument</goal>
+                        </goals>
+                        <configuration>
+                            <notNull>
+                                <param>org.jetbrains.annotations.NotNull</param>
+                                <param>javax.validation.constraints.NotNull</param>
+                            </notNull>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+           <groupId>org.bukkit</groupId>
+           <artifactId>bukkit</artifactId>
+           <version>1.13.2-R0.1-SNAPSHOT</version>
+           <scope>provided</scope>
+        </dependency>
+        <!-- SerializationConfig Dependency -->
+        <dependency>
+            <groupId>me.main__.util</groupId>
+            <artifactId>SerializationConfig</artifactId>
+            <version>1.7</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- End of SerializationConfig Dependency -->
+        <!-- Start of Economy Dependency -->
+        <dependency>
+            <groupId>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>
@@ -1,11 +0,0 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-    }
-}
-
-rootProject.name = 'multiverse-core'
@@ -356,7 +356,7 @@ public class MVWorld implements MultiverseWorld {

        @Override
        public Map<String, Object> serialize() {
-            return Collections.emptyMap();
+            return Collections.EMPTY_MAP;
        }

        /**
@@ -534,7 +534,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
            } else if (entry.getValue() instanceof ConfigurationSection) {
                Logging.fine("Migrating: " + entry.getKey());
                // we have to migrate this
-                WorldProperties world = new WorldProperties(Collections.emptyMap());
+                WorldProperties world = new WorldProperties(Collections.EMPTY_MAP);
                ConfigurationSection section = (ConfigurationSection) entry.getValue();

                // migrate animals and monsters
@@ -9,6 +9,7 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.enums.MVEnums;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
@@ -21,6 +22,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;

 /**
 * Creates a new world and loads it.
@@ -90,23 +92,22 @@ public class CreateCommand extends MultiverseCommand {
            return;
        }

-        Environment environment = EnvironmentCommand.getEnvFromString(env);
-        if (environment == null) {
+        // Parse Environment.
+        Optional<Environment> environment = MVEnums.ENVIRONMENT.parseValue(env);
+        if (!environment.isPresent()) {
            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
            EnvironmentCommand.showEnvironments(sender);
            return;
        }

-        // If they didn't specify a type, default to NORMAL
-        if (typeString == null) {
-            typeString = "NORMAL";
-        }
-        WorldType type = EnvironmentCommand.getWorldTypeFromString(typeString);
-        if (type == null) {
+        // Parse WorldType. If they didn't specify a type, default to normal.
+        Optional<WorldType> type = MVEnums.WORLD_TYPE.parseValue(typeString == null ? "normal" : typeString);
+        if (!type.isPresent()) {
            sender.sendMessage(ChatColor.RED + "That is not a valid World Type.");
            EnvironmentCommand.showWorldTypes(sender);
            return;
        }
+
        // Determine if the generator is valid. #918
        if (generator != null) {
            List<String> genarray = new ArrayList<String>(Arrays.asList(generator.split(":")));
@@ -122,7 +123,13 @@ public class CreateCommand extends MultiverseCommand {
        }
        Command.broadcastCommandMessage(sender, "Starting creation of world '" + worldName + "'...");

-        if (this.worldManager.addWorld(worldName, environment, seed, type, allowStructures, generator, useSpawnAdjust)) {
+        if (this.worldManager.addWorld(
+                worldName,
+                environment.get(),
+                seed, type.get(),
+                allowStructures,
+                generator,
+                useSpawnAdjust)) {
            Command.broadcastCommandMessage(sender, "Complete!");
        } else {
            Command.broadcastCommandMessage(sender, "FAILED.");
@@ -8,6 +8,7 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.enums.MVEnums;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.WorldType;
@@ -68,25 +69,11 @@ public class EnvironmentCommand extends MultiverseCommand {
     *
     * @param type The WorldType as a {@link String}
     * @return The WorldType as a {@link WorldType}
+     * @deprecated Use {@link MVEnums#WORLD_TYPE} instead.
     */
+    @Deprecated
    public static WorldType getWorldTypeFromString(String type) {
-        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
-        if (type.equalsIgnoreCase("normal")) {
-            type = "NORMAL";
-        } else if (type.equalsIgnoreCase("flat")) {
-            type = "FLAT";
-        } else if (type.equalsIgnoreCase("largebiomes")) {
-            type = "LARGE_BIOMES";
-        } else if (type.equalsIgnoreCase("amplified")) {
-            type = "AMPLIFIED";
-        }
-        try {
-            // Now that we've converted a potentially unfriendly value
-            // to a friendly one, get it from the ENUM!
-            return WorldType.valueOf(type);
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
+        return MVEnums.WORLD_TYPE.parseValue(type).orElse(null);
    }

    /**
@@ -94,25 +81,10 @@ public class EnvironmentCommand extends MultiverseCommand {
     *
     * @param env The environment as {@link String}
     * @return The environment as {@link org.bukkit.World.Environment}
+     * @deprecated Use {@link MVEnums#ENVIRONMENT} instead.
     */
+    @Deprecated
    public static World.Environment getEnvFromString(String env) {
-        env = env.toUpperCase();
-        // Don't reference the enum directly as there aren't that many, and we can be more forgiving to users this way
-        if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER"))
-            env = "NETHER";
-
-        if (env.equalsIgnoreCase("END") || env.equalsIgnoreCase("THEEND") || env.equalsIgnoreCase("STARWARS"))
-            env = "THE_END";
-
-        if (env.equalsIgnoreCase("NORMAL") || env.equalsIgnoreCase("WORLD"))
-            env = "NORMAL";
-
-        try {
-            // Now that we've converted a potentially unfriendly value
-            // to a friendly one, get it from the ENUM!
-            return World.Environment.valueOf(env);
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
+        return MVEnums.ENVIRONMENT.parseValue(env).orElse(null);
    }
 }
@@ -9,6 +9,7 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
+import com.onarandombox.MultiverseCore.enums.MVEnums;
 import com.onarandombox.MultiverseCore.utils.WorldNameChecker;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
@@ -20,6 +21,7 @@ import org.bukkit.permissions.PermissionDefault;
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;

 /**
 * Imports a new world of the specified type.
@@ -106,8 +108,8 @@ public class ImportCommand extends MultiverseCommand {
        }

        String env = args.get(1);
-        Environment environment = EnvironmentCommand.getEnvFromString(env);
-        if (environment == null) {
+        Optional<Environment> environment = MVEnums.ENVIRONMENT.parseValue(env);
+        if (!environment.isPresent()) {
            sender.sendMessage(ChatColor.RED + "That is not a valid environment.");
            EnvironmentCommand.showEnvironments(sender);
            return;
@@ -128,10 +130,18 @@ public class ImportCommand extends MultiverseCommand {
            sender.sendMessage("For a list of available world types, type: " + ChatColor.AQUA + "/mvenv");
        } else {
            Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
-            if (this.worldManager.addWorld(worldName, environment, null, null, null, generator, useSpawnAdjust))
+            if (this.worldManager.addWorld(worldName,
+                    environment.get(),
+                    null,
+                    null,
+                    null,
+                    generator,
+                    useSpawnAdjust)) {
                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
-            else
+            }
+            else {
                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
+            }
        }
    }
 }
@@ -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),
@@ -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}.
@@ -0,0 +1,20 @@
+package com.onarandombox.MultiverseCore.enums;
+
+import com.onarandombox.MultiverseCore.utils.EnumMapping;
+import org.bukkit.World;
+import org.bukkit.WorldType;
+
+public class MVEnums {
+
+    public static final EnumMapping<World.Environment> ENVIRONMENT = EnumMapping.builder(World.Environment.class)
+            .addAlias("overworld", World.Environment.NORMAL)
+            .addAlias("hell", World.Environment.NETHER)
+            .addAlias("end", World.Environment.THE_END)
+            .addAlias("starwars", World.Environment.THE_END)
+            .mapWithoutUnderscore()
+            .build();
+
+    public static final EnumMapping<WorldType> WORLD_TYPE = EnumMapping.builder(WorldType.class)
+            .mapWithoutUnderscore()
+            .build();
+}
@@ -170,7 +170,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")) {
@@ -0,0 +1,107 @@
+package com.onarandombox.MultiverseCore.utils;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+public class EnumMapping<T extends Enum<T>> {
+
+    public static <T extends Enum<T>> Builder<T> builder(Class<T> enumClass) {
+        return builder(enumClass, false);
+    }
+
+    public static <T extends Enum<T>> Builder<T> builder(Class<T> enumClass, boolean caseSensitive) {
+        return new Builder<>(enumClass, caseSensitive);
+    }
+
+    private final Class<T> enumClass;
+    private final boolean caseSensitive;
+    private final Map<String, T> enumsMap;
+
+    public EnumMapping(Class<T> enumClass, boolean caseSensitive) {
+        this.enumClass = enumClass;
+        this.caseSensitive = caseSensitive;
+        this.enumsMap = new HashMap<>();
+    }
+
+    @NotNull
+    public Optional<T> parseValue(@Nullable String value) {
+        if (value == null) {
+            return Optional.empty();
+        }
+
+        T enumType = this.enumsMap.get(caseSensitive ? value : value.toLowerCase());
+        if (enumType != null) {
+            return Optional.of(enumType);
+        }
+
+        try {
+            return Optional.of(Enum.valueOf(enumClass, value));
+        } catch (IllegalArgumentException e) {
+            return Optional.empty();
+        }
+    }
+
+    @NotNull
+    public Map<String, T> getEnumsMap() {
+        return Collections.unmodifiableMap(this.enumsMap);
+    }
+
+    public boolean isCaseSensitive() {
+        return caseSensitive;
+    }
+
+    public Class<? extends Enum<T>> getEnumClass() {
+        return enumClass;
+    }
+
+    public static class Builder<T extends Enum<T>> {
+
+        private final EnumMapping<T> enumMapping;
+
+        public Builder(Class<T> enumClass, boolean caseSensitive) {
+            this.enumMapping = new EnumMapping<>(enumClass, caseSensitive);
+            if (!this.enumMapping.caseSensitive) {
+                addLowerCaseMap();
+            }
+        }
+
+        private void addLowerCaseMap() {
+            Arrays.stream(this.enumMapping.enumClass.getEnumConstants()).forEach(enumType -> {
+                addAlias(enumType.name(), enumType);
+            });
+        }
+
+        public Builder<T> mapWithoutUnderscore() {
+            Arrays.stream(this.enumMapping.enumClass.getEnumConstants()).forEach(enumType -> {
+                addAlias(enumType.name().replace("_", ""), enumType);
+            });
+            return this;
+        }
+
+        @NotNull
+        public Builder<T> addAlias(String aliasName, String enumString) {
+            this.enumMapping.parseValue(enumString).ifPresent(enumType -> addAlias(aliasName, enumType));
+            return this;
+        }
+
+        @NotNull
+        public Builder<T> addAlias(String aliasName, T enumType) {
+            if (!this.enumMapping.caseSensitive) {
+                aliasName = aliasName.toLowerCase();
+            }
+            this.enumMapping.enumsMap.computeIfAbsent(aliasName, name -> enumType);
+            return this;
+        }
+
+        @NotNull
+        public EnumMapping<T> build() {
+            return this.enumMapping;
+        }
+    }
+}
@@ -9,11 +9,11 @@ package com.onarandombox.MultiverseCore.utils;

 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
+import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
 import com.onarandombox.MultiverseCore.enums.TeleportResult;
-import org.bukkit.Bukkit;
+
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -25,6 +25,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.util.Vector;

+import java.util.logging.Level;
+
 /**
 * The default-implementation of {@link SafeTTeleporter}.
 */
@@ -35,7 +37,6 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
        this.plugin = plugin;
    }

-    private static final Vector DEFAULT_VECTOR = new Vector();
    private static final int DEFAULT_TOLERANCE = 6;
    private static final int DEFAULT_RADIUS = 9;

@@ -213,11 +214,8 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {

        if (safeLoc != null) {
            if (teleportee.teleport(safeLoc)) {
-                Vector v = d.getVelocity();
-                if (v != null && !DEFAULT_VECTOR.equals(v)) {
-                    Bukkit.getScheduler().runTaskLater(this.plugin, () -> {
-                        teleportee.setVelocity(d.getVelocity());
-                    }, 1);
+                if (!d.getVelocity().equals(new Vector(0, 0, 0))) {
+                    teleportee.setVelocity(d.getVelocity());
                }
                return TeleportResult.SUCCESS;
            }
@@ -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() {
@@ -27,6 +27,7 @@ class BitlyURLShortener extends URLShortener {
    @Override
    String encodeData(String data) {
        JSONObject json = new JSONObject();
+        json.put("domain", "j.mp");
        json.put("long_url", data);
        return json.toJSONString();
    }
@@ -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
@@ -101,42 +101,42 @@ public class TestEntitySpawnRules {
    @Test
    public void test() {
        // test 1: no spawning at all allowed
-        adjustSettings(false, false, Collections.emptyList(), Collections.emptyList());
+        adjustSettings(false, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
        createAnimals();
        spawnAllNatural();
        verify(sheepEvent).setCancelled(true);
        verify(zombieEvent).setCancelled(true);

        // test 2: only monsters
-        adjustSettings(false, true, Collections.emptyList(), Collections.emptyList());
+        adjustSettings(false, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
        createAnimals();
        spawnAllNatural();
        verify(sheepEvent).setCancelled(true);
        verify(zombieEvent).setCancelled(false);

        // test 3: all spawning allowed
-        adjustSettings(true, true, Collections.emptyList(), Collections.emptyList());
+        adjustSettings(true, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
        createAnimals();
        spawnAllNatural();
        verify(sheepEvent).setCancelled(false);
        verify(zombieEvent).setCancelled(false);

        // test 4: no spawning with zombie exception
-        adjustSettings(false, false, Collections.emptyList(), Arrays.asList("ZOMBIE"));
+        adjustSettings(false, false, Collections.EMPTY_LIST, Arrays.asList("ZOMBIE"));
        createAnimals();
        spawnAllNatural();
        verify(sheepEvent).setCancelled(true);
        verify(zombieEvent).setCancelled(false);

        // test 5: all spawning with sheep exception
-        adjustSettings(true, true, Arrays.asList("SHEEP"), Collections.emptyList());
+        adjustSettings(true, true, Arrays.asList("SHEEP"), Collections.EMPTY_LIST);
        createAnimals();
        spawnAllNatural();
        verify(sheepEvent).setCancelled(true);
        verify(zombieEvent).setCancelled(false);

        // test 6: eggs
-        adjustSettings(false, false, Collections.emptyList(), Collections.emptyList());
+        adjustSettings(false, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
        createAnimals();
        spawnAll(SpawnReason.SPAWNER_EGG);
        verify(sheepEvent, never()).setCancelled(anyBoolean());
Author	SHA1	Message	Date
Ben Woo	fee9b95bef	Safer null checking with parsing enum value.	2021-07-22 11:42:54 +08:00
Ben Woo	b940063104	Implement new way of mapping enums with alias.	2021-07-22 11:39:39 +08:00