From 0c369a4cc347a086b0af78b47f1b58a1a98e1dcf Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Mon, 5 Aug 2024 23:12:51 +1200 Subject: [PATCH] Initial gradle configuration --- .gitignore | 21 ++ build.gradle.kts | 51 ++++ gradle/libs.versions.toml | 45 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43504 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++++++ gradlew.bat | 94 ++++++ minimessage/build.gradle.kts | 45 +++ minimessage/pom.xml | 113 ------- nms/nmsModule.gradle | 40 +++ nms/pom.xml | 38 --- nms/specialSource.gradle | 73 +++++ nms/v1_17_R1/build.gradle.kts | 9 + nms/v1_17_R1/pom.xml | 88 ------ nms/v1_18_R1/build.gradle.kts | 9 + nms/v1_18_R1/pom.xml | 112 ------- nms/v1_18_R2/build.gradle.kts | 9 + nms/v1_18_R2/pom.xml | 112 ------- nms/v1_19_R1/build.gradle.kts | 9 + nms/v1_19_R1/pom.xml | 112 ------- nms/v1_19_R2/build.gradle.kts | 9 + nms/v1_19_R2/pom.xml | 120 -------- nms/v1_19_R3/build.gradle.kts | 9 + nms/v1_19_R3/pom.xml | 120 -------- nms/v1_20_R1/build.gradle.kts | 9 + nms/v1_20_R1/pom.xml | 120 -------- nms/v1_20_R2/build.gradle.kts | 9 + nms/v1_20_R2/pom.xml | 120 -------- nms/v1_20_R3/build.gradle.kts | 9 + nms/v1_20_R3/pom.xml | 120 -------- nms/v1_20_R4/build.gradle.kts | 9 + nms/v1_20_R4/pom.xml | 120 -------- nms/v1_21_R1/build.gradle.kts | 9 + nms/v1_21_R1/pom.xml | 120 -------- plugin/build.gradle.kts | 47 +++ plugin/pom.xml | 153 ---------- .../disguise/DisguiseConfig.java | 2 - .../libraryaddict/disguise/LibsDisguises.java | 6 +- .../disguise/utilities/DisguiseUtilities.java | 1 - .../reflection/ReflectionManager.java | 19 +- .../utilities/sounds/DisguiseSoundEnums.java | 4 +- pom.xml | 170 ----------- settings.gradle.kts | 9 + shaded/build.gradle.kts | 117 ++++++++ shaded/pom.xml | 272 ----------------- .../utilities/watchers/CompileMethods.java | 97 +++--- shaded/src/main/resources/plugin.yml | 5 +- .../disguisetypes/DisguiseCloneTest.java | 5 +- .../utilities/DisguiseUtilitiesTest.java | 76 +++-- .../parser/DisguisePermissionsTest.java | 284 +++++++++--------- shared/build.gradle.kts | 10 + shared/pom.xml | 56 ---- 52 files changed, 1163 insertions(+), 2312 deletions(-) create mode 100644 .gitignore create mode 100644 build.gradle.kts create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 minimessage/build.gradle.kts delete mode 100644 minimessage/pom.xml create mode 100644 nms/nmsModule.gradle delete mode 100644 nms/pom.xml create mode 100644 nms/specialSource.gradle create mode 100644 nms/v1_17_R1/build.gradle.kts delete mode 100644 nms/v1_17_R1/pom.xml create mode 100644 nms/v1_18_R1/build.gradle.kts delete mode 100644 nms/v1_18_R1/pom.xml create mode 100644 nms/v1_18_R2/build.gradle.kts delete mode 100644 nms/v1_18_R2/pom.xml create mode 100644 nms/v1_19_R1/build.gradle.kts delete mode 100644 nms/v1_19_R1/pom.xml create mode 100644 nms/v1_19_R2/build.gradle.kts delete mode 100644 nms/v1_19_R2/pom.xml create mode 100644 nms/v1_19_R3/build.gradle.kts delete mode 100644 nms/v1_19_R3/pom.xml create mode 100644 nms/v1_20_R1/build.gradle.kts delete mode 100644 nms/v1_20_R1/pom.xml create mode 100644 nms/v1_20_R2/build.gradle.kts delete mode 100644 nms/v1_20_R2/pom.xml create mode 100644 nms/v1_20_R3/build.gradle.kts delete mode 100644 nms/v1_20_R3/pom.xml create mode 100644 nms/v1_20_R4/build.gradle.kts delete mode 100644 nms/v1_20_R4/pom.xml create mode 100644 nms/v1_21_R1/build.gradle.kts delete mode 100644 nms/v1_21_R1/pom.xml create mode 100644 plugin/build.gradle.kts delete mode 100644 plugin/pom.xml delete mode 100644 pom.xml create mode 100644 settings.gradle.kts create mode 100644 shaded/build.gradle.kts delete mode 100644 shaded/pom.xml create mode 100644 shared/build.gradle.kts delete mode 100644 shared/pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..6e1065fe --- /dev/null +++ b/.gitignore @@ -0,0 +1,21 @@ +.gradle +**/build/ +!src/**/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Avoid ignore Gradle wrappper properties +!gradle-wrapper.properties + +# Cache of project +.gradletasknamecache + +# Eclipse Gradle plugin generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..f2f4ae73 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,51 @@ +plugins { + `java-library` +} + +subprojects { + repositories { + mavenCentral() + mavenLocal() + + maven { + url = uri("https://repo.md-5.net/content/groups/public/") + } + + maven { + url = uri("https://papermc.io/repo/repository/maven-public/") + } + + maven { + url = uri("https://mvn.lumine.io/repository/maven-public/") + } + + maven { + url = uri("https://repo.codemc.io/repository/maven-releases/") + } + + maven { + url = uri("https://repo.codemc.io/repository/maven-snapshots/") + } + } + + apply(plugin = "java-library") + + java { + sourceCompatibility = JavaVersion.VERSION_1_8 + } + + tasks.withType { + options.encoding = "UTF-8" + sourceCompatibility = "1.8" + } + + group = "me.libraryaddict.disguises" + version = "1.0-SNAPSHOT" + + dependencies { + implementation(rootProject.libs.org.spigotmc.spigot.api) + + compileOnly(rootProject.libs.org.projectlombok.lombok) + annotationProcessor(rootProject.libs.org.projectlombok.lombok) + } +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..697755cc --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,45 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +com-mojang-authlib = "6.0.54" +commons-lang-commons-lang = "2.6" +io-netty-netty-buffer = "4.1.90.Final" +io-netty-netty-codec = "4.1.90.Final" +io-papermc-paper-paper-api = "1.20.3-R0.1-SNAPSHOT" +net-kyori-adventure-api = "4.17.0" +net-kyori-adventure-text-minimessage = "4.17.0" +net-kyori-adventure-text-serializer-gson = "4.17.0" +net-kyori-adventure-text-serializer-json = "4.17.0" +net-md-v5-bungeecord-chat = "1.16-R0.4" +org-spigotmc-spigot-latest = "1.21-R0.1-SNAPSHOT" +com-retro-packetevents-version = "2.4.0" +lombok-version = "1.18.34" +shadow-version = "8.1.1" +junit-version = "4.13.2" +junit-jupiter-version = "5.9.3" +mockito-version = "5.12.0" + +[libraries] +com-mojang-authlib = { module = "com.mojang:authlib", version.ref = "com-mojang-authlib" } +commons-lang-commons-lang = { module = "commons-lang:commons-lang", version.ref = "commons-lang-commons-lang" } +io-netty-netty-buffer = { module = "io.netty:netty-buffer", version.ref = "io-netty-netty-buffer" } +io-netty-netty-codec = { module = "io.netty:netty-codec", version.ref = "io-netty-netty-codec" } +io-papermc-paper-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "io-papermc-paper-paper-api" } +net-kyori-adventure-api = { module = "net.kyori:adventure-api", version.ref = "net-kyori-adventure-api" } +net-kyori-adventure-text-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "net-kyori-adventure-text-minimessage" } +net-kyori-adventure-text-serializer-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "net-kyori-adventure-text-serializer-gson" } +net-kyori-adventure-text-serializer-json = { module = "net.kyori:adventure-text-serializer-json", version.ref = "net-kyori-adventure-text-serializer-json" } +net-md-v5-bungeecord-chat = { module = "net.md-5:bungeecord-chat", version.ref = "net-md-v5-bungeecord-chat" } +org-spigotmc-spigot = { module = "org.spigotmc:spigot", version.ref = "org-spigotmc-spigot-latest" } +org-spigotmc-spigot-api = { module = "org.spigotmc:spigot-api", version.ref = "org-spigotmc-spigot-latest" } +com-retro-packetevents = { module = "com.github.retrooper:packetevents-spigot", version.ref = "com-retro-packetevents-version" } +org-projectlombok-lombok = { module = "org.projectlombok:lombok", version.ref = "lombok-version" } +libsdisguises-minimessage = { module = "me.libraryaddict.disguises:minimessage", version = "1.0-SNAPSHOT" } +junit-plugin = { module = "junit:junit", version.ref = "junit-version" } +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter-version" } +mockito = { module = "org.mockito:mockito-core", version.ref = "mockito-version" } + +[plugins] +shadowjar = { id = "com.github.johnrengelman.shadow", version.ref = "shadow-version" } + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2c3521197d7c4586c843d1d3e9090525f1898cde GIT binary patch literal 43504 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 TZiJi*F`$tkWLn) literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..09523c0e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..f5feea6d --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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/platforms/jvm/plugins-application/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 -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || 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/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..9d21a218 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +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/minimessage/build.gradle.kts b/minimessage/build.gradle.kts new file mode 100644 index 00000000..69e780b7 --- /dev/null +++ b/minimessage/build.gradle.kts @@ -0,0 +1,45 @@ +plugins { + alias(libs.plugins.shadowjar) + `maven-publish` +} + +dependencies { + shadow(libs.net.kyori.adventure.api) + shadow(libs.net.kyori.adventure.text.minimessage) + shadow(libs.net.kyori.adventure.text.serializer.json) + shadow(libs.net.kyori.adventure.text.serializer.gson) { + exclude("*") + } +} + +artifacts.add("shadow", tasks.shadowJar.get()) + +tasks { + jar { + isEnabled = false + } + + build { + dependsOn(publish) + dependsOn(shadowJar) + } + + shadowJar { + configurations = listOf(project.configurations.shadow.get()) + relocate("net.kyori", "libsdisg.shaded.net.kyori") + archiveClassifier.set("shadow") + } +} + +publishing { + publications { + create("relocated") { + artifact(tasks["shadowJar"]) { + classifier = null + } + } + } + repositories { + mavenLocal() + } +} \ No newline at end of file diff --git a/minimessage/pom.xml b/minimessage/pom.xml deleted file mode 100644 index 3fbc5f36..00000000 --- a/minimessage/pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - parent - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - minimessage - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - - - - io.papermc.paper - paper-api - ${paper-api.version} - provided - true - - - net.kyori - adventure-api - ${adventure-minimessage.version} - compile - true - - - net.kyori - adventure-text-minimessage - ${adventure-minimessage.version} - compile - true - - - net.kyori - adventure-text-serializer-json - ${adventure-text.version} - compile - true - - - net.kyori - adventure-text-serializer-gson - ${adventure-text.version} - compile - true - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - compile - package - - attach-artifact - - - - - ${basedir}/target/minimessage-1.0-SNAPSHOT.jar - jar - optional - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - - - net.kyori:* - - - - - net.kyori - libsdisg.shaded.net.kyori - - - - - - - - \ No newline at end of file diff --git a/nms/nmsModule.gradle b/nms/nmsModule.gradle new file mode 100644 index 00000000..cd56bcfb --- /dev/null +++ b/nms/nmsModule.gradle @@ -0,0 +1,40 @@ +// Code copied from https://github.com/Shopkeepers/Shopkeepers/tree/master + +apply plugin: 'java-library' + +apply from: rootProject.file('nms/specialSource.gradle') + +ext { + // This needs to be defined by projects that apply this script. + craftbukkitVersion = 'UNSPECIFIED' + // This can be overridden by projects that apply this script. + remapServerCode = true +} + +dependencies { + implementation project(':shared') + afterEvaluate { + if (remapServerCode) { + implementation "org.spigotmc:spigot:${craftbukkitVersion}:remapped-mojang" + } else { + implementation "org.spigotmc:spigot:${craftbukkitVersion}" + } + } +} + +afterEvaluate { + if (remapServerCode) { + jar { + doLast { + def outputFiles = outputs.files.files + for (inputFile in outputFiles) { + File intermediateFile = new File(temporaryDir, inputFile.name.replace('.jar', '-obf.jar')) + File outputFile = inputFile + remapMojangToSpigot(inputFile, intermediateFile, outputFile, craftbukkitVersion) + } + } + } + } +} + +// Note: The NMS modules are not published as standalone artifacts, but are shaded into the final plugin jar. diff --git a/nms/pom.xml b/nms/pom.xml deleted file mode 100644 index 72f159e7..00000000 --- a/nms/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - nms - pom - - - parent - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - - - LibsDisguises - shared - 1.0-SNAPSHOT - true - - - - - v1_17_R1 - v1_18_R1 - v1_18_R2 - v1_19_R1 - v1_19_R2 - v1_19_R3 - v1_20_R1 - v1_20_R2 - v1_20_R3 - v1_20_R4 - v1_21_R1 - - - diff --git a/nms/specialSource.gradle b/nms/specialSource.gradle new file mode 100644 index 00000000..cf4b3847 --- /dev/null +++ b/nms/specialSource.gradle @@ -0,0 +1,73 @@ +// Code copied from https://github.com/Shopkeepers/Shopkeepers/tree/master + +buildscript { + repositories { + mavenCentral() + } + + configurations.create('specialSource') + + dependencies { + specialSource 'net.md-5:SpecialSource:1.11.4:shaded' + } +} + +// Spigot server code remapping: https://www.spigotmc.org/threads/spigot-bungeecord-1-17-1-17-1.510208/ +// These dependencies and mappings are installed into the local Maven repository when BuildTools builds the Spigot dependencies. +def m2Repo = new File(repositories.mavenLocal().url.path) +def remappedMojang = new File(m2Repo, 'org/spigotmc/spigot/{craftbukkitVersion}/spigot-{craftbukkitVersion}-remapped-mojang.jar').path +def remappedObf = new File(m2Repo, 'org/spigotmc/spigot/{craftbukkitVersion}/spigot-{craftbukkitVersion}-remapped-obf.jar').path +def mojangMappings = new File(m2Repo, 'org/spigotmc/minecraft-server/{craftbukkitVersion}/minecraft-server-{craftbukkitVersion}-maps-mojang.txt').path +def spigotMappings = new File(m2Repo, 'org/spigotmc/minecraft-server/{craftbukkitVersion}/minecraft-server-{craftbukkitVersion}-maps-spigot.csrg').path + +def specialSource = buildscript.configurations.specialSource.resolvedConfiguration.getFirstLevelModuleDependencies().find { + it.moduleGroup == 'net.md-5' && it.moduleName == 'SpecialSource' +}.moduleArtifacts.first().file.path + +// Converts from Mojang's mappings to Minecraft's obfuscated mappings. +ext.remapMojangToObfuscated = { inputFile, outputFile, craftbukkitVersion -> + println '> remapMojangToObfuscated' + println ' Input: ' + inputFile.path + println ' Output: ' + outputFile.path + println ' CraftBukkit version: ' + craftbukkitVersion + def classpathSeparator = System.properties['path.separator'] + exec { + commandLine 'java', + '-cp', "${specialSource}${classpathSeparator}${remappedMojang}".replace('{craftbukkitVersion}', craftbukkitVersion), + 'net.md_5.specialsource.SpecialSource', + '--live', + '-i', inputFile.path, + '-o', outputFile.path, + '-m', mojangMappings.replace('{craftbukkitVersion}', craftbukkitVersion), + '--reverse' + } +} + +// Converts from Minecraft's obfuscated mappings to Spigot's mappings. +ext.remapObfuscatedToSpigot = { inputFile, outputFile, craftbukkitVersion -> + println '> remapObfuscatedToSpigot' + println ' Input: ' + inputFile.path + println ' Output: ' + outputFile.path + println ' CraftBukkit version: ' + craftbukkitVersion + def classpathSeparator = System.properties['path.separator'] + exec { + commandLine 'java', + '-cp', "${specialSource}${classpathSeparator}${remappedObf}".replace('{craftbukkitVersion}', craftbukkitVersion), + 'net.md_5.specialsource.SpecialSource', + '--live', + '-i', inputFile.path, + '-o', outputFile.path, + '-m', spigotMappings.replace('{craftbukkitVersion}', craftbukkitVersion) + } +} + +// Converts from Mojang's mappings to Spigot's mappings. +ext.remapMojangToSpigot = { inputFile, intermediateFile, outputFile, craftbukkitVersion -> + println '> remapMojangToSpigot' + println ' Input: ' + inputFile.path + println ' Intermediate: ' + intermediateFile.path + println ' Output: ' + outputFile.path + println ' CraftBukkit version: ' + craftbukkitVersion + remapMojangToObfuscated(inputFile, intermediateFile, craftbukkitVersion) + remapObfuscatedToSpigot(intermediateFile, outputFile, craftbukkitVersion) +} diff --git a/nms/v1_17_R1/build.gradle.kts b/nms/v1_17_R1/build.gradle.kts new file mode 100644 index 00000000..91c4e379 --- /dev/null +++ b/nms/v1_17_R1/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + `java-library` +} + +apply(from = rootProject.file("nms/nmsModule.gradle")) + +extra["craftbukkitVersion"] = "1.17.1-R0.1-SNAPSHOT" + +description = "v1_17_R1" diff --git a/nms/v1_17_R1/pom.xml b/nms/v1_17_R1/pom.xml deleted file mode 100644 index ac3f814e..00000000 --- a/nms/v1_17_R1/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - nms - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - v1_17_R1 - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - 1.17.1-R0.1-SNAPSHOT - - - - - org.spigotmc - spigot - ${spigot.version} - remapped-mojang - provided - - - org.spigotmc - spigot-api - ${spigot.version} - provided - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.4 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang - true - org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang - remapped-mojang - true - - - - package - - remap - - remap-spigot - - target/${project.build.finalName}-remapped-mojang.jar - org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot - org.spigotmc:spigot:${spigot.version}:jar:remapped-obf - remapped-spigot - true - - - - - - - \ No newline at end of file diff --git a/nms/v1_18_R1/build.gradle.kts b/nms/v1_18_R1/build.gradle.kts new file mode 100644 index 00000000..ee381726 --- /dev/null +++ b/nms/v1_18_R1/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + `java-library` +} + +apply(from = rootProject.file("nms/nmsModule.gradle")) + +extra["craftbukkitVersion"] = "1.18.1-R0.1-SNAPSHOT" + +description = "v1_18_R1" diff --git a/nms/v1_18_R1/pom.xml b/nms/v1_18_R1/pom.xml deleted file mode 100644 index 5f869522..00000000 --- a/nms/v1_18_R1/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - nms - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - v1_18_R1 - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - 1.18.1-R0.1-SNAPSHOT - - - - - org.spigotmc - spigot - ${spigot.version} - remapped-mojang - provided - true - - - org.spigotmc - spigot-api - ${spigot.version} - provided - true - - - - com.mojang - authlib - 3.5.41 - provided - true - - - - it.unimi.dsi - fastutil - 8.5.8 - provided - true - - - - com.mojang - datafixerupper - 4.1.27 - provided - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.4 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang - true - org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang - remapped-mojang - true - - - - package - - remap - - remap-spigot - - target/${project.build.finalName}-remapped-mojang.jar - org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot - org.spigotmc:spigot:${spigot.version}:jar:remapped-obf - remapped-spigot - true - - - - - - - \ No newline at end of file diff --git a/nms/v1_18_R2/build.gradle.kts b/nms/v1_18_R2/build.gradle.kts new file mode 100644 index 00000000..c494d8dd --- /dev/null +++ b/nms/v1_18_R2/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + `java-library` +} + +apply(from = rootProject.file("nms/nmsModule.gradle")) + +extra["craftbukkitVersion"] = "1.18.2-R0.1-SNAPSHOT" + +description = "v1_18_R2" diff --git a/nms/v1_18_R2/pom.xml b/nms/v1_18_R2/pom.xml deleted file mode 100644 index 56cd5a61..00000000 --- a/nms/v1_18_R2/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - nms - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - v1_18_R2 - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - 1.18.2-R0.1-SNAPSHOT - - - - - org.spigotmc - spigot - ${spigot.version} - remapped-mojang - provided - true - - - org.spigotmc - spigot-api - ${spigot.version} - provided - true - - - - com.mojang - authlib - 3.5.41 - provided - true - - - - it.unimi.dsi - fastutil - 8.5.8 - provided - true - - - - com.mojang - datafixerupper - 4.1.27 - provided - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.4 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang - true - org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang - remapped-mojang - true - - - - package - - remap - - remap-spigot - - target/${project.build.finalName}-remapped-mojang.jar - org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot - org.spigotmc:spigot:${spigot.version}:jar:remapped-obf - remapped-spigot - true - - - - - - - \ No newline at end of file diff --git a/nms/v1_19_R1/build.gradle.kts b/nms/v1_19_R1/build.gradle.kts new file mode 100644 index 00000000..ad64c1d5 --- /dev/null +++ b/nms/v1_19_R1/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + `java-library` +} + +apply(from = rootProject.file("nms/nmsModule.gradle")) + +extra["craftbukkitVersion"] = "1.19.1-R0.1-SNAPSHOT" + +description = "v1_19_R1" diff --git a/nms/v1_19_R1/pom.xml b/nms/v1_19_R1/pom.xml deleted file mode 100644 index 6864b37c..00000000 --- a/nms/v1_19_R1/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - nms - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - v1_19_R1 - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - 1.19.1-R0.1-SNAPSHOT - - - - - org.spigotmc - spigot - ${spigot.version} - remapped-mojang - provided - true - - - org.spigotmc - spigot-api - ${spigot.version} - provided - true - - - - it.unimi.dsi - fastutil - 8.5.8 - provided - true - - - - com.mojang - authlib - 3.5.41 - provided - true - - - - com.mojang - datafixerupper - 5.0.28 - provided - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.4 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang - true - org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang - remapped-mojang - true - - - - package - - remap - - remap-spigot - - target/${project.build.finalName}-remapped-mojang.jar - org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot - org.spigotmc:spigot:${spigot.version}:jar:remapped-obf - remapped-spigot - true - - - - - - - \ No newline at end of file diff --git a/nms/v1_19_R2/build.gradle.kts b/nms/v1_19_R2/build.gradle.kts new file mode 100644 index 00000000..f5fd2a29 --- /dev/null +++ b/nms/v1_19_R2/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + `java-library` +} + +apply(from = rootProject.file("nms/nmsModule.gradle")) + +extra["craftbukkitVersion"] = "1.19.3-R0.1-SNAPSHOT" + +description = "v1_19_R2" diff --git a/nms/v1_19_R2/pom.xml b/nms/v1_19_R2/pom.xml deleted file mode 100644 index fa8ecad1..00000000 --- a/nms/v1_19_R2/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - nms - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - v1_19_R2 - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - 1.19.3-R0.1-SNAPSHOT - - - - - org.spigotmc - spigot - ${spigot.version} - remapped-mojang - provided - true - - - org.spigotmc - spigot-api - ${spigot.version} - provided - true - - - - it.unimi.dsi - fastutil - 8.5.8 - provided - true - - - - com.mojang - authlib - 3.5.41 - provided - true - - - - com.mojang - datafixerupper - 5.0.28 - provided - true - - - - com.mojang - brigadier - 1.0.18 - compile - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.4 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang - true - org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang - remapped-mojang - true - - - - package - - remap - - remap-spigot - - target/${project.build.finalName}-remapped-mojang.jar - org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot - org.spigotmc:spigot:${spigot.version}:jar:remapped-obf - remapped-spigot - true - - - - - - - \ No newline at end of file diff --git a/nms/v1_19_R3/build.gradle.kts b/nms/v1_19_R3/build.gradle.kts new file mode 100644 index 00000000..32b8dceb --- /dev/null +++ b/nms/v1_19_R3/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + `java-library` +} + +apply(from = rootProject.file("nms/nmsModule.gradle")) + +extra["craftbukkitVersion"] = "1.19.4-R0.1-SNAPSHOT" + +description = "v1_19_R3" diff --git a/nms/v1_19_R3/pom.xml b/nms/v1_19_R3/pom.xml deleted file mode 100644 index 193982ee..00000000 --- a/nms/v1_19_R3/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - nms - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - v1_19_R3 - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - 1.19.4-R0.1-SNAPSHOT - - - - - org.spigotmc - spigot - ${spigot.version} - remapped-mojang - provided - true - - - org.spigotmc - spigot-api - ${spigot.version} - provided - true - - - - it.unimi.dsi - fastutil - 8.5.8 - provided - true - - - - com.mojang - authlib - 3.5.41 - provided - true - - - - com.mojang - datafixerupper - 5.0.28 - provided - true - - - - com.mojang - brigadier - 1.0.18 - compile - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.4 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang - true - org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang - remapped-mojang - true - - - - package - - remap - - remap-spigot - - target/${project.build.finalName}-remapped-mojang.jar - org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot - org.spigotmc:spigot:${spigot.version}:jar:remapped-obf - remapped-spigot - true - - - - - - - \ No newline at end of file diff --git a/nms/v1_20_R1/build.gradle.kts b/nms/v1_20_R1/build.gradle.kts new file mode 100644 index 00000000..c7785e89 --- /dev/null +++ b/nms/v1_20_R1/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + `java-library` +} + +apply(from = rootProject.file("nms/nmsModule.gradle")) + +extra["craftbukkitVersion"] = "1.20-R0.1-SNAPSHOT" + +description = "v1_20_R1" diff --git a/nms/v1_20_R1/pom.xml b/nms/v1_20_R1/pom.xml deleted file mode 100644 index 29e3b96c..00000000 --- a/nms/v1_20_R1/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - nms - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - v1_20_R1 - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - 1.20-R0.1-SNAPSHOT - - - - - org.spigotmc - spigot - ${spigot.version} - remapped-mojang - provided - true - - - org.spigotmc - spigot-api - ${spigot.version} - provided - true - - - - it.unimi.dsi - fastutil - 8.5.8 - provided - true - - - - com.mojang - authlib - 3.5.41 - provided - true - - - - com.mojang - datafixerupper - 5.0.28 - provided - true - - - - com.mojang - brigadier - 1.0.18 - compile - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.4 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang - true - org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang - remapped-mojang - true - - - - package - - remap - - remap-spigot - - target/${project.build.finalName}-remapped-mojang.jar - org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot - org.spigotmc:spigot:${spigot.version}:jar:remapped-obf - remapped-spigot - true - - - - - - - \ No newline at end of file diff --git a/nms/v1_20_R2/build.gradle.kts b/nms/v1_20_R2/build.gradle.kts new file mode 100644 index 00000000..3b9385c1 --- /dev/null +++ b/nms/v1_20_R2/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + `java-library` +} + +apply(from = rootProject.file("nms/nmsModule.gradle")) + +extra["craftbukkitVersion"] = "1.20.2-R0.1-SNAPSHOT" + +description = "v1_20_R2" diff --git a/nms/v1_20_R2/pom.xml b/nms/v1_20_R2/pom.xml deleted file mode 100644 index 88b1b63b..00000000 --- a/nms/v1_20_R2/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - nms - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - v1_20_R2 - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - 1.20.2-R0.1-SNAPSHOT - - - - - org.spigotmc - spigot - ${spigot.version} - remapped-mojang - provided - true - - - org.spigotmc - spigot-api - ${spigot.version} - provided - true - - - - it.unimi.dsi - fastutil - 8.5.8 - provided - true - - - - com.mojang - authlib - 5.0.47 - provided - true - - - - com.mojang - datafixerupper - 5.0.28 - provided - true - - - - com.mojang - brigadier - 1.0.18 - compile - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.4 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang - true - org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang - remapped-mojang - true - - - - package - - remap - - remap-spigot - - target/${project.build.finalName}-remapped-mojang.jar - org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot - org.spigotmc:spigot:${spigot.version}:jar:remapped-obf - remapped-spigot - true - - - - - - - \ No newline at end of file diff --git a/nms/v1_20_R3/build.gradle.kts b/nms/v1_20_R3/build.gradle.kts new file mode 100644 index 00000000..eb0fda5c --- /dev/null +++ b/nms/v1_20_R3/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + `java-library` +} + +apply(from = rootProject.file("nms/nmsModule.gradle")) + +extra["craftbukkitVersion"] = "1.20.3-R0.1-SNAPSHOT" + +description = "v1_20_R3" diff --git a/nms/v1_20_R3/pom.xml b/nms/v1_20_R3/pom.xml deleted file mode 100644 index efbc0134..00000000 --- a/nms/v1_20_R3/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - nms - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - v1_20_R3 - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - 1.20.3-R0.1-SNAPSHOT - - - - - org.spigotmc - spigot - ${spigot.version} - remapped-mojang - provided - true - - - org.spigotmc - spigot-api - ${spigot.version} - provided - true - - - - it.unimi.dsi - fastutil - 8.5.8 - provided - true - - - - com.mojang - authlib - 5.0.47 - provided - true - - - - com.mojang - datafixerupper - 5.0.28 - provided - true - - - - com.mojang - brigadier - 1.0.18 - compile - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 1.2.4 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang - true - org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang - remapped-mojang - true - - - - package - - remap - - remap-spigot - - target/${project.build.finalName}-remapped-mojang.jar - org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot - org.spigotmc:spigot:${spigot.version}:jar:remapped-obf - remapped-spigot - true - - - - - - - \ No newline at end of file diff --git a/nms/v1_20_R4/build.gradle.kts b/nms/v1_20_R4/build.gradle.kts new file mode 100644 index 00000000..2312f7e0 --- /dev/null +++ b/nms/v1_20_R4/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + `java-library` +} + +apply(from = rootProject.file("nms/nmsModule.gradle")) + +extra["craftbukkitVersion"] = "1.20.6-R0.1-SNAPSHOT" + +description = "v1_20_R4" diff --git a/nms/v1_20_R4/pom.xml b/nms/v1_20_R4/pom.xml deleted file mode 100644 index e8390ae3..00000000 --- a/nms/v1_20_R4/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - nms - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - v1_20_R4 - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - 1.20.6-R0.1-SNAPSHOT - - - - - org.spigotmc - spigot - ${spigot.version} - remapped-mojang - provided - true - - - org.spigotmc - spigot-api - ${spigot.version} - provided - true - - - - it.unimi.dsi - fastutil - 8.5.8 - provided - true - - - - com.mojang - authlib - 6.0.54 - provided - true - - - - com.mojang - datafixerupper - 7.0.14 - provided - true - - - - com.mojang - brigadier - 1.2.9 - compile - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang - true - org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang - remapped-mojang - true - - - - package - - remap - - remap-spigot - - target/${project.build.finalName}-remapped-mojang.jar - org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot - org.spigotmc:spigot:${spigot.version}:jar:remapped-obf - remapped-spigot - true - - - - - - - \ No newline at end of file diff --git a/nms/v1_21_R1/build.gradle.kts b/nms/v1_21_R1/build.gradle.kts new file mode 100644 index 00000000..2f3ef310 --- /dev/null +++ b/nms/v1_21_R1/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + `java-library` +} + +apply(from = rootProject.file("nms/nmsModule.gradle")) + +extra["craftbukkitVersion"] = "1.21-R0.1-SNAPSHOT"; + +description = "v1_21_R1" \ No newline at end of file diff --git a/nms/v1_21_R1/pom.xml b/nms/v1_21_R1/pom.xml deleted file mode 100644 index 80655f83..00000000 --- a/nms/v1_21_R1/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - nms - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - v1_21_R1 - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - 1.21-R0.1-SNAPSHOT - - - - - org.spigotmc - spigot - ${spigot.version} - remapped-mojang - provided - true - - - org.spigotmc - spigot-api - ${spigot.version} - provided - true - - - - it.unimi.dsi - fastutil - 8.5.8 - provided - true - - - - com.mojang - authlib - 6.0.54 - provided - true - - - - com.mojang - datafixerupper - 7.0.14 - provided - true - - - - com.mojang - brigadier - 1.2.9 - compile - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - - - - - net.md-5 - specialsource-maven-plugin - 2.0.3 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang - true - org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang - remapped-mojang - true - - - - package - - remap - - remap-spigot - - target/${project.build.finalName}-remapped-mojang.jar - org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot - org.spigotmc:spigot:${spigot.version}:jar:remapped-obf - remapped-spigot - true - - - - - - - \ No newline at end of file diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts new file mode 100644 index 00000000..a545cb3c --- /dev/null +++ b/plugin/build.gradle.kts @@ -0,0 +1,47 @@ +plugins { + `maven-publish` +} + +version = "10.0.44-SNAPSHOT" + +dependencies { + compileOnly(project(":shared")) + compileOnly(libs.io.netty.netty.buffer) + compileOnly(libs.io.netty.netty.codec) + compileOnly(libs.commons.lang.commons.lang) + compileOnly(libs.com.mojang.authlib) + compileOnly(libs.org.spigotmc.spigot.api) + compileOnly(libs.com.retro.packetevents) + compileOnly(libs.libsdisguises.minimessage) + compileOnly(libs.io.papermc.paper.paper.api); +} + +publishing { + repositories { +// maven { +// name = "md_5-releases" +// url = uri("https://repo.md-5.net/content/repositories/releases/") +// credentials { +// username = project.findProperty("repoUser") as String? ?: System.getenv("REPO_USER") +// password = project.findProperty("repoPassword") as String? ?: System.getenv("REPO_PASSWORD") +// } +// } +// maven { +// name = "md_5-snapshots" +// url = uri("https://repo.md-5.net/content/repositories/snapshots/") +// credentials { +// username = project.findProperty("repoUser") as String? ?: System.getenv("REPO_USER") +// password = project.findProperty("repoPassword") as String? ?: System.getenv("REPO_PASSWORD") +// } +// } + mavenLocal() + } + publications { + create("mavenJava") { + from(components["java"]) + + groupId = "LibsDisguises" + artifactId = "LibsDisguises" + } + } +} \ No newline at end of file diff --git a/plugin/pom.xml b/plugin/pom.xml deleted file mode 100644 index 6da8c2fa..00000000 --- a/plugin/pom.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - parent - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - LibsDisguises - ${libsdisguises.version} - - - 1.8 - 1.8 - UTF-8 - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - default-install - - false - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.2 - - - default-deploy - - false - - - - - - - - - - LibsDisguises - minimessage - 1.0-SNAPSHOT - provided - true - - - LibsDisguises - shared - 1.0-SNAPSHOT - provided - true - - - org.spigotmc - spigot - true - - - org.spigotmc - spigot-api - true - - - io.papermc.paper - paper-api - ${paper-api.version} - provided - true - - - * - * - - - - - net.md-5 - bungeecord-chat - ${bungeecord-chat.version} - provided - true - - - - - - it.unimi.dsi - fastutil - 8.5.12 - provided - true - - - com.mojang - authlib - 5.0.51 - provided - true - - - com.mojang - datafixerupper - 5.0.28 - provided - true - - - com.mojang - brigadier - 1.0.18 - provided - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - io.netty - netty-codec - 4.1.90.Final - provided - true - - - commons-lang - commons-lang - 2.6 - true - provided - - - - \ No newline at end of file diff --git a/plugin/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java b/plugin/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java index b7d8e173..ab93b6fd 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java @@ -187,8 +187,6 @@ public class DisguiseConfig { @Getter @Setter private static int maxClonedDisguises; - @Getter - @Setter private static int uuidGeneratedVersion; @Getter @Setter diff --git a/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java b/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java index 858a7e7c..4304d131 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java @@ -349,14 +349,14 @@ public class LibsDisguises extends JavaPlugin { buildNumber = StringUtils.stripToNull(pluginYml.getString("build-number")); buildDate = StringUtils.stripToNull(pluginYml.getString("build-date")); - int fileCount = ReflectionManager.getJarFileCount(getFile(), LibsPremium.ignoredDirectories()); + int fileCount = ReflectionManager.getJarFileCount(getFile()); int expected = pluginYml.getInt("file-count", fileCount); if (fileCount != expected) { getLogger().severe( "Hi, this is libraryaddict from Lib's Disguises informing you that I have detected that my plugin Lib's Disguises looks " + - "like another plugin (unknown) has injected malware into it as soon as it started running on your server, there were " + - (fileCount - expected) + + "like another plugin (don't know which) has injected malware into it as soon as Lib's Disguises started running on " + + "your server, there were " + (fileCount - expected) + " unknown files injected into the jar. Please redownload from a trusted source such as SpigotMC. If this warning " + "shows even after updating, try https://www.spigotmc.org/resources/spigot-anti-malware.64982/ but you will likely " + "need to reinstall all your plugins, jars, etc as just one infected plugin will infect everything else when it loads."); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java index f56fabb9..7fbb5f45 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java @@ -285,7 +285,6 @@ public class DisguiseUtilities { private static final HashMap> disguiseLoading = new HashMap<>(); @Getter private static boolean runningPaper; - @Getter private static MineSkinAPI mineSkinAPI; @Getter private static boolean invalidFile; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java index 5d8f4e71..1d7e33c5 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java @@ -410,7 +410,9 @@ public class ReflectionManager { } public static long getGameTime(Entity entity) { - if (entity==null||entity.getWorld()==null ||!NmsVersion.v1_19_R3.isSupported())return 0L; + if (entity == null || entity.getWorld() == null || !NmsVersion.v1_19_R3.isSupported()) { + return 0L; + } return entity.getWorld().getGameTime(); } @@ -504,28 +506,17 @@ public class ReflectionManager { return null; } - public static int getJarFileCount(File file, String... ignoredDirectories) throws IOException { + public static int getJarFileCount(File file) throws IOException { try (JarFile jar = new JarFile(file)) { int count = 0; Enumeration entry = jar.entries(); - loop: while (entry.hasMoreElements()) { - JarEntry element = entry.nextElement(); - - if (element.isDirectory()) { + if (entry.nextElement().isDirectory()) { continue; } - for (String ignored : ignoredDirectories) { - if (!element.getName().startsWith(ignored)) { - continue; - } - - continue loop; - } - count++; } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/DisguiseSoundEnums.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/DisguiseSoundEnums.java index a46be83b..fc3f0383 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/DisguiseSoundEnums.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/DisguiseSoundEnums.java @@ -11,6 +11,7 @@ import java.util.HashMap; /** * Only living disguises go in here! */ +@Getter public enum DisguiseSoundEnums { ALLAY(Sound.ENTITY_ALLAY_HURT, null, Sound.ENTITY_ALLAY_DEATH, new Sound[]{Sound.ENTITY_ALLAY_AMBIENT_WITHOUT_ITEM, Sound.ENTITY_ALLAY_AMBIENT_WITH_ITEM}, Sound.ENTITY_ALLAY_ITEM_GIVEN, @@ -184,7 +185,7 @@ public enum DisguiseSoundEnums { Sound.ENTITY_PANDA_SNEEZE), PARROT(Sound.ENTITY_PARROT_HURT, Sound.ENTITY_PARROT_STEP, Sound.ENTITY_PARROT_DEATH, Sound.ENTITY_PARROT_AMBIENT, - Arrays.stream(Sound.values()).filter( + (Object) Arrays.stream(Sound.values()).filter( sound -> sound.name().contains("PARROT_IMITATE") || sound == Sound.ENTITY_PARROT_EAT || sound == Sound.ENTITY_PARROT_FLY) .toArray(Sound[]::new)), @@ -328,7 +329,6 @@ public enum DisguiseSoundEnums { ZOMBIFIED_PIGLIN(Sound.ENTITY_ZOMBIFIED_PIGLIN_HURT, null, Sound.ENTITY_ZOMBIFIED_PIGLIN_DEATH, Sound.ENTITY_ZOMBIFIED_PIGLIN_AMBIENT, Sound.ENTITY_ZOMBIFIED_PIGLIN_ANGRY, Sound.ENTITY_PIGLIN_CONVERTED_TO_ZOMBIFIED); - @Getter private final HashMap sounds = new HashMap<>(); DisguiseSoundEnums(Object hurt, Object step, Object death, Object idle, Object... sounds) { diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 143b1fd8..00000000 --- a/pom.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - 4.0.0 - - LibsDisguises - parent - pom - 1.0-SNAPSHOT - - - shared - nms - minimessage - plugin - shaded - - - - 10.0.44-SNAPSHOT - - unknown - ${maven.build.timestamp} - dd/MM/yyyy HH:mm - 21 - 1.8 - UTF-8 - - 1.18.32 - 2.4.0 - 1.21-R0.1-SNAPSHOT - 4.13.2 - 5.9.3 - 1.20.3-R0.1-SNAPSHOT - 1.16-R0.4 - 4.17.0 - 4.17.0 - 5.12.0 - - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - default-install - - true - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.2 - - - default-deploy - - true - - - - - - - - - - - org.projectlombok - lombok - ${lombok.version} - true - - - com.github.retrooper - packetevents-spigot - true - compile - - - - junit - junit - ${junit.version} - test - true - - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - true - - - org.mockito - mockito-core - ${mockito.version} - - - - - - - com.github.retrooper - packetevents-spigot - ${packetevents.version} - provided - - - org.spigotmc - spigot-api - ${spigot.version} - true - - - org.spigotmc - spigot - ${spigot.version} - true - - - - - - - md_5-releases - https://repo.md-5.net/content/groups/public/ - - - - papermc - https://papermc.io/repo/repository/maven-public/ - - - - - nexus - Lumine Releases - https://mvn.lumine.io/repository/maven-public/ - - - - codemc-releases - https://repo.codemc.io/repository/maven-releases/ - - - codemc-snapshots - https://repo.codemc.io/repository/maven-snapshots/ - - - - - - md_5-releases - https://repo.md-5.net/content/repositories/releases/ - - - md_5-snapshots - https://repo.md-5.net/content/repositories/snapshots/ - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..4df4abd9 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,9 @@ +rootProject.name = "LibsDisguises" + +include("minimessage") + +include("shared", "plugin", "shaded") + +val nmsModules = File(rootDir, "nms").listFiles()!!.filter { s -> s.isDirectory() && s.name.matches("v[\\d_]+R\\d+".toRegex()) }.map { s -> ":nms:" + s.name }; +gradle.extra["nmsModules"] = nmsModules +include(nmsModules) diff --git a/shaded/build.gradle.kts b/shaded/build.gradle.kts new file mode 100644 index 00000000..35764604 --- /dev/null +++ b/shaded/build.gradle.kts @@ -0,0 +1,117 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter + +plugins { + `java` + alias(libs.plugins.shadowjar) + application +} + +tasks { + build { + dependsOn("shadowJar") + dependsOn("run") + dependsOn(getByName("jenkins")) + } + + task("publish") { + dependsOn("build") + } + + shadowJar { + configurations = listOf(project.configurations.shadow.get()) + exclude("**/CompileMethods.class") + } + + getByName("run") { + mustRunAfter(shadowJar) + } + + task("jenkins") { + mustRunAfter("run") + + doLast { + copy { + from(shadowJar.get().archiveFile.get().asFile.absolutePath) + into(rootProject.projectDir.absolutePath + "\\target") + rename { + "LibsDisguises.jar" + } + } + } + } + + processResources { + // Always inject timestamp & version + outputs.upToDateWhen { false } + + var number = "unknown"; + + if (gradle.startParameter.taskNames.contains("publish")) { + number = System.getProperty("build.number", "unknown"); + } + + filesMatching("plugin.yml") { + expand( + "libsdisguisesVersion" to project(":plugin").version, + "timestamp" to DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm").format(LocalDateTime.now()), + "buildNumber" to number + ) + } + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_21 +} + +application { + mainClass = "me.libraryaddict.disguise.utilities.watchers.CompileMethods" + applicationDefaultJvmArgs = listOf( + "-Djar.path=" + tasks.named("shadowJar").get().archiveFile.get().asFile.absolutePath + ) +} + +testing { + suites { + val test by getting(JvmTestSuite::class) { + useJUnitJupiter() + } + } +} + +dependencies { + shadow(libs.libsdisguises.minimessage) { + exclude("*") + } + shadow(project(":shared")) { + exclude("*") + } + shadow(project(":plugin")) { + exclude("*") + } + runtimeOnly(project(":plugin")) + runtimeOnly(libs.com.retro.packetevents) + + (gradle.extra["nmsModules"] as List<*>).map { s -> project(s as String) }.forEach { + shadow(it) { + exclude("*") + } + } + + testCompileOnly(libs.org.projectlombok.lombok) + testAnnotationProcessor(libs.org.projectlombok.lombok) + + testImplementation(project(":shared")) + testImplementation(project(":plugin")) + testImplementation(libs.libsdisguises.minimessage) + testImplementation(libs.mockito) + testImplementation(libs.com.retro.packetevents) + testImplementation(libs.net.kyori.adventure.api) + testImplementation(libs.net.kyori.adventure.text.minimessage) + testImplementation(libs.net.kyori.adventure.text.serializer.gson) + testImplementation(libs.net.kyori.adventure.text.serializer.json) + testRuntimeOnly(libs.org.spigotmc.spigot.api) + testRuntimeOnly(libs.org.spigotmc.spigot) +} \ No newline at end of file diff --git a/shaded/pom.xml b/shaded/pom.xml deleted file mode 100644 index b38c46c6..00000000 --- a/shaded/pom.xml +++ /dev/null @@ -1,272 +0,0 @@ - - - - parent - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - shaded - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - - - exec:java clean package - LibsDisguises - - - - src/main/resources - true - - plugin.yml - - - - src/main/resources - false - - **/* - - - - ${project.basedir} - - README.md - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - ../target - - - - maven-surefire-plugin - 3.1.2 - - - org.codehaus.mojo - exec-maven-plugin - 3.0.0 - - - - my-execution - compile - - java - - - - - true - me.libraryaddict.disguise.utilities.watchers.CompileMethods - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - true - - - LibsDisguises:* - - ** - - - META-INF/**/v*/** - - - - - - LibsDisguises:* - - - - - - - - - - org.spigotmc - spigot-api - true - - - - LibsDisguises - minimessage - 1.0-SNAPSHOT - compile - true - - - LibsDisguises - shared - 1.0-SNAPSHOT - compile - true - - - LibsDisguises - LibsDisguises - ${libsdisguises.version} - compile - - - LibsDisguises - v1_17_R1 - 1.0-SNAPSHOT - remapped-spigot - compile - - - LibsDisguises - v1_18_R1 - 1.0-SNAPSHOT - remapped-spigot - compile - - - LibsDisguises - v1_18_R2 - 1.0-SNAPSHOT - remapped-spigot - compile - - - LibsDisguises - v1_19_R1 - 1.0-SNAPSHOT - remapped-spigot - compile - - - LibsDisguises - v1_19_R2 - 1.0-SNAPSHOT - remapped-spigot - compile - - - LibsDisguises - v1_19_R3 - 1.0-SNAPSHOT - remapped-spigot - compile - - - LibsDisguises - v1_20_R1 - 1.0-SNAPSHOT - remapped-spigot - compile - - - LibsDisguises - v1_20_R2 - 1.0-SNAPSHOT - remapped-spigot - compile - - - LibsDisguises - v1_20_R3 - 1.0-SNAPSHOT - remapped-spigot - compile - - - LibsDisguises - v1_20_R4 - 1.0-SNAPSHOT - remapped-spigot - compile - - - LibsDisguises - v1_21_R1 - 1.0-SNAPSHOT - remapped-spigot - compile - - - - - it.unimi.dsi - fastutil - 8.5.12 - provided - true - - - com.mojang - authlib - 5.0.51 - provided - true - - - com.mojang - datafixerupper - 5.0.28 - provided - true - - - com.mojang - brigadier - 1.0.18 - provided - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - io.netty - netty-codec - 4.1.90.Final - provided - true - - - commons-lang - commons-lang - 2.6 - true - provided - - - - \ No newline at end of file diff --git a/shaded/src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java b/shaded/src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java index ebaf4c85..4f0f8404 100644 --- a/shaded/src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java +++ b/shaded/src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java @@ -16,59 +16,85 @@ import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsRemovedIn; import me.libraryaddict.disguise.utilities.sounds.DisguiseSoundEnums; import me.libraryaddict.disguise.utilities.sounds.SoundGroup; -import org.jetbrains.annotations.NotNull; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.nio.charset.StandardCharsets; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; import java.nio.file.Files; -import java.nio.file.StandardOpenOption; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; +import java.util.Enumeration; import java.util.List; import java.util.Map; import java.util.Random; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; public class CompileMethods { public static void main(String[] args) { - doMethods(); - doSounds(); - doFileCount(); + Path zipFilePath = Paths.get(System.getProperty("jar.path")); + + try (FileSystem fs = FileSystems.newFileSystem(zipFilePath, (ClassLoader) null)) { + Files.write(fs.getPath("/METHOD_MAPPINGS.txt"), doMethods()); + Files.write(fs.getPath("/SOUND_MAPPINGS.txt"), doSounds()); + // Count after we write the mappings + Files.write(fs.getPath("/plugin.yml"), doFileCount()); + } catch (IOException e) { + e.printStackTrace(); + } } - private static void doFileCount() { - int totalCount = 0; + private static int getJarFileCount(File file, String... skipFiles) { + try (JarFile jar = new JarFile(file)) { + int count = 0; - for (String folder : new String[]{"plugin/target/classes", "shaded/target/classes"}) { - totalCount += getFileCount(new File(folder)); - } + Enumeration entries = jar.entries(); - try { - Files.write(new File(new File("shaded/target/classes"), "plugin.yml").toPath(), - ("\nfile-count: " + totalCount).getBytes(StandardCharsets.UTF_8), StandardOpenOption.APPEND); + loop: + while (entries.hasMoreElements()) { + JarEntry entry = entries.nextElement(); + + if (entry.isDirectory()) { + continue; + } + + for (String skipFile : skipFiles) { + if (!skipFile.equals(entry.getName())) { + continue; + } + + continue loop; + } + + count++; + } + + return count; } catch (IOException e) { throw new RuntimeException(e); } } - private static int getFileCount(File folder) { - int count = 0; + private static byte[] doFileCount() { + int totalCount = getJarFileCount(new File(System.getProperty("jar.path")), "METHOD_MAPPINGS.txt", "SOUND_MAPPINGS.txt") + 2; - for (File f : folder.listFiles()) { - if (f.isFile()) { - count++; - } else { - count += getFileCount(f); - } + try { + Path path = new File(new File("build/resources/main"), "plugin.yml").toPath(); + String pluginYaml = + Files.readString(path, StandardCharsets.UTF_8).replaceFirst("file-count: -?\\d+", "file-count: " + totalCount); + return pluginYaml.getBytes(StandardCharsets.UTF_8); + } catch (IOException e) { + throw new RuntimeException(e); } - - return count; } - private static void doSounds() { + private static byte[] doSounds() { List list = new ArrayList<>(); for (DisguiseSoundEnums e : DisguiseSoundEnums.values()) { @@ -77,16 +103,9 @@ public class CompileMethods { list.add(sound.toString()); } - File soundsFile = new File("shaded/target/classes/SOUND_MAPPINGS.txt"); - - try (FileOutputStream fos = new FileOutputStream(soundsFile)) { - fos.write(String.join("\n", list).getBytes(StandardCharsets.UTF_8)); - } catch (IOException e) { - e.printStackTrace(); - } + return String.join("\n", list).getBytes(StandardCharsets.UTF_8); } - @NotNull private static StringBuilder getSoundAsString(DisguiseSoundEnums e) { StringBuilder sound = new StringBuilder(e.name()); @@ -122,7 +141,7 @@ public class CompileMethods { classes.add(c); } - private static void doMethods() { + private static byte[] doMethods() { ArrayList> classes = ClassGetter.getClassesForPackage(FlagWatcher.class, "me.libraryaddict.disguise.disguisetypes.watchers"); @@ -258,15 +277,7 @@ public class CompileMethods { throw new IllegalStateException("Methods were not compiled"); } - String gson = new Gson().toJson(methods); - - File methodsFile = new File("shaded/target/classes/METHOD_MAPPINGS.txt"); - - try (FileOutputStream fos = new FileOutputStream(methodsFile)) { - fos.write(gson.getBytes(StandardCharsets.UTF_8)); - } catch (IOException e) { - e.printStackTrace(); - } + return new Gson().toJson(methods).getBytes(StandardCharsets.UTF_8); } static String getDescriptorForClass(final Class c) { diff --git a/shaded/src/main/resources/plugin.yml b/shaded/src/main/resources/plugin.yml index 5765672e..5ecc9ddd 100644 --- a/shaded/src/main/resources/plugin.yml +++ b/shaded/src/main/resources/plugin.yml @@ -1,13 +1,14 @@ name: LibsDisguises main: me.libraryaddict.disguise.LibsDisguises description: A disguise plugin with various disguises. -version: ${libsdisguises.version} +version: ${libsdisguisesVersion} build-date: ${timestamp} -build-number: ${build.number} +build-number: ${buildNumber} author: libraryaddict authors: [ Byteflux, Navid K. ] softdepend: [ packetevents ] api-version: '1.13' +file-count: 0 commands: libsdisguises: aliases: [ libsdisg, ld ] diff --git a/shaded/src/test/java/me/libraryaddict/disguise/disguisetypes/DisguiseCloneTest.java b/shaded/src/test/java/me/libraryaddict/disguise/disguisetypes/DisguiseCloneTest.java index 05f5fd94..f63a4356 100644 --- a/shaded/src/test/java/me/libraryaddict/disguise/disguisetypes/DisguiseCloneTest.java +++ b/shaded/src/test/java/me/libraryaddict/disguise/disguisetypes/DisguiseCloneTest.java @@ -6,11 +6,12 @@ import me.libraryaddict.disguise.utilities.parser.WatcherMethod; import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import org.junit.Assert; import java.lang.invoke.MethodHandle; import java.util.Map; +import static org.junit.jupiter.api.Assertions.fail; + public class DisguiseCloneTest { /** @@ -94,7 +95,7 @@ public class DisguiseCloneTest { if (!dString.equals(cString)) { System.err.println(dString); System.err.println(cString); - Assert.fail("Cloned disguise is not the same!"); + fail("Cloned disguise is not the same!"); } } } catch (Exception ex) { diff --git a/shaded/src/test/java/me/libraryaddict/disguise/utilities/DisguiseUtilitiesTest.java b/shaded/src/test/java/me/libraryaddict/disguise/utilities/DisguiseUtilitiesTest.java index e9e3444a..bb85e70b 100644 --- a/shaded/src/test/java/me/libraryaddict/disguise/utilities/DisguiseUtilitiesTest.java +++ b/shaded/src/test/java/me/libraryaddict/disguise/utilities/DisguiseUtilitiesTest.java @@ -1,72 +1,71 @@ package me.libraryaddict.disguise.utilities; import me.libraryaddict.disguise.disguisetypes.DisguiseType; -import org.junit.Assert; -import org.junit.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class DisguiseUtilitiesTest { @Test public void testNewlineSplitter() { - Assert.assertArrayEquals(new String[]{"Name 1", "Name 2"}, DisguiseUtilities.splitNewLine("Name 1\nName 2")); - Assert.assertArrayEquals(new String[]{"Name 1", "Name 2"}, DisguiseUtilities.splitNewLine("Name 1\\nName 2")); - Assert.assertArrayEquals(new String[]{"Name 1\\", "Name 2"}, DisguiseUtilities.splitNewLine("Name 1\\\nName 2")); - Assert.assertArrayEquals(new String[]{"Name 1\\nName 2"}, DisguiseUtilities.splitNewLine("Name 1\\\\nName 2")); - Assert.assertArrayEquals(new String[]{"Name 1\\", "Name 2"}, DisguiseUtilities.splitNewLine("Name 1\\\\\\nName 2")); - Assert.assertArrayEquals(new String[]{"Name 1\\\\nName 2"}, DisguiseUtilities.splitNewLine("Name 1\\\\\\\\nName 2")); + assertArrayEquals(new String[]{"Name 1", "Name 2"}, DisguiseUtilities.splitNewLine("Name 1\nName 2")); + assertArrayEquals(new String[]{"Name 1", "Name 2"}, DisguiseUtilities.splitNewLine("Name 1\\nName 2")); + assertArrayEquals(new String[]{"Name 1\\", "Name 2"}, DisguiseUtilities.splitNewLine("Name 1\\\nName 2")); + assertArrayEquals(new String[]{"Name 1\\nName 2"}, DisguiseUtilities.splitNewLine("Name 1\\\\nName 2")); + assertArrayEquals(new String[]{"Name 1\\", "Name 2"}, DisguiseUtilities.splitNewLine("Name 1\\\\\\nName 2")); + assertArrayEquals(new String[]{"Name 1\\\\nName 2"}, DisguiseUtilities.splitNewLine("Name 1\\\\\\\\nName 2")); } @Test public void testQuoteSplitter() { // Test if splits are correct - Assert.assertArrayEquals(new String[]{"A", "simple", "string"}, DisguiseUtilities.split("A simple string")); + assertArrayEquals(new String[]{"A", "simple", "string"}, DisguiseUtilities.split("A simple string")); - Assert.assertArrayEquals(new String[]{"A quoted string"}, DisguiseUtilities.split("\"A quoted string\"")); + assertArrayEquals(new String[]{"A quoted string"}, DisguiseUtilities.split("\"A quoted string\"")); - Assert.assertArrayEquals(new String[]{"\"A double quoted string\""}, DisguiseUtilities.split("\"\"A double quoted string\"\"")); + assertArrayEquals(new String[]{"\"A double quoted string\""}, DisguiseUtilities.split("\"\"A double quoted string\"\"")); - Assert.assertArrayEquals(new String[]{"A", "string", "containing a", "quote"}, - DisguiseUtilities.split("A string \"containing a\" quote")); + assertArrayEquals(new String[]{"A", "string", "containing a", "quote"}, DisguiseUtilities.split("A string \"containing a\" quote")); - Assert.assertArrayEquals(new String[]{"A", "string", "fully", "split"}, DisguiseUtilities.split("\"A\" string fully split")); + assertArrayEquals(new String[]{"A", "string", "fully", "split"}, DisguiseUtilities.split("\"A\" string fully split")); - Assert.assertArrayEquals(new String[]{"A", "string", "fully", "split"}, DisguiseUtilities.split("\"A\" \"string\" fully split")); + assertArrayEquals(new String[]{"A", "string", "fully", "split"}, DisguiseUtilities.split("\"A\" \"string\" fully split")); - Assert.assertArrayEquals(new String[]{"A", "string", "fully", "split"}, DisguiseUtilities.split("A \"string\" fully split")); + assertArrayEquals(new String[]{"A", "string", "fully", "split"}, DisguiseUtilities.split("A \"string\" fully split")); // Test if quotes are ignored properly and included in result - Assert.assertArrayEquals(new String[]{"A", "\"string", "fully", "split"}, DisguiseUtilities.split("A \"string fully split")); + assertArrayEquals(new String[]{"A", "\"string", "fully", "split"}, DisguiseUtilities.split("A \"string fully split")); - Assert.assertArrayEquals(new String[]{"A", "\"string", "\"fully", "split"}, DisguiseUtilities.split("A \"string \"fully split")); + assertArrayEquals(new String[]{"A", "\"string", "\"fully", "split"}, DisguiseUtilities.split("A \"string \"fully split")); - Assert.assertArrayEquals(new String[]{"\"A", "\"string", "\"fully", "split"}, - DisguiseUtilities.split("\"A \"string \"fully split")); + assertArrayEquals(new String[]{"\"A", "\"string", "\"fully", "split"}, DisguiseUtilities.split("\"A \"string \"fully split")); - Assert.assertArrayEquals(new String[]{"A", "string\"", "fully", "split"}, DisguiseUtilities.split("A string\" fully split")); + assertArrayEquals(new String[]{"A", "string\"", "fully", "split"}, DisguiseUtilities.split("A string\" fully split")); - Assert.assertArrayEquals(new String[]{"A", "string\"", "fully\"", "split"}, DisguiseUtilities.split("A string\" fully\" split")); + assertArrayEquals(new String[]{"A", "string\"", "fully\"", "split"}, DisguiseUtilities.split("A string\" fully\" split")); - Assert.assertArrayEquals(new String[]{"A", "string", "fully\"", "split"}, DisguiseUtilities.split("A \"string\" fully\" split")); + assertArrayEquals(new String[]{"A", "string", "fully\"", "split"}, DisguiseUtilities.split("A \"string\" fully\" split")); - Assert.assertArrayEquals(new String[]{"A \"string", "with", "four", "splits"}, - DisguiseUtilities.split("\"A \"string\" with four splits")); + assertArrayEquals(new String[]{"A \"string", "with", "four", "splits"}, DisguiseUtilities.split("\"A \"string\" with four splits")); // Test for quotes inside words - Assert.assertArrayEquals(new String[]{"Fully", "split", "\"", "message"}, DisguiseUtilities.split("Fully split \"\"\" message")); + assertArrayEquals(new String[]{"Fully", "split", "\"", "message"}, DisguiseUtilities.split("Fully split \"\"\" message")); // Test to make sure space can be quoted, with an empty quote at the end - Assert.assertArrayEquals(new String[]{" ", "\""}, DisguiseUtilities.split("\" \" \"")); + assertArrayEquals(new String[]{" ", "\""}, DisguiseUtilities.split("\" \" \"")); // Test to make sure empty quotes, are still quotes - Assert.assertArrayEquals(new String[]{"Three", "", "split"}, DisguiseUtilities.split("Three \"\" split")); + assertArrayEquals(new String[]{"Three", "", "split"}, DisguiseUtilities.split("Three \"\" split")); // Test to ensure single quotes, are still not quotes - Assert.assertArrayEquals(new String[]{"'Three", "split", "message'"}, DisguiseUtilities.split("'Three split message'")); + assertArrayEquals(new String[]{"'Three", "split", "message'"}, DisguiseUtilities.split("'Three split message'")); // There is a quoted message inside the quoted message, however it was not escaped - Assert.assertArrayEquals(new String[]{"A", "quoted message \"inside a quoted message\""}, + assertArrayEquals(new String[]{"A", "quoted message \"inside a quoted message\""}, DisguiseUtilities.split("A \"quoted message \"inside a quoted message\"\"")); // Now test for escaped quotes, however as escaped quotes look different inside editors, I'll be replacing \ @@ -118,15 +117,15 @@ public class DisguiseUtilitiesTest { String quoted = DisguiseUtilities.quote(string); String[] split = DisguiseUtilities.split(quoted); - Assert.assertEquals(1, split.length); - Assert.assertEquals(string, split[0]); + assertEquals(1, split.length); + assertEquals(string, split[0]); } private void splitEquals(String toSplit, String... expected) { String[] splitted = DisguiseUtilities.split(toSplit.replace("/", "\\").replace("'", "\"")); String[] expect = Arrays.stream(expected).map(string -> string.replace("/", "\\").replace("'", "\"")).toArray(String[]::new); - Assert.assertArrayEquals(expect, splitted); + assertArrayEquals(expect, splitted); splitAndBack(toSplit); } @@ -155,15 +154,14 @@ public class DisguiseUtilitiesTest { @Test public void testYaw() { - Assertions.assertEquals(180, DisguiseUtilities.getYaw(DisguiseType.MINECART, DisguiseType.PLAYER, 90)); + assertEquals(180, DisguiseUtilities.getYaw(DisguiseType.MINECART, DisguiseType.PLAYER, 90)); } @Test public void testQuoter() { - Assertions.assertEquals("\"&c10.0 ❤ &8| &5Prokurator &8(&7poz. 1&8)\"", - DisguiseUtilities.quote("&c10.0 ❤ &8| &5Prokurator &8(&7poz. 1&8)")); - Assertions.assertEquals("String", DisguiseUtilities.quote("String")); - Assertions.assertEquals("\"\"String\"", DisguiseUtilities.quote("\"String")); - Assertions.assertEquals("\"String 2\"", DisguiseUtilities.quote("String 2")); + assertEquals("\"&c10.0 ❤ &8| &5Prokurator &8(&7poz. 1&8)\"", DisguiseUtilities.quote("&c10.0 ❤ &8| &5Prokurator &8(&7poz. 1&8)")); + assertEquals("String", DisguiseUtilities.quote("String")); + assertEquals("\"\"String\"", DisguiseUtilities.quote("\"String")); + assertEquals("\"String 2\"", DisguiseUtilities.quote("String 2")); } } diff --git a/shaded/src/test/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissionsTest.java b/shaded/src/test/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissionsTest.java index 3005d2ac..2e2ab933 100644 --- a/shaded/src/test/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissionsTest.java +++ b/shaded/src/test/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissionsTest.java @@ -4,13 +4,15 @@ import lombok.SneakyThrows; import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseConfig; import me.libraryaddict.disguise.disguisetypes.DisguiseType; +import org.bukkit.Bukkit; import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.plugin.Plugin; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import java.util.ArrayList; import java.util.Arrays; @@ -20,27 +22,36 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class DisguisePermissionsTest { + @BeforeAll + public static void beforeAll() { + Mockito.mockStatic(Bukkit.class).when(Bukkit::getConsoleSender).thenReturn(null); + } + @Test public void testDisguisesExist() { - Assert.assertNull("There should not be a reindeer disguise", DisguiseParser.getDisguisePerm("Reindeer")); + assertNull(DisguiseParser.getDisguisePerm("Reindeer"), "There should not be a reindeer disguise"); - Assert.assertNotNull("There should be a cow disguise", DisguiseParser.getDisguisePerm("Cow")); + assertNotNull(DisguiseParser.getDisguisePerm("Cow"), "There should be a cow disguise"); - Assert.assertNotNull("There should be a firework disguise", DisguiseParser.getDisguisePerm("Firework")); + assertNotNull(DisguiseParser.getDisguisePerm("Firework"), "There should be a firework disguise"); } @Test public void testPermissionNames() { - Assert.assertFalse("There should not be permissions", createPermissions("Disguise", false).hasPermissions()); + assertFalse(createPermissions("Disguise", false).hasPermissions(), "There should not be permissions"); - Assert.assertFalse("The commands should not match", - createPermissions("Disguise", false, "libsdisguises.disguiseentity.cow").hasPermissions()); + assertFalse(createPermissions("Disguise", false, "libsdisguises.disguiseentity.cow").hasPermissions(), + "The commands should not match"); - Assert.assertFalse("The commands should not match", - createPermissions("Disguised", false, "libsdisguises.disguise.cow").hasPermissions()); + assertFalse(createPermissions("Disguised", false, "libsdisguises.disguise.cow").hasPermissions(), "The commands should not match"); - Assert.assertTrue("There should be permissions", createPermissions("Disguise", false, "libsdisguises.*.animal").hasPermissions()); + assertTrue(createPermissions("Disguise", false, "libsdisguises.*.animal").hasPermissions(), "There should be permissions"); } @Test @@ -48,47 +59,47 @@ public class DisguisePermissionsTest { DisguisePermissions permissions = createPermissions("Disguise", true, "-libsdisguises.disguise.sheep", "-libsdisguises.disguise.horse.setBaby"); - Assert.assertTrue("There should be permissions", permissions.hasPermissions()); + assertTrue(permissions.hasPermissions(), "There should be permissions"); - Assert.assertTrue("The disguise cow should be allowed", permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow")), "The disguise cow should be allowed"); - Assert.assertFalse("The disguise sheep should not be allowed", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Sheep"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Sheep")), "The disguise sheep should not be allowed"); - Assert.assertTrue("The disguise horse should be allowed", permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Horse"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Horse")), "The disguise horse should be allowed"); - Assert.assertFalse("The disguise horse should not be allowed with setBaby", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Horse"), Collections.singletonList("setBaby"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Horse"), Collections.singletonList("setBaby")), + "The disguise horse should not be allowed with setBaby"); } @Test public void testWildcardsPermissions() { - Assert.assertTrue("The cow disguise should be allowed", - createPermissions("Disguise", false, "libsdisguises.*.animal").isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"))); + assertTrue(createPermissions("Disguise", false, "libsdisguises.*.animal").isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow")), + "The cow disguise should be allowed"); - Assert.assertFalse("The firework disguise should not be allowed", - createPermissions("Disguise", false, "libsdisguises.*.animal").isAllowedDisguise(DisguiseParser.getDisguisePerm("Firework"))); + assertFalse( + createPermissions("Disguise", false, "libsdisguises.*.animal").isAllowedDisguise(DisguiseParser.getDisguisePerm("Firework")), + "The firework disguise should not be allowed"); - Assert.assertTrue("The firework disguise should be allowed", - createPermissions("Disguise", false, "libsdisguises.*.*").isAllowedDisguise(DisguiseParser.getDisguisePerm("Firework"))); + assertTrue(createPermissions("Disguise", false, "libsdisguises.*.*").isAllowedDisguise(DisguiseParser.getDisguisePerm("Firework")), + "The firework disguise should be allowed"); - Assert.assertTrue("The firework disguise should be allowed", - createPermissions("Disguise", false, "libsdisguises.disguise.*").isAllowedDisguise(DisguiseParser.getDisguisePerm("Firework"))); + assertTrue( + createPermissions("Disguise", false, "libsdisguises.disguise.*").isAllowedDisguise(DisguiseParser.getDisguisePerm("Firework")), + "The firework disguise should be allowed"); - Assert.assertTrue("The firework disguise should be allowed", - createPermissions("Disguise", false, "libsdisguises.*.Firework").isAllowedDisguise(DisguiseParser.getDisguisePerm("Firework"))); + assertTrue( + createPermissions("Disguise", false, "libsdisguises.*.Firework").isAllowedDisguise(DisguiseParser.getDisguisePerm("Firework")), + "The firework disguise should be allowed"); - Assert.assertFalse("The firework disguise should not be allowed", - createPermissions("Disguise", false, "libsdisguises.*.*", "-libsdisguises.*.misc").isAllowedDisguise( - DisguiseParser.getDisguisePerm("Firework"))); + assertFalse(createPermissions("Disguise", false, "libsdisguises.*.*", "-libsdisguises.*.misc").isAllowedDisguise( + DisguiseParser.getDisguisePerm("Firework")), "The firework disguise should not be allowed"); - Assert.assertTrue("The firework disguise should be allowed", - createPermissions("Disguise", false, "libsdisguises.disguise.*", "-libsdisguises.*.*").isAllowedDisguise( - DisguiseParser.getDisguisePerm("Firework"))); + assertTrue(createPermissions("Disguise", false, "libsdisguises.disguise.*", "-libsdisguises.*.*").isAllowedDisguise( + DisguiseParser.getDisguisePerm("Firework")), "The firework disguise should be allowed"); - Assert.assertTrue("The firework disguise should be allowed", + assertTrue( createPermissions("Disguise", false, "libsdisguises.disguise.firework", "-libsdisguises.disguise.misc").isAllowedDisguise( - DisguiseParser.getDisguisePerm("Firework"))); + DisguiseParser.getDisguisePerm("Firework")), "The firework disguise should be allowed"); } @Test @@ -101,18 +112,18 @@ public class DisguisePermissionsTest { } private void testInheritedPermissions(DisguisePermissions permissions) { - Assert.assertTrue("The sheep disguise should be allowed", permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Sheep"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Sheep")), "The sheep disguise should be allowed"); - Assert.assertTrue("The cow disguise should be allowed", permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow")), "The cow disguise should be allowed"); - Assert.assertTrue("The cow disguise should be allowed with setBaby", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Collections.singletonList("setBaby"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Collections.singletonList("setBaby")), + "The cow disguise should be allowed with setBaby"); - Assert.assertFalse("The sheep disguise should not be allowed with setBaby", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Sheep"), Collections.singletonList("setBaby"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Sheep"), Collections.singletonList("setBaby")), + "The sheep disguise should not be allowed with setBaby"); - Assert.assertFalse("The firework disguise should not be allowed", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Firework"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Firework")), + "The firework disguise should not be allowed"); } @Test @@ -121,20 +132,19 @@ public class DisguisePermissionsTest { createPermissions("Disguise", false, "libsdisguises.disguise.sheep", "-libsdisguises.disguise.cow.setSprinting", "-libsdisguises.disguise.donkey", "-libsdisguises.disguise.horse.setRearing", "libsdisguises.disguise.horse"); - Assert.assertFalse("The cow disguise should not be allowed", permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow")), "The cow disguise should not be allowed"); - Assert.assertTrue("The sheep disguise should be allowed", permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Sheep"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Sheep")), "The sheep disguise should be allowed"); - Assert.assertFalse("The donkey disguise should not be allowed", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Donkey"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Donkey")), "The donkey disguise should not be allowed"); - Assert.assertTrue("The horse disguise should be allowed", permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Horse"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Horse")), "The horse disguise should be allowed"); - Assert.assertTrue("The horse disguise should be allowed with options", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Horse"), Collections.singletonList("setBaby"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Horse"), Collections.singletonList("setBaby")), + "The horse disguise should be allowed with options"); - Assert.assertFalse("The horse disguise should not be allowed setRearing", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Horse"), Collections.singletonList("setRearing"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Horse"), Collections.singletonList("setRearing")), + "The horse disguise should not be allowed setRearing"); } @Test @@ -143,69 +153,69 @@ public class DisguisePermissionsTest { createPermissions("Disguise", false, "libsdisguises.disguise.cow.setBaby", "libsdisguises.disguise.cow.setHealth", "libsdisguises.disguise.cow.-setBurning"); - Assert.assertTrue("The cow disguise should be able to use setBaby", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Collections.singletonList("setBaby"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Collections.singletonList("setBaby")), + "The cow disguise should be able to use setBaby"); - Assert.assertTrue("The cow disguise should be able to use setHealth", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Collections.singletonList("setHealth"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Collections.singletonList("setHealth")), + "The cow disguise should be able to use setHealth"); - Assert.assertTrue("The cow disguise should be able to use setBaby and setHealth", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Arrays.asList("setBaby", "setHealth"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Arrays.asList("setBaby", "setHealth")), + "The cow disguise should be able to use setBaby and setHealth"); - Assert.assertFalse("The cow disguise should not be able to use setBurning", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Collections.singletonList("setBurning"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Collections.singletonList("setBurning")), + "The cow disguise should not be able to use setBurning"); - Assert.assertFalse("The cow disguise should not be able to use setSprinting", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Collections.singletonList("setSprinting"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Collections.singletonList("setSprinting")), + "The cow disguise should not be able to use setSprinting"); - Assert.assertFalse("The cow disguise should not be able to use setSprinting with setBaby", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Arrays.asList("setSprinting", "setBaby"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Arrays.asList("setSprinting", "setBaby")), + "The cow disguise should not be able to use setSprinting with setBaby"); } @Test public void testOptions() { - Assert.assertFalse("The disguise should not be valid", - createPermissions("Disguise", false, "libsdisguises.disguise.cow", "-libsdisguises.disguise.cow").hasPermissions()); + assertFalse(createPermissions("Disguise", false, "libsdisguises.disguise.cow", "-libsdisguises.disguise.cow").hasPermissions(), + "The disguise should not be valid"); DisguisePermissions permissions = createPermissions("Disguise", false, "libsdisguises.disguise.cow", "libsdisguises.disguise.sheep.setColor.setSprinting", "libsdisguises.disguise.animal.-setSprinting", "libsdisguises.disguise.sheep.setcolor.blue"); - Assert.assertTrue("There should be a valid disguise", permissions.hasPermissions()); + assertTrue(permissions.hasPermissions(), "There should be a valid disguise"); DisguisePerm cow = DisguiseParser.getDisguisePerm("Cow"); - Assert.assertTrue("The cow disguise should be allowed", permissions.isAllowedDisguise(cow)); + assertTrue(permissions.isAllowedDisguise(cow), "The cow disguise should be allowed"); - Assert.assertTrue("The cow disguise should be allowed with options", - permissions.isAllowedDisguise(cow, Arrays.asList("setBaby", "setBurning"))); + assertTrue(permissions.isAllowedDisguise(cow, Arrays.asList("setBaby", "setBurning")), + "The cow disguise should be allowed with options"); - Assert.assertFalse("The cow disguise should not be allowed with options setSprinting", - permissions.isAllowedDisguise(cow, Arrays.asList("setBaby", "setSprinting"))); + assertFalse(permissions.isAllowedDisguise(cow, Arrays.asList("setBaby", "setSprinting")), + "The cow disguise should not be allowed with options setSprinting"); - Assert.assertFalse("The cow disguise should not be allowed with options", - permissions.isAllowedDisguise(cow, Collections.singletonList("setSprinting"))); + assertFalse(permissions.isAllowedDisguise(cow, Collections.singletonList("setSprinting")), + "The cow disguise should not be allowed with options"); DisguisePerm sheep = DisguiseParser.getDisguisePerm("Sheep"); - Assert.assertFalse("The sheep disguise should not be allowed with options", - permissions.isAllowedDisguise(sheep, Arrays.asList("setBaby", "setBurning"))); + assertFalse(permissions.isAllowedDisguise(sheep, Arrays.asList("setBaby", "setBurning")), + "The sheep disguise should not be allowed with options"); - Assert.assertTrue("The sheep disguise should be allowed setColor", - permissions.isAllowedDisguise(sheep, Collections.singletonList("setColor"))); + assertTrue(permissions.isAllowedDisguise(sheep, Collections.singletonList("setColor")), + "The sheep disguise should be allowed setColor"); - Assert.assertTrue("The sheep disguise should be allowed setSprinting", - permissions.isAllowedDisguise(sheep, Collections.singletonList("setSprinting"))); + assertTrue(permissions.isAllowedDisguise(sheep, Collections.singletonList("setSprinting")), + "The sheep disguise should be allowed setSprinting"); - Assert.assertFalse("The sheep disguise should not be allowed setColor and setBaby", - permissions.isAllowedDisguise(sheep, Arrays.asList("setColor", "setBaby"))); + assertFalse(permissions.isAllowedDisguise(sheep, Arrays.asList("setColor", "setBaby")), + "The sheep disguise should not be allowed setColor and setBaby"); DisguisePerm firework = DisguiseParser.getDisguisePerm("Firework"); - Assert.assertFalse("The firework disguise should not be allowed", permissions.isAllowedDisguise(firework)); + assertFalse(permissions.isAllowedDisguise(firework), "The firework disguise should not be allowed"); - Assert.assertFalse("The disguise should not be allowed even with options", - permissions.isAllowedDisguise(firework, Arrays.asList("setBaby", "setBurning"))); + assertFalse(permissions.isAllowedDisguise(firework, Arrays.asList("setBaby", "setBurning")), + "The disguise should not be allowed even with options"); } @@ -215,14 +225,14 @@ public class DisguisePermissionsTest { createPermissionsHolder(false, "libsdisguises.options.disguise.falling_block.setblock.stone"), "Disguise", new DisguisePerm(DisguiseType.FALLING_BLOCK)); - Assert.assertTrue("They should be allowed to use true as a disguise option on setBurning", - DisguisePermissions.hasPermissionOption(disguiseOptions, "setBurning", "true")); + assertTrue(DisguisePermissions.hasPermissionOption(disguiseOptions, "setBurning", "true"), + "They should be allowed to use true as a disguise option on setBurning"); - Assert.assertTrue("They should be allowed to use Material.STONE as a disguise option", - DisguisePermissions.hasPermissionOption(disguiseOptions, "setBlock", "STONE")); + assertTrue(DisguisePermissions.hasPermissionOption(disguiseOptions, "setBlock", "STONE"), + "They should be allowed to use Material.STONE as a disguise option"); - Assert.assertFalse("They should be not allowed to use Material.DIRT as a disguise option", - DisguisePermissions.hasPermissionOption(disguiseOptions, "setBlock", "DIRT")); + assertFalse(DisguisePermissions.hasPermissionOption(disguiseOptions, "setBlock", "DIRT"), + "They should be not allowed to use Material.DIRT as a disguise option"); } @Test @@ -230,28 +240,28 @@ public class DisguisePermissionsTest { DisguisePermissions permissions = createPermissions("Disguise", false, "libsdisguises.disguise.falling_block.setCustomName", "libsdisguises.disguise.valid.falling_block.setblock"); - Assert.assertFalse("The falling block disguise should not allow setBurning", - permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.FALLING_BLOCK), Arrays.asList("setBurning"))); + assertFalse(permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.FALLING_BLOCK), Arrays.asList("setBurning")), + "The falling block disguise should not allow setBurning"); - Assert.assertTrue("The falling block disguise should allow setCustomName", - permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.FALLING_BLOCK), Arrays.asList("setcustomname"))); + assertTrue(permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.FALLING_BLOCK), Arrays.asList("setcustomname")), + "The falling block disguise should allow setCustomName"); - Assert.assertTrue("The falling block disguise should allow setBlock", - permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.FALLING_BLOCK), Arrays.asList("setBlock"))); + assertTrue(permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.FALLING_BLOCK), Arrays.asList("setBlock")), + "The falling block disguise should allow setBlock"); } @Test public void testDisguiseValidDoesntGiveExtra() { DisguisePermissions permissions = createPermissions("Disguise", false, "libsdisguises.disguise.valid.falling_block.setblock"); - Assert.assertFalse("The falling block disguise should not be allowed", - permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.FALLING_BLOCK))); + assertFalse(permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.FALLING_BLOCK)), + "The falling block disguise should not be allowed"); - Assert.assertFalse("The falling block disguise should not allow setBurning", - permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.FALLING_BLOCK), Arrays.asList("setBurning"))); + assertFalse(permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.FALLING_BLOCK), Arrays.asList("setBurning")), + "The falling block disguise should not allow setBurning"); - Assert.assertFalse("The falling block disguise should not allow setBlock", - permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.FALLING_BLOCK), Arrays.asList("setBlock"))); + assertFalse(permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.FALLING_BLOCK), Arrays.asList("setBlock")), + "The falling block disguise should not allow setBlock"); } @SneakyThrows @@ -260,26 +270,26 @@ public class DisguisePermissionsTest { DisguiseConfig.getCustomDisguises().put(new DisguisePerm(DisguiseType.BEE, "babybee"), "bee setbaby"); DisguisePermissions permissions = - createPermissions("me/libraryaddict/disguise/utilities/watchers", false, "libsdisguises.disguise.bee.-*", "libsdisguises.disguise.babybee.nooptions"); + createPermissions("Disguise", false, "libsdisguises.disguise.bee.-*", "libsdisguises.disguise.babybee.nooptions"); - Assert.assertNotNull("The custom disguise babybee should exist", DisguiseParser.getDisguisePerm("babybee")); + assertNotNull(DisguiseParser.getDisguisePerm("babybee"), "The custom disguise babybee should exist"); - Assert.assertTrue("They should be allowed to disguise as a bee", permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.BEE))); + assertTrue(permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.BEE)), "They should be allowed to disguise as a bee"); - Assert.assertFalse("They should not be allowed to disguise as a bee and call setbaby", - permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.BEE), Collections.singletonList("setbaby"))); + assertFalse(permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.BEE), Collections.singletonList("setbaby")), + "They should not be allowed to disguise as a bee and call setbaby"); - Assert.assertFalse("They should not be allowed to disguise as a burning bee", - permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.BEE), Collections.singletonList("setburning"))); + assertFalse(permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.BEE), Collections.singletonList("setburning")), + "They should not be allowed to disguise as a burning bee"); - Assert.assertFalse("They should not be allowed to disguise as a slime", - permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.SLIME))); + assertFalse(permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.SLIME)), + "They should not be allowed to disguise as a slime"); - Assert.assertTrue("They should be allowed to disguise as babybee", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("babybee"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("babybee")), + "They should be allowed to disguise as babybee"); - Assert.assertFalse("They should not be allowed to disguise as babybee and use setbaby", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("babybee"), Collections.singletonList("setbaby"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("babybee"), Collections.singletonList("setbaby")), + "They should not be allowed to disguise as babybee and use setbaby"); DisguiseAPI.removeCustomDisguise("babybee"); } @@ -293,38 +303,36 @@ public class DisguisePermissionsTest { "libsdisguises.disguise.skeleton.*", "libsdisguises.disguise.wither.setburning", "libsdisguises.disguise.silverfish.-setburning"); - Assert.assertTrue("The cow disguise should be usable", permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow")), "The cow disguise should be usable"); - Assert.assertFalse("The cow disguise should not be able to use setBurning", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Collections.singletonList("setBurning"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Cow"), Collections.singletonList("setBurning")), + "The cow disguise should not be able to use setBurning"); - Assert.assertTrue("The zombie disguise should be usable", permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Zombie"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Zombie")), "The zombie disguise should be usable"); - Assert.assertFalse("The zombie disguise should not be able to use setBurning", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Zombie"), Collections.singletonList("setBurning"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Zombie"), Collections.singletonList("setBurning")), + "The zombie disguise should not be able to use setBurning"); - Assert.assertTrue("The skeleton disguise should be usable", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Skeleton"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Skeleton")), "The skeleton disguise should be usable"); - Assert.assertTrue("The skeleton disguise should be able to use setBurning", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Skeleton"), Collections.singletonList("setBurning"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Skeleton"), Collections.singletonList("setBurning")), + "The skeleton disguise should be able to use setBurning"); - Assert.assertTrue("The wither disguise should be usable", permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Wither"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Wither")), "The wither disguise should be usable"); - Assert.assertTrue("The wither disguise should be able to use setBurning", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Wither"), Collections.singletonList("setBurning"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Wither"), Collections.singletonList("setBurning")), + "The wither disguise should be able to use setBurning"); - Assert.assertFalse("The wither disguise should not be able to use setSprinting", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Wither"), Collections.singletonList("setSprinting"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Wither"), Collections.singletonList("setSprinting")), + "The wither disguise should not be able to use setSprinting"); - Assert.assertTrue("The silverfish disguise should be usable", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Silverfish"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Silverfish")), "The silverfish disguise should be usable"); - Assert.assertFalse("The silverfish disguise should not be able to use setBurning", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Silverfish"), Collections.singletonList("setBurning"))); + assertFalse(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Silverfish"), Collections.singletonList("setBurning")), + "The silverfish disguise should not be able to use setBurning"); - Assert.assertTrue("The silverfish disguise should be able to use setSprinting", - permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Silverfish"), Collections.singletonList("setSprinting"))); + assertTrue(permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("Silverfish"), Collections.singletonList("setSprinting")), + "The silverfish disguise should be able to use setSprinting"); DisguiseConfig.setExplicitDisguisePermissions(false); } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts new file mode 100644 index 00000000..e53adac4 --- /dev/null +++ b/shared/build.gradle.kts @@ -0,0 +1,10 @@ +dependencies { + compileOnly(libs.org.spigotmc.spigot) + compileOnly(libs.org.spigotmc.spigot.api) + compileOnly(libs.com.mojang.authlib) + compileOnly(libs.io.papermc.paper.paper.api) + compileOnly(libs.io.netty.netty.buffer) + compileOnly(libs.com.retro.packetevents) +} + +description = "shared" diff --git a/shared/pom.xml b/shared/pom.xml deleted file mode 100644 index 93e37304..00000000 --- a/shared/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - parent - LibsDisguises - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - shared - 1.0-SNAPSHOT - - - 1.8 - 1.8 - UTF-8 - - - - - com.mojang - authlib - 3.5.41 - provided - true - - - org.spigotmc - spigot - true - - - org.spigotmc - spigot-api - true - - - io.papermc.paper - paper-api - ${paper-api.version} - provided - true - - - io.netty - netty-buffer - 4.1.90.Final - provided - true - - - - \ No newline at end of file