diff --git a/build.gradle.kts b/build.gradle.kts index f30e0b180..f276a28ec 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,6 +18,17 @@ project.extensions.configure { } allprojects { + + repositories { + mavenCentral() + maven("https://oss.sonatype.org/content/repositories/snapshots") + maven("https://papermc.io/repo/repository/maven-public/") + maven("https://repo.aikar.co/content/groups/aikar/") + maven("https://libraries.minecraft.net") + + maven("https://jitpack.io") + } + pluginManager.withPlugin("java-library") { configure { toolchain { @@ -88,9 +99,4 @@ allprojects { subprojects { apply(plugin = "java-library") apply(plugin = "maven-publish") - - repositories { - mavenCentral() - maven("https://oss.sonatype.org/content/repositories/snapshots") - } } \ No newline at end of file diff --git a/plugins/civmodcore-paper/.github/workflows/pr_updated.yml b/plugins/civmodcore-paper/.github/workflows/pr_updated.yml deleted file mode 100644 index b28b2e815..000000000 --- a/plugins/civmodcore-paper/.github/workflows/pr_updated.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: ⬇️ PR Updated - -on: - pull_request: - types: [opened, synchronize, reopened] - -jobs: - call_gradle_build: - name: ☎️ Call Gradle Build - uses: CivMC/.github/.github/workflows/gradle_build.yml@master - with: - gradle_task: reobf - secrets: inherit diff --git a/plugins/civmodcore-paper/.github/workflows/pr_updated_completed.yml b/plugins/civmodcore-paper/.github/workflows/pr_updated_completed.yml deleted file mode 100644 index ae9dd7613..000000000 --- a/plugins/civmodcore-paper/.github/workflows/pr_updated_completed.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: ✅ PR Updated Completed - -on: - workflow_run: - types: - - "completed" - workflows: - - "⬇️ PR Updated" - -jobs: - call_comment_on_pr: - name: ☎️ Call Comment on PR - uses: CivMC/.github/.github/workflows/comment_on_pr.yml@master - secrets: inherit diff --git a/plugins/civmodcore-paper/.github/workflows/tag_created.yml b/plugins/civmodcore-paper/.github/workflows/tag_created.yml deleted file mode 100644 index 30ab804fa..000000000 --- a/plugins/civmodcore-paper/.github/workflows/tag_created.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: 🏷️ Tag Created - -on: - push: - tags: - - 'v*.*.*' - -jobs: - call_gradle_publish: - name: ☎️ Call Gradle Publish - uses: CivMC/.github/.github/workflows/gradle_publish.yml@master - secrets: inherit diff --git a/plugins/civmodcore-paper/build.gradle.kts b/plugins/civmodcore-paper/build.gradle.kts index 439c714b9..e22b08d40 100644 --- a/plugins/civmodcore-paper/build.gradle.kts +++ b/plugins/civmodcore-paper/build.gradle.kts @@ -1,23 +1,28 @@ -import net.civmc.civgradle.CivGradleExtension - plugins { - id("net.civmc.civgradle") version "3.1.2" apply false + id("io.papermc.paperweight.userdev") + id("com.github.johnrengelman.shadow") + id("xyz.jpenilla.run-paper") } -subprojects { - apply(plugin = "java-library") - apply(plugin = "maven-publish") - apply(plugin = "net.civmc.civgradle") +group = "net.civmc.civmodcore" +version = "3.0.0" - configure { - pluginName = project.property("pluginName") as String +dependencies { + paperweight { + paperDevBundle("1.18.2-R0.1-SNAPSHOT") } - repositories { - mavenCentral() - maven("https://repo.aikar.co/content/groups/aikar/") - maven("https://libraries.minecraft.net") + implementation("co.aikar:acf-bukkit:0.5.0-SNAPSHOT") + implementation("com.mojang:datafixerupper:1.0.20") + implementation("com.zaxxer:HikariCP:5.0.1") + implementation("co.aikar:taskchain-bukkit:3.7.2") + implementation("com.github.IPVP-MC:canvas:91ec97f076") + implementation("org.apache.commons:commons-lang3:3.12.0") + implementation("org.apache.commons:commons-collections4:4.4") + implementation("com.google.code.findbugs:jsr305:3.0.2") - maven("https://jitpack.io") - } + compileOnly("it.unimi.dsi:fastutil:8.5.8") + + testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") } diff --git a/plugins/civmodcore-paper/gradle/wrapper/gradle-wrapper.jar b/plugins/civmodcore-paper/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7f93135c4..000000000 Binary files a/plugins/civmodcore-paper/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/plugins/civmodcore-paper/gradle/wrapper/gradle-wrapper.properties b/plugins/civmodcore-paper/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 3fa8f862f..000000000 --- a/plugins/civmodcore-paper/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/plugins/civmodcore-paper/gradlew b/plugins/civmodcore-paper/gradlew deleted file mode 100755 index 1aa94a426..000000000 --- a/plugins/civmodcore-paper/gradlew +++ /dev/null @@ -1,249 +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##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit - -# 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 - if ! command -v java >/dev/null 2>&1 - then - 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 -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=SC2039,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=SC2039,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 - - -# 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"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -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/plugins/civmodcore-paper/gradlew.bat b/plugins/civmodcore-paper/gradlew.bat deleted file mode 100644 index 93e3f59f1..000000000 --- a/plugins/civmodcore-paper/gradlew.bat +++ /dev/null @@ -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 diff --git a/plugins/civmodcore-paper/paper/build.gradle.kts b/plugins/civmodcore-paper/paper/build.gradle.kts deleted file mode 100644 index 314d2ffdf..000000000 --- a/plugins/civmodcore-paper/paper/build.gradle.kts +++ /dev/null @@ -1,25 +0,0 @@ -plugins { - id("io.papermc.paperweight.userdev") - id("com.github.johnrengelman.shadow") - id("xyz.jpenilla.run-paper") -} - -dependencies { - paperweight { - paperDevBundle("1.18.2-R0.1-SNAPSHOT") - } - - implementation("co.aikar:acf-bukkit:0.5.0-SNAPSHOT") - implementation("com.mojang:datafixerupper:1.0.20") - implementation("com.zaxxer:HikariCP:5.0.1") - implementation("co.aikar:taskchain-bukkit:3.7.2") - implementation("com.github.IPVP-MC:canvas:91ec97f076") - implementation("org.apache.commons:commons-lang3:3.12.0") - implementation("org.apache.commons:commons-collections4:4.4") - implementation("com.google.code.findbugs:jsr305:3.0.2") - - compileOnly("it.unimi.dsi:fastutil:8.5.8") - - testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") -} diff --git a/plugins/civmodcore-paper/paper/src/main/java/org/bukkit/pseudo/PseudoServer.java b/plugins/civmodcore-paper/src/main/java/org/bukkit/pseudo/PseudoServer.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/org/bukkit/pseudo/PseudoServer.java rename to plugins/civmodcore-paper/src/main/java/org/bukkit/pseudo/PseudoServer.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/org/ipvp/canvas/type/AbstractCivMenu.java b/plugins/civmodcore-paper/src/main/java/org/ipvp/canvas/type/AbstractCivMenu.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/org/ipvp/canvas/type/AbstractCivMenu.java rename to plugins/civmodcore-paper/src/main/java/org/ipvp/canvas/type/AbstractCivMenu.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/org/ipvp/canvas/type/CivChestMenu.java b/plugins/civmodcore-paper/src/main/java/org/ipvp/canvas/type/CivChestMenu.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/org/ipvp/canvas/type/CivChestMenu.java rename to plugins/civmodcore-paper/src/main/java/org/ipvp/canvas/type/CivChestMenu.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/org/ipvp/canvas/type/OpenHandler.java b/plugins/civmodcore-paper/src/main/java/org/ipvp/canvas/type/OpenHandler.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/org/ipvp/canvas/type/OpenHandler.java rename to plugins/civmodcore-paper/src/main/java/org/ipvp/canvas/type/OpenHandler.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/org/ipvp/canvas/type/UpdateHandler.java b/plugins/civmodcore-paper/src/main/java/org/ipvp/canvas/type/UpdateHandler.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/org/ipvp/canvas/type/UpdateHandler.java rename to plugins/civmodcore-paper/src/main/java/org/ipvp/canvas/type/UpdateHandler.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/ACivMod.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/ACivMod.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/ACivMod.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/ACivMod.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCoreConfig.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCoreConfig.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCoreConfig.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCoreConfig.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCorePlugin.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCorePlugin.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCorePlugin.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCorePlugin.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/chat/ChatUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/chat/ChatUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/chat/ChatUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/chat/ChatUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/chat/Componentify.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/chat/Componentify.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/chat/Componentify.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/chat/Componentify.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/chat/dialog/Dialog.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/chat/dialog/Dialog.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/chat/dialog/Dialog.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/chat/dialog/Dialog.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/chat/dialog/DialogManager.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/chat/dialog/DialogManager.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/chat/dialog/DialogManager.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/chat/dialog/DialogManager.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/commands/CommandManager.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/commands/CommandManager.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/commands/CommandManager.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/commands/CommandManager.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/commands/NamedCommand.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/commands/NamedCommand.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/commands/NamedCommand.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/commands/NamedCommand.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/commands/StatCommand.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/commands/StatCommand.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/commands/StatCommand.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/commands/StatCommand.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/commands/TabComplete.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/commands/TabComplete.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/commands/TabComplete.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/commands/TabComplete.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigHelper.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigHelper.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigHelper.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigHelper.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigParser.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigParser.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigParser.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigParser.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigSection.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigSection.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigSection.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigSection.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/dao/ConnectionPool.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/dao/ConnectionPool.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/dao/ConnectionPool.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/dao/ConnectionPool.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/dao/DatabaseCredentials.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/dao/DatabaseCredentials.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/dao/DatabaseCredentials.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/dao/DatabaseCredentials.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/dao/DatabaseMigration.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/dao/DatabaseMigration.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/dao/DatabaseMigration.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/dao/DatabaseMigration.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/dao/ManagedDatasource.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/dao/ManagedDatasource.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/dao/ManagedDatasource.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/dao/ManagedDatasource.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/dao/package-info.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/dao/package-info.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/dao/package-info.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/dao/package-info.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/entities/EntityUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/entities/EntityUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/entities/EntityUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/entities/EntityUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/events/EventUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/events/EventUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/events/EventUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/events/EventUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/ClonedInventory.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/ClonedInventory.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/ClonedInventory.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/ClonedInventory.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/InventoryUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/InventoryUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/InventoryUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/InventoryUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/RecipeManager.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/RecipeManager.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/RecipeManager.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/RecipeManager.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/AnimatedClickable.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/AnimatedClickable.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/AnimatedClickable.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/AnimatedClickable.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/Clickable.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/Clickable.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/Clickable.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/Clickable.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/ClickableInventory.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/ClickableInventory.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/ClickableInventory.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/ClickableInventory.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/ClickableInventoryListener.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/ClickableInventoryListener.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/ClickableInventoryListener.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/ClickableInventoryListener.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/DecorationStack.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/DecorationStack.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/DecorationStack.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/DecorationStack.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/IClickable.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/IClickable.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/IClickable.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/IClickable.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/LClickable.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/LClickable.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/LClickable.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/LClickable.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/MultiPageView.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/MultiPageView.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/MultiPageView.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/MultiPageView.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/canvas/MenuPagination.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/canvas/MenuPagination.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/canvas/MenuPagination.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/canvas/MenuPagination.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/canvas/MenuUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/canvas/MenuUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/canvas/MenuUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/canvas/MenuUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/canvas/MultiPageCanvas.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/canvas/MultiPageCanvas.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/canvas/MultiPageCanvas.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/canvas/MultiPageCanvas.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ComponableInventory.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ComponableInventory.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ComponableInventory.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ComponableInventory.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ComponableSection.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ComponableSection.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ComponableSection.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ComponableSection.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ContentAligner.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ContentAligner.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ContentAligner.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ContentAligner.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ContentAligners.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ContentAligners.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ContentAligners.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/ContentAligners.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/InventoryComponent.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/InventoryComponent.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/InventoryComponent.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/InventoryComponent.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/Scrollbar.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/Scrollbar.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/Scrollbar.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/Scrollbar.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/SlotPredicates.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/SlotPredicates.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/SlotPredicates.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/SlotPredicates.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/StaticDisplaySection.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/StaticDisplaySection.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/StaticDisplaySection.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/StaticDisplaySection.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/impl/CommonGUIs.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/impl/CommonGUIs.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/impl/CommonGUIs.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/components/impl/CommonGUIs.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/history/HistoryItem.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/history/HistoryItem.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/history/HistoryItem.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/history/HistoryItem.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/history/HistoryTracker.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/history/HistoryTracker.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/history/HistoryTracker.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/gui/history/HistoryTracker.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/EnchantUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/EnchantUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/EnchantUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/EnchantUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemBuilder.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemBuilder.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemBuilder.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemBuilder.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemFactory.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemFactory.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemFactory.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemFactory.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MaterialUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MaterialUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MaterialUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MaterialUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MetaUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MetaUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MetaUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MetaUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MoreTags.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MoreTags.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MoreTags.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MoreTags.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/PotionUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/PotionUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/PotionUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/PotionUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/SpawnEggUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/SpawnEggUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/SpawnEggUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/SpawnEggUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/TreeTypeUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/TreeTypeUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/TreeTypeUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/TreeTypeUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTDeserializer.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTDeserializer.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTDeserializer.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTDeserializer.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTHelper.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTHelper.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTHelper.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTHelper.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerializable.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerializable.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerializable.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerializable.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerialization.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerialization.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerialization.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerialization.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerializationException.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerializationException.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerializationException.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerializationException.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTType.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTType.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTType.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTType.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/extensions/NBTTagCompoundExtensions.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/extensions/NBTTagCompoundExtensions.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/extensions/NBTTagCompoundExtensions.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/extensions/NBTTagCompoundExtensions.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/extensions/NBTTagListExtensions.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/extensions/NBTTagListExtensions.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/extensions/NBTTagListExtensions.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/extensions/NBTTagListExtensions.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/wrappers/NBTCompound.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/wrappers/NBTCompound.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/wrappers/NBTCompound.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/wrappers/NBTCompound.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/AbstractPersistentDataType.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/AbstractPersistentDataType.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/AbstractPersistentDataType.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/AbstractPersistentDataType.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/PersistentDataTypes.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/PersistentDataTypes.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/PersistentDataTypes.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/PersistentDataTypes.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/PersistentEnumDataType.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/PersistentEnumDataType.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/PersistentEnumDataType.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/PersistentEnumDataType.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/PersistentMapDataType.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/PersistentMapDataType.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/PersistentMapDataType.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/PersistentMapDataType.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/extensions/PersistentDataContainerExtensions.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/extensions/PersistentDataContainerExtensions.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/extensions/PersistentDataContainerExtensions.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/pdc/extensions/PersistentDataContainerExtensions.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/bottom/BottomLine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/bottom/BottomLine.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/bottom/BottomLine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/bottom/BottomLine.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/bottom/BottomLineAPI.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/bottom/BottomLineAPI.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/bottom/BottomLineAPI.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/bottom/BottomLineAPI.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/side/CivScoreBoard.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/side/CivScoreBoard.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/side/CivScoreBoard.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/side/CivScoreBoard.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/side/ScoreBoardAPI.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/side/ScoreBoardAPI.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/side/ScoreBoardAPI.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/side/ScoreBoardAPI.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/side/ScoreBoardListener.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/side/ScoreBoardListener.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/side/ScoreBoardListener.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/scoreboard/side/ScoreBoardListener.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/AltRequestEvent.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/AltRequestEvent.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/AltRequestEvent.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/AltRequestEvent.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/MenuDialog.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/MenuDialog.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/MenuDialog.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/MenuDialog.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/PlayerSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/PlayerSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/PlayerSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/PlayerSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/PlayerSettingAPI.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/PlayerSettingAPI.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/PlayerSettingAPI.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/PlayerSettingAPI.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/SettingChangeListener.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/SettingChangeListener.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/SettingChangeListener.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/SettingChangeListener.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/SettingTypeManager.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/SettingTypeManager.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/SettingTypeManager.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/SettingTypeManager.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/commands/ConfigCommand.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/commands/ConfigCommand.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/commands/ConfigCommand.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/commands/ConfigCommand.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/ClickableMenuItem.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/ClickableMenuItem.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/ClickableMenuItem.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/ClickableMenuItem.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/MenuItem.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/MenuItem.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/MenuItem.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/MenuItem.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/MenuOption.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/MenuOption.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/MenuOption.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/MenuOption.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/MenuSection.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/MenuSection.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/MenuSection.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/gui/MenuSection.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/AltConsistentSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/AltConsistentSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/AltConsistentSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/AltConsistentSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/BooleanSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/BooleanSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/BooleanSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/BooleanSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/BoundedIntegerSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/BoundedIntegerSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/BoundedIntegerSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/BoundedIntegerSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/CommandReplySetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/CommandReplySetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/CommandReplySetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/CommandReplySetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DecimalFormatSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DecimalFormatSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DecimalFormatSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DecimalFormatSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DisplayLocationSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DisplayLocationSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DisplayLocationSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DisplayLocationSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DoubleSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DoubleSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DoubleSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DoubleSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/EnumSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/EnumSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/EnumSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/EnumSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/FloatSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/FloatSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/FloatSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/FloatSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/IntegerSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/IntegerSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/IntegerSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/IntegerSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/JsonSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/JsonSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/JsonSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/JsonSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/LimitedStringSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/LimitedStringSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/LimitedStringSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/LimitedStringSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/LongSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/LongSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/LongSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/LongSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/StringSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/StringSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/StringSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/StringSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/collection/AbstractCollectionSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/collection/AbstractCollectionSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/collection/AbstractCollectionSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/collection/AbstractCollectionSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/collection/ListSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/collection/ListSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/collection/ListSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/collection/ListSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/collection/SetSetting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/collection/SetSetting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/collection/SetSetting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/collection/SetSetting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/util/SkinCache.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/util/SkinCache.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/util/SkinCache.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/util/SkinCache.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/BiasedRandomPicker.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/BiasedRandomPicker.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/BiasedRandomPicker.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/BiasedRandomPicker.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/BukkitComparators.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/BukkitComparators.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/BukkitComparators.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/BukkitComparators.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/CivLogger.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/CivLogger.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/CivLogger.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/CivLogger.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ClassUtility.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ClassUtility.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ClassUtility.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ClassUtility.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/DelayedItemDrop.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/DelayedItemDrop.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/DelayedItemDrop.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/DelayedItemDrop.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/DependencyGlue.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/DependencyGlue.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/DependencyGlue.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/DependencyGlue.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/DoubleInteractFixer.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/DoubleInteractFixer.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/DoubleInteractFixer.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/DoubleInteractFixer.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/JavaExtensions.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/JavaExtensions.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/JavaExtensions.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/JavaExtensions.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/KeyedUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/KeyedUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/KeyedUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/KeyedUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreArrayUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreArrayUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreArrayUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreArrayUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreClassUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreClassUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreClassUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreClassUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreCollectionUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreCollectionUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreCollectionUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreCollectionUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreMapUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreMapUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreMapUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreMapUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreMath.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreMath.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreMath.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreMath.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreObjectUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreObjectUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreObjectUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreObjectUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreStringUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreStringUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreStringUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/MoreStringUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/NullUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/NullUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/NullUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/NullUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/Resettable.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/Resettable.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/Resettable.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/Resettable.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ResourceUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ResourceUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ResourceUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ResourceUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/SkinCache.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/SkinCache.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/SkinCache.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/SkinCache.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/TextUtil.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/TextUtil.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/TextUtil.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/TextUtil.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/Title.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/Title.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/Title.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/Title.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/UuidUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/UuidUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/UuidUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/UuidUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/Validation.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/Validation.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/Validation.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/Validation.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/cooldowns/ICoolDownHandler.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/cooldowns/ICoolDownHandler.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/cooldowns/ICoolDownHandler.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/cooldowns/ICoolDownHandler.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/cooldowns/MilliSecCoolDownHandler.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/cooldowns/MilliSecCoolDownHandler.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/cooldowns/MilliSecCoolDownHandler.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/cooldowns/MilliSecCoolDownHandler.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/cooldowns/TickCoolDownHandler.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/cooldowns/TickCoolDownHandler.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/cooldowns/TickCoolDownHandler.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/cooldowns/TickCoolDownHandler.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/progress/ProgressTrackable.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/progress/ProgressTrackable.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/progress/ProgressTrackable.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/progress/ProgressTrackable.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/progress/ProgressTracker.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/progress/ProgressTracker.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/progress/ProgressTracker.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/progress/ProgressTracker.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ratelimiting/RateLimiter.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ratelimiting/RateLimiter.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ratelimiting/RateLimiter.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ratelimiting/RateLimiter.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ratelimiting/RateLimiting.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ratelimiting/RateLimiting.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ratelimiting/RateLimiting.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ratelimiting/RateLimiting.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ratelimiting/TokenBucket.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ratelimiting/TokenBucket.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ratelimiting/TokenBucket.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/utilities/ratelimiting/TokenBucket.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/BeaconTracker.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/BeaconTracker.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/BeaconTracker.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/BeaconTracker.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/BlockProperties.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/BlockProperties.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/BlockProperties.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/BlockProperties.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/ChunkLoadedFilter.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/ChunkLoadedFilter.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/ChunkLoadedFilter.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/ChunkLoadedFilter.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/ImmutableLocation.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/ImmutableLocation.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/ImmutableLocation.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/ImmutableLocation.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/WorldTracker.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/WorldTracker.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/WorldTracker.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/WorldTracker.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/WorldUtils.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/WorldUtils.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/WorldUtils.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/WorldUtils.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/WorldXZ.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/WorldXZ.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/WorldXZ.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/WorldXZ.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBox.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBox.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBox.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBox.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBoxImpl.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBoxImpl.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBoxImpl.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBoxImpl.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/SparseQuadTree.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/SparseQuadTree.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/SparseQuadTree.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/SparseQuadTree.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/CacheState.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/CacheState.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/CacheState.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/CacheState.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkCoord.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkCoord.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkCoord.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkCoord.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMeta.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMeta.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMeta.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMeta.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaFactory.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaFactory.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaFactory.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaFactory.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaInitializer.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaInitializer.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaInitializer.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaInitializer.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaListener.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaListener.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaListener.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaListener.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaLoadStatus.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaLoadStatus.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaLoadStatus.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaLoadStatus.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/GlobalChunkMetaManager.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/GlobalChunkMetaManager.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/GlobalChunkMetaManager.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/GlobalChunkMetaManager.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/WorldChunkMetaManager.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/WorldChunkMetaManager.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/WorldChunkMetaManager.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/WorldChunkMetaManager.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/XZWCoord.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/XZWCoord.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/XZWCoord.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/XZWCoord.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/APIView.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/APIView.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/APIView.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/APIView.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/BlockBasedChunkMetaView.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/BlockBasedChunkMetaView.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/BlockBasedChunkMetaView.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/BlockBasedChunkMetaView.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaAPI.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaAPI.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaAPI.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaAPI.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaView.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaView.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaView.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaView.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaViewTracker.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaViewTracker.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaViewTracker.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaViewTracker.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/SingleBlockAPIView.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/SingleBlockAPIView.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/SingleBlockAPIView.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/SingleBlockAPIView.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedChunkMeta.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedChunkMeta.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedChunkMeta.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedChunkMeta.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedStorageEngine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedStorageEngine.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedStorageEngine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedStorageEngine.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockDataObject.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockDataObject.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockDataObject.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockDataObject.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockDataObjectLoadStatus.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockDataObjectLoadStatus.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockDataObjectLoadStatus.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockDataObjectLoadStatus.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/StorageEngine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/StorageEngine.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/StorageEngine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/StorageEngine.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoBlockChunkMeta.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoBlockChunkMeta.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoBlockChunkMeta.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoBlockChunkMeta.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoStorageEngine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoStorageEngine.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoStorageEngine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoStorageEngine.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonStorageEngine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonStorageEngine.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonStorageEngine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonStorageEngine.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonableDataObject.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonableDataObject.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonableDataObject.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonableDataObject.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/SerializableDataObject.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/SerializableDataObject.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/SerializableDataObject.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/SerializableDataObject.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlDataObject.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlDataObject.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlDataObject.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlDataObject.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlStorageEngine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlStorageEngine.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlStorageEngine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlStorageEngine.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/fallback/SingleBlockTracker.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/fallback/SingleBlockTracker.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/fallback/SingleBlockTracker.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/fallback/SingleBlockTracker.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedDataObject.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedDataObject.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedDataObject.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedDataObject.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableStorageEngine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableStorageEngine.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableStorageEngine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableStorageEngine.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/stat/LoadStatistic.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/stat/LoadStatistic.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/stat/LoadStatistic.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/stat/LoadStatistic.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/stat/LoadStatisticManager.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/stat/LoadStatisticManager.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/stat/LoadStatisticManager.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/stat/LoadStatisticManager.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/stat/PluginStatistic.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/stat/PluginStatistic.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/stat/PluginStatistic.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/stat/PluginStatistic.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/CMCWorldDAO.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/CMCWorldDAO.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/CMCWorldDAO.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/CMCWorldDAO.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalLocationTracker.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalLocationTracker.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalLocationTracker.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalLocationTracker.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalTrackableDAO.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalTrackableDAO.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalTrackableDAO.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalTrackableDAO.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/LocationTrackable.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/LocationTrackable.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/LocationTrackable.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/LocationTrackable.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/WorldIDManager.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/WorldIDManager.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/WorldIDManager.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/WorldIDManager.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/AbstractYLimitedArea.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/AbstractYLimitedArea.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/AbstractYLimitedArea.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/AbstractYLimitedArea.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/EllipseArea.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/EllipseArea.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/EllipseArea.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/EllipseArea.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/GlobalYLimitedArea.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/GlobalYLimitedArea.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/GlobalYLimitedArea.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/GlobalYLimitedArea.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/IArea.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/IArea.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/IArea.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/IArea.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/PseudoChunk.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/PseudoChunk.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/PseudoChunk.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/PseudoChunk.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/RectangleArea.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/RectangleArea.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/RectangleArea.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/model/RectangleArea.java diff --git a/plugins/civmodcore-paper/paper/src/main/resources/config.yml b/plugins/civmodcore-paper/src/main/resources/config.yml similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/resources/config.yml rename to plugins/civmodcore-paper/src/main/resources/config.yml diff --git a/plugins/civmodcore-paper/paper/src/main/resources/enchants.yml b/plugins/civmodcore-paper/src/main/resources/enchants.yml similarity index 100% rename from plugins/civmodcore-paper/paper/src/main/resources/enchants.yml rename to plugins/civmodcore-paper/src/main/resources/enchants.yml diff --git a/plugins/civmodcore-paper/paper/src/main/resources/plugin.yml b/plugins/civmodcore-paper/src/main/resources/plugin.yml similarity index 94% rename from plugins/civmodcore-paper/paper/src/main/resources/plugin.yml rename to plugins/civmodcore-paper/src/main/resources/plugin.yml index 61485d204..a31e1258c 100644 --- a/plugins/civmodcore-paper/paper/src/main/resources/plugin.yml +++ b/plugins/civmodcore-paper/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ -name: ${name} +name: CivModCore version: ${version} authors: [valadian, rourke750, ProgrammerDan, Maxopoly, DeadBeef, Protonull, Okx, mindless728, Tealnerd] main: vg.civcraft.mc.civmodcore.CivModCorePlugin diff --git a/plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/config/ConfigTests.java b/plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/config/ConfigTests.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/config/ConfigTests.java rename to plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/config/ConfigTests.java diff --git a/plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/inheritance/ChildClass.java b/plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/inheritance/ChildClass.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/inheritance/ChildClass.java rename to plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/inheritance/ChildClass.java diff --git a/plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/inheritance/InheritanceTests.java b/plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/inheritance/InheritanceTests.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/inheritance/InheritanceTests.java rename to plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/inheritance/InheritanceTests.java diff --git a/plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/inheritance/ParentClass.java b/plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/inheritance/ParentClass.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/inheritance/ParentClass.java rename to plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/inheritance/ParentClass.java diff --git a/plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/items/ItemMetaTests.java b/plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/items/ItemMetaTests.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/items/ItemMetaTests.java rename to plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/items/ItemMetaTests.java diff --git a/plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/nbt/NBTTests.java b/plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/nbt/NBTTests.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/nbt/NBTTests.java rename to plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/nbt/NBTTests.java diff --git a/plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/text/TextTests.java b/plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/text/TextTests.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/text/TextTests.java rename to plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/text/TextTests.java diff --git a/plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/uuid/UuidTests.java b/plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/uuid/UuidTests.java similarity index 100% rename from plugins/civmodcore-paper/paper/src/test/java/vg/civcraft/mc/civmodcore/uuid/UuidTests.java rename to plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/uuid/UuidTests.java diff --git a/plugins/civspy-paper/build.gradle.kts b/plugins/civspy-paper/build.gradle.kts index beff96ead..d8e4e4f19 100644 --- a/plugins/civspy-paper/build.gradle.kts +++ b/plugins/civspy-paper/build.gradle.kts @@ -7,10 +7,6 @@ plugins { group = "net.civmc.civspy" version = "2.0.1" -repositories { - maven("https://papermc.io/repo/repository/maven-public/") -} - dependencies { implementation(project(":plugins:civspy-api")) diff --git a/settings.gradle.kts b/settings.gradle.kts index b3a6dd629..6b8e69d1b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,6 +4,8 @@ plugins { id("com.gradle.enterprise") version "3.16.2" } + +include(":plugins:civmodcore-paper") include(":plugins:civspy-api") include(":plugins:civspy-paper") include(":plugins:civspy-bungee")