diff --git a/plugins/banstick-paper/.editorconfig b/plugins/banstick-paper/.editorconfig deleted file mode 100644 index 9dc8b3bae..000000000 --- a/plugins/banstick-paper/.editorconfig +++ /dev/null @@ -1,22 +0,0 @@ -# Editorconfig is awesome: http://EditorConfig.org - -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file -[*] -charset = utf-8 -indent_style = tab -indent_size = 4 -end_of_line = lf -insert_final_newline = true -continuation_indent_size = 8 -max_line_length = 120 - -[*.java] -indent_style = tab -indent_size = 4 - -[*.{xml,yml}] -indent_style = space -indent_size = 2 diff --git a/plugins/banstick-paper/.github/workflows/build.yml b/plugins/banstick-paper/.github/workflows/build.yml deleted file mode 100644 index 8a5b08ede..000000000 --- a/plugins/banstick-paper/.github/workflows/build.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build - -on: - push: - branches: - - '*' - pull_request: - types: [opened, synchronize, reopened] - -jobs: - build: - name: Build - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: temurin - - - uses: gradle/gradle-build-action@v2 - with: - arguments: build diff --git a/plugins/banstick-paper/.github/workflows/publish.yml b/plugins/banstick-paper/.github/workflows/publish.yml deleted file mode 100644 index a7f7fbf3d..000000000 --- a/plugins/banstick-paper/.github/workflows/publish.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Publish - -on: - push: - tags: - - 'v*.*.*' - -jobs: - publish: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: temurin - - - uses: gradle/gradle-build-action@v2 - with: - arguments: publish - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CIVMC_NEXUS_USER: ${{ secrets.CIVMC_NEXUS_USER }} - CIVMC_NEXUS_PASSWORD: ${{ secrets.CIVMC_NEXUS_PASSWORD }} diff --git a/plugins/banstick-paper/.gitignore b/plugins/banstick-paper/.gitignore deleted file mode 100644 index c5cf281d3..000000000 --- a/plugins/banstick-paper/.gitignore +++ /dev/null @@ -1,288 +0,0 @@ - -# Created by https://www.gitignore.io/api/java,batch,linux,macos,maven,windows,eclipse,intellij+all -# Edit at https://www.gitignore.io/?templates=java,batch,linux,macos,maven,windows,eclipse,intellij+all - -### Batch ### -# BatchFiles -*.bat -*.cmd -*.btm - -### Eclipse ### - -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.settings/ -.loadpath -.recommenders - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# PyDev specific (Python IDE for Eclipse) -*.pydevproject - -# CDT-specific (C/C++ Development Tooling) -.cproject - -# CDT- autotools -.autotools - -# Java annotation processor (APT) -.factorypath - -# PDT-specific (PHP Development Tools) -.buildpath - -# sbteclipse plugin -.target - -# Tern plugin -.tern-project - -# TeXlipse plugin -.texlipse - -# STS (Spring Tool Suite) -.springBeans - -# Code Recommenders -.recommenders/ - -# Annotation Processing -.apt_generated/ - -# Scala IDE specific (Scala & Java development for Eclipse) -.cache-main -.scala_dependencies -.worksheet - -### Eclipse Patch ### -# Eclipse Core -.project - -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# Annotation Processing -.apt_generated - -.sts4-cache/ - -### Intellij+all ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries -.gradle -build - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/modules.xml -# .idea/*.iml -# .idea/modules - -# CMake -cmake-build-*/ - -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - -# File-based project format -*.iws - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser - -### Intellij+all Patch ### -# Ignores the whole .idea folder and all .iml files -# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 - -.idea/ - -# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 - -*.iml -modules.xml -.idea/misc.xml -*.ipr - -### Java ### -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -### Linux ### -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -### macOS ### -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -### Maven ### -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -.mvn/wrapper/maven-wrapper.jar - -### Windows ### -# Windows thumbnail cache files -Thumbs.db -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -<<<<<<< HEAD -# End of https://www.gitignore.io/api/java,batch,linux,macos,maven,windows,intellij+all - - -#Eclipse stuff -/target/ -.classpath -.settings/** -.project -/logs/ -dependency-reduced-pom.xml -/target/ - -/bin/ -======= -# End of https://www.gitignore.io/api/java,batch,linux,macos,maven,windows,eclipse,intellij+all ->>>>>>> civclassic/master - -!gradle-wrapper.jar -!gradlew.bat diff --git a/plugins/banstick-paper/build.gradle.kts b/plugins/banstick-paper/build.gradle.kts index 24598244c..0cae37d63 100644 --- a/plugins/banstick-paper/build.gradle.kts +++ b/plugins/banstick-paper/build.gradle.kts @@ -1,21 +1,16 @@ -import net.civmc.civgradle.CivGradleExtension - plugins { - id("net.civmc.civgradle") version "2.+" apply false + id("io.papermc.paperweight.userdev") + id("com.github.johnrengelman.shadow") } -subprojects { - apply(plugin = "net.civmc.civgradle") - apply(plugin = "java-library") - apply(plugin = "maven-publish") +version = "2.0.1" - configure { - pluginName = project.property("pluginName") as String - } +dependencies { + paperDevBundle("1.18.2-R0.1-SNAPSHOT") - repositories { - mavenCentral() - maven("https://repo.civmc.net/repository/maven-public") - maven("https://jitpack.io") - } + compileOnly(project(":plugins:civmodcore-paper")) + compileOnly(project(":plugins:namelayer-paper")) + + implementation("com.github.seancfoley:ipaddress:2.0.2") + implementation("org.jsoup:jsoup:1.13.1") } diff --git a/plugins/banstick-paper/gradle.properties b/plugins/banstick-paper/gradle.properties deleted file mode 100644 index 1d3c5a36a..000000000 --- a/plugins/banstick-paper/gradle.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Gradle properties -group = net.civmc.banstick -version = 2.0.1 -description = BanStick - -# Custom Properties -pluginName = BanStick diff --git a/plugins/banstick-paper/gradle/wrapper/gradle-wrapper.jar b/plugins/banstick-paper/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2..000000000 Binary files a/plugins/banstick-paper/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/plugins/banstick-paper/gradle/wrapper/gradle-wrapper.properties b/plugins/banstick-paper/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index d2880ba80..000000000 --- a/plugins/banstick-paper/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/plugins/banstick-paper/gradlew b/plugins/banstick-paper/gradlew deleted file mode 100755 index 1b6c78733..000000000 --- a/plugins/banstick-paper/gradlew +++ /dev/null @@ -1,234 +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/master/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 - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# 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/banstick-paper/gradlew.bat b/plugins/banstick-paper/gradlew.bat deleted file mode 100644 index 107acd32c..000000000 --- a/plugins/banstick-paper/gradlew.bat +++ /dev/null @@ -1,89 +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=. -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%" == "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%"=="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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/plugins/banstick-paper/paper/build.gradle.kts b/plugins/banstick-paper/paper/build.gradle.kts deleted file mode 100644 index 57033e003..000000000 --- a/plugins/banstick-paper/paper/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -plugins { - id("io.papermc.paperweight.userdev") - id("com.github.johnrengelman.shadow") -} - -dependencies { - paperDevBundle("1.18.2-R0.1-SNAPSHOT") - - compileOnly("net.civmc.civmodcore:civmodcore-paper:2.3.5:dev-all") - compileOnly("net.civmc.namelayer:namelayer-paper:3.0.3:dev") - - implementation("com.github.seancfoley:ipaddress:2.0.2") - implementation("org.jsoup:jsoup:1.13.1") -} diff --git a/plugins/banstick-paper/settings.gradle.kts b/plugins/banstick-paper/settings.gradle.kts deleted file mode 100644 index 6fccaf901..000000000 --- a/plugins/banstick-paper/settings.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -pluginManagement { - repositories { - gradlePluginPortal() - maven("https://repo.civmc.net/repository/maven-public/") - maven("https://papermc.io/repo/repository/maven-public/") - } -} - -rootProject.name = "banstick" - -include(":paper") -project(":paper").name = rootProject.name + "-paper" diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/BanStick.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/BanStick.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/BanStick.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/BanStick.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/BanRegistrarCommand.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/BanRegistrarCommand.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/BanRegistrarCommand.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/BanRegistrarCommand.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/BanSaveCommand.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/BanSaveCommand.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/BanSaveCommand.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/BanSaveCommand.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/BanStickCommand.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/BanStickCommand.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/BanStickCommand.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/BanStickCommand.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/DoubleTapCommand.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/DoubleTapCommand.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/DoubleTapCommand.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/DoubleTapCommand.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/DowsingRodCommand.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/DowsingRodCommand.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/DowsingRodCommand.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/DowsingRodCommand.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/DrillDownCommand.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/DrillDownCommand.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/DrillDownCommand.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/DrillDownCommand.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/ForgiveCommand.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/ForgiveCommand.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/ForgiveCommand.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/ForgiveCommand.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/GetAltsCommand.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/GetAltsCommand.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/GetAltsCommand.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/GetAltsCommand.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/LoveTapCommand.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/LoveTapCommand.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/LoveTapCommand.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/LoveTapCommand.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/TakeItBackCommand.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/TakeItBackCommand.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/TakeItBackCommand.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/TakeItBackCommand.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/UntangleCommand.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/UntangleCommand.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/UntangleCommand.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/UntangleCommand.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/package-info.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/package-info.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/commands/package-info.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/commands/package-info.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/containers/BanResult.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/containers/BanResult.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/containers/BanResult.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/containers/BanResult.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/containers/package-info.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/containers/package-info.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/containers/package-info.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/containers/package-info.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSBan.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSBan.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSBan.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSBan.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSExclusion.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSExclusion.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSExclusion.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSExclusion.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSExclusions.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSExclusions.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSExclusions.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSExclusions.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSIP.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSIP.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSIP.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSIP.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSIPData.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSIPData.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSIPData.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSIPData.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSIPs.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSIPs.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSIPs.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSIPs.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSLog.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSLog.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSLog.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSLog.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSPlayer.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSPlayer.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSPlayer.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSPlayer.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSRegistrars.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSRegistrars.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSRegistrars.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSRegistrars.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSSession.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSSession.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSSession.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSSession.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSSessions.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSSessions.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSSessions.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSSessions.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSShare.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSShare.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSShare.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSShare.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSShares.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSShares.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSShares.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/BSShares.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/package-info.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/package-info.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/data/package-info.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/data/package-info.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanHandler.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanHandler.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanHandler.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanHandler.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickCommandHandler.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickCommandHandler.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickCommandHandler.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickCommandHandler.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickDatabaseHandler.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickDatabaseHandler.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickDatabaseHandler.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickDatabaseHandler.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickEventHandler.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickEventHandler.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickEventHandler.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickEventHandler.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickIPDataHandler.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickIPDataHandler.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickIPDataHandler.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickIPDataHandler.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickIPHubHandler.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickIPHubHandler.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickIPHubHandler.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickIPHubHandler.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickImportHandler.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickImportHandler.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickImportHandler.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickImportHandler.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickProxyHandler.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickProxyHandler.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickProxyHandler.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickProxyHandler.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickScrapeHandler.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickScrapeHandler.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickScrapeHandler.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickScrapeHandler.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickTorUpdater.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickTorUpdater.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickTorUpdater.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/BanStickTorUpdater.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/ImportWorker.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/ImportWorker.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/ImportWorker.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/ImportWorker.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/ProxyLoader.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/ProxyLoader.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/ProxyLoader.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/ProxyLoader.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/ScraperWorker.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/ScraperWorker.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/ScraperWorker.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/ScraperWorker.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/package-info.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/package-info.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/handler/package-info.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/handler/package-info.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/importer/IpCheckImportWorker.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/importer/IpCheckImportWorker.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/importer/IpCheckImportWorker.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/importer/IpCheckImportWorker.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/proxy/Cloud9ProxyLoader.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/proxy/Cloud9ProxyLoader.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/proxy/Cloud9ProxyLoader.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/proxy/Cloud9ProxyLoader.java diff --git a/plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/scraper/ScrapeFreeProxyList.java b/plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/scraper/ScrapeFreeProxyList.java similarity index 100% rename from plugins/banstick-paper/paper/src/main/java/com/programmerdan/minecraft/banstick/scraper/ScrapeFreeProxyList.java rename to plugins/banstick-paper/src/main/java/com/programmerdan/minecraft/banstick/scraper/ScrapeFreeProxyList.java diff --git a/plugins/banstick-paper/paper/src/main/resources/config.yml b/plugins/banstick-paper/src/main/resources/config.yml similarity index 100% rename from plugins/banstick-paper/paper/src/main/resources/config.yml rename to plugins/banstick-paper/src/main/resources/config.yml diff --git a/plugins/banstick-paper/paper/src/main/resources/plugin.yml b/plugins/banstick-paper/src/main/resources/plugin.yml similarity index 100% rename from plugins/banstick-paper/paper/src/main/resources/plugin.yml rename to plugins/banstick-paper/src/main/resources/plugin.yml diff --git a/settings.gradle.kts b/settings.gradle.kts index 73f98c29a..4230ba7a2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,6 +5,7 @@ plugins { } +include(":plugins:banstick-paper") include(":plugins:citadel-paper") include(":plugins:civmodcore-paper") include(":plugins:civspy-api")