WIP doxygen fix.

2020-06-12 23:54:55 -04:00
119 changed files with 1564 additions and 4555 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 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 💬 Multiverse Discord Server
-    url: https://discord.gg/NZtfKky
-    about: Need help with using Multiverse-Core or just want to chat with the devs? Join the Multiverse Discord Server for help!
@@ -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
@@ -1,47 +0,0 @@
-name: Publish package to GitHub Packages
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Get release
-        id: get_release
-        uses: bruceadams/get-release@v1.3.2
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Publish package
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: publish
-        env:
-          GITHUB_VERSION: ${{ steps.get_release.outputs.tag_name }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload release artifact
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: build/libs/multiverse-core-${{ steps.get_release.outputs.tag }}.jar
-          asset_name: multiverse-core-${{ steps.get_release.outputs.tag }}.jar
-          asset_content_type: application/java-archive
@@ -1,37 +0,0 @@
-name: Create Release Version
-
-on:
-  push:
-    branches: [main]
-
-jobs:
-  release_on_push:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Test & Build
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: clean build -x assemble -x shadowJar
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Create release
-        uses: rymndhng/release-on-push-action@v0.27.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-        with:
-          bump_version_scheme: norelease
-          tag_prefix: v
-          release_name: "Release <RELEASE_VERSION>"
-          use_github_release_notes: true
@@ -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 release"
@@ -1,29 +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_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -43,6 +43,3 @@ debug.log
 # Doxygen
 /docs/html
 debug.txt
-
-# Gradle
-.gradle
@@ -0,0 +1,6 @@
+language: java
+jdk:
+  - oraclejdk8
+notifications:
+  email: false
+dist: trusty
@@ -1,6 +0,0 @@
-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,44 +1,16 @@
-![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 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:
-* [Multiverse-NetherPortals](https://github.com/Multiverse/Multiverse-NetherPortals) -> Have separate nether and end worlds for each of your overworlds!
-* [Multiverse-Portals](https://github.com/Multiverse/Multiverse-Portals) -> Make custom portals to go to any destination!
-* [Multiverse-Inventories](https://github.com/Multiverse/Multiverse-Inventories) -> Have separated players stats and inventories per world or per group of worlds.
-* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleprompters!
-
 Building
 ========
-Simply build the source with Gradle:
-```
-./gradlew build
-```
+Simply build the source with maven:
+
+    $ mvn install
+
 More details are available on the [build instructions wiki page](https://github.com/Multiverse/Multiverse-Core/wiki/Building).

-
-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)!
-
-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.
+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,173 +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'
-}
-
-version = System.getenv('GITHUB_VERSION')?.substring(1) ?: 'local'
-group = 'com.onarandombox.multiversecore'
-description = 'Multiverse-Core'
-
-java.sourceCompatibility = JavaVersion.VERSION_11
-
-repositories {
-    mavenLocal()
-    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') {
-        exclude group: 'junit', module: 'junit'
-    }
-
-    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 '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"
-}
-
-build.dependsOn shadowJar
-jar.enabled = false
@@ -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,374 @@
+<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.1.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>
+    </properties>
+
+    <repositories>
+      <!-- Spigot -->
+        <repository>
+            <id>spigotmc-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+            <id>onarandombox</id>
+            <url>http://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>vault-repo</id>
+            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+        </repository>
+        <repository>
+            <id>minebench-repo</id>
+            <url>https://repo.minebench.de/</url>
+        </repository>
+        <!-- Has a copy of metrics R8-SNAPSHOT !-->
+        <repository>
+            <id>elmakers-repo</id>
+            <url>http://maven.elmakers.com/repository/</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>doodleproject-repo</id>
+            <name>DoodleProject Maven 2 Repository</name>
+            <url>http://doodleproject.sourceforge.net/maven2/release</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <ciManagement>
+        <system>jenkins</system>
+        <url>http://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>
+    </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>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <file>target/classes/plugin.yml</file>
+                    <replacements>
+                        <replacement>
+                            <token>maven-version-number</token>
+                            <value>${project.version}-b${project.build.number}</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </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>
+                    <parallel>methods</parallel>
+                    <threadCount>10</threadCount>
+                    <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>
+                <groupId>net.sf.doodleproject</artifactId>
+                <artifactId>doxygen-maven-plugin</artifactId>
+                <configuration>
+                    <alphabeticalIndex>true</alphabeticalIndex>
+                    <inputDirectory>${basedir}/src/main/java</inputDirectory>
+                    <filePatterns>*.java</filePatterns>
+                    <recursive>true</recursive>
+                    <outputDirectory>${project.reporting.outputDirectory}/doxygen</outputDirectory>
+                </configuration>
+            </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.1.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <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.mcstats</pattern>
+                                    <shadedPattern>com.onarandombox.mcstats</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>0.6.8</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>instrument</goal>
+                            <goal>tests-instrument</goal>
+                        </goals>
+                    </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>net.milkbowl.vault</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.mcstats.bukkit</groupId>
+            <artifactId>metrics</artifactId>
+            <version>R8-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
+        </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.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>2.0.0</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-easymock</artifactId>
+            <version>2.0.0</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>2.0.0</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>4.0.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>http://repo.onarandombox.com/content/repositories/multiverse</url>
+        </repository>
+        <snapshotRepository>
+            <id>OnARandomBox</id>
+            <url>http://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+</project>
@@ -1,5 +0,0 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
-rootProject.name = 'multiverse-core'
@@ -214,7 +214,7 @@ public class MVWorld implements MultiverseWorld {
        public Double validateChange(String property, Double newValue, Double oldValue,
                MVWorld object) throws ChangeDeniedException {
            if (newValue <= 0) {
-                Logging.fine("Someone tried to set a scale <= 0, aborting!");
+                plugin.log(Level.FINE, "Someone tried to set a scale <= 0, aborting!");
                throw new ChangeDeniedException();
            }
            return super.validateChange(property, newValue, oldValue, object);
@@ -297,7 +297,7 @@ public class MVWorld implements MultiverseWorld {
        public GameMode validateChange(String property, GameMode newValue, GameMode oldValue,
                MVWorld object) throws ChangeDeniedException {
            for (Player p : plugin.getServer().getWorld(getName()).getPlayers()) {
-                Logging.finer(String.format("Setting %s's GameMode to %s",
+                plugin.log(Level.FINER, String.format("Setting %s's GameMode to %s",
                        p.getName(), newValue.toString()));
                plugin.getPlayerListener().handleGameModeAndFlight(p, MVWorld.this);
            }
@@ -319,16 +319,16 @@ public class MVWorld implements MultiverseWorld {
                // verify that the location is safe
                if (!bs.playerCanSpawnHereSafely(newValue)) {
                    // it's not ==> find a better one!
-                    Logging.warning(String.format("Somebody tried to set the spawn location for '%s' to an unsafe value! Adjusting...", getAlias()));
-                    Logging.warning("Old Location: " + plugin.getLocationManipulation().strCoordsRaw(oldValue));
-                    Logging.warning("New (unsafe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
+                    plugin.log(Level.WARNING, String.format("Somebody tried to set the spawn location for '%s' to an unsafe value! Adjusting...", getAlias()));
+                    plugin.log(Level.WARNING, "Old Location: " + plugin.getLocationManipulation().strCoordsRaw(oldValue));
+                    plugin.log(Level.WARNING, "New (unsafe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
                    SafeTTeleporter teleporter = plugin.getSafeTTeleporter();
                    newValue = teleporter.getSafeLocation(newValue, SPAWN_LOCATION_SEARCH_TOLERANCE, SPAWN_LOCATION_SEARCH_RADIUS);
                    if (newValue == null) {
-                        Logging.warning("Couldn't fix the location. I have to abort the spawn location-change :/");
+                        plugin.log(Level.WARNING, "Couldn't fix the location. I have to abort the spawn location-change :/");
                        throw new ChangeDeniedException();
                    }
-                    Logging.warning("New (safe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
+                    plugin.log(Level.WARNING, "New (safe) Location: " + plugin.getLocationManipulation().strCoordsRaw(newValue));
                }
            }
            return super.validateChange(property, newValue, oldValue, object);
@@ -356,7 +356,7 @@ public class MVWorld implements MultiverseWorld {

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

        /**
@@ -411,7 +411,7 @@ public class MVWorld implements MultiverseWorld {
            // Add limit bypass to it's parent
            this.limitbypassperm.addParent("mv.bypass.playerlimit.*", true);
        } catch (IllegalArgumentException e) {
-            Logging.finer("Permissions nodes were already added for " + this.name);
+            this.plugin.log(Level.FINER, "Permissions nodes were already added for " + this.name);
        }
    }

@@ -422,16 +422,16 @@ public class MVWorld implements MultiverseWorld {
        // Verify that location was safe
        if (!bs.playerCanSpawnHereSafely(location)) {
            if (!this.getAdjustSpawn()) {
-                Logging.fine("Spawn location from world.dat file was unsafe!!");
-                Logging.fine("NOT adjusting spawn for '" + this.getAlias() + "' because you told me not to.");
-                Logging.fine("To turn on spawn adjustment for this world simply type:");
-                Logging.fine("/mvm set adjustspawn true " + this.getAlias());
+                this.plugin.log(Level.FINE, "Spawn location from world.dat file was unsafe!!");
+                this.plugin.log(Level.FINE, "NOT adjusting spawn for '" + this.getAlias() + "' because you told me not to.");
+                this.plugin.log(Level.FINE, "To turn on spawn adjustment for this world simply type:");
+                this.plugin.log(Level.FINE, "/mvm set adjustspawn true " + this.getAlias());
                return location;
            }
            // If it's not, find a better one.
            SafeTTeleporter teleporter = this.plugin.getSafeTTeleporter();
-            Logging.warning("Spawn location from world.dat file was unsafe. Adjusting...");
-            Logging.warning("Original Location: " + plugin.getLocationManipulation().strCoordsRaw(location));
+            this.plugin.log(Level.WARNING, "Spawn location from world.dat file was unsafe. Adjusting...");
+            this.plugin.log(Level.WARNING, "Original Location: " + plugin.getLocationManipulation().strCoordsRaw(location));
            Location newSpawn = teleporter.getSafeLocation(location,
                    SPAWN_LOCATION_SEARCH_TOLERANCE, SPAWN_LOCATION_SEARCH_RADIUS);
            // I think we could also do this, as I think this is what Notch does.
@@ -450,7 +450,7 @@ public class MVWorld implements MultiverseWorld {
                            this.getName(), plugin.getLocationManipulation().locationToString(newerSpawn));
                    return newerSpawn;
                } else {
-                    Logging.severe("Safe spawn NOT found!!!");
+                    this.plugin.log(Level.SEVERE, "Safe spawn NOT found!!!");
                }
            }
        }
@@ -17,9 +17,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;

 import buscript.Buscript;
@@ -32,6 +34,7 @@ import com.onarandombox.MultiverseCore.api.MVPlugin;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
 import com.onarandombox.MultiverseCore.api.MultiverseMessaging;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.commands.AnchorCommand;
 import com.onarandombox.MultiverseCore.commands.CheckCommand;
@@ -68,7 +71,6 @@ import com.onarandombox.MultiverseCore.commands.TeleportCommand;
 import com.onarandombox.MultiverseCore.commands.UnloadCommand;
 import com.onarandombox.MultiverseCore.commands.VersionCommand;
 import com.onarandombox.MultiverseCore.commands.WhoCommand;
-import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
 import com.onarandombox.MultiverseCore.destination.AnchorDestination;
 import com.onarandombox.MultiverseCore.destination.BedDestination;
 import com.onarandombox.MultiverseCore.destination.CannonDestination;
@@ -89,14 +91,11 @@ import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
 import com.onarandombox.MultiverseCore.listeners.MVWorldInitListener;
 import com.onarandombox.MultiverseCore.listeners.MVWorldListener;
 import com.onarandombox.MultiverseCore.utils.AnchorManager;
-import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
 import com.onarandombox.MultiverseCore.utils.MVEconomist;
 import com.onarandombox.MultiverseCore.utils.MVMessaging;
 import com.onarandombox.MultiverseCore.utils.MVPermissions;
 import com.onarandombox.MultiverseCore.utils.MVPlayerSession;
 import com.onarandombox.MultiverseCore.utils.MaterialConverter;
-import com.onarandombox.MultiverseCore.utils.TestingMode;
-import com.onarandombox.MultiverseCore.utils.metrics.MetricsConfigurator;
 import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety;
 import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
 import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
@@ -110,6 +109,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
+import org.bukkit.World.Environment;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.Configuration;
@@ -122,6 +122,7 @@ import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
+import org.mcstats.Metrics;

 /**
 * The implementation of the Multiverse-{@link Core}.
@@ -205,7 +206,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {

    // Setup our Map for our Commands using the CommandHandler.
    private CommandHandler commandHandler;
-    private CommandQueueManager commandQueueManager;

    private static final String LOG_TAG = "[Multiverse-Core]";

@@ -257,8 +257,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        // Setup our SafeTTeleporter
        this.safeTTeleporter = new SimpleSafeTTeleporter(this);
        this.unsafeCallWrapper = new UnsafeCallWrapper(this);
-        // Setup our CompatibilityLayer
-        CompatibilityLayer.init();
    }


@@ -290,7 +288,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {

        // Setup the command manager
        this.commandHandler = new CommandHandler(this, this.ph);
-        this.commandQueueManager = new CommandQueueManager(this);
        // Call the Function to assign all the Commands to their Class.
        this.registerCommands();

@@ -312,7 +309,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
            this.worldManager.loadDefaultWorlds();
            this.worldManager.loadWorlds(true);
        } else {
-            Logging.severe("Your configs were not loaded. Very little will function in Multiverse.");
+            this.log(Level.SEVERE, "Your configs were not loaded. Very little will function in Multiverse.");
        }
        this.anchorManager.loadAnchors();

@@ -349,28 +346,104 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        }
    }

-    private void setupMetrics() {
-        if (TestingMode.isDisabled()) {
-            MetricsConfigurator.configureMetrics(this);
-        }
-    }
-
    /**
     * Initializes the buscript javascript library.
     */
    private void initializeBuscript() {
-        buscript = null;
+        buscript = new Buscript(this);
+        // Add global variable "multiverse" to javascript environment
+        buscript.setScriptVariable("multiverse", this);
+    }

-        if (this.getMVConfig().getEnableBuscript()) {
-            try {
-                buscript = new Buscript(this);
-                // Add global variable "multiverse" to javascript environment
-                buscript.setScriptVariable("multiverse", this);
-            } catch (NullPointerException e) {
-                Logging.warning("Buscript failed to load! The script command will be disabled! " +
-                        "If you would like not to see this message, " +
-                        "use `/mv conf enablebuscript false` to disable Buscript from loading.");
-            }
+    /**
+     * Plotter for Environment-Values.
+     */
+    private static final class EnvironmentPlotter extends Metrics.Plotter {
+        private MultiverseCore core;
+        private final Environment env;
+
+        public EnvironmentPlotter(MultiverseCore core, Environment env) {
+            super(envToString(env));
+            this.core = core;
+            this.env = env;
+        }
+
+        private static String envToString(Environment env) {
+            return new StringBuilder().append(env.name().toUpperCase().charAt(0))
+                    .append(env.name().toLowerCase().substring(1)).toString();
+        }
+
+        @Override
+        public int getValue() {
+            int count = 0;
+            for (MultiverseWorld w : core.getMVWorldManager().getMVWorlds())
+                if (w.getEnvironment() == env)
+                    count++;
+            core.log(Level.FINE, String.format("Tracking %d worlds of type %s", count, env));
+            return count;
+        }
+    }
+
+    /**
+     * Plotter for Generator-Values.
+     */
+    private static final class GeneratorPlotter extends Metrics.Plotter {
+        private MultiverseCore core;
+        private final String gen;
+
+        public GeneratorPlotter(MultiverseCore core, String gen) {
+            super(gen);
+            this.core = core;
+            this.gen = gen;
+        }
+
+        @Override
+        public int getValue() {
+            int count = 0;
+            for (MultiverseWorld w : core.getMVWorldManager().getMVWorlds())
+                if (gen.equals(w.getGenerator()))
+                    count++;
+            core.log(Level.FINE, String.format("Tracking %d worlds of type %s", count, gen));
+            return count;
+        }
+    }
+
+    private void setupMetrics() {
+        try {
+            Metrics m = new Metrics(this);
+
+            Metrics.Graph envGraph = m.createGraph("Worlds by environment");
+            for (Environment env : Environment.values())
+                envGraph.addPlotter(new EnvironmentPlotter(this, env));
+
+            Metrics.Graph loadedWorldsGraph = m.createGraph("Worlds by environment");
+            loadedWorldsGraph.addPlotter(new Metrics.Plotter("Loaded worlds") {
+                @Override
+                public int getValue() {
+                    return getMVWorldManager().getMVWorlds().size();
+                }
+            });
+            loadedWorldsGraph.addPlotter(new Metrics.Plotter("Total number of worlds") {
+                @Override
+                public int getValue() {
+                    return getMVWorldManager().getMVWorlds().size()
+                            + getMVWorldManager().getUnloadedWorlds().size();
+                }
+            });
+
+            Set<String> gens = new HashSet<String>();
+            for (MultiverseWorld w : this.getMVWorldManager().getMVWorlds())
+                gens.add(w.getGenerator());
+            gens.remove(null);
+            gens.remove("null");
+            Metrics.Graph genGraph = m.createGraph("Custom Generators");
+            for (String gen : gens)
+                genGraph.addPlotter(new GeneratorPlotter(this, gen));
+
+            m.start();
+            log(Level.FINE, "Metrics have run!");
+        } catch (Exception e) {
+            log(Level.WARNING, "There was an issue while enabling metrics: " + e.getMessage());
        }
    }

@@ -394,7 +467,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        pm.registerEvents(this.entityListener, this);
        pm.registerEvents(this.weatherListener, this);
        pm.registerEvents(this.portalListener, this);
-        Logging.info(ChatColor.GREEN + "We are aware of the warning about the deprecated event. There is no alternative that allows us to do what we need to do and performance impact is negligible. It is safe to ignore.");
+        log(Level.INFO, "We are aware of the warning about the deprecated event. There is no alternative that allows us to do what we need to do. The performance impact is negligible.");
        pm.registerEvents(this.worldListener, this);
        pm.registerEvents(new MVMapListener(this), this);
    }
@@ -513,13 +586,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        try {
            wconf.load(worldsFile);
        } catch (IOException e) {
-            Logging.warning("Cannot load worlds.yml");
+            log(Level.WARNING, "Cannot load worlds.yml");
        } catch (InvalidConfigurationException e) {
-            Logging.warning("Your worlds.yml is invalid!");
+            log(Level.WARNING, "Your worlds.yml is invalid!");
        }

        if (!wconf.isConfigurationSection("worlds")) { // empty config
-            Logging.fine("No worlds to migrate!");
+            this.log(Level.FINE, "No worlds to migrate!");
            return;
        }

@@ -532,9 +605,9 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                // fine
                newValues.put(entry.getKey(), entry.getValue());
            } else if (entry.getValue() instanceof ConfigurationSection) {
-                Logging.fine("Migrating: " + entry.getKey());
+                this.log(Level.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
@@ -698,8 +771,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                    try {
                        difficulty = Difficulty.valueOf(section.getString("difficulty").toUpperCase());
                    } catch (IllegalArgumentException e) {
-                        Logging.warning("Could not parse difficulty: " + section.getString("difficulty"));
-                        Logging.warning("Setting world " + entry.getKey() + " difficulty to NORMAL");
+                        this.log(Level.WARNING, "Could not parse difficulty: " + section.getString("difficulty"));
+                        this.log(Level.WARNING, "Setting world " + entry.getKey() + " difficulty to NORMAL");
                        difficulty = Difficulty.NORMAL;
                    }
                    if (difficulty != null) {
@@ -716,7 +789,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                wasChanged = true;
            } else {
                // huh?
-                Logging.warning("Removing unknown entry in the config: " + entry);
+                this.log(Level.WARNING, "Removing unknown entry in the config: " + entry);
                // just don't add to newValues
                wasChanged = true;
            }
@@ -850,12 +923,8 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {

    /**
     * {@inheritDoc}
-     *
-     * @deprecated This is now deprecated, nobody needs it any longer.
-     * All logging is now done with {@link Logging}.
     */
    @Override
-    @Deprecated
    public void log(Level level, String msg) {
        Logging.log(level, msg);
    }
@@ -922,15 +991,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
        return this.commandHandler;
    }

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Deprecated
-    public CommandQueueManager getCommandQueueManager() {
-        return commandQueueManager;
-    }
-
    /**
     * Gets the log-tag.
     *
@@ -1083,7 +1143,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
            this.multiverseConfig.save(new File(getDataFolder(), "config.yml"));
            return true;
        } catch (IOException e) {
-            Logging.severe("Could not save Multiverse config.yml config. Please check your file permissions.");
+            this.log(Level.SEVERE, "Could not save Multiverse config.yml config. Please check your file permissions.");
            return false;
        }
    }
@@ -1131,22 +1191,12 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {

    /**
     * {@inheritDoc}
-     * @deprecated This is deprecated! Do not use!
+     * @deprecated This is deprecated!
     */
    @Override
    @Deprecated
    public Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed) {
-        return this.worldManager.regenWorld(name, useNewSeed, randomSeed, seed, false);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @deprecated This is deprecated! Do not use!
-     */
-    @Override
-    @Deprecated
-    public Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed, Boolean keepGameRules) {
-        return this.worldManager.regenWorld(name, useNewSeed, randomSeed, seed, keepGameRules);
+        return this.worldManager.regenWorld(name, useNewSeed, randomSeed, seed);
    }

    /**
@@ -56,8 +56,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
    @Property
    private volatile boolean displaypermerrors;
    @Property
-    private volatile boolean enablebuscript;
-    @Property
    private volatile int globaldebug;
    @Property
    private volatile boolean silentstart;
@@ -96,18 +94,17 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
        enforceaccess = false;
        useasyncchat = true;
-        prefixchat = false;
+        prefixchat = true;
        prefixchatformat = "[%world%]%chat%";
        teleportintercept = true;
        firstspawnoverride = true;
        displaypermerrors = true;
-        enablebuscript = true;
        globaldebug = 0;
        messagecooldown = 5000;
        teleportcooldown = 1000;
        this.version = 2.9;
        silentstart = false;
-        defaultportalsearch = true;
+        defaultportalsearch = false;
        portalsearchradius = 128;
        autopurge = true;
        idonotwanttodonate = false;
@@ -216,22 +213,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
        return this.displaypermerrors;
    }

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getEnableBuscript() {
-        return this.enablebuscript;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setEnableBuscript(boolean enableBuscript) {
-        this.enablebuscript = enableBuscript;
-    }
-
    /**
     * {@inheritDoc}
     */
@@ -8,7 +8,6 @@
 package com.onarandombox.MultiverseCore.api;

 import buscript.Buscript;
-import com.onarandombox.MultiverseCore.commandtools.queue.CommandQueueManager;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.utils.AnchorManager;
 import com.onarandombox.MultiverseCore.utils.MVEconomist;
@@ -87,15 +86,6 @@ public interface Core {
     */
    CommandHandler getCommandHandler();

-    /**
-     * Manager for command that requires /mv confirm before execution.
-     *
-     * @return A non-null {@link CommandQueueManager}.
-     * @deprecated To be moved to new command manager in 5.0.0
-     */
-    @Deprecated
-    CommandQueueManager getCommandQueueManager();
-
    /**
     * Gets the factory class responsible for loading many different destinations
     * on demand.
@@ -126,38 +116,20 @@ public interface Core {
    AnchorManager getAnchorManager();

    /**
-     * Previously used by queued commands to regenerate a world on a delay.
-     * Do not use api method for any other purpose.
+     * Used by queued commands to regenerate a world on a delay.
     *
-     * @param name          Name of the world to regenerate
-     * @param useNewSeed    If a new seed should be used
-     * @param randomSeed    If the new seed should be random
-     * @param seed          The seed of the world.
+     * @param name Name of the world to regenerate
+     * @param useNewSeed If a new seed should be used
+     * @param randomSeed IF the new seed should be random
+     * @param seed The seed of the world.
     *
     * @return True if success, false if fail.
     *
-     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String, boolean)} instead.
+     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String)} instead.
     */
    @Deprecated
    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed);

-    /**
-     * Used by queued commands to regenerate a world on a delay.
-     * Do not use api method for any other purpose.
-     *
-     * @param name          Name of the world to regenerate
-     * @param useNewSeed    If a new seed should be used
-     * @param randomSeed    If the new seed should be random
-     * @param seed          The seed of the world.
-     * @param keepGameRules If GameRules should be kept on world regen.
-     *
-     * @return True if success, false if fail.
-     *
-     * @deprecated Use {@link MVWorldManager#regenWorld(String, boolean, boolean, String, boolean)} instead.
-     */
-    @Deprecated
-    Boolean regenWorld(String name, Boolean useNewSeed, Boolean randomSeed, String seed, Boolean keepGameRules);
-
    /**
     * Decrements the number of plugins that have specifically hooked into core.
     */
@@ -7,17 +7,11 @@

 package com.onarandombox.MultiverseCore.api;

-import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.Server;

 import java.util.logging.Level;

-/**
- * A simple API to require plugins to have a log method.
- *
- * @deprecated Replaced by {@link Logging}.
- * */
-@Deprecated
+/** A simple API to require plugins to have a log method. */
 public interface LoggablePlugin {
    /**
     * Logs a message at the specified level.
@@ -174,16 +174,6 @@ public interface MVWorldManager {
     */
    MultiverseWorld getMVWorld(String name);

-    /**
-     * Returns a {@link MultiverseWorld} if the world with name given exists, and null if it does not.
-     * This will search optionally for alias names.
-     *
-     * @param name          The name or optionally the alias of the world to get.
-     * @param checkAliases  Indicates whether to check for world alias name.
-     * @return A {@link MultiverseWorld} or null.
-     */
-    MultiverseWorld getMVWorld(String name, boolean checkAliases);
-
    /**
     * Returns a {@link MultiverseWorld} if it exists, and null if it does not.
     *
@@ -193,24 +183,13 @@ public interface MVWorldManager {
    MultiverseWorld getMVWorld(World world);

    /**
-     * Checks to see if the given name is a valid {@link MultiverseWorld}
-     * Searches based on world name AND alias.
+     * Checks to see if the given name is a valid {@link MultiverseWorld}.
     *
     * @param name The name or alias of the world to check.
     * @return True if the world exists, false if not.
     */
    boolean isMVWorld(String name);

-    /**
-     * Checks to see if the given name is a valid {@link MultiverseWorld}.
-     * Optionally searches by alias is specified.
-     *
-     * @param name          The name or alias of the world to check.
-     * @param checkAliases  Indicates whether to check for world alias name.
-     * @return True if the world exists, false if not.
-     */
-    boolean isMVWorld(String name, boolean checkAliases);
-
    /**
     * Checks to see if the given world is a valid {@link MultiverseWorld}.
     *
@@ -313,28 +292,15 @@ public interface MVWorldManager {
    /**
     * Regenerates a world.
     *
-     * @param name          Name of the world to regenerate
-     * @param useNewSeed    If a new seed should be used
-     * @param randomSeed    If the new seed should be random
-     * @param seed          The seed of the world.
+     * @param name Name of the world to regenerate
+     * @param useNewSeed If a new seed should be used
+     * @param randomSeed IF the new seed should be random
+     * @param seed The seed of the world.
     *
     * @return True if success, false if fail.
     */
    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed);

-    /**
-     * Regenerates a world.
-     *
-     * @param name          Name of the world to regenerate
-     * @param useNewSeed    If a new seed should be used
-     * @param randomSeed    If the new seed should be random
-     * @param seed          The seed of the world.
-     * @param keepGameRules If GameRules should be kept on world regen.
-     *
-     * @return True if success, false if fail.
-     */
-    boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed, boolean keepGameRules);
-
    boolean isKeepingSpawnInMemory(World world);
    
    /**
@@ -348,11 +314,4 @@ public interface MVWorldManager {
     * does not exist. {@code includeLoaded} if the world exists and is loaded.
     */
    boolean hasUnloadedWorld(String name, boolean includeLoaded);
-
-    /**
-     * Get all the possible worlds that Multiverse has detected to be importable.
-     *
-     * @return A collection of world names that are deemed importable.
-     */
-    Collection<String> getPotentialWorlds();
 }
@@ -86,18 +86,6 @@ public interface MultiverseCoreConfig extends ConfigurationSerializable {
     */
    boolean getDisplayPermErrors();

-    /**
-     * Sets enableBuscript.
-     * @param enableBuscript The new value.
-     */
-    void setEnableBuscript(boolean enableBuscript);
-
-    /**
-     * Gets enableBuscript.
-     * @return enableBuscript.
-     */
-    boolean getEnableBuscript();
-
    /**
     * Sets firstSpawnOverride.
     * @param firstSpawnOverride The new value.
@@ -11,7 +11,6 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
 import com.onarandombox.MultiverseCore.utils.MVPermissions;
-import com.onarandombox.MultiverseCore.utils.PlayerFinder;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -38,7 +37,7 @@ public class CheckCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        Player p = PlayerFinder.get(args.get(0), sender);
+        Player p = this.plugin.getServer().getPlayer(args.get(0));
        if (p == null) {
            sender.sendMessage("Could not find player " + ChatColor.GREEN + args.get(0));
            sender.sendMessage("Are they online?");
@@ -33,7 +33,7 @@ public class ConfirmCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        this.plugin.getCommandQueueManager().runQueuedCommand(sender);
+        this.plugin.getCommandHandler().confirmQueuedCommand(sender);
    }

 }
@@ -46,15 +46,10 @@ public class CreateCommand extends MultiverseCommand {
        this.addCommandExample("/mv create " + ChatColor.GOLD + "moonworld" + ChatColor.GREEN + " normal" + ChatColor.DARK_AQUA + " -g BukkitFullOfMoon");
        this.worldManager = this.plugin.getMVWorldManager();
    }
-	
-	private String trimWorldName(String userInput) {
-        // Removes relative paths.
-        return userInput.replaceAll("^[./\\\\]+", "");
-    }
-	
+
    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        String worldName = trimWorldName(args.get(0));
+        String worldName = args.get(0);
        File worldFile = new File(this.plugin.getServer().getWorldContainer(), worldName);
        String env = args.get(1);
        String seed = CommandHandler.getFlag("-s", args);
@@ -71,13 +66,7 @@ public class CreateCommand extends MultiverseCommand {
                useSpawnAdjust = false;
            }
        }
-		
-		// Make sure the world name doesn't contain the words 'plugins' and '.dat'
-		if(worldName.contains("plugins")||worldName.contains(".dat")){
-			sender.sendMessage(ChatColor.RED + "Multiverse cannot create a world that contains 'plugins' or '.dat'");
-            return;
-		}
-		
+
        if (this.worldManager.isMVWorld(worldName)) {
            sender.sendMessage(ChatColor.RED + "Multiverse cannot create " + ChatColor.GOLD + ChatColor.UNDERLINE
                    + "another" + ChatColor.RESET + ChatColor.RED + " world named " + worldName);
@@ -128,4 +117,4 @@ public class CreateCommand extends MultiverseCommand {
            Command.broadcastCommandMessage(sender, "FAILED.");
        }
    }
-}
+}
@@ -7,7 +7,6 @@

 package com.onarandombox.MultiverseCore.commands;

-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -61,7 +60,7 @@ public class DebugCommand extends MultiverseCommand {
            sender.sendMessage("Multiverse Debug mode is " + ChatColor.RED + "OFF");
        } else {
            sender.sendMessage("Multiverse Debug mode is " + ChatColor.GREEN + debugLevel);
-            Logging.fine("Multiverse Debug ENABLED");
+            this.plugin.log(Level.FINE, "Multiverse Debug ENABLED");
        }
    }
 }
@@ -8,11 +8,9 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
-import org.jetbrains.annotations.NotNull;

 import java.util.ArrayList;
 import java.util.List;
@@ -37,24 +35,11 @@ public class DeleteCommand extends MultiverseCommand {
    public void runCommand(CommandSender sender, List<String> args) {
        String worldName = args.get(0);

-        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
-                sender,
-                deleteRunnable(sender, worldName),
-                String.format("Are you sure you want to delete world '%s'? You cannot undo this action.", worldName)
-        ));
-    }
-
-    private Runnable deleteRunnable(@NotNull CommandSender sender,
-                                    @NotNull String worldName) {
-
-        return () -> {
-            sender.sendMessage(String.format("Deleting world '%s'...", worldName));
-            if (this.plugin.getMVWorldManager().deleteWorld(worldName)) {
-                sender.sendMessage(String.format("%sWorld %s was deleted!", ChatColor.GREEN, worldName));
-                return;
-            }
-            sender.sendMessage(String.format("%sThere was an issue deleting '%s'! Please check console for errors.",
-                    ChatColor.RED, worldName));
-        };
+        Class<?>[] paramTypes = {String.class};
+        List<Object> objectArgs = new ArrayList<Object>(args);
+        this.plugin.getCommandHandler()
+                   .queueCommand(sender, "mvdelete", "deleteWorld", objectArgs,
+                                 paramTypes, ChatColor.GREEN + "World '" + worldName + "' Deleted!",
+                                 ChatColor.RED + "World '" + worldName + "' could NOT be deleted!");
    }
 }
@@ -10,7 +10,6 @@ package com.onarandombox.MultiverseCore.commands;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.GameRule;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -56,7 +55,7 @@ public class GameruleCommand extends MultiverseCommand {
            return;
        }

-        final GameRule gameRule = GameRule.getByName(args.get(0));
+        final String gameRule = args.get(0);
        final String value = args.get(1);
        final World world;
        if (args.size() == 2) {
@@ -65,52 +64,17 @@ public class GameruleCommand extends MultiverseCommand {
            world = Bukkit.getWorld(args.get(2));
            if (world == null) {
                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(2)
-                        + ChatColor.WHITE + " does not exist.");
+                    + ChatColor.WHITE + " does not exist.");
                return;
            }
        }

-        if (gameRule == null) {
-            sender.sendMessage(ChatColor.RED + "Failure! " + ChatColor.AQUA + args.get(0) + ChatColor.WHITE
-                    + " is not a valid gamerule.");
+        if (world.setGameRuleValue(gameRule, value)) {
+            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                    + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value);
        } else {
-            if (gameRule.getType() == Boolean.class) {
-                boolean booleanValue;
-                if (value.equalsIgnoreCase("true")) {
-                    booleanValue = true;
-                } else if (value.equalsIgnoreCase("false")) {
-                    booleanValue = false;
-                } else {
-                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "it can only be set to true or false.");
-                    return;
-                }
-
-                if (!world.setGameRule(gameRule, booleanValue)) {
-                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "something went wrong.");
-                    return;
-                }
-            } else if (gameRule.getType() == Integer.class) {
-                try {
-                    if (!world.setGameRule(gameRule, Integer.parseInt(value))) {
-                        throw new NumberFormatException();
-                    }
-                } catch (NumberFormatException e) {
-                    sender.sendMessage(getErrorMessage(gameRule.getName(), value) + "it can only be set to a positive integer.");
-                    return;
-                }
-            } else {
-                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule.getName()
-                        + ChatColor.WHITE + " isn't supported yet, please let us know about it.");
-                return;
-            }
-
-            sender.sendMessage(ChatColor.GREEN + "Success!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule.getName()
-                    + ChatColor.WHITE + " was set to " + ChatColor.GREEN + value + ChatColor.WHITE + ".");
+            sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
+                    + ChatColor.WHITE + " cannot be set to " + ChatColor.RED + value);
        }
    }
-
-    private String getErrorMessage(String gameRule, String value) {
-        return ChatColor.RED + "Failure!" + ChatColor.WHITE + " Gamerule " + ChatColor.AQUA + gameRule
-                + ChatColor.WHITE + " could not be set to " + ChatColor.RED + value + ChatColor.WHITE + ", ";
-    }
 }
@@ -8,20 +8,14 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.display.ColorAlternator;
-import com.onarandombox.MultiverseCore.display.ContentDisplay;
-import com.onarandombox.MultiverseCore.display.settings.MapDisplaySettings;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.GameRule;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;

-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;

 /**
 * Allows management of Anchor Destinations.
@@ -66,30 +60,17 @@ public class GamerulesCommand extends MultiverseCommand {
            world = p.getWorld();
        } else {
            world = Bukkit.getWorld(args.get(0));
-            if (world == null) {
-                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(0)
-                        + ChatColor.WHITE + " does not exist.");
-                return;
-            }
        }

-        ContentDisplay.forContent(getGameRuleMap(world))
-                .header("=== Gamerules for %s%s%s ===", ChatColor.AQUA, world.getName(), ChatColor.WHITE)
-                .colorTool(ColorAlternator.with(ChatColor.GREEN, ChatColor.GOLD))
-                .setting(MapDisplaySettings.OPERATOR, ": ")
-                .show(sender);
-    }
-
-    private Map<String, Object> getGameRuleMap(World world) {
-        Map<String, Object> gameRuleMap = new HashMap<>();
-        for (GameRule<?> rule : GameRule.values()) {
-            Object value = world.getGameRuleValue(rule);
-            if (value == null) {
-                gameRuleMap.put(rule.getName(), "null");
-                continue;
+        final StringBuilder gameRules = new StringBuilder();
+        for (final String gameRule : world.getGameRules()) {
+            if (gameRules.length() != 0) {
+                gameRules.append(ChatColor.WHITE).append(", ");
            }
-            gameRuleMap.put(rule.getName(), value);
+            gameRules.append(ChatColor.AQUA).append(gameRule).append(ChatColor.WHITE).append(": ");
+            gameRules.append(ChatColor.GREEN).append(world.getGameRuleValue(gameRule));
        }
-        return gameRuleMap;
+        sender.sendMessage("=== Gamerules for " + ChatColor.AQUA + world.getName() + ChatColor.WHITE + " ===");
+        sender.sendMessage(gameRules.toString());
    }
 }
@@ -40,16 +40,24 @@ public class HelpCommand extends PaginatedCoreCommand<Command> {

    @Override
    protected List<Command> getFilteredItems(List<Command> availableItems, String filter) {
-        String expression = "(?i).*" + cleanFilter(filter) + ".*";
        List<Command> filtered = new ArrayList<Command>();

        for (Command c : availableItems) {
-            if (stitchThisString(c.getKeyStrings()).matches(expression)
-                    || c.getCommandName().matches(expression)
-                    || c.getCommandDesc().matches(expression)
-                    || c.getCommandUsage().matches(expression)
-                    || c.getCommandExamples().stream().anyMatch(eg -> eg.matches(expression))) {
+            if (stitchThisString(c.getKeyStrings()).matches("(?i).*" + filter + ".*")) {
                filtered.add(c);
+            } else if (c.getCommandName().matches("(?i).*" + filter + ".*")) {
+                filtered.add(c);
+            } else if (c.getCommandDesc().matches("(?i).*" + filter + ".*")) {
+                filtered.add(c);
+            } else if (c.getCommandUsage().matches("(?i).*" + filter + ".*")) {
+                filtered.add(c);
+            } else {
+                for (String example : c.getCommandExamples()) {
+                    if (example.matches("(?i).*" + filter + ".*")) {
+                        filtered.add(c);
+                        break;
+                    }
+                }
            }
        }
        return filtered;
@@ -9,7 +9,7 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.utils.WorldNameChecker;
+import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.World.Environment;
@@ -18,6 +18,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;

 import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

@@ -43,17 +45,55 @@ public class ImportCommand extends MultiverseCommand {
        this.worldManager = this.plugin.getMVWorldManager();
    }

-    private String getPotentialWorldStrings() {
-        final Collection<String> potentialWorlds = this.worldManager.getPotentialWorlds();
-        StringBuilder worldList = new StringBuilder();
-        ChatColor currColor = ChatColor.WHITE;
-
-        for (String world : potentialWorlds) {
-            worldList.append(currColor).append(world).append(' ');
-            currColor = currColor == ChatColor.WHITE ? ChatColor.YELLOW : ChatColor.WHITE;
+    /**
+     * A very basic check to see if a folder has a level.dat file.
+     * If it does, we can safely assume it's a world folder.
+     *
+     * @param worldFolder The File that may be a world.
+     * @return True if it looks like a world, false if not.
+     */
+    private static boolean checkIfIsWorld(File worldFolder) {
+        if (worldFolder.isDirectory()) {
+            File[] files = worldFolder.listFiles(new FilenameFilter() {
+                @Override
+                public boolean accept(File file, String name) {
+                    return name.toLowerCase().endsWith(".dat");
+                }
+            });
+            if (files != null && files.length > 0) {
+                return true;
+            }
        }
+        return false;
+    }

-        return worldList.toString();
+    private String getPotentialWorlds() {
+        File worldFolder = this.plugin.getServer().getWorldContainer();
+        if (worldFolder == null) {
+            return "";
+        }
+        File[] files = worldFolder.listFiles();
+        String worldList = "";
+        Collection<MultiverseWorld> worlds = this.worldManager.getMVWorlds();
+        List<String> worldStrings = new ArrayList<String>();
+        for (MultiverseWorld world : worlds) {
+            worldStrings.add(world.getName());
+        }
+        for (String world : this.worldManager.getUnloadedWorlds()) {
+            worldStrings.add(world);
+        }
+        ChatColor currColor = ChatColor.WHITE;
+        for (File file : files) {
+            if (file.isDirectory() && checkIfIsWorld(file) && !worldStrings.contains(file.getName())) {
+                worldList += currColor + file.getName() + " ";
+                if (currColor == ChatColor.WHITE) {
+                    currColor = ChatColor.YELLOW;
+                } else {
+                    currColor = ChatColor.WHITE;
+                }
+            }
+        }
+        return worldList;
    }
    
    private String trimWorldName(String userInput) {
@@ -66,7 +106,7 @@ public class ImportCommand extends MultiverseCommand {
        String worldName = trimWorldName(args.get(0));

        if (worldName.toLowerCase().equals("--list") || worldName.toLowerCase().equals("-l")) {
-            String worldList = this.getPotentialWorldStrings();
+            String worldList = this.getPotentialWorlds();
            if (worldList.length() > 2) {
                sender.sendMessage(ChatColor.AQUA + "====[ These look like worlds ]====");
                sender.sendMessage(worldList);
@@ -81,12 +121,6 @@ public class ImportCommand extends MultiverseCommand {
            this.showHelp(sender);
            return;
        }
-		
-		// Make sure the world name doesn't contain the words 'plugins' and '.dat'
-		if(worldName.contains("plugins")||worldName.contains(".dat")){
-			sender.sendMessage(ChatColor.RED + "Multiverse cannot create a world that contains 'plugins' or '.dat'");
-            return;
-		}

        // Make sure we don't already know about this world.
        if (this.worldManager.isMVWorld(worldName)) {
@@ -115,10 +149,10 @@ public class ImportCommand extends MultiverseCommand {

        if (!worldFile.exists()) {
            sender.sendMessage(ChatColor.RED + "FAILED.");
-            String worldList = this.getPotentialWorldStrings();
+            String worldList = this.getPotentialWorlds();
            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
            sender.sendMessage(worldList);
-        } else if (!WorldNameChecker.isValidWorldFolder(worldFile)) {
+        } else if (!checkIfIsWorld(worldFile)) {
            sender.sendMessage(ChatColor.RED + "FAILED.");
            sender.sendMessage(String.format("'%s' does not appear to be a world. It is lacking a .dat file.",
                                             worldName));
@@ -134,4 +168,4 @@ public class ImportCommand extends MultiverseCommand {
                Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
        }
    }
-}
+}
@@ -115,7 +115,6 @@ public class InfoCommand extends MultiverseCommand {
        FancyColorScheme colors = new FancyColorScheme(ChatColor.AQUA, ChatColor.AQUA, ChatColor.GOLD, ChatColor.WHITE);
        message.add(new FancyHeader("General Info", colors));
        message.add(new FancyMessage("World Name: ", world.getName(), colors));
-        message.add(new FancyMessage("World UID: ", world.getCBWorld().getUID().toString(), colors));
        message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors));
        message.add(new FancyMessage("Game Mode: ", world.getGameMode().toString(), colors));
        message.add(new FancyMessage("Difficulty: ", world.getDifficulty().toString(), colors));
@@ -152,7 +151,6 @@ public class InfoCommand extends MultiverseCommand {
        message = new ArrayList<FancyText>();
        message.add(new FancyHeader("More World Settings", colors));
        message.add(new FancyMessage("World Type: ", world.getWorldType().toString(), colors));
-        message.add(new FancyMessage("Generator: ", world.getGenerator(), colors));
        message.add(new FancyMessage("Structures: ", world.getCBWorld().canGenerateStructures() + "", colors));
        message.add(new FancyMessage("Weather: ", world.isWeatherEnabled() + "", colors));
        message.add(new FancyMessage("Players will get hungry: ", world.getHunger() + "", colors));
@@ -9,111 +9,122 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.display.ColorAlternator;
-import com.onarandombox.MultiverseCore.display.ContentDisplay;
-import com.onarandombox.MultiverseCore.display.ContentFilter;
-import com.onarandombox.MultiverseCore.display.DisplayHandlers;
-import com.onarandombox.MultiverseCore.display.settings.PagedDisplaySettings;
 import org.bukkit.ChatColor;
-import org.bukkit.World;
+import org.bukkit.World.Environment;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
-import org.jetbrains.annotations.NotNull;

-import java.util.Collection;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;

 /**
 * Displays a listing of all worlds that a player can enter.
 */
-public class ListCommand extends MultiverseCommand {
+public class ListCommand extends PaginatedCoreCommand<String> {

    public ListCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("World Listing");
-        this.setCommandUsage("/mv list [filter] [page]");
+        this.setCommandUsage("/mv list");
        this.setArgRange(0, 2);
        this.addKey("mvlist");
        this.addKey("mvl");
        this.addKey("mv list");
        this.setPermission("multiverse.core.list.worlds", "Displays a listing of all worlds that you can enter.", PermissionDefault.OP);
+        this.setItemsPerPage(8); // SUPPRESS CHECKSTYLE: MagicNumberCheck
+    }
+
+    private List<String> getFancyWorldList(Player p) {
+        List<String> worldList = new ArrayList<String>();
+        for (MultiverseWorld world : this.plugin.getMVWorldManager().getMVWorlds()) {
+
+            if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
+                continue;
+            }
+
+            ChatColor color = ChatColor.GOLD;
+            Environment env = world.getEnvironment();
+            if (env == Environment.NETHER) {
+                color = ChatColor.RED;
+            } else if (env == Environment.NORMAL) {
+                color = ChatColor.GREEN;
+            } else if (env == Environment.THE_END) {
+                color = ChatColor.AQUA;
+            }
+            StringBuilder builder = new StringBuilder();
+            builder.append(world.getColoredWorldString()).append(ChatColor.WHITE);
+            builder.append(" - ").append(color).append(world.getEnvironment());
+            if (world.isHidden()) {
+                if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.core.modify", true)) {
+                    // Prefix hidden worlds with an "[H]"
+                    worldList.add(ChatColor.GRAY + "[H]" + builder.toString());
+                }
+            } else {
+                worldList.add(builder.toString());
+            }
+        }
+        for (String name : this.plugin.getMVWorldManager().getUnloadedWorlds()) {
+            if (p == null || this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + name, true)) {
+                worldList.add(ChatColor.GRAY + name + " - UNLOADED");
+            }
+        }
+        return worldList;
+    }
+
+    @Override
+    protected List<String> getFilteredItems(List<String> availableItems, String filter) {
+        List<String> filtered = new ArrayList<String>();
+
+        for (String s : availableItems) {
+            if (s.matches("(?i).*" + filter + ".*")) {
+                filtered.add(s);
+            }
+        }
+        return filtered;
+    }
+
+    @Override
+    protected String getItemText(String item) {
+        return item;
    }

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        ContentFilter filter = ContentFilter.DEFAULT;
-        int page = 1;
+        sender.sendMessage(ChatColor.LIGHT_PURPLE + "====[ Multiverse World List ]====");
+        Player p = null;
+        if (sender instanceof Player) {
+            p = (Player) sender;
+        }

-        // Either page or filter.
-        if (args.size() == 1) {
-            try {
-                page = Integer.parseInt(args.get(0));
-            } catch (NumberFormatException ignore) {
-                filter = new ContentFilter(args.get(0));
+
+        FilterObject filterObject = this.getPageAndFilter(args);
+
+        List<String> availableWorlds = new ArrayList<String>(this.getFancyWorldList(p));
+        if (filterObject.getFilter().length() > 0) {
+            availableWorlds = this.getFilteredItems(availableWorlds, filterObject.getFilter());
+            if (availableWorlds.size() == 0) {
+                sender.sendMessage(ChatColor.RED + "Sorry... " + ChatColor.WHITE
+                        + "No worlds matched your filter: " + ChatColor.AQUA + filterObject.getFilter());
+                return;
            }
        }

-        // Filter then page.
-        if (args.size() == 2) {
-            filter = new ContentFilter(args.get(0));
-            try {
-                page = Integer.parseInt(args.get(1));
-            } catch (NumberFormatException ignore) {
-                sender.sendMessage(ChatColor.RED + args.get(1) + " is not valid number!");
+        if (!(sender instanceof Player)) {
+            for (String c : availableWorlds) {
+                sender.sendMessage(c);
            }
+            return;
        }

-        ContentDisplay.forContent(getListContents(sender))
-                .header("%s====[ Multiverse World List ]====", ChatColor.GOLD)
-                .displayHandler(DisplayHandlers.PAGE_LIST)
-                .colorTool(ColorAlternator.with(ChatColor.AQUA, ChatColor.GOLD))
-                .filter(filter)
-                .setting(PagedDisplaySettings.SHOW_PAGE, page)
-                .show(sender);
-    }
+        int totalPages = (int) Math.ceil(availableWorlds.size() / (this.itemsPerPage + 0.0));

-    private Collection<String> getListContents(@NotNull CommandSender sender) {
-        Player player = (sender instanceof Player) ? (Player) sender : null;
-
-        List<String> worldList = this.plugin.getMVWorldManager().getMVWorlds().stream()
-                .filter(world -> player == null || plugin.getMVPerms().canEnterWorld(player, world))
-                .filter(world -> canSeeWorld(player, world))
-                .map(world -> hiddenText(world) + world.getColoredWorldString() + " - " + parseColouredEnvironment(world.getEnvironment()))
-                .collect(Collectors.toList());
-
-        this.plugin.getMVWorldManager().getUnloadedWorlds().stream()
-                .filter(world -> plugin.getMVPerms().hasPermission(sender, "multiverse.access." + world, true))
-                .map(world -> ChatColor.GRAY + world + " - UNLOADED")
-                .forEach(worldList::add);
-        
-        return worldList;
-    }
-
-    private boolean canSeeWorld(Player player, MultiverseWorld world) {
-        return !world.isHidden()
-                || player == null
-                || this.plugin.getMVPerms().hasPermission(player, "multiverse.core.modify", true);
-    }
-
-    private String hiddenText(MultiverseWorld world) {
-        return (world.isHidden()) ? String.format("%s[H] ", ChatColor.GRAY) : "";
-    }
-
-    private String parseColouredEnvironment(World.Environment env) {
-        ChatColor color = ChatColor.GOLD;
-        switch (env) {
-            case NETHER:
-                color = ChatColor.RED;
-                break;
-            case NORMAL:
-                color = ChatColor.GREEN;
-                break;
-            case THE_END:
-                color = ChatColor.AQUA;
-                break;
+        if (filterObject.getPage() > totalPages) {
+            filterObject.setPage(totalPages);
        }
-        return color + env.toString();
+
+        sender.sendMessage(ChatColor.AQUA + " Page " + filterObject.getPage() + " of " + totalPages);
+
+        this.showPage(filterObject.getPage(), sender, availableWorlds);
    }
 }
@@ -13,14 +13,12 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;

 import java.util.List;
-import java.util.regex.Pattern;

 /**
 * A generic paginated command.
 * @param <T> The type of items on the page.
 */
 public abstract class PaginatedCommand<T> extends Command {
-    private final Pattern REGEX_SPECIAL_CHARS = Pattern.compile("[.+*?\\[^\\]$(){}=!<>|:-\\\\]");
    private static final int DEFAULT_ITEMS_PER_PAGE = 9;
    /**
     * The number of items per page.
@@ -42,23 +40,12 @@ public abstract class PaginatedCommand<T> extends Command {

    /**
     * Gets filtered items.
-     *
     * @param availableItems All available items.
     * @param filter The filter-{@link String}.
     * @return A list of items that match the filter.
     */
    protected abstract List<T> getFilteredItems(List<T> availableItems, String filter);

-    /**
-     * Escape regex special characters from filter
-     *
-     * @param filter The filter-{@link String}.
-     * @return String with regex characters escaped
-     */
-    protected String cleanFilter(String filter) {
-        return REGEX_SPECIAL_CHARS.matcher(filter).replaceAll("\\\\$0");
-    }
-
    /**
     * Constructs a single string from a list of strings.
     *
@@ -8,13 +8,11 @@
 package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
-import com.pneumaticraft.commandhandler.CommandHandler;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
-import org.jetbrains.annotations.NotNull;

+import java.util.ArrayList;
 import java.util.List;

 /**
@@ -25,8 +23,8 @@ public class RegenCommand extends MultiverseCommand {
    public RegenCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Regenerates a World");
-        this.setCommandUsage("/mv regen" + ChatColor.GREEN + " {WORLD}" + ChatColor.GOLD + " [-s [SEED]] [--keep-gamerules]");
-        this.setArgRange(1, 4);
+        this.setCommandUsage("/mv regen" + ChatColor.GREEN + " {WORLD}" + ChatColor.GOLD + " [-s [SEED]]");
+        this.setArgRange(1, 3);
        this.addKey("mvregen");
        this.addKey("mv regen");
        this.addCommandExample("You can use the -s with no args to get a new seed:");
@@ -39,31 +37,17 @@ public class RegenCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        String worldName = args.get(0);
-        boolean useseed = (!(args.size() == 1));
-        boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s"));
+        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);
-        this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
-                sender,
-                doWorldRegen(sender, worldName, useseed, randomseed, seed, keepGamerules),
-                String.format("Are you sure you want to regen '%s'? You cannot undo this action.", worldName)
-        ));
-    }

-    private Runnable doWorldRegen(@NotNull CommandSender sender,
-                                  @NotNull String worldName,
-                                  boolean useSeed,
-                                  boolean randomSeed,
-                                  @NotNull String seed,
-                                  boolean keepGamerules) {
-
-        return () -> {
-            if (this.plugin.getMVWorldManager().regenWorld(worldName, useSeed, randomSeed, seed, keepGamerules)) {
-                sender.sendMessage(ChatColor.GREEN + "World Regenerated!");
-                return;
-            }
-            sender.sendMessage(ChatColor.RED + "World could NOT be regenerated!");
-        };
+        Class<?>[] paramTypes = {String.class, Boolean.class, Boolean.class, String.class};
+        List<Object> objectArgs = new ArrayList<Object>();
+        objectArgs.add(args.get(0));
+        objectArgs.add(useseed);
+        objectArgs.add(randomseed);
+        objectArgs.add(seed);
+        this.plugin.getCommandHandler().queueCommand(sender, "mvregen", "regenWorld", objectArgs,
+                paramTypes, ChatColor.GREEN + "World Regenerated!", ChatColor.RED + "World could NOT be regenerated!");
    }
 }
@@ -27,7 +27,6 @@ public class ReloadCommand extends MultiverseCommand {
        this.setCommandUsage("/mv reload");
        this.setArgRange(0, 0);
        this.addKey("mvreload");
-        this.addKey("mvr");
        this.addKey("mv reload");
        this.addCommandExample("/mv reload");
        this.setPermission("multiverse.core.reload", "Reloads worlds.yml and config.yml.", PermissionDefault.OP);
@@ -35,10 +35,6 @@ public class ScriptCommand extends MultiverseCommand {

    @Override
    public void runCommand(CommandSender sender, List<String> args) {
-        if (plugin.getScriptAPI() == null) {
-            sender.sendMessage("Buscript failed to load while the server was starting. Scripts cannot be run.");
-            return;
-        }
        File file = new File(plugin.getScriptAPI().getScriptFolder(), args.get(0));
        if (!file.exists()) {
            sender.sendMessage("That script file does not exist in the Multiverse-Core scripts directory!");
@@ -30,7 +30,6 @@ public class SetSpawnCommand extends MultiverseCommand {
        this.setCommandUsage("/mv setspawn");
        this.setArgRange(0, 6);
        this.addKey("mvsetspawn");
-        this.addKey("mvsets");
        this.addKey("mvss");
        this.addKey("mv set spawn");
        this.addKey("mv setspawn");
@@ -9,7 +9,6 @@ package com.onarandombox.MultiverseCore.commands;

 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.PlayerFinder;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
@@ -51,7 +50,7 @@ public class SpawnCommand extends MultiverseCommand {
                sender.sendMessage("You don't have permission to teleport another player to spawn. (multiverse.core.spawn.other)");
                return;
            }
-            Player target = PlayerFinder.get(args.get(0), sender);
+            Player target = this.plugin.getServer().getPlayer(args.get(0));
            if (target != null) {
                target.sendMessage("Teleporting to this world's spawn...");
                spawnAccurately(target);
@@ -7,11 +7,9 @@

 package com.onarandombox.MultiverseCore.commands;

-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.Teleporter;
 import com.onarandombox.MultiverseCore.api.MVDestination;
-import com.onarandombox.MultiverseCore.commandtools.queue.QueuedCommand;
 import com.onarandombox.MultiverseCore.destination.CustomTeleporterDestination;
 import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.destination.InvalidDestination;
@@ -19,7 +17,6 @@ import com.onarandombox.MultiverseCore.destination.WorldDestination;
 import com.onarandombox.MultiverseCore.enums.TeleportResult;
 import com.onarandombox.MultiverseCore.event.MVTeleportEvent;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.utils.PlayerFinder;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -30,6 +27,7 @@ import org.bukkit.permissions.PermissionDefault;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;

 /**
 * Used to teleport players.
@@ -42,7 +40,7 @@ public class TeleportCommand extends MultiverseCommand {
        Permission menu = new Permission("multiverse.teleport.*", "Allows you to display the teleport menu.", PermissionDefault.OP);

        this.setName("Teleport");
-        this.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {DESTINATION}");
+        this.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {WORLD}");
        this.setArgRange(1, 2);
        this.addKey("mvtp");
        this.addKey("mv tp");
@@ -60,7 +58,7 @@ public class TeleportCommand extends MultiverseCommand {
        String destinationName;

        if (args.size() == 2) {
-            teleportee = PlayerFinder.get(args.get(0), sender);
+            teleportee = this.plugin.getServer().getPlayer(args.get(0));
            if (teleportee == null) {
                this.messaging.sendMessage(sender, String.format("Sorry, I couldn't find player: %s%s",
                        ChatColor.GOLD, args.get(0)), false);
@@ -76,14 +74,27 @@ public class TeleportCommand extends MultiverseCommand {
            }
            teleportee = (Player) sender;
        }
+        // Special case for cannons:
+        if (destinationName.matches("(?i)cannon-[\\d]+(\\.[\\d]+)?")) {
+            String[] cannonSpeed = destinationName.split("-");
+            try {
+                double speed = Double.parseDouble(cannonSpeed[1]);
+                destinationName = "ca:" + teleportee.getWorld().getName() + ":" + teleportee.getLocation().getX()
+                        + "," + teleportee.getLocation().getY() + "," + teleportee.getLocation().getZ() + ":"
+                        + teleportee.getLocation().getPitch() + ":" + teleportee.getLocation().getYaw() + ":" + speed;
+            } catch (Exception e) {
+                destinationName = "i:invalid";
+            }

+        }
        DestinationFactory df = this.plugin.getDestFactory();
-        MVDestination d = df.getPlayerAwareDestination(teleportee, destinationName);
+        MVDestination d = df.getDestination(destinationName);
+

        MVTeleportEvent teleportEvent = new MVTeleportEvent(d, teleportee, teleporter, true);
        this.plugin.getServer().getPluginManager().callEvent(teleportEvent);
        if (teleportEvent.isCancelled()) {
-            Logging.fine("Someone else cancelled the MVTeleport Event!!!");
+            this.plugin.log(Level.FINE, "Someone else cancelled the MVTeleport Event!!!");
            return;
        }

@@ -151,29 +162,26 @@ public class TeleportCommand extends MultiverseCommand {
                ((CustomTeleporterDestination)d).getTeleporter() : this.playerTeleporter;
        TeleportResult result = teleportObject.teleport(teleporter, teleportee, d);
        if (result == TeleportResult.FAIL_UNSAFE) {
-            Logging.fine("Could not teleport " + teleportee.getName()
+            this.plugin.log(Level.FINE, "Could not teleport " + teleportee.getName()
                    + " to " + plugin.getLocationManipulation().strCoordsRaw(d.getLocation(teleportee)));
-
+            this.plugin.log(Level.FINE, "Queueing Command");
+            Class<?>[] paramTypes = { CommandSender.class, Player.class, Location.class };
+            List<Object> items = new ArrayList<Object>();
+            items.add(teleporter);
+            items.add(teleportee);
+            items.add(d.getLocation(teleportee));
            String player = "you";
            if (!teleportee.equals(teleporter)) {
                player = teleportee.getName();
            }
-
-            this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
-                    sender,
-                    doUnsafeTeleport(teleporter, teleportee, d.getLocation(teleportee)),
-                    String.format("%sMultiverse %sdid not teleport %s%s %sto %s%s %sbecause it was unsafe. Would you like to try anyway?",
-                            ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE),
-                    UNSAFE_TELEPORT_EXPIRE_DELAY
-            ));
+            String message = String.format("%sMultiverse %sdid not teleport %s%s %sto %s%s %sbecause it was unsafe.",
+                    ChatColor.GREEN, ChatColor.WHITE, ChatColor.AQUA, player, ChatColor.WHITE, ChatColor.DARK_AQUA, d.getName(), ChatColor.WHITE);
+            this.plugin.getCommandHandler().queueCommand(sender, "mvteleport", "teleportPlayer", items,
+                    paramTypes, message, "Would you like to try anyway?", "", "", UNSAFE_TELEPORT_EXPIRE_DELAY);
        }
        // else: Player was teleported successfully (or the tp event was fired I should say)
    }

-    private Runnable doUnsafeTeleport(CommandSender teleporter, Player player, Location location) {
-        return () -> this.plugin.getSafeTTeleporter().safelyTeleport(teleporter, player, location, false);
-    }
-
    private boolean checkSendPermissions(CommandSender teleporter, Player teleportee, MVDestination destination) {
        if (teleporter.equals(teleportee)) {
            if (!this.plugin.getMVPerms().hasPermission(teleporter, "multiverse.teleport.self." + destination.getIdentifier(), true)) {
@@ -10,13 +10,12 @@ package com.onarandombox.MultiverseCore.commands;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
+import com.onarandombox.MultiverseCore.utils.webpaste.BitlyURLShortener;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteFailedException;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteService;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
 import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
-import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerFactory;
-import com.onarandombox.MultiverseCore.utils.webpaste.URLShortenerType;
 import com.pneumaticraft.commandhandler.CommandHandler;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
@@ -25,8 +24,10 @@ import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.util.StringUtil;

-import java.io.File;
+import java.io.*;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

@@ -34,95 +35,110 @@ import java.util.Map;
 * Dumps version info to the console.
 */
 public class VersionCommand extends MultiverseCommand {
-    private static final URLShortener SHORTENER = URLShortenerFactory.getService(URLShortenerType.BITLY);
+    private static final URLShortener SHORTENER = new BitlyURLShortener();

    public VersionCommand(MultiverseCore plugin) {
        super(plugin);
        this.setName("Multiverse Version");
-        this.setCommandUsage("/mv version " + ChatColor.GOLD + "[-b|-h|-p] [--include-plugin-list]");
+        this.setCommandUsage("/mv version " + ChatColor.GOLD + "-[bh] [--include-plugin-list]");
        this.setArgRange(0, 2);
        this.addKey("mv version");
-        this.addKey("mvver");
        this.addKey("mvv");
        this.addKey("mvversion");
-        this.setPermission(
-                "multiverse.core.version",
-                "Dumps version info to the console, optionally to pastebin.com with -b, to hastebin.com using -h, or to paste.gg with -p.",
-                PermissionDefault.OP)
-        ;
+        this.setPermission("multiverse.core.version",
+                "Dumps version info to the console, optionally to pastie.org with -p or pastebin.com with a -b.", PermissionDefault.TRUE);
    }

    private String getLegacyString() {
-        return "[Multiverse-Core] Multiverse-Core Version: " + this.plugin.getDescription().getVersion() + '\n'
-                + "[Multiverse-Core] Bukkit Version: " + this.plugin.getServer().getVersion() + '\n'
-                + "[Multiverse-Core] Loaded Worlds: " + this.plugin.getMVWorldManager().getMVWorlds() + '\n'
-                + "[Multiverse-Core] Multiverse Plugins Loaded: " + this.plugin.getPluginCount() + '\n'
-                +"[Multiverse-Core] Economy being used: " + plugin.getEconomist().getEconomyName() + '\n'
-                + "[Multiverse-Core] Permissions Plugin: " + this.plugin.getMVPerms().getType() + '\n'
-                + "[Multiverse-Core] Dumping Config Values: (version " + this.plugin.getMVConfig().getVersion() + ")" + '\n'
-                + "[Multiverse-Core]   enforceaccess: " + plugin.getMVConfig().getEnforceAccess() + '\n'
-                + "[Multiverse-Core]   prefixchat: " + plugin.getMVConfig().getPrefixChat() + '\n'
-                + "[Multiverse-Core]   prefixchatformat: " + plugin.getMVConfig().getPrefixChatFormat() + '\n'
-                + "[Multiverse-Core]   useasyncchat: " + plugin.getMVConfig().getUseAsyncChat() + '\n'
-                + "[Multiverse-Core]   teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + '\n'
-                + "[Multiverse-Core]   firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + '\n'
-                + "[Multiverse-Core]   displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + '\n'
-                + "[Multiverse-Core]   enablebuscript: " + plugin.getMVConfig().getEnableBuscript() + '\n'
-                + "[Multiverse-Core]   globaldebug: " + plugin.getMVConfig().getGlobalDebug() + '\n'
-                + "[Multiverse-Core]   silentstart: " + plugin.getMVConfig().getSilentStart() + '\n'
-                + "[Multiverse-Core]   messagecooldown: " + plugin.getMessaging().getCooldown() + '\n'
-                + "[Multiverse-Core]   version: " + plugin.getMVConfig().getVersion() + '\n'
-                + "[Multiverse-Core]   firstspawnworld: " + plugin.getMVConfig().getFirstSpawnWorld() + '\n'
-                + "[Multiverse-Core]   teleportcooldown: " + plugin.getMVConfig().getTeleportCooldown() + '\n'
-                + "[Multiverse-Core]   defaultportalsearch: " + plugin.getMVConfig().isUsingDefaultPortalSearch() + '\n'
-                + "[Multiverse-Core]   portalsearchradius: " + plugin.getMVConfig().getPortalSearchRadius() + '\n'
-                + "[Multiverse-Core]   autopurge: " + plugin.getMVConfig().isAutoPurgeEnabled() + '\n'
-                + "[Multiverse-Core] Special Code: FRN002" + '\n';
+        StringBuilder legacyFile = new StringBuilder();
+        legacyFile.append("[Multiverse-Core] Multiverse-Core Version: ").append(this.plugin.getDescription().getVersion()).append('\n');
+        legacyFile.append("[Multiverse-Core] Bukkit Version: ").append(this.plugin.getServer().getVersion()).append('\n');
+        legacyFile.append("[Multiverse-Core] Loaded Worlds: ").append(this.plugin.getMVWorldManager().getMVWorlds()).append('\n');
+        legacyFile.append("[Multiverse-Core] Multiverse Plugins Loaded: ").append(this.plugin.getPluginCount()).append('\n');
+        legacyFile.append("[Multiverse-Core] Economy being used: ").append(plugin.getEconomist().getEconomyName()).append('\n');
+        legacyFile.append("[Multiverse-Core] Permissions Plugin: ").append(this.plugin.getMVPerms().getType()).append('\n');
+        legacyFile.append("[Multiverse-Core] Dumping Config Values: (version ")
+                .append(this.plugin.getMVConfig().getVersion()).append(")").append('\n');
+        legacyFile.append("[Multiverse-Core]  messagecooldown: ").append(plugin.getMessaging().getCooldown()).append('\n');
+        legacyFile.append("[Multiverse-Core]  teleportcooldown: ").append(plugin.getMVConfig().getTeleportCooldown()).append('\n');
+        legacyFile.append("[Multiverse-Core]  worldnameprefix: ").append(plugin.getMVConfig().getPrefixChat()).append('\n');
+        legacyFile.append("[Multiverse-Core]  worldnameprefixFormat: ").append(plugin.getMVConfig().getPrefixChatFormat()).append('\n');
+        legacyFile.append("[Multiverse-Core]  enforceaccess: ").append(plugin.getMVConfig().getEnforceAccess()).append('\n');
+        legacyFile.append("[Multiverse-Core]  displaypermerrors: ").append(plugin.getMVConfig().getDisplayPermErrors()).append('\n');
+        legacyFile.append("[Multiverse-Core]  teleportintercept: ").append(plugin.getMVConfig().getTeleportIntercept()).append('\n');
+        legacyFile.append("[Multiverse-Core]  firstspawnoverride: ").append(plugin.getMVConfig().getFirstSpawnOverride()).append('\n');
+        legacyFile.append("[Multiverse-Core]  firstspawnworld: ").append(plugin.getMVConfig().getFirstSpawnWorld()).append('\n');
+        legacyFile.append("[Multiverse-Core]  debug: ").append(plugin.getMVConfig().getGlobalDebug()).append('\n');
+        legacyFile.append("[Multiverse-Core] Special Code: FRN002").append('\n');
+        return legacyFile.toString();
    }

    private String getMarkdownString() {
-        return "# Multiverse-Core" + '\n'
-                + "## Overview" + '\n'
-                + "| Name | Value |" + '\n'
-                + "| --- | --- |" + '\n'
-                + "| Multiverse-Core Version | `" + this.plugin.getDescription().getVersion() + "` |" + '\n'
-                + "| Bukkit Version | `" + this.plugin.getServer().getVersion() + "` |" + '\n'
-                + "| Loaded Worlds | `" + this.plugin.getMVWorldManager().getMVWorlds() + "` |" + '\n'
-                + "| Multiverse Plugins Loaded | `" + this.plugin.getPluginCount() + "` |" + '\n'
-                + "| Economy being used | `" + plugin.getEconomist().getEconomyName() + "` |" + '\n'
-                + "| Permissions Plugin | `" + this.plugin.getMVPerms().getType() + "` |" + '\n'
-                + "## Parsed Config" + '\n'
-                + "These are what Multiverse thought the in-memory values of the config were." + "\n\n"
-                + "| Config Key  | Value |" + '\n'
-                + "| --- | --- |" + '\n'
-                + "| version | `" + this.plugin.getMVConfig().getVersion() + "` |" + '\n'
-                + "| messagecooldown | `" + plugin.getMessaging().getCooldown() + "` |" + '\n'
-                + "| teleportcooldown | `" + plugin.getMVConfig().getTeleportCooldown() + "` |" + '\n'
-                + "| worldnameprefix | `" + plugin.getMVConfig().getPrefixChat() + "` |" + '\n'
-                + "| worldnameprefixFormat | `" + plugin.getMVConfig().getPrefixChatFormat() + "` |" + '\n'
-                + "| enforceaccess | `" + plugin.getMVConfig().getEnforceAccess() + "` |" + '\n'
-                + "| displaypermerrors | `" + plugin.getMVConfig().getDisplayPermErrors() + "` |" + '\n'
-                + "| teleportintercept | `" + plugin.getMVConfig().getTeleportIntercept() + "` |" + '\n'
-                + "| firstspawnoverride | `" + plugin.getMVConfig().getFirstSpawnOverride() + "` |" + '\n'
-                + "| firstspawnworld | `" + plugin.getMVConfig().getFirstSpawnWorld() + "` |" + '\n'
-                + "| debug | `" + plugin.getMVConfig().getGlobalDebug() + "` |" + '\n';
+        StringBuilder markdownString = new StringBuilder();
+        markdownString.append("# Multiverse-Core\n");
+        markdownString.append("## Overview\n");
+        markdownString.append("| Name | Value |\n");
+        markdownString.append("| --- | --- |\n");
+        markdownString.append("| Multiverse-Core Version | `").append(this.plugin.getDescription().getVersion()).append("` |\n");
+        markdownString.append("| Bukkit Version | `").append(this.plugin.getServer().getVersion()).append("` |\n");
+        //markdownString.append("| Loaded Worlds | `").append(this.plugin.getMVWorldManager().getMVWorlds()).append("` |\n");
+        markdownString.append("| Multiverse Plugins Loaded | `").append(this.plugin.getPluginCount()).append("` |\n");
+        markdownString.append("| Economy being used | `").append(plugin.getEconomist().getEconomyName()).append("` |\n");
+        markdownString.append("| Permissions Plugin | `").append(this.plugin.getMVPerms().getType()).append("` |\n");
+        markdownString.append("## Parsed Config\n");
+        markdownString.append("These are what Multiverse thought the in-memory values of the config were.\n\n");
+        markdownString.append("| Config Key  | Value |\n");
+        markdownString.append("| --- | --- |\n");
+        markdownString.append("| version | `").append(this.plugin.getMVConfig().getVersion()).append("` |\n");
+        markdownString.append("| messagecooldown | `").append(plugin.getMessaging().getCooldown()).append("` |\n");
+        markdownString.append("| teleportcooldown | `").append(plugin.getMVConfig().getTeleportCooldown()).append("` |\n");
+        markdownString.append("| worldnameprefix | `").append(plugin.getMVConfig().getPrefixChat()).append("` |\n");
+        markdownString.append("| worldnameprefixFormat | `").append(plugin.getMVConfig().getPrefixChatFormat()).append("` |\n");
+        markdownString.append("| enforceaccess | `").append(plugin.getMVConfig().getEnforceAccess()).append("` |\n");
+        markdownString.append("| displaypermerrors | `").append(plugin.getMVConfig().getDisplayPermErrors()).append("` |\n");
+        markdownString.append("| teleportintercept | `").append(plugin.getMVConfig().getTeleportIntercept()).append("` |\n");
+        markdownString.append("| firstspawnoverride | `").append(plugin.getMVConfig().getFirstSpawnOverride()).append("` |\n");
+        markdownString.append("| firstspawnworld | `").append(plugin.getMVConfig().getFirstSpawnWorld()).append("` |\n");
+        markdownString.append("| debug | `").append(plugin.getMVConfig().getGlobalDebug()).append("` |\n");
+        return markdownString.toString();
    }

-    private void addVersionInfoToEvent(MVVersionEvent event) {
-        // add the legacy version info
-        event.appendVersionInfo(this.getLegacyString());
+    private String readFile(final String filename) {
+        String result;
+        try {
+            FileReader reader = new FileReader(filename);
+            BufferedReader bufferedReader = new BufferedReader(reader);
+            String line;
+            result = "";
+            while ((line = bufferedReader.readLine()) != null) {
+                result += line + '\n';
+            }
+        } catch (FileNotFoundException e) {
+            Logging.severe("Unable to find %s. Here's the traceback: %s", filename, e.getMessage());
+            e.printStackTrace();
+            result = String.format("ERROR: Could not load: %s", filename);
+        } catch (IOException e) {
+            Logging.severe("Something bad happend when reading %s. Here's the traceback: %s", filename, e.getMessage());
+            e.printStackTrace();
+            result = String.format("ERROR: Could not load: %s", filename);
+        }
+        return result;
+    }

-        // add the legacy file, but as markdown so it's readable
-        // TODO Readd this in 5.0.0
-        // event.putDetailedVersionInfo("version.md", this.getMarkdownString());
+    private Map<String, String> getVersionFiles() {
+        Map<String, String> files = new HashMap<String, String>();

-        // add config.yml
+        // Add the legacy file, but as markdown so it's readable
+        files.put("version.md", this.getMarkdownString());
+
+        // Add the config.yml
        File configFile = new File(this.plugin.getDataFolder(), "config.yml");
-        event.putDetailedVersionInfo("multiverse-core/config.yml", configFile);
+        files.put(configFile.getName(), this.readFile(configFile.getAbsolutePath()));

-        // add worlds.yml
-        File worldsFile = new File(this.plugin.getDataFolder(), "worlds.yml");
-        event.putDetailedVersionInfo("multiverse-core/worlds.yml", worldsFile);
+        // Add the config.yml
+        File worldConfig = new File(this.plugin.getDataFolder(), "worlds.yml");
+        files.put(worldConfig.getName(), this.readFile(worldConfig.getAbsolutePath()));
+        return files;
    }

    @Override
@@ -132,26 +148,23 @@ public class VersionCommand extends MultiverseCommand {
            sender.sendMessage("Version info dumped to console. Please check your server logs.");
        }

-        MVVersionEvent versionEvent = new MVVersionEvent();
-
-        this.addVersionInfoToEvent(versionEvent);
+        MVVersionEvent versionEvent = new MVVersionEvent(this.getLegacyString(), this.getVersionFiles());
+        final Map<String, String> files = this.getVersionFiles();
        this.plugin.getServer().getPluginManager().callEvent(versionEvent);

+        String versionInfo = versionEvent.getVersionInfo();
+
        if (CommandHandler.hasFlag("--include-plugin-list", args)) {
-            versionEvent.appendVersionInfo('\n' + "Plugins: " + getPluginList());
-            versionEvent.putDetailedVersionInfo("plugins.txt", "Plugins: " + getPluginList());
+            versionInfo = versionInfo + "\nPlugins: " + getPluginList();
        }

-        final String versionInfo = versionEvent.getVersionInfo();
-        versionEvent.putDetailedVersionInfo("version.txt", versionInfo);
-
-        final Map<String, String> files = versionEvent.getDetailedVersionInfo();
+        final String data = versionInfo;

        // log to console
-        String[] lines = versionInfo.split("\\r?\\n");
+        String[] lines = data.split("\n");
        for (String line : lines) {
            if (!line.isEmpty()) {
-                this.plugin.getServer().getLogger().info(line);
+                Logging.info(line);
            }
        }

@@ -162,16 +175,10 @@ public class VersionCommand extends MultiverseCommand {
                    String pasteUrl;
                    if (CommandHandler.hasFlag("-b", args)) {
                        // private post to pastebin
-                        pasteUrl = postToService(PasteServiceType.PASTEBIN, true, versionInfo, files);
-                    } else if (CommandHandler.hasFlag("-g", args)) {
-                        // private post to github
-                        pasteUrl = postToService(PasteServiceType.GITHUB, true, versionInfo, files);
+                        pasteUrl = postToService(PasteServiceType.PASTEBIN, true, data, files);
                    } else if (CommandHandler.hasFlag("-h", args)) {
-                        // private post to hastebin
-                        pasteUrl = postToService(PasteServiceType.HASTEBIN, true, versionInfo, files);
-                    } else if (CommandHandler.hasFlag("-p", args)) {
-                        // private post to paste.gg
-                        pasteUrl = postToService(PasteServiceType.PASTEGG, true, versionInfo, files);
+                        // private post to pastebin
+                        pasteUrl = postToService(PasteServiceType.HASTEBIN, true, data, files);
                    } else {
                        return;
                    }
@@ -197,25 +204,20 @@ public class VersionCommand extends MultiverseCommand {
     * @param pasteFiles Map of filenames/contents of debug info.
     * @return URL of visible paste
     */
-    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData, Map<String, String> pasteFiles) {
+    private static String postToService(PasteServiceType type, boolean isPrivate, String pasteData,
+                                        Map<String, String> pasteFiles) {
        PasteService ps = PasteServiceFactory.getService(type, isPrivate);
-
        try {
            String result;
            if (ps.supportsMultiFile()) {
-                result = ps.postData(pasteFiles);
+                result = ps.postData(ps.encodeData(pasteFiles), ps.getPostURL());
            } else {
-                result = ps.postData(pasteData);
+                result = ps.postData(ps.encodeData(pasteData), ps.getPostURL());
            }
-
-            if (SHORTENER != null) return SHORTENER.shorten(result);
-            return result;
+            return SHORTENER.shorten(result);
        } catch (PasteFailedException e) {
-            e.printStackTrace();
-            return "Error posting to service.";
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            return "That service isn't supported yet.";
+            System.out.print(e);
+            return "Error posting to service";
        }
    }

@@ -1,161 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commandtools.queue;
-
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.block.data.type.CommandBlock;
-import org.bukkit.command.BlockCommandSender;
-import org.bukkit.command.CommandSender;
-import org.bukkit.scheduler.BukkitTask;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Map;
-import java.util.WeakHashMap;
-
-/**
- * <p>Manages the queuing of dangerous commands that require {@code /mv confirm} before executing.</p>
- *
- * <p>Each sender can only have one command in queue at any given time. When a queued command is added
- * for a sender that already has a command in queue, it will replace the old queued command.</p>
- */
-public class CommandQueueManager {
-
-    private static final long TICKS_PER_SECOND = 20;
-    private static final DummyCommandBlockSender COMMAND_BLOCK = new DummyCommandBlockSender();
-
-    private final MultiverseCore plugin;
-    private final Map<CommandSender, QueuedCommand> queuedCommandMap;
-
-    public CommandQueueManager(@NotNull MultiverseCore plugin) {
-        this.plugin = plugin;
-        this.queuedCommandMap = new WeakHashMap<>();
-    }
-
-    /**
-     * Adds a {@link QueuedCommand} into queue.
-     *
-     * @param queuedCommand The queued command to add.
-     */
-    public void addToQueue(QueuedCommand queuedCommand) {
-        CommandSender targetSender = parseSender(queuedCommand.getSender());
-
-        // Since only one command is stored in queue per sender, we remove the old one.
-        this.removeFromQueue(targetSender);
-
-        Logging.finer("Add new command to queue for sender %s.", targetSender);
-        this.queuedCommandMap.put(targetSender, queuedCommand);
-        queuedCommand.setExpireTask(runExpireLater(queuedCommand));
-
-        queuedCommand.getSender().sendMessage(queuedCommand.getPrompt());
-        queuedCommand.getSender().sendMessage(String.format("Run %s/mv confirm %sto continue. This will expire in %s seconds.",
-                ChatColor.GREEN, ChatColor.WHITE, queuedCommand.getValidDuration()));
-    }
-
-    /**
-     * Expire task that removes a {@link QueuedCommand} from queue after valid duration defined.
-     *
-     * @param queuedCommand Command to run the expire task on.
-     * @return The expire {@link BukkitTask}.
-     */
-    @NotNull
-    private BukkitTask runExpireLater(@NotNull QueuedCommand queuedCommand) {
-        return Bukkit.getScheduler().runTaskLater(
-                this.plugin,
-                expireRunnable(queuedCommand),
-                queuedCommand.getValidDuration() * TICKS_PER_SECOND
-        );
-    }
-
-    /**
-     * Runnable responsible for expiring the queued command.
-     *
-     * @param queuedCommand Command to create the expire task on.
-     * @return The expire runnable.
-     */
-    @NotNull
-    private Runnable expireRunnable(@NotNull QueuedCommand queuedCommand) {
-        return () -> {
-            CommandSender targetSender = parseSender(queuedCommand.getSender());
-            QueuedCommand matchingQueuedCommand = this.queuedCommandMap.get(targetSender);
-            if (!queuedCommand.equals(matchingQueuedCommand) || queuedCommand.getExpireTask().isCancelled()) {
-                // To be safe, but this shouldn't happen since we cancel old commands before add new once.
-                Logging.finer("This is an old queue command already.");
-                return;
-            }
-            queuedCommand.getSender().sendMessage("Your queued command has expired.");
-            this.queuedCommandMap.remove(queuedCommand.getSender());
-        };
-    }
-
-    /**
-     * Runs the command in queue for the given sender, if any.
-     *
-     * @param sender    {@link CommandSender} that confirmed the command.
-     * @return True if queued command ran successfully, else false.
-     */
-    public boolean runQueuedCommand(@NotNull CommandSender sender) {
-        CommandSender targetSender = parseSender(sender);
-        QueuedCommand queuedCommand = this.queuedCommandMap.get(targetSender);
-        if (queuedCommand == null) {
-            sender.sendMessage(ChatColor.RED + "You do not have any commands in queue.");
-            return false;
-        }
-        Logging.finer("Running queued command...");
-        queuedCommand.getAction().run();
-        return removeFromQueue(targetSender);
-    }
-
-    /**
-     * Since only one command is stored in queue per sender, we remove the old one.
-     *
-     * @param sender    The {@link CommandSender} that executed the command.
-     * @return True if queue command is removed from sender successfully, else false.
-     */
-    public boolean removeFromQueue(@NotNull CommandSender sender) {
-        CommandSender targetSender = parseSender(sender);
-        QueuedCommand previousCommand = this.queuedCommandMap.remove(targetSender);
-        if (previousCommand == null) {
-            Logging.finer("No queue command to remove for sender %s.", targetSender.getName());
-            return false;
-        }
-        previousCommand.getExpireTask().cancel();
-        Logging.finer("Removed queue command for sender %s.", targetSender.getName());
-        return true;
-    }
-
-    /**
-     * To allow all CommandBlocks to be a common sender with use of {@link DummyCommandBlockSender}.
-     * So confirm command can be used for a queued command on another command block.
-     *
-     * @param sender    The sender to parse.
-     * @return The sender, or if its a command block, a {@link DummyCommandBlockSender}.
-     */
-    @NotNull
-    private CommandSender parseSender(@NotNull CommandSender sender) {
-        Logging.fine(sender.getClass().getName());
-        if (isCommandBlock(sender)) {
-            Logging.finer("Is command block.");
-            return COMMAND_BLOCK;
-        }
-        return sender;
-    }
-
-    /**
-     * Checks if the sender is a command block.
-     *
-     * @param sender    The sender to check.
-     * @return True if sender is a command block, else false.
-     */
-    private boolean isCommandBlock(@NotNull CommandSender sender) {
-        return sender instanceof BlockCommandSender
-                && ((BlockCommandSender) sender).getBlock().getBlockData() instanceof CommandBlock;
-    }
-}
@@ -1,104 +0,0 @@
-package com.onarandombox.MultiverseCore.commandtools.queue;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionAttachment;
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Set;
-
-/**
- * Used by {@link CommandQueueManager}, so different commands block can be recognised as one.
- */
-class DummyCommandBlockSender implements CommandSender {
-
-    @Override
-    public void sendMessage(@NotNull String message) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendMessage(@NotNull String[] messages) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NotNull Server getServer() {
-        return Bukkit.getServer();
-    }
-
-    @Override
-    public @NotNull String getName() {
-        return "DummyCommandBlockSender";
-    }
-
-    @Override
-    public boolean isPermissionSet(@NotNull String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean isPermissionSet(@NotNull Permission perm) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasPermission(@NotNull String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasPermission(@NotNull Permission perm) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NotNull PermissionAttachment addAttachment(@NotNull Plugin plugin) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @Nullable PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void removeAttachment(@NotNull PermissionAttachment attachment) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void recalculatePermissions() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NotNull Set<PermissionAttachmentInfo> getEffectivePermissions() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean isOp() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void setOp(boolean value) {
-        throw new UnsupportedOperationException();
-    }
-}
@@ -1,86 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2020.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package com.onarandombox.MultiverseCore.commandtools.queue;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.scheduler.BukkitTask;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Represents a single command used in {@link CommandQueueManager} for confirming before running potentially
- * dangerous action.
- */
-public class QueuedCommand {
-
-    private static final String DEFAULT_PROMPT_MESSAGE = "The command you are trying to run is deemed dangerous.";
-    private static final int DEFAULT_VALID_TIME = 10;
-
-    private final CommandSender sender;
-    private final Runnable action;
-    private final String prompt;
-    private final int validDuration;
-    private BukkitTask expireTask;
-
-    public QueuedCommand(CommandSender sender, Runnable action) {
-        this(sender, action, DEFAULT_PROMPT_MESSAGE, DEFAULT_VALID_TIME);
-    }
-
-    public QueuedCommand(CommandSender sender, Runnable action, String prompt) {
-        this(sender, action, prompt, DEFAULT_VALID_TIME);
-    }
-
-    public QueuedCommand(CommandSender sender, Runnable action, int validDuration) {
-        this(sender, action, DEFAULT_PROMPT_MESSAGE, validDuration);
-    }
-
-    /**
-     * Creates a new queue command, to be registered at {@link CommandQueueManager#addToQueue(QueuedCommand)}.
-     *
-     * @param sender        The sender that ran the command needed for confirmation.
-     * @param action        The logic to execute upon confirming.
-     * @param prompt        Question to ask sender to confirm.
-     * @param validDuration Duration in which the command is valid for confirm in seconds.
-     */
-    public QueuedCommand(CommandSender sender, Runnable action, String prompt, int validDuration) {
-        this.sender = sender;
-        this.action = action;
-        this.prompt = prompt;
-        this.validDuration = validDuration;
-    }
-
-    @NotNull
-    CommandSender getSender() {
-        return sender;
-    }
-
-    @NotNull
-    String getPrompt() {
-        return prompt;
-    }
-
-    int getValidDuration() {
-        return validDuration;
-    }
-
-    @NotNull
-    Runnable getAction() {
-        return action;
-    }
-
-    @NotNull
-    BukkitTask getExpireTask() {
-        return expireTask;
-    }
-
-    void setExpireTask(@NotNull BukkitTask expireTask) {
-        if (this.expireTask != null) {
-            throw new IllegalStateException("This queue command already has an expire task. You can't register twice!");
-        }
-        this.expireTask = expireTask;
-    }
-}
@@ -1,4 +0,0 @@
-/**
- * Manager queuing of dangerous commands in need of confirmation.
- */
-package com.onarandombox.MultiverseCore.commandtools.queue;
@@ -22,8 +22,6 @@ public class EntryFee extends SerializationConfig {
    @Nullable
    private Material currency;

-    private final Material DISABLED_MATERIAL = Material.AIR;
-
    public EntryFee() {
        super();
    }
@@ -53,9 +51,6 @@ public class EntryFee extends SerializationConfig {
     */
    @Nullable
    public Material getCurrency() {
-        if (currency == null || currency.equals(DISABLED_MATERIAL)) {
-            return null;
-        }
        return currency;
    }

@@ -23,7 +23,7 @@ import org.bukkit.util.Vector;
 * A bed-{@link MVDestination}.
 */
 public class BedDestination implements MVDestination {
-    public static final String OWN_BED_STRING = "playerbed";
+    public static final String OLD_BED_STRING = "b:playerbed";
    private String playername = "";
    private boolean isValid;
    private Location knownBedLoc;
@@ -46,11 +46,11 @@ public class BedDestination implements MVDestination {
        boolean validFormat = split.length >= 1 && split.length <= 2 && split[0].equals(this.getIdentifier());

        OfflinePlayer p = Bukkit.getOfflinePlayer(split[1]);
-        boolean validPlayer = p.getName() != null && !p.getName().equals(OWN_BED_STRING);
+        boolean validPlayer = (p != null);

        if (validFormat && validPlayer) this.playername = p.getName();

-        this.isValid = destination.equals("b:" + OWN_BED_STRING) || (validFormat && validPlayer);
+        this.isValid = destination.equals(OLD_BED_STRING) || (validFormat && validPlayer);

        return this.isValid;
    }
@@ -136,6 +136,6 @@ public class BedDestination implements MVDestination {

    @Override
    public String toString() {
-        return "b:" + (playername.isEmpty() ? OWN_BED_STRING : playername);
+        return playername.isEmpty() ? OLD_BED_STRING : ("b:" + playername);
    }
 }
@@ -11,29 +11,16 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
 import com.onarandombox.MultiverseCore.commands.TeleportCommand;
 import com.onarandombox.MultiverseCore.utils.PermissionTools;
-import com.onarandombox.MultiverseCore.utils.PlayerFinder;
 import com.pneumaticraft.commandhandler.Command;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;

-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;

-/**
- * A factory class that will create destinations from specific strings.
- */
+/** A factory class that will create destinations from specific strings. */
 public class DestinationFactory {
-
-    private static final Pattern CANNON_PATTERN = Pattern.compile("(?i)cannon-[\\d]+(\\.[\\d]+)?");
-
    private MultiverseCore plugin;
    private Map<String, Class<? extends MVDestination>> destList;
    private Command teleportCommand;
@@ -49,59 +36,6 @@ public class DestinationFactory {
        }
    }

-    /**
-     * Parse a destination that has relation to sender, such as a cannon or player destination.
-     *
-     * @param teleportee        The player that is going to be teleported.
-     * @param destinationName   The destination to parse.
-     * @return A non-null MVDestination
-     */
-    @NotNull
-    public MVDestination getPlayerAwareDestination(@NotNull Player teleportee,
-                                                   @NotNull String destinationName) {
-
-        // Prioritise world, in the event that a world is named after a player online.
-        if (Bukkit.getWorld(destinationName) != null) {
-            return getDestination(destinationName);
-        }
-
-        Player targetPlayer = PlayerFinder.get(destinationName, teleportee);
-        if (targetPlayer != null) {
-            return getDestination("pl:" + targetPlayer.getName());
-        }
-
-        if (CANNON_PATTERN.matcher(destinationName).matches()) {
-            return getDestination(parseCannonDest(teleportee, destinationName));
-        }
-
-        return getDestination(destinationName);
-    }
-
-    /**
-     * Parses a cannon destination.
-     *
-     * @param teleportee        The player that is going to be teleported.
-     * @param destinationName   The destination to parse.
-     * @return A destination string.
-     */
-    @NotNull
-    private String parseCannonDest(@NotNull Player teleportee,
-                                   @NotNull String destinationName) {
-
-        String[] cannonSpeed = destinationName.split("-");
-        try {
-            double speed = Double.parseDouble(cannonSpeed[1]);
-            destinationName = "ca:" + teleportee.getWorld().getName() + ":" + teleportee.getLocation().getX()
-                    + "," + teleportee.getLocation().getY() + "," + teleportee.getLocation().getZ() + ":"
-                    + teleportee.getLocation().getPitch() + ":" + teleportee.getLocation().getYaw() + ":" + speed;
-        }
-        catch (Exception e) {
-            destinationName = "i:invalid";
-        }
-
-        return destinationName;
-    }
-
    /**
     * Gets a new destination from a string.
     * Returns a new InvalidDestination if the string could not be parsed.
@@ -167,13 +101,4 @@ public class DestinationFactory {
        this.teleportCommand.addAdditonalPermission(other);
        return true;
    }
-
-    /**
-     * Gets all the {@link MVDestination} identifiers registered.
-     *
-     * @return A collection of destination identifiers.
-     */
-    public Collection<String> getRegisteredIdentifiers() {
-        return this.destList.keySet();
-    }
 }
@@ -50,7 +50,7 @@ public class PlayerDestination implements MVDestination {
     */
    @Override
    public Location getLocation(Entity e) {
-        Player p = plugin.getServer().getPlayerExact(this.player);
+        Player p = plugin.getServer().getPlayer(this.player);
        Player plLoc = null;
        if (e instanceof Player) {
            plLoc = (Player) e;
@@ -1,62 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-import org.bukkit.ChatColor;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Helper class to switch between 2 {@link ChatColor}.
- */
-public class ColorAlternator implements ColorTool {
-
-    /**
-     * Creates a new {@link ColorAlternator} with 2 {@link ChatColor}s.
-     *
-     * @param colorThis The first color.
-     * @param colorThat The second color.
-     * @return The {@link ColorAlternator} created for you.
-     */
-    public static ColorAlternator with(@NotNull ChatColor colorThis,
-                                       @NotNull ChatColor colorThat) {
-
-        return new ColorAlternator(colorThis, colorThat);
-    }
-
-    private boolean switcher;
-    private final ChatColor thisColor;
-    private final ChatColor thatColor;
-
-    /**
-     * @param colorThis The first color.
-     * @param colorThat The second color.
-     */
-    public ColorAlternator(@NotNull ChatColor colorThis,
-                           @NotNull ChatColor colorThat) {
-
-        this.thisColor = colorThis;
-        this.thatColor = colorThat;
-    }
-
-    /**
-     * Gets the color. Everytime this method is called, it swaps the color that it returns.
-     *
-     * @return The color.
-     */
-    @Override
-    public ChatColor get() {
-        return (this.switcher ^= true) ? this.thisColor : this.thatColor;
-    }
-
-    /**
-     * @return The first color.
-     */
-    public ChatColor getThisColor() {
-        return thisColor;
-    }
-
-    /**
-     * @return The second color.
-     */
-    public ChatColor getThatColor() {
-        return thatColor;
-    }
-}
@@ -1,22 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-import org.bukkit.ChatColor;
-
-/**
- * Tools to allow customisation.
- */
-@FunctionalInterface
-public interface ColorTool {
-
-    /**
-     * Gets a chat color.
-     *
-     * @return The color.
-     */
-    ChatColor get();
-
-    /**
-     * Default implementation of this interface. Returns a default white color.
-     */
-    ColorTool DEFAULT = () -> ChatColor.WHITE;
-}
@@ -1,268 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-import com.onarandombox.MultiverseCore.display.settings.DisplaySetting;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Objects;
-import java.util.WeakHashMap;
-
-/**
- * Helps to display contents such as list and maps in a nicely formatted fashion.
- *
- * @param <T>   Type of content to display.
- */
-public class ContentDisplay<T> {
-
-    public static final String LINE_BREAK = "%br%";
-
-    /**
-     * Creates a ContentDisplay.Builder for the given content.
-     *
-     * @param content The content to be displayed.
-     * @param <T> The type of the content which can be inferred.
-     * @return A new Builder.
-     */
-    public static <T> Builder<T> forContent(T content) {
-        return new Builder<>(content);
-    }
-
-    /**
-     * Creates a ContentDisplay.Builder for the given collection of content.
-     *
-     * @param content The content to be displayed.
-     * @return A new Builder.
-     */
-    public static Builder<Collection<String>> forContent(Collection<String> content) {
-        return new Builder<>(content).displayHandler(DisplayHandlers.LIST);
-    }
-
-    /**
-     * Creates a ContentDisplay.Builder for the given map of content.
-     *
-     * @param content The content to be displayed.
-     * @return A new Builder.
-     */
-    public static Builder<Map<String, Object>> forContent(Map<String, Object> content) {
-        return new Builder<>(content).displayHandler(DisplayHandlers.INLINE_MAP);
-    }
-
-    private final T contents;
-
-    private String header;
-    private String emptyMessage = "No matching content to display.";
-    private DisplayHandler<T> displayHandler;
-    private ColorTool colorTool = ColorTool.DEFAULT;
-    private ContentFilter filter = ContentFilter.DEFAULT;
-    private final Map<DisplaySetting<?>, Object> settingsMap = new WeakHashMap<>();
-
-    private ContentDisplay(T contents) {
-        this.contents = contents;
-    }
-
-    /**
-     * Do the actual displaying of contents to the sender.
-     *
-     * @param sender The CommandSender to show the display to.
-     */
-    public void show(@NotNull CommandSender sender) {
-        Collection<String> formattedContent;
-        try {
-            formattedContent = (this.contents == null) ? null : this.displayHandler.format(sender, this);
-        } catch (DisplayFormatException e) {
-            sender.sendMessage(String.format("%sError: %s", ChatColor.RED, e.getMessage()));
-            return;
-        }
-        this.displayHandler.sendHeader(sender, this);
-        this.displayHandler.sendSubHeader(sender, this);
-        this.displayHandler.sendBody(sender, this, formattedContent);
-    }
-
-    /**
-     * @return Gets the header to display.
-     */
-    public String getHeader() {
-        return header;
-    }
-
-    /**
-     * Sets the header text.
-     */
-    public void setHeader(@NotNull String header) {
-        this.header = header;
-    }
-
-    /**
-     * @return Gets the contents to display.
-     */
-    public T getContents() {
-        return contents;
-    }
-
-    /**
-     * @return Gets the message to display when no content is shown.
-     */
-    @NotNull
-    public String getEmptyMessage() {
-        return emptyMessage;
-    }
-
-    /**
-     * @return Gets the display handler that formats and sends content to sender.
-     */
-    @NotNull
-    public DisplayHandler<T> getDisplayHandler() {
-        return displayHandler;
-    }
-
-    /**
-     * @return Gets the color tool used.
-     */
-    @NotNull
-    public ColorTool getColorTool() {
-        return colorTool;
-    }
-
-    /**
-     * @return Gets the filter used.
-     */
-    @NotNull
-    public ContentFilter getFilter() {
-        return filter;
-    }
-
-    /**
-     * Gets the value for a given setting option.
-     *
-     * @param setting   The setting option.
-     * @param <S>       The setting type.
-     * @return Value set for the given setting.
-     */
-    public <S> S getSetting(@NotNull DisplaySetting<S> setting) {
-        return (S) settingsMap.getOrDefault(setting, setting.defaultValue());
-    }
-
-    /**
-     * Sets other specific settings that may be used by the {@link DisplayHandler}.
-     *
-     * @param setting   The settings option.
-     * @param value     The value to set.
-     * @param <S>       The type of setting.
-     */
-    public <S> void setSetting(@NotNull DisplaySetting<S> setting, S value) {
-        this.settingsMap.put(setting, value);
-    }
-
-    /**
-     * Builds a {@link ContentDisplay}.
-     *
-     * @param <T>   Type of content to display.
-     */
-    public static class Builder<T> {
-
-        private final ContentDisplay<T> display;
-
-        private Builder(T content) {
-            this.display = new ContentDisplay<>(content);
-        }
-
-        /**
-         * Sets header to be displayed.
-         *
-         * @param header        The header text.
-         * @param replacements  String formatting replacements.
-         * @return The builder.
-         */
-        @NotNull
-        public Builder<T> header(@NotNull String header, Object...replacements) {
-            this.display.header = String.format(header, replacements);
-            return this;
-        }
-
-        /**
-         * Sets the message to show when no content is available for display.
-         *
-         * @param emptyMessage  The message text.
-         * @param replacements  String formatting replacements.
-         * @return The builder.
-         */
-        @NotNull
-        public Builder<T> emptyMessage(@NotNull String emptyMessage, Object...replacements) {
-            this.display.emptyMessage = String.format(emptyMessage, replacements);
-            return this;
-        }
-
-        /**
-         * Sets the display handler that does the formatting and sending of content. <b>Required.</b>
-         *
-         * @param displayHandler    The display handler for the given content type.
-         * @return The builder.
-         */
-        @NotNull
-        public Builder<T> displayHandler(@NotNull DisplayHandler<T> displayHandler) {
-            this.display.displayHandler = displayHandler;
-            return this;
-        }
-
-        /**
-         * Sets the color tool used to make messages more colourful.
-         *
-         * @param colorTool The color tool to use.
-         * @return The builder.
-         */
-        @NotNull
-        public Builder<T> colorTool(@NotNull ColorTool colorTool) {
-            this.display.colorTool = colorTool;
-            return this;
-        }
-
-        /**
-         * Sets content filter used to match specific content to be displayed.
-         *
-         * @param filter    The filter to use.
-         * @return The builder.
-         */
-        @NotNull
-        public Builder<T> filter(@NotNull ContentFilter filter) {
-            this.display.filter = filter;
-            return this;
-        }
-
-        /**
-         * Sets other specific settings that may be used by the {@link DisplayHandler}.
-         *
-         * @param setting   The settings option.
-         * @param value     The value to set.
-         * @param <S>       The type of setting.
-         * @return The builder.
-         */
-        @NotNull
-        public <S> Builder<T> setting(@NotNull DisplaySetting<S> setting, S value) {
-            this.display.settingsMap.put(setting, value);
-            return this;
-        }
-
-        /**
-         * Validates and build the content display.
-         *
-         * @return The content display.
-         */
-        @NotNull
-        public ContentDisplay<T> build() {
-            Objects.requireNonNull(this.display.displayHandler);
-            return this.display;
-        }
-
-        /**
-         * Build and show the content to the sender.
-         *
-         * @param sender The CommandSender to show the display to.
-         */
-        public void show(CommandSender sender) {
-            this.build().show(sender);
-        }
-    }
-}
@@ -1,153 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.ChatColor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-/**
- * <p>Filter content and text based on regex matching.</p>
- *
- * <p>Compile regex pattern based on {@link ContentFilter#filterString}. When prefixed with 'r=',
- * use {@link ContentFilter#filterString} as the full regex pattern. Else, set to any match that
- * contains the {@link ContentFilter#filterString}.<p>
- */
-public class ContentFilter {
-
-    public static final ContentFilter DEFAULT = new ContentFilter();
-    private static final Pattern REGEX_SPECIAL_CHARS = Pattern.compile("[.+*?\\[^\\]$(){}=!<>|:-\\\\]");
-
-    private String filterString;
-    private Pattern filterPattern;
-    private boolean exactMatch;
-
-    private ContentFilter() {
-    }
-
-    /**
-     * @param filterString  The text to do matching, either plaintext or regex.
-     */
-    public ContentFilter(@NotNull String filterString) {
-        this(filterString, false);
-    }
-
-    /**
-     * @param filterString  The text to do matching, else plaintext or regex.
-     * @param exactMatch    Should check for exact match when doing regex matching.
-     */
-    public ContentFilter(@NotNull String filterString,
-                         boolean exactMatch) {
-
-        this.filterString = filterString;
-        this.exactMatch = exactMatch;
-        parseFilter();
-    }
-
-    private void parseFilter() {
-        if (filterString == null) {
-            return;
-        }
-        if (filterString.startsWith("r=")) {
-            convertToMatcher(filterString.substring(2));
-            return;
-        }
-        String cleanedFilter = REGEX_SPECIAL_CHARS.matcher(filterString.toLowerCase()).replaceAll("\\\\$0");
-        convertToMatcher("(?i).*" + cleanedFilter + ".*");
-    }
-
-    /**
-     * Compile and store the regex into a {@link Pattern}.
-     *
-     * @param regex The regex text.
-     */
-    private void convertToMatcher(@NotNull String regex) {
-        try {
-            this.filterPattern = Pattern.compile(regex);
-            Logging.finest("Parsed regex pattern: %s", this.filterPattern.toString());
-        }
-        catch (PatternSyntaxException ignored) {
-            Logging.warning("Error parsing regex: %s", filterString);
-        }
-    }
-
-    /**
-     * Do regex matching.
-     *
-     * @param text String to check regex on.
-     * @return True of matches regex pattern, false otherwise.
-     */
-    public boolean checkMatch(@Nullable Object text) {
-        if (!hasFilter()) {
-            return true;
-        }
-        if (text == null || !hasValidPattern()) {
-            return false;
-        }
-        text = ChatColor.stripColor(String.valueOf(text));
-        return (exactMatch)
-                ? filterPattern.matcher((CharSequence) text).matches()
-                : filterPattern.matcher((CharSequence) text).find();
-    }
-
-    /**
-     * Checks if a filter string is present.
-     *
-     * @return True if there is a filter string, else false.
-     */
-    public boolean hasFilter() {
-        return filterString != null;
-    }
-
-    /**
-     * Checks if regex pattern syntax is valid.
-     *
-     * @return True if valid, else false.
-     */
-    public boolean hasValidPattern() {
-        return filterPattern != null;
-    }
-
-    /**
-     * @return The filter string.
-     */
-    @Nullable
-    public String getString() {
-        return filterString;
-    }
-
-    /**
-     * @return The regex pattern.
-     */
-    @Nullable
-    public Pattern getPattern() {
-        return filterPattern;
-    }
-
-    /**
-     * @return True if filter is set to do exact matching, else false.
-     */
-    public boolean isExactMatch() {
-        return exactMatch;
-    }
-
-    /**
-     * Nicely format the filter string to be used for showing the sender.
-     *
-     * @return The formatted filter string.
-     */
-    public @NotNull String getFormattedString() {
-        return String.format("%sFilter: '%s'", ChatColor.ITALIC, filterString);
-    }
-
-    @Override
-    public String toString() {
-        return "ContentFilter{" +
-                "filterString='" + filterString + '\'' +
-                ", filterPattern=" + filterPattern +
-                ", exactMatch=" + exactMatch +
-                '}';
-    }
-}
@@ -1,25 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-/**
- * Thrown when an issue occur while formatting content.
- */
-public class DisplayFormatException extends Exception {
-    public DisplayFormatException() {
-    }
-
-    public DisplayFormatException(String message) {
-        super(message);
-    }
-
-    public DisplayFormatException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public DisplayFormatException(Throwable cause) {
-        super(cause);
-    }
-
-    public DisplayFormatException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}
@@ -1,68 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-import com.google.common.base.Strings;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-
-/**
- * Handles the formatting and sending of all content by the {@link ContentDisplay}.
- *
- * @param <T>   Type of content to display.
- */
-@FunctionalInterface
-public interface DisplayHandler<T> {
-
-    /**
-     * Formats the raw content into a {@link Collection} 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}.
-     * @return The formatted content.
-     * @throws DisplayFormatException Issue occurred while formatting content. E.g. invalid page.
-     */
-    Collection<String> format(@NotNull CommandSender sender, @NotNull ContentDisplay<T> display)
-            throws DisplayFormatException;
-
-    /**
-     * Sends the header.
-     *
-     * @param sender The {@link CommandSender} who will the header will be displayed to.
-     * @param display The responsible {@link ContentDisplay}.
-     */
-    default void sendHeader(@NotNull CommandSender sender, @NotNull ContentDisplay<T> display) {
-        if (!Strings.isNullOrEmpty(display.getHeader())) {
-            sender.sendMessage(display.getHeader());
-        }
-    }
-
-    /**
-     * Sends info such as filter and page.
-     *
-     * @param sender The {@link CommandSender} who will the sub header will be displayed to.
-     * @param display The responsible {@link ContentDisplay}.
-     */
-    default void sendSubHeader(@NotNull CommandSender sender, @NotNull ContentDisplay<T> display) {
-        if (display.getFilter().hasFilter()) {
-            sender.sendMessage(String.format("%s[ %s ]", ChatColor.GRAY, display.getFilter().getFormattedString()));
-        }
-    }
-
-    /**
-     * Sends the content.
-     *
-     * @param sender The {@link CommandSender} who will the body will be displayed to.
-     * @param display The responsible {@link ContentDisplay}.
-     * @param formattedContent The content after being formatted by {@link #format(CommandSender, ContentDisplay)}
-     */
-    default void sendBody(@NotNull CommandSender sender, @NotNull ContentDisplay<T> display,
-                          Collection<String> formattedContent) {
-        if (formattedContent == null || formattedContent.size() == 0) {
-            sender.sendMessage(display.getEmptyMessage());
-            return;
-        }
-        sender.sendMessage(formattedContent.toArray(new String[0]));
-    }
-}
@@ -1,47 +0,0 @@
-package com.onarandombox.MultiverseCore.display;
-
-import com.onarandombox.MultiverseCore.display.handlers.InlineListDisplayHandler;
-import com.onarandombox.MultiverseCore.display.handlers.InlineMapDisplayHandler;
-import com.onarandombox.MultiverseCore.display.handlers.ListDisplayHandler;
-import com.onarandombox.MultiverseCore.display.handlers.PagedListDisplayHandler;
-import com.onarandombox.MultiverseCore.display.settings.InlineDisplaySettings;
-import com.onarandombox.MultiverseCore.display.settings.PagedDisplaySettings;
-import com.onarandombox.MultiverseCore.display.settings.MapDisplaySettings;
-
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * Various implementations of {@link DisplayHandler}.
- */
-public class DisplayHandlers {
-
-    /**
-     * Standard list display.
-     *
-     * Supported settings: none.
-     */
-    public static final DisplayHandler<Collection<String>> LIST = new ListDisplayHandler();
-
-    /**
-     * List display with paging.
-     *
-     * Supported settings: {@link PagedDisplaySettings#SHOW_PAGE}, {@link PagedDisplaySettings#LINES_PER_PAGE},
-     * {@link PagedDisplaySettings#PAGE_IN_CONSOLE}, {@link PagedDisplaySettings#DO_END_PADDING}.
-     */
-    public static final DisplayHandler<Collection<String>> PAGE_LIST = new PagedListDisplayHandler();
-
-    /**
-     * Display a list inline.
-     *
-     * Supported settings: {@link InlineDisplaySettings#SEPARATOR}.
-     */
-    public static final DisplayHandler<Collection<String>> INLINE_LIST = new InlineListDisplayHandler();
-
-    /**
-     * Display key value pair inline.
-     *
-     * Supported settings: {@link InlineDisplaySettings#SEPARATOR}, {@link MapDisplaySettings#OPERATOR}.
-     */
-    public static final DisplayHandler<Map<String, Object>> INLINE_MAP = new InlineMapDisplayHandler();
-}
@@ -1,36 +0,0 @@
-package com.onarandombox.MultiverseCore.display.handlers;
-
-import com.onarandombox.MultiverseCore.display.ContentDisplay;
-import com.onarandombox.MultiverseCore.display.DisplayFormatException;
-import com.onarandombox.MultiverseCore.display.DisplayHandler;
-import com.onarandombox.MultiverseCore.display.settings.InlineDisplaySettings;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-public class InlineListDisplayHandler implements DisplayHandler<Collection<String>> {
-
-    @Override
-    public Collection<String> format(@NotNull CommandSender sender, @NotNull ContentDisplay<Collection<String>> display)
-            throws DisplayFormatException {
-        StringBuilder builder = new StringBuilder();
-        String separator = display.getSetting(InlineDisplaySettings.SEPARATOR);
-
-        for (Iterator<String> iterator = display.getContents().iterator(); iterator.hasNext(); ) {
-            String content = iterator.next();
-            if (!display.getFilter().checkMatch(content)) {
-                continue;
-            }
-            builder.append(display.getColorTool().get()).append(content);
-            if (iterator.hasNext()) {
-                builder.append(separator);
-            }
-        }
-        return (builder.length() == 0)
-                ? Collections.singletonList(display.getEmptyMessage())
-                : Collections.singleton(builder.toString());
-    }
-}
@@ -1,44 +0,0 @@
-package com.onarandombox.MultiverseCore.display.handlers;
-
-import com.onarandombox.MultiverseCore.display.ContentDisplay;
-import com.onarandombox.MultiverseCore.display.DisplayFormatException;
-import com.onarandombox.MultiverseCore.display.DisplayHandler;
-import com.onarandombox.MultiverseCore.display.settings.InlineDisplaySettings;
-import com.onarandombox.MultiverseCore.display.settings.MapDisplaySettings;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-
-public class InlineMapDisplayHandler implements DisplayHandler<Map<String, Object>> {
-
-    @Override
-    public Collection<String> format(@NotNull CommandSender sender,
-                                     @NotNull ContentDisplay<Map<String, Object>> display)
-            throws DisplayFormatException {
-        StringBuilder builder = new StringBuilder();
-        String separator = display.getSetting(InlineDisplaySettings.SEPARATOR);
-        String operator = display.getSetting(MapDisplaySettings.OPERATOR);
-
-        for (Iterator<Map.Entry<String, Object>> iterator = display.getContents().entrySet().iterator(); iterator.hasNext(); ) {
-            Map.Entry<String, Object> entry = iterator.next();
-            if (!display.getFilter().checkMatch(entry.getKey()) && !display.getFilter().checkMatch(entry.getValue())) {
-                continue;
-            }
-            builder.append(display.getColorTool().get())
-                    .append(entry.getKey())
-                    .append(operator)
-                    .append(display.getColorTool().get())
-                    .append(entry.getValue());
-            if (iterator.hasNext()) {
-                builder.append(separator);
-            }
-        }
-        return (builder.length() == 0)
-                ? Collections.singletonList(display.getEmptyMessage())
-                : Collections.singleton(builder.toString());
-    }
-}
@@ -1,22 +0,0 @@
-package com.onarandombox.MultiverseCore.display.handlers;
-
-import com.onarandombox.MultiverseCore.display.ContentDisplay;
-import com.onarandombox.MultiverseCore.display.DisplayFormatException;
-import com.onarandombox.MultiverseCore.display.DisplayHandler;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-public class ListDisplayHandler implements DisplayHandler<Collection<String>> {
-
-    @Override
-    public Collection<String> format(@NotNull CommandSender sender, @NotNull ContentDisplay<Collection<String>> display)
-            throws DisplayFormatException {
-        return display.getContents().stream()
-                .filter(display.getFilter()::checkMatch)
-                .map(s -> (ContentDisplay.LINE_BREAK.equals(s)) ? "" : display.getColorTool().get() + s)
-                .collect(Collectors.toList());
-    }
-}
@@ -1,105 +0,0 @@
-package com.onarandombox.MultiverseCore.display.handlers;
-
-import com.onarandombox.MultiverseCore.display.ContentDisplay;
-import com.onarandombox.MultiverseCore.display.DisplayFormatException;
-import com.onarandombox.MultiverseCore.display.settings.PagedDisplaySettings;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.IntStream;
-
-public class PagedListDisplayHandler extends ListDisplayHandler {
-
-    @Override
-    public Collection<String> format(@NotNull CommandSender sender, @NotNull ContentDisplay<Collection<String>> display)
-            throws DisplayFormatException {
-        if (dontNeedPaging(sender, display)) {
-            return super.format(sender, display);
-        }
-
-        int pages = 1;
-        int currentLength = 0;
-        int targetPage = display.getSetting(PagedDisplaySettings.SHOW_PAGE);
-        int linesPerPage = display.getSetting(PagedDisplaySettings.LINES_PER_PAGE);
-        List<String> content = new ArrayList<>(linesPerPage);
-
-        // Calculate the paging.
-        for (String line : display.getContents()) {
-            if (!display.getFilter().checkMatch(line)) {
-                continue;
-            }
-            // When it's the next page.
-            boolean isLineBreak = ContentDisplay.LINE_BREAK.equals(line);
-            if (isLineBreak || ++currentLength > linesPerPage) {
-                pages++;
-                currentLength = 0;
-                if (isLineBreak) {
-                    continue;
-                }
-            }
-            if (pages == targetPage) {
-                // Let first line be the header when no header is defined.
-                if (display.getHeader() == null) {
-                    display.setHeader(line);
-                    currentLength--;
-                    continue;
-                }
-                content.add(display.getColorTool().get() + line);
-            }
-        }
-
-        // Page out of range.
-        if (targetPage < 1 || targetPage > pages) {
-            if (pages == 1) {
-                throw new DisplayFormatException("There is only 1 page!");
-            }
-            throw new DisplayFormatException("Please enter a page from 1 to " + pages + ".");
-        }
-
-        // No content
-        if (content.size() == 0) {
-            content.add(display.getEmptyMessage());
-        }
-
-        // Add empty lines to make output length consistent.
-        if (display.getSetting(PagedDisplaySettings.DO_END_PADDING)) {
-            IntStream.range(0, linesPerPage - content.size()).forEach(i -> content.add(""));
-        }
-        display.setSetting(PagedDisplaySettings.TOTAL_PAGE, pages);
-
-        return content;
-    }
-
-    @Override
-    public void sendSubHeader(@NotNull CommandSender sender, @NotNull ContentDisplay<Collection<String>> display) {
-        if (dontNeedPaging(sender, display)) {
-            super.sendSubHeader(sender, display);
-            return;
-        }
-
-        if (display.getFilter().hasFilter()) {
-            sender.sendMessage(String.format("%s[ Page %s of %s, %s ]",
-                    ChatColor.GRAY,
-                    display.getSetting(PagedDisplaySettings.SHOW_PAGE),
-                    display.getSetting(PagedDisplaySettings.TOTAL_PAGE),
-                    display.getFilter().getFormattedString())
-            );
-            return;
-        }
-        sender.sendMessage(String.format("%s[ Page %s of %s ]",
-                ChatColor.GRAY,
-                display.getSetting(PagedDisplaySettings.SHOW_PAGE),
-                display.getSetting(PagedDisplaySettings.TOTAL_PAGE))
-        );
-    }
-
-    private boolean dontNeedPaging(CommandSender sender, ContentDisplay<Collection<String>> display) {
-        return sender instanceof ConsoleCommandSender
-                && !display.getSetting(PagedDisplaySettings.PAGE_IN_CONSOLE);
-    }
-}
@@ -1,19 +0,0 @@
-package com.onarandombox.MultiverseCore.display.settings;
-
-import com.onarandombox.MultiverseCore.display.DisplayHandler;
-
-/**
- * Represents a setting option that can be used by {@link DisplayHandler}.
- *
- * @param <T>
- */
-@FunctionalInterface
-public interface DisplaySetting<T> {
-
-     /**
-      * Gets the default value of this Display Setting.
-      *
-      * @return The default value.
-      */
-     T defaultValue();
-}
@@ -1,15 +0,0 @@
-package com.onarandombox.MultiverseCore.display.settings;
-
-import com.onarandombox.MultiverseCore.display.DisplayHandler;
-import org.bukkit.ChatColor;
-
-/**
- * Collection of {@link DisplaySetting} that are used by various {@link DisplayHandler}.
- */
-public class InlineDisplaySettings {
-
-    /**
-     * Inline separator. E.g. '1, 2, 3'
-     */
-    public static final DisplaySetting<String> SEPARATOR = () -> ChatColor.WHITE + ", ";
-}
@@ -1,15 +0,0 @@
-package com.onarandombox.MultiverseCore.display.settings;
-
-import com.onarandombox.MultiverseCore.display.DisplayHandler;
-import org.bukkit.ChatColor;
-
-/**
- * Collection of {@link DisplaySetting} that are used by various {@link DisplayHandler}.
- */
-public class MapDisplaySettings {
-
-    /**
-     * The thing between a key value pair. E.g. 'Me = Smart'
-     */
-    public static final DisplaySetting<String> OPERATOR = () -> ChatColor.WHITE + " = ";
-}
@@ -1,30 +0,0 @@
-package com.onarandombox.MultiverseCore.display.settings;
-
-public class PagedDisplaySettings {
-
-    /**
-     * Page to display.
-     */
-    public static final DisplaySetting<Integer> SHOW_PAGE = () -> 1;
-
-    /**
-     * Total pages available to display.
-     */
-    public static final DisplaySetting<Integer> TOTAL_PAGE = () -> 1;
-
-    /**
-     * The max number of lines per page. This excludes header.
-     */
-    public static final DisplaySetting<Integer> LINES_PER_PAGE = () -> 8;
-
-    /**
-     * Should add empty lines if content lines shown is less that {@link #LINES_PER_PAGE}.
-     */
-    public static final DisplaySetting<Boolean> DO_END_PADDING = () -> true;
-
-    /**
-     * Should display with paging when it's sent to console.
-     */
-    public static final DisplaySetting<Boolean> PAGE_IN_CONSOLE = () -> false;
-
-}
@@ -1,7 +0,0 @@
-package com.onarandombox.MultiverseCore.enums;
-
-public enum RespawnType {
-    BED,
-    ANCHOR,
-    OTHER
-}
@@ -1,16 +1,8 @@
 package com.onarandombox.MultiverseCore.event;

-import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;

 /**
@@ -21,9 +13,9 @@ public class MVVersionEvent extends Event {
    private final StringBuilder versionInfoBuilder;
    private final Map<String, String> detailedVersionInfo;

-    public MVVersionEvent() {
-        versionInfoBuilder = new StringBuilder();
-        detailedVersionInfo = new HashMap<>();
+    public MVVersionEvent(String legacyVersionInfo, Map<String, String> files) {
+        this.versionInfoBuilder = new StringBuilder(legacyVersionInfo);
+        this.detailedVersionInfo = files;
    }

    private static final HandlerList HANDLERS = new HandlerList();
@@ -57,14 +49,14 @@ public class MVVersionEvent extends Event {
     *
     * This information is used for advanced paste services that would prefer
     * to get the information as several files. Examples include config.yml or
-     * portals.yml. Note that the map returned is immutable.
+     * portals.yml.
     *
     * The keys are filenames, the values are the contents of the files.
     *
-     * @return The immutable key value mapping of files and the contents of those files.
+     * @return The key value mapping of files and the contents of those files.
     */
    public Map<String, String> getDetailedVersionInfo() {
-        return Collections.unmodifiableMap(this.detailedVersionInfo);
+        return this.detailedVersionInfo;
    }

    /**
@@ -74,46 +66,4 @@ public class MVVersionEvent extends Event {
    public void appendVersionInfo(String moreVersionInfo) {
        this.versionInfoBuilder.append(moreVersionInfo);
    }
-
-    private String readFile(final String filename) {
-        StringBuilder result;
-
-        try {
-            FileReader reader = new FileReader(filename);
-            BufferedReader bufferedReader = new BufferedReader(reader);
-            String line;
-            result = new StringBuilder();
-            while ((line = bufferedReader.readLine()) != null) {
-                result.append(line).append("\n");
-            }
-        } catch (FileNotFoundException e) {
-            Logging.severe("Unable to find %s. Here's the traceback: %s", filename, e.getMessage());
-            e.printStackTrace();
-            result = new StringBuilder(String.format("ERROR: Could not load: %s", filename));
-        } catch (IOException e) {
-            Logging.severe("Something bad happend when reading %s. Here's the traceback: %s", filename, e.getMessage());
-            e.printStackTrace();
-            result = new StringBuilder(String.format("ERROR: Could not load: %s", filename));
-        }
-
-        return result.toString();
-    }
-
-    /**
-     * Adds a file to to the detailed version-info currently saved in this event.
-     * @param fileName The name of the file.
-     * @param contents The contents of the file.
-     */
-    public void putDetailedVersionInfo(String fileName, String contents) {
-        this.detailedVersionInfo.put(fileName, contents);
-    }
-
-    /**
-     * Adds a file to to the detailed version-info currently saved in this event.
-     * @param filename The name of the file.
-     * @param file     The file.
-     */
-    public void putDetailedVersionInfo(String filename, File file) {
-        this.putDetailedVersionInfo(filename, readFile(file.getAbsolutePath()));
-    }
 }
@@ -9,7 +9,6 @@ package com.onarandombox.MultiverseCore.listeners;

 import java.util.logging.Level;

-import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.AsyncPlayerChatEvent;

@@ -21,7 +20,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 public class MVAsyncPlayerChatListener extends MVChatListener {
    public MVAsyncPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
        super(plugin, playerListener);
-        Logging.fine("Created AsyncPlayerChatEvent listener.");
+        plugin.log(Level.FINE, "Created AsyncPlayerChatEvent listener.");
    }

    /**
@@ -7,11 +7,9 @@

 package com.onarandombox.MultiverseCore.listeners;

-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.utils.CompatibilityLayer;
 import org.bukkit.World;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -19,7 +17,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
-import org.bukkit.event.entity.EntityPortalEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
@@ -101,7 +98,7 @@ public class MVEntityListener implements Listener {
         * Handle people with non-standard animals: ie a patched craftbukkit.
         */
        if (type == null || type.getName() == null) {
-            Logging.finer("Found a null typed creature.");
+            this.plugin.log(Level.FINER, "Found a null typed creature.");
            return;
        }

@@ -109,17 +106,4 @@ public class MVEntityListener implements Listener {
        event.setCancelled(this.plugin.getMVWorldManager().getTheWorldPurger().shouldWeKillThisCreature(mvworld, event.getEntity()));
    }

-    /**
-     * Handles portal search radius adjustment.
-     * @param event The Event that was fired.
-     */
-    @EventHandler
-    public void entityPortal(EntityPortalEvent event) {
-        if (event.isCancelled() || event.getTo() == null) {
-            return;
-        }
-        if (!this.plugin.getMVConfig().isUsingDefaultPortalSearch()) {
-            CompatibilityLayer.setPortalSearchRadius(event, this.plugin.getMVConfig().getPortalSearchRadius());
-        }
-    }
 }
@@ -9,7 +9,6 @@ package com.onarandombox.MultiverseCore.listeners;

 import java.util.logging.Level;

-import com.dumptruckman.minecraft.util.Logging;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerChatEvent;

@@ -22,7 +21,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 public class MVPlayerChatListener extends MVChatListener {
    public MVPlayerChatListener(MultiverseCore plugin, MVPlayerListener playerListener) {
        super(plugin, playerListener);
-        Logging.fine("Registered PlayerChatEvent listener.");
+        plugin.log(Level.FINE, "Registered PlayerChatEvent listener.");
    }

    /**
@@ -7,13 +7,15 @@

 package com.onarandombox.MultiverseCore.listeners;

+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import com.onarandombox.MultiverseCore.enums.RespawnType;
 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.Location;
@@ -31,9 +33,6 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;

-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 /**
 * Multiverse's {@link Listener} for players.
 */
@@ -70,16 +69,9 @@ public class MVPlayerListener implements Listener {
            return;
        }

-        RespawnType respawnType = RespawnType.OTHER;
-        if (event.isBedSpawn()) {
-            respawnType = RespawnType.BED;
-        }
-        if (CompatibilityLayer.isAnchorSpawn(event)) {
-            respawnType = RespawnType.ANCHOR;
-        }

-        if (mvWorld.getBedRespawn() && (respawnType == RespawnType.BED || respawnType == RespawnType.ANCHOR)) {
-            Logging.fine("Spawning %s at their %s", event.getPlayer().getName(), respawnType);
+        if (mvWorld.getBedRespawn() && event.isBedSpawn()) {
+            this.plugin.log(Level.FINE, "Spawning " + event.getPlayer().getName() + " at their bed");
            return;
        }

@@ -118,15 +110,15 @@ public class MVPlayerListener implements Listener {
    public void playerJoin(PlayerJoinEvent event) {
        Player p = event.getPlayer();
        if (!p.hasPlayedBefore()) {
-            Logging.finer("Player joined for the FIRST time!");
+            this.plugin.log(Level.FINER, "Player joined for the FIRST time!");
            if (plugin.getMVConfig().getFirstSpawnOverride()) {
-                Logging.fine("Moving NEW player to(firstspawnoverride): "
+                this.plugin.log(Level.FINE, "Moving NEW player to(firstspawnoverride): "
                        + worldManager.getFirstSpawnWorld().getSpawnLocation());
                this.sendPlayerToDefaultWorld(p);
            }
            return;
        } else {
-            Logging.finer("Player joined AGAIN!");
+            this.plugin.log(Level.FINER, "Player joined AGAIN!");
            if (this.plugin.getMVConfig().getEnforceAccess() // check this only if we're enforcing access!
                    && !this.plugin.getMVPerms().hasPermission(p, "multiverse.access." + p.getWorld().getName(), false)) {
                p.sendMessage("[MV] - Sorry you can't be in this world anymore!");
@@ -164,7 +156,7 @@ public class MVPlayerListener implements Listener {
     */
    @EventHandler(priority = EventPriority.HIGHEST)
    public void playerTeleport(PlayerTeleportEvent event) {
-        Logging.finer("Got teleport event for player '"
+        this.plugin.log(Level.FINER, "Got teleport event for player '"
                + event.getPlayer().getName() + "' with cause '" + event.getCause() + "'");
        if (event.isCancelled()) {
            return;
@@ -174,25 +166,25 @@ public class MVPlayerListener implements Listener {
        String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName());
        if (teleporterName != null) {
            if (teleporterName.equals("CONSOLE")) {
-                Logging.finer("We know the teleporter is the console! Magical!");
+                this.plugin.log(Level.FINER, "We know the teleporter is the console! Magical!");
                teleporter = this.plugin.getServer().getConsoleSender();
            } else {
-                teleporter = this.plugin.getServer().getPlayerExact(teleporterName);
+                teleporter = this.plugin.getServer().getPlayer(teleporterName);
            }
        }
-        Logging.finer("Inferred sender '" + teleporter + "' from name '"
+        this.plugin.log(Level.FINER, "Inferred sender '" + teleporter + "' from name '"
                + teleporterName + "', fetched from name '" + teleportee.getName() + "'");
        MultiverseWorld fromWorld = this.worldManager.getMVWorld(event.getFrom().getWorld().getName());
        MultiverseWorld toWorld = this.worldManager.getMVWorld(event.getTo().getWorld().getName());
        if (toWorld == null) {
-            Logging.fine("Player '" + teleportee.getName() + "' is teleporting to world '"
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName() + "' is teleporting to world '"
                    + event.getTo().getWorld().getName() + "' which is not managed by Multiverse-Core.  No further "
                    + "actions will be taken by Multiverse-Core.");
            return;
        }
        if (event.getFrom().getWorld().equals(event.getTo().getWorld())) {
            // The player is Teleporting to the same world.
-            Logging.finer("Player '" + teleportee.getName() + "' is teleporting to the same world.");
+            this.plugin.log(Level.FINER, "Player '" + teleportee.getName() + "' is teleporting to the same world.");
            this.stateSuccess(teleportee.getName(), toWorld.getAlias());
            return;
        }
@@ -200,7 +192,7 @@ public class MVPlayerListener implements Listener {
        // Charge the teleporter
        event.setCancelled(!pt.playerHasMoneyToEnter(fromWorld, toWorld, teleporter, teleportee, true));
        if (event.isCancelled() && teleporter != null) {
-            Logging.fine("Player '" + teleportee.getName()
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                    + "' was DENIED ACCESS to '" + toWorld.getAlias()
                    + "' because '" + teleporter.getName()
                    + "' don't have the FUNDS required to enter it.");
@@ -211,14 +203,14 @@ public class MVPlayerListener implements Listener {
        if (plugin.getMVConfig().getEnforceAccess()) {
            event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, teleporter, teleportee));
            if (event.isCancelled() && teleporter != null) {
-                Logging.fine("Player '" + teleportee.getName()
+                this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                        + "' was DENIED ACCESS to '" + toWorld.getAlias()
                        + "' because '" + teleporter.getName()
                        + "' don't have: multiverse.access." + event.getTo().getWorld().getName());
                return;
            }
        } else {
-            Logging.fine("Player '" + teleportee.getName()
+            this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                    + "' was allowed to go to '" + toWorld.getAlias() + "' because enforceaccess is off.");
        }

@@ -228,7 +220,7 @@ public class MVPlayerListener implements Listener {
            if (toWorld.getCBWorld().getPlayers().size() >= toWorld.getPlayerLimit()) {
                // Ouch the world is full, lets see if the player can bypass that limitation
                if (!pt.playerCanBypassPlayerLimit(toWorld, teleporter, teleportee)) {
-                    Logging.fine("Player '" + teleportee.getName()
+                    this.plugin.log(Level.FINE, "Player '" + teleportee.getName()
                            + "' was DENIED ACCESS to '" + toWorld.getAlias()
                            + "' because the world is full and '" + teleporter.getName()
                            + "' doesn't have: mv.bypass.playerlimit." + event.getTo().getWorld().getName());
@@ -243,7 +235,7 @@ public class MVPlayerListener implements Listener {
    }

    private void stateSuccess(String playerName, String worldName) {
-        Logging.fine("MV-Core is allowing Player '" + playerName
+        this.plugin.log(Level.FINE, "MV-Core is allowing Player '" + playerName
                + "' to go to '" + worldName + "'.");
    }

@@ -290,12 +282,12 @@ public class MVPlayerListener implements Listener {
        MultiverseWorld toWorld = this.worldManager.getMVWorld(event.getTo().getWorld().getName());
        if (event.getFrom().getWorld().equals(event.getTo().getWorld())) {
            // The player is Portaling to the same world.
-            Logging.finer("Player '" + event.getPlayer().getName() + "' is portaling to the same world.");
+            this.plugin.log(Level.FINER, "Player '" + event.getPlayer().getName() + "' is portaling to the same world.");
            return;
        }
        event.setCancelled(!pt.playerHasMoneyToEnter(fromWorld, toWorld, event.getPlayer(), event.getPlayer(), true));
        if (event.isCancelled()) {
-            Logging.fine("Player '" + event.getPlayer().getName()
+            this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
                    + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName()
                    + "' because they don't have the FUNDS required to enter.");
            return;
@@ -303,17 +295,25 @@ public class MVPlayerListener implements Listener {
        if (plugin.getMVConfig().getEnforceAccess()) {
            event.setCancelled(!pt.playerCanGoFromTo(fromWorld, toWorld, event.getPlayer(), event.getPlayer()));
            if (event.isCancelled()) {
-                Logging.fine("Player '" + event.getPlayer().getName()
+                this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
                        + "' was DENIED ACCESS to '" + event.getTo().getWorld().getName()
                        + "' because they don't have: multiverse.access." + event.getTo().getWorld().getName());
            }
        } else {
-            Logging.fine("Player '" + event.getPlayer().getName()
+            this.plugin.log(Level.FINE, "Player '" + event.getPlayer().getName()
                    + "' was allowed to go to '" + event.getTo().getWorld().getName()
                    + "' because enforceaccess is off.");
        }
-        if (!this.plugin.getMVConfig().isUsingDefaultPortalSearch()) {
-            CompatibilityLayer.setPortalSearchRadius(event, this.plugin.getMVConfig().getPortalSearchRadius());
+        if (!plugin.getMVConfig().isUsingDefaultPortalSearch()) {
+            try {
+                Class.forName("org.bukkit.TravelAgent");
+                if (event.getPortalTravelAgent() != null) {
+                    event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
+                }
+            } catch (ClassNotFoundException ignore) {
+                plugin.log(Level.FINE, "TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
+            }
+
        }
    }

@@ -335,7 +335,7 @@ public class MVPlayerListener implements Listener {
        if (mvWorld != null) {
            this.handleGameModeAndFlight(player, mvWorld);
        } else {
-            Logging.finer("Not handling gamemode and flight for world '" + world.getName()
+            this.plugin.log(Level.FINER, "Not handling gamemode and flight for world '" + world.getName()
                    + "' not managed by Multiverse.");
        }
    }
@@ -376,7 +376,7 @@ public class MVPlayerListener implements Listener {
                                        player.getName(), player.getWorld().getName(), world.getName());
                            }
                        } else {
-                            Logging.fine("Player: " + player.getName() + " is IMMUNE to gamemode changes!");
+                            MVPlayerListener.this.plugin.log(Level.FINE, "Player: " + player.getName() + " is IMMUNE to gamemode changes!");
                        }
                    }
                }, 1L);
@@ -7,7 +7,6 @@

 package com.onarandombox.MultiverseCore.listeners;

-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.Material;
@@ -57,7 +56,7 @@ public class MVPortalListener implements Listener {
    public void portalForm(PortalCreateEvent event) {
        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getWorld());
        if (world != null && !world.getAllowedPortals().isPortalAllowed(PortalType.NETHER)) {
-            Logging.fine("Cancelling creation of nether portal because portalForm disallows.");
+            plugin.log(Level.FINE, "Cancelling creation of nether portal because portalForm disallows.");
            event.setCancelled(true);
        }
    }
@@ -80,7 +79,7 @@ public class MVPortalListener implements Listener {
        }
        MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getPlayer().getWorld());
        if (world != null && !world.getAllowedPortals().isPortalAllowed(PortalType.ENDER)) {
-            Logging.fine("Cancelling creation of ender portal because portalForm disallows.");
+            plugin.log(Level.FINE, "Cancelling creation of ender portal because portalForm disallows.");
            event.setCancelled(true);
        }
    }
@@ -74,7 +74,7 @@ public class AnchorManager {
            this.anchorConfig.save(new File(this.plugin.getDataFolder(), "anchors.yml"));
            return true;
        } catch (IOException e) {
-            Logging.severe("Failed to save anchors.yml. Please check your file permissions.");
+            this.plugin.log(Level.SEVERE, "Failed to save anchors.yml. Please check your file permissions.");
            return false;
        }
    }
@@ -2,7 +2,6 @@ package com.onarandombox.MultiverseCore.utils;

 import java.util.logging.Level;

-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.destination.CannonDestination;
 import org.bukkit.Location;
@@ -90,7 +89,7 @@ public class BukkitTravelAgent implements TravelAgent {
    private Location getSafeLocation() {
        // At this time, these can never use the velocity.
        if (agent.destination instanceof CannonDestination) {
-            Logging.fine("Using Stock TP method. This cannon will have 0 velocity");
+            agent.core.log(Level.FINE, "Using Stock TP method. This cannon will have 0 velocity");
        }
        SafeTTeleporter teleporter = agent.core.getSafeTTeleporter();
        Location newLoc = agent.destination.getLocation(agent.player);
@@ -1,106 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.event.entity.EntityPortalEvent;
-import org.bukkit.event.player.PlayerPortalEvent;
-import org.bukkit.event.player.PlayerRespawnEvent;
-
-import java.lang.reflect.Method;
-
-/**
- * Utility class to enable version specific minecraft features.
- */
-public class CompatibilityLayer {
-
-    private static Method checkAnchorSpawn;
-    private static boolean useTravelAgent;
-    private static Method playerPortalSearchRadius;
-    private static Method entityPortalSearchRadius;
-
-    /**
-     * Initialise the reflection class, methods and fields.
-     */
-    public static void init() {
-        checkAnchorSpawn = ReflectHelper.getMethod(PlayerRespawnEvent.class, "isAnchorSpawn");
-        useTravelAgent = ReflectHelper.hasClass("org.bukkit.TravelAgent");
-        playerPortalSearchRadius = ReflectHelper.getMethod(PlayerPortalEvent.class, "setSearchRadius", int.class);
-        entityPortalSearchRadius = ReflectHelper.getMethod(EntityPortalEvent.class, "setSearchRadius", int.class);
-    }
-
-    /**
-     * <p>Check if the respawn point is of respawn anchor type.</p>
-     * <p>Introduced in minecraft 1.16</p>
-     *
-     * @param event A player respawn event.
-     * @return If the respawn location is an anchor point.
-     */
-    public static boolean isAnchorSpawn(PlayerRespawnEvent event) {
-        if (checkAnchorSpawn == null) {
-            return false;
-        }
-        Boolean result = ReflectHelper.invokeMethod(event, checkAnchorSpawn);
-        if (result == null) {
-            Logging.warning("Unable to check if spawning at respawn anchor!");
-            return false;
-        }
-        return result;
-    }
-
-    /**
-     * <p>Gets if Travel Agent is supported on the server's minecraft version.</p>
-     * <p>Removed in minecraft 1.14</p>
-     *
-     * @return True if Travel Agent is supported, else false.
-     */
-    public static boolean isUseTravelAgent() {
-        return useTravelAgent;
-    }
-
-    /**
-     * <p>Sets search radius for a PlayerPortalEvent.</p>
-     *
-     * <p>Use travel agent if available, else using new PlayerPortalEvent.setSearchRadius(int) method
-     * introduced in minecraft 1.15</p>
-     *
-     * @param event         A Player Portal Event.
-     * @param searchRadius  Target search radius to set to.
-     */
-    public static void setPortalSearchRadius(PlayerPortalEvent event, int searchRadius) {
-        if (useTravelAgent) {
-            event.getPortalTravelAgent().setSearchRadius(searchRadius);
-            event.useTravelAgent(true);
-            Logging.finer("Used travel agent to set player portal search radius.");
-            return;
-        }
-        if (playerPortalSearchRadius == null) {
-            Logging.warning("Unable to set player portal search radius!");
-            return;
-        }
-        ReflectHelper.invokeMethod(event, playerPortalSearchRadius, searchRadius);
-        Logging.finer("Used new method to set player portal search radius.");
-    }
-
-    /**
-     * <p>Sets search radius for a EntityPortalEvent.</p>
-     *
-     * <p>Use travel agent if available, else using new EntityPortalEvent.setSearchRadius(int) method
-     * introduced in minecraft 1.15</p>
-     *
-     * @param event         A Entity Portal Event.
-     * @param searchRadius  Target search radius to set to.
-     */
-    public static void setPortalSearchRadius(EntityPortalEvent event, int searchRadius) {
-        if (useTravelAgent) {
-            event.getPortalTravelAgent().setSearchRadius(searchRadius);
-            event.useTravelAgent(true);
-            Logging.finer("Used travel agent to set entity portal search radius.");
-            return;
-        }
-        if (entityPortalSearchRadius == null) {
-            Logging.warning("Unable to set entity portal search radius!");
-            return;
-        }
-        ReflectHelper.invokeMethod(event, entityPortalSearchRadius, searchRadius);
-        Logging.finer("Used new method to set entity portal search radius.");
-    }
-}
@@ -16,9 +16,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.util.Arrays;
 import java.util.Comparator;
-import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
@@ -72,30 +70,19 @@ public class FileUtils {
     * Helper method to copy the world-folder.
     * @param source Source-File
     * @param target Target-File
+     * @param log A logger that logs the operation
     *
-     * @return true if it had success
+     * @return if it had success
     */
-    public static boolean copyFolder(File source, File target) {
-        return copyFolder(source, target, null);
-    }
-
-    /**
-     * Helper method to copy the world-folder.
-     * @param source Source-File
-     * @param target Target-File
-     * @param excludeFiles files to ignore and not copy over to Target-File
-     *
-     * @return true if it had success
-     */
-    public static boolean copyFolder(File source, File target, List<String> excludeFiles) {
+    public static boolean copyFolder(File source, File target, Logger log) {
        Path sourceDir = source.toPath();
        Path targetDir = target.toPath();

        try {
-            Files.walkFileTree(sourceDir, new CopyDirFileVisitor(sourceDir, targetDir, excludeFiles));
+            Files.walkFileTree(sourceDir, new CopyDirFileVisitor(sourceDir, targetDir));
            return true;
        } catch (IOException e) {
-            Logging.warning("Unable to copy directory", e);
+            log.log(Level.WARNING, "Unable to copy directory", e);
            return false;
        }
    }
@@ -104,12 +91,10 @@ public class FileUtils {

        private final Path sourceDir;
        private final Path targetDir;
-        private final List<String> excludeFiles;

-        private CopyDirFileVisitor(Path sourceDir, Path targetDir, List<String> excludeFiles) {
+        private CopyDirFileVisitor(Path sourceDir, Path targetDir) {
            this.sourceDir = sourceDir;
            this.targetDir = targetDir;
-            this.excludeFiles = excludeFiles;
        }

        @Override
@@ -123,13 +108,9 @@ public class FileUtils {

        @Override
        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-            // Pass files that are set to ignore
-            if (excludeFiles != null && excludeFiles.contains(file.getFileName().toString()))
-                return FileVisitResult.CONTINUE;
-            // Copy the files
            Path targetFile = targetDir.resolve(sourceDir.relativize(file));
            Files.copy(file, targetFile, COPY_ATTRIBUTES);
            return FileVisitResult.CONTINUE;
        }
    }
-}
+}
@@ -7,7 +7,6 @@

 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.MVWorldManager;
@@ -101,7 +100,7 @@ public class MVPermissions implements PermissionsInterface {
    public boolean canEnterWorld(Player p, MultiverseWorld w) {
        // If we're not enforcing access, anyone can enter.
        if (!plugin.getMVConfig().getEnforceAccess()) {
-            Logging.finest("EnforceAccess is OFF. Player was allowed in " + w.getAlias());
+            this.plugin.log(Level.FINEST, "EnforceAccess is OFF. Player was allowed in " + w.getAlias());
            return true;
        }
        return this.hasPermission(p, "multiverse.access." + w.getName(), false);
@@ -258,14 +257,14 @@ public class MVPermissions implements PermissionsInterface {

        boolean hasPermission = sender.hasPermission(node);
        if (!sender.isPermissionSet(node)) {
-            Logging.finer(String.format("The node [%s%s%s] was %sNOT%s set for [%s%s%s].",
+            this.plugin.log(Level.FINER, String.format("The node [%s%s%s] was %sNOT%s set for [%s%s%s].",
                    ChatColor.RED, node, ChatColor.WHITE, ChatColor.RED, ChatColor.WHITE, ChatColor.AQUA,
                    player.getDisplayName(), ChatColor.WHITE));
        }
        if (hasPermission) {
-            Logging.finer("Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
+            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... YES");
        } else {
-            Logging.finer("Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
+            this.plugin.log(Level.FINER, "Checking to see if player [" + player.getName() + "] has permission [" + node + "]... NO");
        }
        return hasPermission;
    }
@@ -7,7 +7,6 @@

 package com.onarandombox.MultiverseCore.utils;

-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import org.bukkit.Material;
@@ -196,7 +195,7 @@ public class PermissionTools {
     * @return True if they can't go to the world, False if they can.
     */
    public boolean playerCanGoFromTo(MultiverseWorld fromWorld, MultiverseWorld toWorld, CommandSender teleporter, Player teleportee) {
-        Logging.finest("Checking '" + teleporter + "' can send '" + teleportee + "' somewhere");
+        this.plugin.log(Level.FINEST, "Checking '" + teleporter + "' can send '" + teleportee + "' somewhere");

        Player teleporterPlayer;
        if (plugin.getMVConfig().getTeleportIntercept()) {
@@ -1,176 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-import com.dumptruckman.minecraft.util.Logging;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * Helper class to get {@link Player} from name, UUID or Selectors.
- */
-public class PlayerFinder {
-
-    private static final Pattern UUID_REGEX = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}");
-    private static final Pattern COMMA_SPLIT = Pattern.compile(",");
-
-    /**
-     * Get a {@link Player} based on an identifier of name UUID or selector.
-     *
-     * @param playerIdentifier  An identifier of name UUID or selector.
-     * @param sender            Target sender for selector.
-     * @return The player if found, else null.
-     */
-    @Nullable
-    public static Player get(@NotNull String playerIdentifier,
-                             @NotNull CommandSender sender) {
-
-        Player targetPlayer = getByName(playerIdentifier);
-        if (targetPlayer != null) {
-            return targetPlayer;
-        }
-        targetPlayer = getByUuid(playerIdentifier);
-        if (targetPlayer != null) {
-            return targetPlayer;
-        }
-        return getBySelector(playerIdentifier, sender);
-    }
-
-    /**
-     * Get multiple {@link Player} based on many identifiers of name UUID or selector.
-     *
-     * @param playerIdentifiers An identifier of multiple names, UUIDs or selectors, separated by comma.
-     * @param sender            Target sender for selector.
-     * @return A list of all the {@link Player} found.
-     */
-    @Nullable
-    public static List<Player> getMulti(@NotNull String playerIdentifiers,
-                                        @NotNull CommandSender sender) {
-
-        String[] playerIdentifierArray = COMMA_SPLIT.split(playerIdentifiers);
-        if (playerIdentifierArray == null || playerIdentifierArray.length == 0) {
-            return null;
-        }
-
-        List<Player> playerResults = new ArrayList<>();
-        for (String playerIdentifier : playerIdentifierArray) {
-            Player targetPlayer = getByName(playerIdentifier);
-            if (targetPlayer != null) {
-                playerResults.add(targetPlayer);
-                continue;
-            }
-            targetPlayer = getByUuid(playerIdentifier);
-            if (targetPlayer != null) {
-                playerResults.add(targetPlayer);
-                continue;
-            }
-            List<Player> targetPlayers = getMultiBySelector(playerIdentifier, sender);
-            if (targetPlayers != null) {
-                playerResults.addAll(targetPlayers);
-            }
-        }
-        return playerResults;
-    }
-
-    /**
-     * Get a {@link Player} based on player name.
-     *
-     * @param playerName    Name of a {@link Player}.
-     * @return The player if found, else null.
-     */
-    @Nullable
-    public static Player getByName(@NotNull String playerName) {
-        return Bukkit.getPlayerExact(playerName);
-    }
-
-    /**
-     * Get a {@link Player} based on player UUID.
-     *
-     * @param playerUuid    UUID of a player.
-     * @return The player if found, else null.
-     */
-    @Nullable
-    public static Player getByUuid(@NotNull String playerUuid) {
-        if (!UUID_REGEX.matcher(playerUuid).matches()) {
-            return null;
-        }
-        UUID uuid;
-        try {
-            uuid = UUID.fromString(playerUuid);
-        } catch (Exception e) {
-            return null;
-        }
-        return getByUuid(uuid);
-    }
-
-    /**
-     * Get a {@link Player} based on playerUUID.
-     *
-     * @param playerUuid    UUID of a player.
-     * @return The player if found, else null.
-     */
-    @Nullable
-    public static Player getByUuid(@NotNull UUID playerUuid) {
-        return Bukkit.getPlayer(playerUuid);
-    }
-
-    /**
-     * Get a {@link Player} based on vanilla selectors.
-     * https://minecraft.gamepedia.com/Commands#Target_selectors
-     *
-     * @param playerSelector    A target selector, usually starts with an '@'.
-     * @param sender            Target sender for selector.
-     * @return The player if only one found, else null.
-     */
-    @Nullable
-    public static Player getBySelector(@NotNull String playerSelector,
-                                       @NotNull CommandSender sender) {
-
-        List<Player> matchedPlayers = getMultiBySelector(playerSelector, sender);
-        if (matchedPlayers == null || matchedPlayers.isEmpty()) {
-            Logging.fine("No player found with selector '%s' for %s.", playerSelector, sender.getName());
-            return null;
-        }
-        if (matchedPlayers.size() > 1) {
-            Logging.warning("Ambiguous selector result '%s' for %s (more than one player matched) - %s",
-                    playerSelector, sender.getName(), matchedPlayers.toString());
-            return null;
-        }
-        return matchedPlayers.get(0);
-    }
-
-    /**
-     * Get multiple {@link Player} based on selector.
-     * https://minecraft.gamepedia.com/Commands#Target_selectors
-     *
-     * @param playerSelector    A target selector, usually starts with an '@'.
-     * @param sender            Target sender for selector.
-     * @return A list of all the {@link Player} found.
-     */
-    @Nullable
-    public static List<Player> getMultiBySelector(@NotNull String playerSelector,
-                                                  @NotNull CommandSender sender) {
-
-        if (playerSelector.charAt(0) != '@') {
-            return null;
-        }
-        try {
-            return Bukkit.selectEntities(sender, playerSelector).stream()
-                    .filter(e -> e instanceof Player)
-                    .map(e -> ((Player) e))
-                    .collect(Collectors.toList());
-        } catch (IllegalArgumentException e) {
-            Logging.warning("An error occurred while parsing selector '%s' for %s. Is it is the correct format?",
-                    playerSelector, sender.getName());
-            e.printStackTrace();
-            return null;
-        }
-    }
-}
@@ -7,7 +7,6 @@

 package com.onarandombox.MultiverseCore.utils;

-import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;

@@ -87,7 +86,7 @@ public class PurgeWorlds {
        }
        int entitiesKilled = 0;
        for (Entity e : world.getEntities()) {
-            Logging.finest("Entity list (aval for purge) from WORLD < " + mvworld.getName() + " >: " + e.toString());
+            this.plugin.log(Level.FINEST, "Entity list (aval for purge) from WORLD < " + mvworld.getName() + " >: " + e.toString());

            // Check against Monsters
            if (killMonster(mvworld, e, thingsToKill, negateMonsters)) {
@@ -134,16 +133,16 @@ public class PurgeWorlds {
            entityName = e.toString().replaceAll("Craft", "").toUpperCase();
        }
        if (e instanceof Slime || e instanceof Monster || e instanceof Ghast || e instanceof EnderDragon) {
-            Logging.finest("Looking at a monster: " + e);
+            this.plugin.log(Level.FINEST, "Looking at a monster: " + e);
            if (creaturesToKill.contains(entityName) || creaturesToKill.contains("ALL") || creaturesToKill.contains("MONSTERS")) {
                if (!negate) {
-                    Logging.finest("Removing a monster: " + e);
+                    this.plugin.log(Level.FINEST, "Removing a monster: " + e);
                    e.remove();
                    return true;
                }
            } else {
                if (negate) {
-                    Logging.finest("Removing a monster: " + e);
+                    this.plugin.log(Level.FINEST, "Removing a monster: " + e);
                    e.remove();
                    return true;
                }
@@ -1,140 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-/**
- * Utility class used to help in doing various reflection actions.
- */
-public class ReflectHelper {
-
-    /**
-     * Try to get the {@link Class} based on its classpath.
-     *
-     * @param classPath The target classpath.
-     * @return A {@link Class} if found, else null.
-     */
-    @Nullable
-    public static Class<?> getClass(String classPath) {
-        try {
-            return Class.forName(classPath);
-        } catch (ClassNotFoundException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Check if the {@link Class} for a give classpath is present/valid.
-     *
-     * @param classPath Target classpath.
-     * @return True if class path is a valid class, else false.
-     */
-    public static boolean hasClass(String classPath) {
-        return getClass(classPath) != null;
-    }
-
-    /**
-     * Try to get a {@link Method} from a given class.
-     *
-     * @param clazz             The class to search the method on.
-     * @param methodName        Name of the method to get.
-     * @param parameterTypes    Parameters present for that method.
-     * @param <C>               The class type.
-     * @return A {@link Method} if found, else null.
-     */
-    @Nullable
-    public static <C> Method getMethod(Class<C> clazz, String methodName, Class<?>... parameterTypes) {
-        try {
-            Method method = clazz.getDeclaredMethod(methodName, parameterTypes);
-            method.setAccessible(true);
-            return method;
-        } catch (NoSuchMethodException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Try to get a {@link Method} from a given class.
-     *
-     * @param classInstance     Instance of the class to search the method on.
-     * @param methodName        Name of the method to get.
-     * @param parameterTypes    Parameters present for that method.
-     * @param <C>               The class type.
-     * @return A {@link Method} if found, else null.
-     */
-    @Nullable
-    public static <C> Method getMethod(C classInstance, String methodName, Class<?>... parameterTypes) {
-        return getMethod(classInstance.getClass(), methodName, parameterTypes);
-    }
-
-    /**
-     * Calls a {@link Method}.
-     *
-     * @param classInstance Instance of the class responsible for the method.
-     * @param method        The method to call.
-     * @param parameters    Parameters needed when calling the method.
-     * @param <C>           The class type.
-     * @param <R>           The return type.
-     * @return Return value of the method call if any, else null.
-     */
-    @Nullable
-    public static <C, R> R invokeMethod(C classInstance, Method method, Object...parameters) {
-        try {
-            return (R) method.invoke(classInstance, parameters);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    /**
-     * Try to get a {@link Field} from a given class.
-     *
-     * @param clazz     The class to search the field on.
-     * @param fieldName Name of the field to get.
-     * @param <C>       The class type.
-     * @return A {@link Field} if found, else null.
-     */
-    @Nullable
-    public static <C> Field getField(Class<C> clazz, String fieldName) {
-        try {
-            Field field = clazz.getDeclaredField(fieldName);
-            field.setAccessible(true);
-            return field;
-        } catch (NoSuchFieldException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Try to get a {@link Field} from a given class.
-     *
-     * @param classInstance Instance of the class to search the field on.
-     * @param fieldName     Name of the field to get.
-     * @param <C>           The class type.
-     * @return A {@link Field} if found, else null.
-     */
-    @Nullable
-    public static <C> Field getField(C classInstance, String fieldName) {
-        return getField(classInstance.getClass(), fieldName);
-    }
-
-    /**
-     * Gets the value of an {@link Field} from an instance of the class responsible.
-     *
-     * @param classInstance Instance of the class to get the field value from.
-     * @param field         The field to get value from.
-     * @param <C>           The class type.
-     * @param <V>           The field value type.
-     * @return The field value if any, else null.
-     */
-    @Nullable
-    public static <C, V> V getFieldValue(C classInstance, Field field)  {
-        try {
-            return (V) field.get(classInstance);
-        } catch (IllegalAccessException e) {
-            return null;
-        }
-    }
-}
@@ -19,7 +19,6 @@ import com.onarandombox.MultiverseCore.api.LocationManipulation;
 import java.text.DecimalFormat;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;

 /**
@@ -40,15 +39,6 @@ public class SimpleLocationManipulation implements LocationManipulation {
        orientationInts.put("w", 90);
        orientationInts.put("nw", 135);

-        orientationInts.put("north", 180);
-        orientationInts.put("northeast", 225);
-        orientationInts.put("east", 270);
-        orientationInts.put("southeast", 315);
-        orientationInts.put("south", 0);
-        orientationInts.put("southwest", 45);
-        orientationInts.put("west", 90);
-        orientationInts.put("northwest", 135);
-
        // "freeze" the map:
        ORIENTATION_INTS = Collections.unmodifiableMap(orientationInts);
        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
@@ -62,7 +52,7 @@ public class SimpleLocationManipulation implements LocationManipulation {
        if (location == null) {
            return "";
        }
-        return String.format(Locale.ENGLISH, "%s:%.2f,%.2f,%.2f:%.2f:%.2f", location.getWorld().getName(),
+        return String.format("%s:%.2f,%.2f,%.2f:%.2f:%.2f", location.getWorld().getName(),
                location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
    }

@@ -7,13 +7,12 @@

 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 +24,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 +36,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;

@@ -58,9 +58,9 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
        if (safe != null) {
            safe.setX(safe.getBlockX() + .5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
            safe.setZ(safe.getBlockZ() + .5); // SUPPRESS CHECKSTYLE: MagicNumberCheck
-            Logging.fine("Hey! I found one: " + plugin.getLocationManipulation().strCoordsRaw(safe));
+            this.plugin.log(Level.FINE, "Hey! I found one: " + plugin.getLocationManipulation().strCoordsRaw(safe));
        } else {
-            Logging.fine("Uh oh! No safe place found!");
+            this.plugin.log(Level.FINE, "Uh oh! No safe place found!");
        }
        return safe;
    }
@@ -72,8 +72,8 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
        }
        // We want half of it, so we can go up and down
        tolerance /= 2;
-        Logging.finer("Given Location of: " + plugin.getLocationManipulation().strCoordsRaw(l));
-        Logging.finer("Checking +-" + tolerance + " with a radius of " + radius);
+        this.plugin.log(Level.FINER, "Given Location of: " + plugin.getLocationManipulation().strCoordsRaw(l));
+        this.plugin.log(Level.FINER, "Checking +-" + tolerance + " with a radius of " + radius);

        // For now this will just do a straight up block.
        Location locToCheck = l.clone();
@@ -191,7 +191,7 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
    @Override
    public TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, MVDestination d) {
        if (d instanceof InvalidDestination) {
-            Logging.finer("Entity tried to teleport to an invalid destination");
+            this.plugin.log(Level.FINER, "Entity tried to teleport to an invalid destination");
            return TeleportResult.FAIL_INVALID;
        }
        Player teleporteePlayer = null;
@@ -213,11 +213,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;
            }
@@ -251,7 +248,7 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
    public Location getSafeLocation(Entity e, MVDestination d) {
        Location l = d.getLocation(e);
        if (plugin.getBlockSafety().playerCanSpawnHereSafely(l)) {
-            Logging.fine("The first location you gave me was safe.");
+            plugin.log(Level.FINE, "The first location you gave me was safe.");
            return l;
        }
        if (e instanceof Minecart) {
@@ -270,21 +267,21 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
            // Add offset to account for a vehicle on dry land!
            if (e instanceof Minecart && !plugin.getBlockSafety().isEntitiyOnTrack(safeLocation)) {
                safeLocation.setY(safeLocation.getBlockY() + .5);
-                Logging.finer("Player was inside a minecart. Offsetting Y location.");
+                this.plugin.log(Level.FINER, "Player was inside a minecart. Offsetting Y location.");
            }
-            Logging.finer("Had to look for a bit, but I found a safe place for ya!");
+            this.plugin.log(Level.FINE, "Had to look for a bit, but I found a safe place for ya!");
            return safeLocation;
        }
        if (e instanceof Player) {
            Player p = (Player) e;
            this.plugin.getMessaging().sendMessage(p, "No safe locations found!", false);
-            Logging.finer("No safe location found for " + p.getName());
+            this.plugin.log(Level.FINER, "No safe location found for " + p.getName());
        } else if (e.getPassenger() instanceof Player) {
            Player p = (Player) e.getPassenger();
            this.plugin.getMessaging().sendMessage(p, "No safe locations found!", false);
-            Logging.finer("No safe location found for " + p.getName());
+            this.plugin.log(Level.FINER, "No safe location found for " + p.getName());
        }
-        Logging.fine("Sorry champ, you're basically trying to teleport into a minefield. I should just kill you now.");
+        this.plugin.log(Level.FINE, "Sorry champ, you're basically trying to teleport into a minefield. I should just kill you now.");
        return null;
    }

@@ -1,18 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-/**
- * A utility class that enables automated tests to flag Multiverse for testing. This allows Multiverse to not perform
- * certain behaviors such as enabled stats uploads.
- */
-public class TestingMode {
-
-    private static boolean enabled = false;
-
-    public static void enable() {
-        enabled = true;
-    }
-
-    public static boolean isDisabled() {
-        return !enabled;
-    }
-}
@@ -18,7 +18,6 @@ import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.api.WorldPurger;
 import com.onarandombox.MultiverseCore.event.MVWorldDeleteEvent;
 import org.bukkit.Bukkit;
-import org.bukkit.GameRule;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
@@ -37,9 +36,7 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,8 +45,7 @@ import java.util.Set;
 import java.util.Stack;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import java.util.logging.Level;

 /**
 * Public facing API to add/remove Multiverse worlds.
@@ -91,7 +87,7 @@ public class WorldManager implements MVWorldManager {
                }
            }
        } else {
-            Logging.warning("Could not read 'bukkit.yml'. Any Default worldgenerators will not be loaded!");
+            this.plugin.log(Level.WARNING, "Could not read 'bukkit.yml'. Any Default worldgenerators will not be loaded!");
        }
    }

@@ -129,18 +125,12 @@ public class WorldManager implements MVWorldManager {
            return false;
        }

-        // Check for valid world name
-        if (!(WorldNameChecker.isValidWorldName(oldName) && WorldNameChecker.isValidWorldName(newName))) {
-            return false;
-        }
-
        final File oldWorldFile = new File(this.plugin.getServer().getWorldContainer(), oldName);
        final File newWorldFile = new File(this.plugin.getServer().getWorldContainer(), newName);
-        final List<String> ignoreFiles = new ArrayList<>(Arrays.asList("session.lock", "uid.dat"));

        // Make sure the new world doesn't exist outside of multiverse.
        if (newWorldFile.exists()) {
-            Logging.warning("Folder for new world '%s' already exists", newName);
+            Logging.warning("File for new world '%s' already exists", newName);
            return false;
        }

@@ -162,8 +152,14 @@ public class WorldManager implements MVWorldManager {
        }
        
        // Grab a bit of metadata from the old world.
-        MultiverseWorld oldWorld = getMVWorld(oldName);
-
+        MVWorld oldWorld = (MVWorld) getMVWorld(oldName);
+        Environment environment = oldWorld.getEnvironment();
+        String seedString = oldWorld.getSeed() + "";
+        WorldType worldType = oldWorld.getWorldType();
+        Boolean generateStructures = oldWorld.getCBWorld().canGenerateStructures();
+        String generator = oldWorld.getGenerator();
+        boolean useSpawnAdjust = oldWorld.getAdjustSpawn();
+        
        // Don't need the loaded world anymore.
        if (wasJustLoaded) {
            this.unloadWorld(oldName, true);
@@ -181,40 +177,32 @@ public class WorldManager implements MVWorldManager {
            oldWorld.getCBWorld().save();
        }
        Logging.config("Copying files for world '%s'", oldName);
-        if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, ignoreFiles)) {
+        if (!FileUtils.copyFolder(oldWorldFile, newWorldFile, Logging.getLogger())) {
            Logging.warning("Failed to copy files for world '%s', see the log info", newName);
            return false;
        }
        if (oldWorld != null && wasAutoSave) {
            oldWorld.getCBWorld().setAutoSave(true);
        }
-        
-        if (newWorldFile.exists()) {
-            Logging.fine("Succeeded at copying files");

-            // initialize new properties with old ones
-            WorldProperties newProps = new WorldProperties();
-            newProps.copyValues(this.worldsFromTheConfig.get(oldName));
-            // don't keep the alias the same -- that would be useless
-            newProps.setAlias("");
-            // store the new properties in worlds config map
-            this.worldsFromTheConfig.put(newName, newProps);
-
-            // save the worlds config to disk (worlds.yml)
-            if (!saveWorldsConfig()) {
-                Logging.severe("Failed to save worlds.yml");
-                return false;
-            }
-
-            // actually load the world
-            if (doLoad(newName)) {
-               Logging.fine("Succeeded at loading cloned world '" + newName + "'");
-               return true;
-            }
-            Logging.severe("Failed to load the cloned world '" + newName + "'");
+        File uidFile = new File(newWorldFile, "uid.dat");
+        if (uidFile.exists() && !uidFile.delete()) {
+            Logging.warning("Failed to delete unique ID file for world '%s'", newName);
            return false;
        }

+        if (newWorldFile.exists()) {
+            Logging.fine("Succeeded at copying files");
+            if (this.addWorld(newName, environment, seedString, worldType, generateStructures, generator, useSpawnAdjust)) {
+                // getMVWorld() doesn't actually return an MVWorld
+                Logging.fine("Succeeded at importing world");
+                MVWorld newWorld = (MVWorld) this.getMVWorld(newName);
+                newWorld.copyValues(this.worldsFromTheConfig.get(oldName));
+                // don't keep the alias the same -- that would be useless
+                newWorld.setAlias("");
+                return true;
+            }
+        }
        Logging.warning("Failed to copy files for world '%s', see the log info", newName);
        return false;
    }
@@ -237,13 +225,6 @@ public class WorldManager implements MVWorldManager {
        if (name.equalsIgnoreCase("plugins") || name.equalsIgnoreCase("logs")) {
            return false;
        }
-
-        if (!WorldNameChecker.isValidWorldName(name)) {
-            Logging.warning("Invalid world name '" + name + "'");
-            Logging.warning("World name should not contain spaces or special characters!");
-            return false;
-        }
-
        Long seed = null;
        WorldCreator c = new WorldCreator(name);
        if (seedString != null && seedString.length() > 0) {
@@ -286,7 +267,7 @@ public class WorldManager implements MVWorldManager {
        Logging.info(builder.toString());

        if (!doLoad(c, true)) {
-            Logging.severe("Failed to Create/Load the world '" + name + "'");
+            this.plugin.log(Level.SEVERE, "Failed to Create/Load the world '" + name + "'");
            return false;
        }

@@ -359,7 +340,7 @@ public class WorldManager implements MVWorldManager {
        MultiverseWorld world = this.getMVWorld(this.firstSpawn);
        if (world == null) {
            // If the spawn world was unloaded, get the default world
-            Logging.warning("The world specified as the spawn world (" + this.firstSpawn + ") did not exist!!");
+            this.plugin.log(Level.WARNING, "The world specified as the spawn world (" + this.firstSpawn + ") did not exist!!");
            try {
                return this.getMVWorld(this.plugin.getServer().getWorlds().get(0));
            } catch (IndexOutOfBoundsException e) {
@@ -387,14 +368,14 @@ public class WorldManager implements MVWorldManager {
            this.worldsFromTheConfig.get(name).cacheVirtualProperties();
            if (unloadBukkit && this.unloadWorldFromBukkit(name, true)) {
                this.worlds.remove(name);
-                Logging.info("World '%s' was unloaded from Bukkit.", name);
+                Logging.info("World '%s' was unloaded from memory.", name);
                return true;
            } else if (!unloadBukkit){
                this.worlds.remove(name);
-                Logging.info("World '%s' was unloaded from Multiverse.", name);
+                Logging.info("World '%s' was unloaded from memory.", name);
                return true;
            } else {
-                Logging.warning("World '%s' could not be unloaded from Bukkit. Is it a default world?", name);
+                Logging.warning("World '%s' could not be unloaded. Is it a default world?", name);
            }
        } else if (this.plugin.getServer().getWorld(name) != null) {
            Logging.warning("Hmm Multiverse does not know about this world but it's loaded in memory.");
@@ -427,15 +408,15 @@ public class WorldManager implements MVWorldManager {
    }

    private void brokenWorld(String name) {
-        Logging.severe("The world '" + name + "' could NOT be loaded because it contains errors and is probably corrupt!");
-        Logging.severe("Try using Minecraft Region Fixer to repair your world! '" + name + "'");
-        Logging.severe("https://github.com/Fenixin/Minecraft-Region-Fixer");
+        this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because it contains errors and is probably corrupt!");
+        this.plugin.log(Level.SEVERE, "Try using Minecraft Region Fixer to repair your world! '" + name + "'");
+        this.plugin.log(Level.SEVERE, "https://github.com/Fenixin/Minecraft-Region-Fixer");
    }

    private void nullWorld(String name) {
-        Logging.severe("The world '" + name + "' could NOT be loaded because the server didn't like it!");
-        Logging.severe("We don't really know why this is. Contact the developer of your server software!");
-        Logging.severe("Server version info: " + Bukkit.getServer().getVersion());
+        this.plugin.log(Level.SEVERE, "The world '" + name + "' could NOT be loaded because the server didn't like it!");
+        this.plugin.log(Level.SEVERE, "We don't really know why this is. Contact the developer of your server software!");
+        this.plugin.log(Level.SEVERE, "Server version info: " + Bukkit.getServer().getVersion());
    }

    private boolean doLoad(String name) {
@@ -475,8 +456,8 @@ public class WorldManager implements MVWorldManager {
            throw new IllegalArgumentException("That world is already loaded!");

        if (!ignoreExists && !new File(this.plugin.getServer().getWorldContainer(), worldName).exists() && !new File(this.plugin.getServer().getWorldContainer().getParent(), worldName).exists()) {
-            Logging.warning("WorldManager: Can't load this world because the folder was deleted/moved: " + worldName);
-            Logging.warning("Use '/mv remove' to remove it from the config!");
+            this.plugin.log(Level.WARNING, "WorldManager: Can't load this world because the folder was deleted/moved: " + worldName);
+            this.plugin.log(Level.WARNING, "Use '/mv remove' to remove it from the config!");
            return false;
        }

@@ -506,13 +487,6 @@ public class WorldManager implements MVWorldManager {
     */
    @Override
    public boolean deleteWorld(String name, boolean removeFromConfig, boolean deleteWorldFolder) {
-        if (this.hasUnloadedWorld(name, false)) {
-            // Attempt to load if unloaded so we can actually delete the world
-            if (!this.doLoad(name)) {
-                return false;
-            }
-        }
-
        World world = this.plugin.getServer().getWorld(name);
        if (world == null) {
            // We can only delete loaded worlds
@@ -523,7 +497,7 @@ public class WorldManager implements MVWorldManager {
        MVWorldDeleteEvent mvwde = new MVWorldDeleteEvent(getMVWorld(name), removeFromConfig);
        this.plugin.getServer().getPluginManager().callEvent(mvwde);
        if (mvwde.isCancelled()) {
-            Logging.fine("Tried to delete a world, but the event was cancelled!");
+            this.plugin.log(Level.FINE, "Tried to delete a world, but the event was cancelled!");
            return false;
        }

@@ -539,7 +513,7 @@ public class WorldManager implements MVWorldManager {

        try {
            File worldFile = world.getWorldFolder();
-            Logging.finer("deleteWorld(): worldFile: " + worldFile.getAbsolutePath());
+            plugin.log(Level.FINER, "deleteWorld(): worldFile: " + worldFile.getAbsolutePath());
            if (deleteWorldFolder ? FileUtils.deleteFolder(worldFile) : FileUtils.deleteFolderContents(worldFile)) {
                Logging.info("World '%s' was DELETED.", name);
                return true;
@@ -617,14 +591,6 @@ public class WorldManager implements MVWorldManager {
     */
    @Override
    public MultiverseWorld getMVWorld(String name) {
-        return this.getMVWorld(name, true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public MultiverseWorld getMVWorld(String name, boolean checkAliases) {
        if (name == null) {
            return null;
        }
@@ -632,7 +598,7 @@ public class WorldManager implements MVWorldManager {
        if (world != null) {
            return world;
        }
-        return (checkAliases) ? this.getMVWorldByAlias(name) : null;
+        return this.getMVWorldByAlias(name);
    }

    /**
@@ -641,7 +607,7 @@ public class WorldManager implements MVWorldManager {
    @Override
    public MultiverseWorld getMVWorld(World world) {
        if (world != null) {
-            return this.getMVWorld(world.getName(), false);
+            return this.getMVWorld(world.getName());
        }
        return null;
    }
@@ -666,15 +632,7 @@ public class WorldManager implements MVWorldManager {
     */
    @Override
    public boolean isMVWorld(final String name) {
-        return this.isMVWorld(name, true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isMVWorld(final String name, boolean checkAliases) {
-        return this.worlds.containsKey(name) || (checkAliases && this.isMVWorldAlias(name));
+        return (this.worlds.containsKey(name) || isMVWorldAlias(name));
    }

    /**
@@ -869,7 +827,7 @@ public class WorldManager implements MVWorldManager {
            this.configWorlds.save(new File(this.plugin.getDataFolder(), "worlds.yml"));
            return true;
        } catch (IOException e) {
-            Logging.severe("Could not save worlds.yml. Please check your settings.");
+            this.plugin.log(Level.SEVERE, "Could not save worlds.yml. Please check your settings.");
            return false;
        }
    }
@@ -897,23 +855,12 @@ public class WorldManager implements MVWorldManager {
     */
    @Override
    public boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed) {
-        return regenWorld(name, useNewSeed, randomSeed, seed, false);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean regenWorld(String name, boolean useNewSeed, boolean randomSeed, String seed, boolean keepGameRules) {
        MultiverseWorld world = this.getMVWorld(name);
-        if (world == null) {
-            Logging.warning("Unable to regen a world that does not exist!");
+        if (world == null)
            return false;
-        }

        List<Player> ps = world.getCBWorld().getPlayers();

-        // Apply new seed if needed.
        if (useNewSeed) {
            long theSeed;

@@ -929,64 +876,19 @@ public class WorldManager implements MVWorldManager {

            world.setSeed(theSeed);
        }
-
        WorldType type = world.getWorldType();

-        // Save current GameRules if needed.
-        Map<GameRule<?>, Object> gameRuleMap = null;
-        if (keepGameRules) {
-            gameRuleMap = new HashMap<>(GameRule.values().length);
-            World CBWorld = world.getCBWorld();
-            for (GameRule<?> gameRule : GameRule.values()) {
-                // Only save if not default value.
-                Object value = CBWorld.getGameRuleValue(gameRule);
-                if (value != CBWorld.getGameRuleDefault(gameRule)) {
-                    gameRuleMap.put(gameRule, value);
-                }
+        if (this.deleteWorld(name, false, false)) {
+            this.doLoad(name, true, type);
+            SafeTTeleporter teleporter = this.plugin.getSafeTTeleporter();
+            Location newSpawn = world.getSpawnLocation();
+            // Send all players that were in the old world, BACK to it!
+            for (Player p : ps) {
+                teleporter.safelyTeleport(null, p, newSpawn, true);
            }
+            return true;
        }
-
-        // Do the regen.
-        if (!this.deleteWorld(name, false, false)) {
-            Logging.severe("Unable to regen world as world cannot be deleted.");
-            return false;
-        }
-        if (!this.doLoad(name, true, type)) {
-            Logging.severe("Unable to regen world as world cannot be loaded.");
-            return false;
-        }
-
-        // Get new MultiverseWorld reference.
-        world = this.getMVWorld(name);
-
-        // Load back GameRules if needed.
-        if (keepGameRules) {
-            Logging.fine("Restoring previous world's GameRules...");
-            World CBWorld = world.getCBWorld();
-            for (Map.Entry<GameRule<?>, Object> gameRuleEntry : gameRuleMap.entrySet()) {
-                if (!setGameRuleValue(CBWorld, gameRuleEntry.getKey(), gameRuleEntry.getValue())) {
-                    Logging.warning("Unable to set GameRule '%s' to '%s' on regen world.",
-                            gameRuleEntry.getKey().getName(), gameRuleEntry.getValue());
-                }
-            }
-        }
-
-        // Send all players that were in the old world, BACK to it!
-        SafeTTeleporter teleporter = this.plugin.getSafeTTeleporter();
-        Location newSpawn = world.getSpawnLocation();
-        for (Player p : ps) {
-            teleporter.safelyTeleport(null, p, newSpawn, true);
-        }
-
-        return true;
-    }
-
-    private <T> boolean setGameRuleValue(World world, GameRule<T> gameRule, Object value) {
-        try {
-            return world.setGameRule(gameRule, (T) value);
-        } catch (Exception e) {
-            return false;
-        }
+        return false;
    }

    /**
@@ -997,9 +899,6 @@ public class WorldManager implements MVWorldManager {
        return this.configWorlds;
    }

-    /**
-     * {@inheritDoc}
-     */
 	@Override
 	public boolean hasUnloadedWorld(String name, boolean includeLoaded) {
 		if (getMVWorld(name) != null) {
@@ -1012,21 +911,4 @@ public class WorldManager implements MVWorldManager {
 		}
 		return false;
 	}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-	public Collection<String> getPotentialWorlds() {
-        File worldContainer = this.plugin.getServer().getWorldContainer();
-        if (worldContainer == null) {
-            return Collections.emptyList();
-        }
-        return Arrays.stream(worldContainer.listFiles())
-                .filter(File::isDirectory)
-                .filter(folder -> !this.isMVWorld(folder.getName(), false))
-                .filter(WorldNameChecker::isValidWorldFolder)
-                .map(File::getName)
-                .collect(Collectors.toList());
-    }
 }
@@ -1,159 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-import org.bukkit.Bukkit;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-/**
- * <p>Utility class in helping to check the status of a world name and it's associated world folder.</p>
- *
- * <p>Note this is for preliminary checks and better command output. A valid result will suggest but not
- * 100% determine that a world name can be created, loaded or imported.</p>
- */
-public class WorldNameChecker {
-
-    private static final Pattern WORLD_NAME_PATTERN = Pattern.compile("[a-zA-Z0-9/._-]+");
-    private static final Set<String> BLACKLIST_NAMES = Collections.unmodifiableSet(new HashSet<String>() {{
-        add("plugins");
-        add("logs");
-        add("cache");
-        add("crash-reports");
-    }});
-
-    /**
-     * Checks if a world name is valid.
-     *
-     * @param worldName The world name to check on.
-     * @return True if check result is valid, else false.
-     */
-    public static boolean isValidWorldName(@Nullable String worldName) {
-        return checkName(worldName) == NameStatus.VALID;
-    }
-
-    /**
-     * Checks the current validity status of a world name.
-     *
-     * @param worldName The world name to check on.
-     * @return The resulting name status.
-     */
-    @NotNull
-    public static NameStatus checkName(@Nullable String worldName) {
-        if (BLACKLIST_NAMES.contains(worldName)) {
-            return NameStatus.BLACKLISTED;
-        }
-        if (worldName == null || !WORLD_NAME_PATTERN.matcher(worldName).matches()) {
-            return NameStatus.INVALID_CHARS;
-        }
-        return NameStatus.VALID;
-    }
-
-    /**
-     * Checks if a world name has a valid world folder.
-     *
-     * @param worldName The world name to check on.
-     * @return True if check result is valid, else false.
-     */
-    public static boolean isValidWorldFolder(@Nullable String worldName) {
-        return checkFolder(worldName) == FolderStatus.VALID;
-    }
-
-    /**
-     * Checks if a world folder is valid.
-     *
-     * @param worldFolder   The world folder to check on.
-     * @return True if check result is valid, else false.
-     */
-    public static boolean isValidWorldFolder(@Nullable File worldFolder) {
-        return checkFolder(worldFolder) == FolderStatus.VALID;
-    }
-
-    /**
-     * Checks the current folder status for a world name.
-     *
-     * @param worldName The world name to check on.
-     * @return The resulting folder status.
-     */
-    @NotNull
-    public static FolderStatus checkFolder(@Nullable String worldName) {
-        if (worldName == null) {
-            return FolderStatus.DOES_NOT_EXIST;
-        }
-        File worldFolder = new File(Bukkit.getWorldContainer(), worldName);
-        return checkFolder(worldFolder);
-    }
-
-    /**
-     * Checks the current folder status.
-     *
-     * @param worldFolder   The world folder to check on.
-     * @return The resulting folder status.
-     */
-    @NotNull
-    public static FolderStatus checkFolder(@Nullable File worldFolder) {
-        if (worldFolder == null || !worldFolder.exists() || !worldFolder.isDirectory()) {
-            return FolderStatus.DOES_NOT_EXIST;
-        }
-        if (!folderHasDat(worldFolder)) {
-            return FolderStatus.NOT_A_WORLD;
-        }
-        return FolderStatus.VALID;
-    }
-
-    /**
-     * A very basic check to see if a folder has a level.dat file. If it does, we can safely assume
-     * it's a world folder.
-     *
-     * @param worldFolder   The File that may be a world.
-     * @return True if it looks like a world, else false.
-     */
-    private static boolean folderHasDat(@NotNull File worldFolder) {
-        File[] files = worldFolder.listFiles((file, name) -> name.toLowerCase().endsWith(".dat"));
-        return files != null && files.length > 0;
-    }
-
-    /**
-     * Result after checking validity of world name.
-     */
-    public enum NameStatus {
-        /**
-         * Name is valid.
-         */
-        VALID,
-
-        /**
-         * Name not valid as it contains invalid characters.
-         */
-        INVALID_CHARS,
-
-        /**
-         * Name not valid as it is deemed blacklisted.
-         */
-        BLACKLISTED
-    }
-
-    /**
-     * Result after checking validity of world folder.
-     */
-    public enum FolderStatus {
-        /**
-         * Folder is valid.
-         */
-        VALID,
-
-        /**
-         * Folder exist, but contents in it doesnt look like a world.
-         */
-        NOT_A_WORLD,
-
-        /**
-         * Folder does not exist.
-         */
-        DOES_NOT_EXIST
-    }
-}
@@ -1,95 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.metrics;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.function.Consumer;
-
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import com.onarandombox.MultiverseCore.api.MultiverseWorld;
-import org.apache.commons.lang.WordUtils;
-import org.bstats.bukkit.Metrics;
-import org.bukkit.World;
-
-public class MetricsConfigurator {
-
-    private static final int PLUGIN_ID = 7765;
-    private static final String NO_GENERATOR_NAME = "N/A";
-
-    public static void configureMetrics(MultiverseCore plugin) {
-        MetricsConfigurator configurator = new MetricsConfigurator(plugin);
-        configurator.initMetrics();
-    }
-
-    private final MultiverseCore plugin;
-    private final Metrics metrics;
-
-    private MetricsConfigurator(MultiverseCore plugin) {
-        this.plugin = plugin;
-        this.metrics = new Metrics(plugin, PLUGIN_ID);
-    }
-
-    private MVWorldManager getWorldManager() {
-        return plugin.getMVWorldManager();
-    }
-
-    private Collection<MultiverseWorld> getMVWorlds() {
-        return getWorldManager().getMVWorlds();
-    }
-
-    private void initMetrics() {
-        try {
-            addCustomGeneratorsMetric();
-            addEnvironmentsMetric();
-            addWorldCountMetric();
-
-            Logging.fine("Metrics enabled.");
-        } catch (Exception e) {
-            Logging.warning("There was an issue while enabling metrics:");
-            e.printStackTrace();
-        }
-    }
-
-    private void addCustomGeneratorsMetric() {
-        addAdvancedPieMetric("custom_generators", map -> {
-            for (MultiverseWorld w : getMVWorlds()) {
-                MetricsHelper.incrementCount(map, getGeneratorName(w));
-            }
-        });
-    }
-
-    private String getGeneratorName(MultiverseWorld world) {
-        String gen = world.getGenerator();
-        return (gen != null && !gen.equalsIgnoreCase("null")) ? gen.split(":")[0] : NO_GENERATOR_NAME;
-    }
-
-    private void addEnvironmentsMetric() {
-        addAdvancedPieMetric("environments", map -> {
-            for (MultiverseWorld w : getMVWorlds()) {
-                MetricsHelper.incrementCount(map, titleCaseEnv(w.getEnvironment()));
-            }
-        });
-    }
-
-    private String titleCaseEnv(World.Environment env) {
-        String envName = env.name().replaceAll("_+", " ");
-        return WordUtils.capitalizeFully(envName);
-    }
-
-    private void addWorldCountMetric() {
-        addMultiLineMetric("world_count", map -> {
-            int loadedWorldsCount = getMVWorlds().size();
-            map.put("Loaded worlds", loadedWorldsCount);
-            map.put("Total number of worlds", loadedWorldsCount + getWorldManager().getUnloadedWorlds().size());
-        });
-    }
-
-    private void addAdvancedPieMetric(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
-        metrics.addCustomChart(MetricsHelper.createAdvancedPieChart(chartId, metricsFunc));
-    }
-
-    private void addMultiLineMetric(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
-        metrics.addCustomChart(MetricsHelper.createMultiLineChart(chartId, metricsFunc));
-    }
-}
@@ -1,33 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.metrics;
-
-import org.bstats.charts.AdvancedPie;
-import org.bstats.charts.MultiLineChart;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Consumer;
-
-enum MetricsHelper {
-    ;
-
-    /**
-     * Adds one to the value in the given map with the given key. If the key does not exist in the map, it will be added with a value of 1.
-     */
-    static void incrementCount(Map<String, Integer> map, String key) {
-        Integer count = map.getOrDefault(key, 0);
-        map.put(key, count + 1);
-    }
-
-    static AdvancedPie createAdvancedPieChart(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
-        Map<String, Integer> map = new HashMap<>();
-        metricsFunc.accept(map);
-        return new AdvancedPie(chartId, () -> map);
-    }
-
-    static MultiLineChart createMultiLineChart(String chartId, Consumer<Map<String, Integer>> metricsFunc) {
-        Map<String, Integer> map = new HashMap<>();
-        metricsFunc.accept(map);
-        return new MultiLineChart(chartId, () -> map);
-    }
-
-}
@@ -1,42 +1,19 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;

-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
 import java.io.IOException;
-import java.util.Map;

 /**
- * A {@link URLShortener} using {@code bit.ly}. Requires an access token.
+ * An {@link URLShortener} using {@code bit.ly}.
 */
-class BitlyURLShortener extends URLShortener {
-    private static final String ACCESS_TOKEN = "Bearer @bitly-access-token@";
-    private static final String BITLY_POST_REQUEST = "https://api-ssl.bitly.com/v4/shorten";
+public class BitlyURLShortener extends HttpAPIClient implements URLShortener {
+    private static final String GENERIC_BITLY_REQUEST_FORMAT = "https://api-ssl.bitly.com/v3/shorten?format=txt&apiKey=%s&login=%s&longUrl=%s";

-    BitlyURLShortener() {
-        super(BITLY_POST_REQUEST, ACCESS_TOKEN);
-        if (ACCESS_TOKEN.endsWith("access-token")) {
-            throw new UnsupportedOperationException();
-        }
-    }
+    // I think it's no problem that these are public
+    private static final String USERNAME = "multiverse2";
+    private static final String API_KEY = "R_9dbff4862a3bc0c4218a7d78cc10d0e0";

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    String encodeData(String data) {
-        JSONObject json = new JSONObject();
-        json.put("long_url", data);
-        return json.toJSONString();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    String encodeData(Map<String, String> data) {
-        throw new UnsupportedOperationException();
+    public BitlyURLShortener() {
+        super(String.format(GENERIC_BITLY_REQUEST_FORMAT, API_KEY, USERNAME, "%s"));
    }

    /**
@@ -45,11 +22,13 @@ class BitlyURLShortener extends URLShortener {
    @Override
    public String shorten(String longUrl) {
        try {
-            String stringJSON = this.exec(encodeData(longUrl), ContentType.JSON);
-            return (String) ((JSONObject) new JSONParser().parse(stringJSON)).get("link");
-        } catch (IOException | ParseException e) {
+            String result = this.exec(longUrl);
+            if (!result.startsWith("http://j.mp/")) // ... then it's failed :/
+                throw new IOException(result);
+            return result;
+        } catch (IOException e) {
            e.printStackTrace();
-            return longUrl;
+            return longUrl; // sorry ...
        }
    }
 }
@@ -1,90 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.webpaste;
-
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Pastes to {@code gist.github.com}. Requires an access token with the {@code gist} scope.
- */
-class GitHubPasteService extends PasteService {
-    private final boolean isPrivate;
-    // this access token must have the "gist" scope
-    private static final String ACCESS_TOKEN = "token github-access-token";
-    private static final String GITHUB_POST_REQUEST = "https://api.github.com/gists";
-
-    GitHubPasteService(boolean isPrivate) {
-        super(GITHUB_POST_REQUEST, ACCESS_TOKEN);
-        this.isPrivate = isPrivate;
-        if (ACCESS_TOKEN.endsWith("access-token")) {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    String encodeData(String data) {
-        Map<String, String> mapData = new HashMap<String, String>();
-        mapData.put("multiverse.txt", data);
-        return this.encodeData(mapData);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    String encodeData(Map<String, String> files) {
-        JSONObject root = new JSONObject();
-        root.put("description", "Multiverse-Core Debug Info");
-        root.put("public", !this.isPrivate);
-        JSONObject fileList = new JSONObject();
-        for (Map.Entry<String, String> entry : files.entrySet()) {
-            JSONObject fileObject = new JSONObject();
-            fileObject.put("content", entry.getValue());
-            fileList.put(entry.getKey(), fileObject);
-        }
-
-        root.put("files", fileList);
-        return root.toJSONString();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String postData(String data) throws PasteFailedException {
-        try {
-            String stringJSON = this.exec(encodeData(data), ContentType.JSON);
-            return (String) ((JSONObject) new JSONParser().parse(stringJSON)).get("html_url");
-        } catch (IOException | ParseException e) {
-            throw new PasteFailedException(e);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String postData(Map<String, String> data) throws PasteFailedException {
-        try {
-            String stringJSON = this.exec(encodeData(data), ContentType.JSON);
-            return (String) ((JSONObject) new JSONParser().parse(stringJSON)).get("html_url");
-        } catch (IOException | ParseException e) {
-            throw new PasteFailedException(e);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean supportsMultiFile() {
-        return true;
-    }
-}
@@ -0,0 +1,99 @@
+package com.onarandombox.MultiverseCore.utils.webpaste;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashMap;
+import java.util.Map;
+
+public class GithubPasteService implements PasteService {
+
+    private final boolean isPrivate;
+
+    public GithubPasteService(boolean isPrivate) {
+        this.isPrivate = isPrivate;
+    }
+
+    @Override
+    public String encodeData(String data) {
+        Map<String, String> mapData = new HashMap<String, String>();
+        mapData.put("multiverse.txt", data);
+        return this.encodeData(mapData);
+    }
+
+    @Override
+    public String encodeData(Map<String, String> files) {
+        JsonObject root = new JsonObject();
+        root.add("description", new JsonPrimitive("Multiverse-Core Debug Info"));
+        root.add("public", new JsonPrimitive(!this.isPrivate));
+        JsonObject fileList = new JsonObject();
+        for (Map.Entry<String, String> entry : files.entrySet())
+        {
+            JsonObject fileObject = new JsonObject();
+            fileObject.add("content", new JsonPrimitive(entry.getValue()));
+            fileList.add(entry.getKey(), fileObject);
+        }
+        root.add("files", fileList);
+        return root.toString();
+    }
+
+    @Override
+    public URL getPostURL() {
+        try {
+            return new URL("https://api.github.com/gists");
+            //return new URL("http://jsonplaceholder.typicode.com/posts");
+        } catch (MalformedURLException e) {
+            return null; // should never hit here
+        }
+    }
+
+    @Override
+    public String postData(String encodedData, URL url) throws PasteFailedException {
+        OutputStreamWriter wr = null;
+        BufferedReader rd = null;
+        try {
+            URLConnection conn = url.openConnection();
+            conn.setDoOutput(true);
+            wr = new OutputStreamWriter(conn.getOutputStream());
+            wr.write(encodedData);
+            wr.flush();
+
+            rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            String line;
+            String pastieUrl = "";
+            //Pattern pastiePattern = this.getURLMatchingPattern();
+            StringBuilder responseString = new StringBuilder();
+
+            while ((line = rd.readLine()) != null) {
+                responseString.append(line);
+            }
+            return new JsonParser().parse(responseString.toString()).getAsJsonObject().get("html_url").getAsString();
+        } catch (Exception e) {
+            throw new PasteFailedException(e);
+        } finally {
+            if (wr != null) {
+                try {
+                    wr.close();
+                } catch (IOException ignore) { }
+            }
+            if (rd != null) {
+                try {
+                    rd.close();
+                } catch (IOException ignore) { }
+            }
+        }
+    }
+
+    @Override
+    public boolean supportsMultiFile() {
+        return true;
+    }
+}
@@ -1,67 +1,79 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;

-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;

+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.Map;

 /**
 * Pastes to {@code hastebin.com}.
 */
-class HastebinPasteService extends PasteService {
-    private static final String HASTEBIN_POST_REQUEST = "https://hastebin.com/documents";
+public class HastebinPasteService implements PasteService {

-    HastebinPasteService() {
-        super(HASTEBIN_POST_REQUEST);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
    @Override
-    String encodeData(String data) {
+    public String encodeData(String data) {
        return data;
    }

-    /**
-     * {@inheritDoc}
-     */
    @Override
-    String encodeData(Map<String, String> data) {
+    public String encodeData(Map<String, String> data) {
        throw new UnsupportedOperationException();
    }

-    /**
-     * {@inheritDoc}
-     */
    @Override
-    public String postData(String data) throws PasteFailedException {
+    public URL getPostURL() {
        try {
-            String stringJSON = this.exec(encodeData(data), ContentType.PLAINTEXT);
-            return "https://hastebin.com/" + ((JSONObject) new JSONParser().parse(stringJSON)).get("key");
-        } catch (IOException | ParseException e) {
-            throw new PasteFailedException(e);
+            return new URL("https://hastebin.com/documents");
+        } catch (MalformedURLException e) {
+            return null; // should never hit here
        }
    }

-    /**
-     * {@inheritDoc}
-     */
    @Override
-    public String postData(Map<String, String> data) throws PasteFailedException {
+    public String postData(String encodedData, URL url) throws PasteFailedException {
+        OutputStreamWriter wr = null;
+        BufferedReader rd = null;
        try {
-            String stringJSON = this.exec(encodeData(data), ContentType.PLAINTEXT);
-            return "https://hastebin.com/" + ((JSONObject) new JSONParser().parse(stringJSON)).get("key");
-        } catch (IOException | ParseException e) {
+            URLConnection conn = url.openConnection();
+            conn.setDoOutput(true);
+
+            wr = new OutputStreamWriter(conn.getOutputStream());
+            rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+
+            wr.write(encodedData);
+            wr.flush();
+
+            String line;
+            StringBuilder responseString = new StringBuilder();
+            while ((line = rd.readLine()) != null) {
+                responseString.append(line);
+            }
+            String key = new JsonParser().parse(responseString.toString()).getAsJsonObject().get("key").getAsString();
+
+            return "https://hastebin.com/" + key;
+        } catch (Exception e) {
            throw new PasteFailedException(e);
+        } finally {
+            if (wr != null) {
+                try {
+                    wr.close();
+                } catch (IOException ignore) { }
+            }
+            if (rd != null) {
+                try {
+                    rd.close();
+                } catch (IOException ignore) { }
+            }
        }
    }

-    /**
-     * {@inheritDoc}
-     */
    @Override
    public boolean supportsMultiFile() {
        return false;
@@ -1,129 +1,50 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;

-import javax.net.ssl.HttpsURLConnection;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
+import java.net.URLConnection;

 /**
 * HTTP API-client.
 */
-abstract class HttpAPIClient {
+public abstract class HttpAPIClient {
    /**
-     * The URL for this API-request, and if necessary, the access token.
-     * If an access token is not necessary, it should be set to null.
+     * The URL for this API-request.
     */
-    private final String url;
-    private final String accessToken;
+    protected final String urlFormat;

-    /**
-     * Types of data that can be sent.
-     */
-    enum ContentType {
-        JSON,
-        PLAINTEXT,
-        URLENCODED
+    public HttpAPIClient(String urlFormat) {
+        this.urlFormat = urlFormat;
    }

-    HttpAPIClient(String url) {
-        this(url, null);
-    }
-
-    HttpAPIClient(String url, String accessToken) {
-        this.url = url;
-        this.accessToken = accessToken;
-    }
-
-    /**
-     * Returns the HTTP Content-Type header that corresponds with each ContentType.
-     * @param type The type of data.
-     * @return The HTTP Content-Type header that corresponds with the type of data.
-     */
-    private String getContentHeader(ContentType type) {
-        switch (type) {
-            case JSON:
-                return "application/json; charset=utf-8";
-            case PLAINTEXT:
-                return "text/plain; charset=utf-8";
-            case URLENCODED:
-                return "application/x-www-form-urlencoded; charset=utf-8";
-            default:
-                throw new IllegalArgumentException("Unexpected value: " + type);
-        }
-    }
-
-    /**
-     * Encode the given String data into a format suitable for transmission in an HTTP request.
-     *
-     * @param data The raw data to encode.
-     * @return A URL-encoded string.
-     */
-    abstract String encodeData(String data);
-
-    /**
-     * Encode the given Map data into a format suitable for transmission in an HTTP request.
-     *
-     * @param data The raw data to encode.
-     * @return A URL-encoded string.
-     */
-    abstract String encodeData(Map<String, String> data);
-
    /**
     * Executes this API-Request.
-     * @param payload The data that will be sent.
-     * @param type The type of data that will be sent.
+     * @param args Format-args.
     * @return The result (as text).
     * @throws IOException When the I/O-operation failed.
     */
-    final String exec(String payload, ContentType type) throws IOException {
-        BufferedReader rd = null;
-        OutputStreamWriter wr = null;
+    protected final String exec(Object... args) throws IOException {

+        URLConnection conn = new URL(String.format(this.urlFormat, args)).openConnection();
+        conn.connect();
+        StringBuilder ret = new StringBuilder();
+        BufferedReader reader = null;
        try {
-            HttpsURLConnection conn = (HttpsURLConnection) new URL(this.url).openConnection();
-            conn.setRequestMethod("POST");
-            conn.setDoOutput(true);
+            reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            while (!reader.ready()); // wait until reader is ready, may not be necessary, SUPPRESS CHECKSTYLE: EmptyStatement

-            // we can receive anything!
-            conn.addRequestProperty("Accept", "*/*");
-            // set a dummy User-Agent
-            conn.addRequestProperty("User-Agent", "placeholder");
-            // this isn't required, but is technically correct
-            conn.addRequestProperty("Content-Type", getContentHeader(type));
-            // only some API requests require an access token
-            if (this.accessToken != null) {
-                conn.addRequestProperty("Authorization", this.accessToken);
+            while (reader.ready()) {
+                ret.append(reader.readLine()).append('\n');
            }
-
-            wr = new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8.newEncoder());
-            wr.write(payload);
-            wr.flush();
-
-            String line;
-            StringBuilder responseString = new StringBuilder();
-            // this has to be initialized AFTER the data has been flushed!
-            rd = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
-
-            while ((line = rd.readLine()) != null) {
-                responseString.append(line);
-            }
-
-            return responseString.toString();
        } finally {
-            if (wr != null) {
+            if (reader != null) {
                try {
-                    wr.close();
-                } catch (IOException ignore) { }
-            }
-            if (rd != null) {
-                try {
-                    rd.close();
+                    reader.close();
                } catch (IOException ignore) { }
            }
        }
+        return ret.toString();
    }
 }
@@ -1,7 +1,7 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;

 /**
- * Thrown when pasting fails.
+ * Thrown when pasting failed.
 */
 public class PasteFailedException extends Exception {
    public PasteFailedException() {
@@ -1,90 +0,0 @@
-package com.onarandombox.MultiverseCore.utils.webpaste;
-
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Pastes to {@code paste.gg}.
- */
-class PasteGGPasteService extends PasteService {
-    private final boolean isPrivate;
-    private static final String PASTEGG_POST_REQUEST = "https://api.paste.gg/v1/pastes";
-
-    PasteGGPasteService(boolean isPrivate) {
-        super(PASTEGG_POST_REQUEST);
-        this.isPrivate = isPrivate;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    String encodeData(String data) {
-        Map<String, String> mapData = new HashMap<String, String>();
-        mapData.put("multiverse.txt", data);
-        return this.encodeData(mapData);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    String encodeData(Map<String, String> files) {
-        JSONObject root = new JSONObject();
-        root.put("name", "Multiverse-Core Debug Info");
-        root.put("visibility", this.isPrivate ? "unlisted" : "public");
-        JSONArray fileList = new JSONArray();
-        for (Map.Entry<String, String> entry : files.entrySet()) {
-            JSONObject fileObject = new JSONObject();
-            JSONObject contentObject = new JSONObject();
-            fileObject.put("name", entry.getKey());
-            fileObject.put("content", contentObject);
-            contentObject.put("format", "text");
-            contentObject.put("value", entry.getValue());
-            fileList.add(fileObject);
-        }
-
-        root.put("files", fileList);
-        return root.toJSONString();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String postData(String data) throws PasteFailedException {
-        try {
-            String stringJSON = this.exec(encodeData(data), ContentType.JSON);
-            return (String) ((JSONObject) ((JSONObject) new JSONParser().parse(stringJSON)).get("result")).get("id");
-        } catch (IOException | ParseException e) {
-            throw new PasteFailedException(e);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String postData(Map<String, String> data) throws PasteFailedException {
-        try {
-            String stringJSON = this.exec(encodeData(data), ContentType.JSON);
-            return "https://paste.gg/" + ((JSONObject) ((JSONObject) new JSONParser().parse(stringJSON)).get("result")).get("id");
-        } catch (IOException | ParseException e) {
-            throw new PasteFailedException(e);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean supportsMultiFile() {
-        return true;
-    }
-}
@@ -1,52 +1,63 @@
 package com.onarandombox.MultiverseCore.utils.webpaste;

+import java.net.URL;
 import java.util.Map;

 /**
- * An interface to a web-based text-pasting service. Classes extending this
- * should implement its methods to send data to an online text-sharing service,
- * such as pastebin.com. Given some PasteService instance ps, a paste is accomplished by:
+ * An interface to a web-based text-pasting service. Classes implementing this
+ * interface should implement its methods to send data to an online text-sharing
+ * service, such as pastebin.com. Conventionally, a paste is accomplished by (given
+ * some PasteService instance ps):
 *
- * {@code ps.postData(someString);}
+ * {@code ps.postData(ps.encodeData(someString), ps.getPostURL());}
 *
 * Services that provide a distinction between "public" and "private" pastes
- * should implement a constructor that specifies which kind the PasteService
+ * should implement a custom constructor that specifies which kind the PasteService
 * instance is submitting; an example of this is the PastebinPasteService class.
 */
-public abstract class PasteService extends HttpAPIClient {
-    PasteService(String url) {
-        super(url);
-    }
-
-    PasteService(String url, String accessToken) {
-        super(url, accessToken);
-    }
+public interface PasteService {

    /**
-     * Post data to the Web.
+     * Encode the given String data into a format suitable for transmission in an HTTP request.
     *
-     * @param data A String to post to the web.
+     * @param data The raw data to encode.
+     * @return A URL-encoded string.
+     */
+    String encodeData(String data);
+
+    /**
+     * Encode the given Map data into a format suitable for transmission in an HTTP request.
+     *
+     * @param data The raw data to encode.
+     * @return A URL-encoded string.
+     */
+    String encodeData(Map<String, String> data);
+
+    /**
+     * Get the URL to which this paste service sends new pastes.
+     *
+     * @return The URL that will be accessed to complete the paste.
+     */
+    URL getPostURL();
+
+    /**
+     * Post encoded data to the Web.
+     *
+     * @param encodedData A URL-encoded String containing the full request to post to
+     *                    the given URL. Can be the result of calling #encodeData().
+     * @param url The URL to which to paste. Can be the result of calling #getPostURL().
     * @throws PasteFailedException When pasting/posting the data failed.
     * @return The URL at which the new paste is visible.
     */
-    public abstract String postData(String data) throws PasteFailedException;
-
-    /**
-     * Post data to the Web.
-     *
-     * @param data A Map to post to the web.
-     * @throws PasteFailedException When pasting/posting the data failed.
-     * @return The URL at which the new paste is visible.
-     */
-    public abstract String postData(Map<String, String> data) throws PasteFailedException;
+    String postData(String encodedData, URL url) throws PasteFailedException;

    /**
     * Does this service support uploading multiple files.
     *
-     * Newer services like GitHub's Gist support multi-file pastes,
-     * which allows us to upload configs in addition to the standard logs.
+     * Newer services like gist support multi-file which allows us to upload configs
+     * in addition to the standard logs.
     *
     * @return True if this service supports multiple file upload.
     */
-    public abstract boolean supportsMultiFile();
+    boolean supportsMultiFile();
 }
@@ -14,14 +14,12 @@ public class PasteServiceFactory {
     */
    public static PasteService getService(PasteServiceType type, boolean isPrivate) {
        switch(type) {
-            case PASTEGG:
-                return new PasteGGPasteService(isPrivate);
            case PASTEBIN:
                return new PastebinPasteService(isPrivate);
            case HASTEBIN:
                return new HastebinPasteService();
            case GITHUB:
-                return new GitHubPasteService(isPrivate);
+                return new GithubPasteService(isPrivate);
            default:
                return null;
        }