diff --git a/.gitignore b/.gitignore
index 4a3f5982..8a593e0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,6 @@ debug.log
# Doxygen
/docs/html
debug.txt
+
+# Gradle
+.gradle
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..aaaa43ab
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,175 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+plugins {
+ id 'java-library'
+ id 'maven-publish'
+ id 'checkstyle'
+ id 'com.github.johnrengelman.shadow' version '7.1.2'
+ id 'org.jetbrains.intellij' version '1.1'
+}
+
+version = '4.3.2-SNAPSHOT'
+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'
+}
+
+
+publishing {
+ publications {
+ maven(MavenPublication) {
+ from(components.java)
+ pom {
+ ciManagement {
+ system = 'jenkins'
+ url = 'https://ci.onarandombox.com/'
+ }
+ }
+ }
+ }
+}
+
+
+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
+}
+
+
+ext.buildNumber = System.getenv('BUILD_NUMBER') ?: 'UNKNOWN'
+
+processResources {
+ def props = [version: "${project.version}-b$buildNumber"]
+ inputs.properties props
+ filteringCharset 'UTF-8'
+ filesMatching('plugin.yml') {
+ expand props
+ }
+}
+
+
+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
+
+
+intellij {
+ instrumentCode = true
+ downloadSources = false
+}
+
+// disable everything from intellij plugin except instrumentation
+patchPluginXml.enabled = false
+prepareSandbox.enabled = false
+buildSearchableOptions.enabled = false
+jarSearchableOptions.enabled = false
+buildPlugin.enabled = false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..943f0cbf
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..f398c33c
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+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
diff --git a/gradlew b/gradlew
new file mode 100755
index 00000000..65dcd68d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,244 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..6689b85b
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 55b9239d..00000000
--- a/pom.xml
+++ /dev/null
@@ -1,371 +0,0 @@
-
- 4.0.0
- com.onarandombox.multiversecore
- Multiverse-Core
- 4.3.2-SNAPSHOT
- Multiverse-Core
- World Management Plugin
-
- UTF-8
- UNKNOWN
- bitly-access-token
-
-
-
-
-
- spigot-repo
- https://hub.spigotmc.org/nexus/content/repositories/snapshots/
-
-
- onarandombox
- https://repo.onarandombox.com/content/groups/public
-
-
- spigot
- https://hub.spigotmc.org/nexus/content/groups/public/
-
-
- jitpack.io
- https://jitpack.io
-
-
- minebench-repo
- https://repo.minebench.de/
-
-
-
-
-
- doodleproject-repo
- DoodleProject Maven 2 Repository
- https://doodleproject.sourceforge.net/maven2/release
-
- true
-
-
-
-
-
- jenkins
- https://ci.onarandombox.com
-
-
-
-
-
- jenkins
-
-
- env.BUILD_NUMBER
-
-
-
- ${env.BUILD_NUMBER}
-
-
-
- bitly
-
-
- env.BITLY_ACCESS_TOKEN
-
-
-
- ${env.BITLY_ACCESS_TOKEN}
-
-
-
-
-
- clean package
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.7.0
-
-
- 1.8
-
-
-
- com.google.code.maven-replacer-plugin
- maven-replacer-plugin
- 1.4.1
-
-
- replace-bitly-access-token
- generate-sources
-
- replace
-
-
- ${project.build.sourceDirectory}
-
- com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java
-
-
-
- bitly-access-token
- ${project.bitly-access-token}
-
-
-
-
-
- replace-maven-version-number
- prepare-package
-
- replace
-
-
- ${project.build.directory}/classes
-
- plugin.yml
-
-
-
- maven-version-number
- ${project.version}-b${project.build.number}
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 3.0.2
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 3.0.0-M3
-
-
- **/TestCommandSender.java
- **/TestInstanceCreator.java
-
-
-
-
- org.apache.maven.surefire
- surefire-junit47
- 3.0.0-M3
-
-
-
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
- 2.17
-
- true
- ${project.basedir}/config/mv_checks.xml
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 3.0.1
-
-
- attach-sources
- package
-
- jar-no-fork
-
-
-
-
-
- maven-javadoc-plugin
- 2.10.4
-
-
- javadoc-jar
- verify
-
- jar
-
-
- false
-
-
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 3.2.4
-
-
- package
-
- shade
-
-
- true
-
-
- me.main__.util
- com.onarandombox.serializationconfig
-
-
- com.pneumaticraft.commandhandler
- com.onarandombox.commandhandler
-
-
- buscript
- com.onarandombox.buscript
-
-
- org.bstats
- com.onarandombox.bstats
-
-
- com.dumptruckman.minecraft.util.Logging
- com.onarandombox.MultiverseCore.utils.CoreLogging
-
-
- com.dumptruckman.minecraft.util.DebugLog
- com.onarandombox.MultiverseCore.utils.DebugFileLogger
-
-
- org.codehaus.jettison
- com.onarandombox.jettison
-
-
- de.themoep.idconverter
- com.onarandombox.idconverter
-
-
-
-
-
-
-
- se.eris
- notnull-instrumenter-maven-plugin
- 1.1.1
-
-
-
- instrument
- tests-instrument
-
-
-
- org.jetbrains.annotations.NotNull
- javax.validation.constraints.NotNull
-
-
-
-
-
-
-
-
-
-
- org.bukkit
- bukkit
- 1.13.2-R0.1-SNAPSHOT
- provided
-
-
-
- me.main__.util
- SerializationConfig
- 1.7
-
-
- org.bukkit
- bukkit
-
-
-
-
-
-
- com.github.MilkBowl
- VaultAPI
- 1.7
- provided
-
-
-
-
- com.pneumaticraft.commandhandler
- CommandHandler
- 11
-
-
- com.dumptruckman.minecraft
- buscript
- 2.0-SNAPSHOT
-
-
- org.bstats
- bstats-bukkit
- 2.2.1
-
-
- com.dumptruckman.minecraft
- Logging
- 1.1.1
-
-
- org.jetbrains
- annotations
- 16.0.2
-
-
- de.themoep.idconverter
- mappings
- 1.2-SNAPSHOT
-
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.mockito
- mockito-core
- 3.11.2
- test
-
-
- commons-io
- commons-io
- 2.4
- test
-
-
-
-
- OnARandomBox
- https://repo.onarandombox.com/content/repositories/multiverse
-
-
- OnARandomBox
- https://repo.onarandombox.com/content/repositories/multiverse-snapshots/
-
-
-
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..0487e1ca
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,5 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+rootProject.name = 'Multiverse-Core'
diff --git a/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandler.java b/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandler.java
index 7971a11f..024f05f6 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandler.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandler.java
@@ -16,7 +16,7 @@ import java.util.Collection;
public interface DisplayHandler {
/**
- * Formats the raw content into a {@link Collection} for displaying to the given sender.
+ * 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}.
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java b/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java
index 0dbb8397..0d91411a 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/BitlyURLShortener.java
@@ -11,7 +11,7 @@ import java.util.Map;
* A {@link URLShortener} using {@code bit.ly}. Requires an access token.
*/
class BitlyURLShortener extends URLShortener {
- private static final String ACCESS_TOKEN = "Bearer bitly-access-token";
+ private static final String ACCESS_TOKEN = "Bearer @bitly-access-token@";
private static final String BITLY_POST_REQUEST = "https://api-ssl.bitly.com/v4/shorten";
BitlyURLShortener() {
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index d46f0fd7..ed7346e8 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -4,7 +4,7 @@ authors: ['dumptruckman', 'Rigby', 'fernferret', 'lithium3141', 'main--']
website: 'https://dev.bukkit.org/projects/multiverse-core'
softdepend: ['Vault']
api-version: 1.13
-version: maven-version-number
+version: ${version}
commands:
mv:
description: Generic Multiverse Command