diff --git a/.gitignore b/.gitignore index 8de8d4c..82d93a0 100755 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ .idea testserver run +.gradle/ +build/ # Compiled class file *.class diff --git a/api/build.gradle.kts b/api/build.gradle.kts new file mode 100644 index 0000000..9755144 --- /dev/null +++ b/api/build.gradle.kts @@ -0,0 +1,26 @@ +plugins { + `maven-publish` +} + +dependencies { + compileOnly("com.alttd:Galaxy-API:1.18.1-R0.1-SNAPSHOT") + compileOnly("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") // Minimessage + compileOnly("org.spongepowered:configurate-yaml:4.1.2") // Configurate + compileOnly("net.luckperms:api:5.3") // Luckperms +} + +publishing { + publications { + create("mavenJava") { + from(components["java"]) + } + } + + repositories{ + maven { + name = "maven" + url = uri("https://repo.destro.xyz/snapshots") + credentials(PasswordCredentials::class) + } + } +} \ No newline at end of file diff --git a/api/pom.xml b/api/pom.xml deleted file mode 100755 index 718ff40..0000000 --- a/api/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - 4.0.0 - - - 11 - 11 - - - - com.alttd.chat - Chat - 1.0 - ../pom.xml - - - chat-api - jar - - - - dv8tion - m2-dv8tion - https://m2.dv8tion.net/releases - - - - - - org.spongepowered - configurate-yaml - 4.1.2 - - - net.kyori - adventure-text-minimessage - 4.1.0-SNAPSHOT - provided - - - com.velocitypowered - velocity-api - 3.1.0 - provided - - - net.luckperms - api - 5.3 - provided - - - com.alttd - Galaxy-API - 1.18.1-R0.1-SNAPSHOT - compile - - - - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..d06f472 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,54 @@ +plugins { + `java-library` + id("com.github.johnrengelman.shadow") version "7.1.0" +} + +allprojects { + group = "com.alttd.chat" + version = "1.0.0-SNAPSHOT" + description = "All in one minecraft chat plugin" +} + +subprojects { + apply() + + java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } + } + + tasks { + withType { + options.encoding = Charsets.UTF_8.name() + } + + withType { + options.encoding = Charsets.UTF_8.name() + } + } +} + +dependencies { +// implementation(project(":api")) + implementation(project(":galaxy")) + implementation(project(":velocity")) + implementation("net.kyori", "adventure-text-minimessage", "4.1.0-SNAPSHOT") + implementation("org.spongepowered", "configurate-yaml", "4.1.2") +} + +tasks { + + shadowJar { + archiveFileName.set("${project.name}-${project.version}.jar") + listOf( + "net.kyori.adventure.text.minimessage", + "org.spongepowered.configurate" + ).forEach { relocate(it, "${rootProject.group}.lib.$it") } + } + + build { + dependsOn(shadowJar) + } + +} \ No newline at end of file diff --git a/galaxy/build.gradle.kts b/galaxy/build.gradle.kts new file mode 100644 index 0000000..cd86574 --- /dev/null +++ b/galaxy/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + `maven-publish` +} + +dependencies { + implementation(project(":api")) // API + compileOnly("com.alttd:Galaxy-API:1.18.1-R0.1-SNAPSHOT") // Galaxy + compileOnly("com.gitlab.ruany:LiteBansAPI:0.3.5") +} \ No newline at end of file diff --git a/galaxy/dependency-reduced-pom.xml b/galaxy/dependency-reduced-pom.xml deleted file mode 100644 index 0fe3ed7..0000000 --- a/galaxy/dependency-reduced-pom.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - Chat - com.alttd.chat - 1.0 - - 4.0.0 - galaxy-chat - - clean package - - - true - src/main/resources - - - ${project.name} - - - maven-compiler-plugin - 3.8.1 - - 16 - 16 - - - - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - - - com.alttd.chat:chat-api - - - META-INF/*.MF - - - - - - - - - placeholderapi - https://repo.extendedclip.com/content/repositories/placeholderapi/ - - - dv8tion - m2-dv8tion - https://m2.dv8tion.net/releases - - - jitpack.io - https://jitpack.io - - - - - com.alttd - Galaxy-API - 1.18.1-R0.1-SNAPSHOT - compile - - - org.slf4j - slf4j-api - 1.7.32 - compile - - - me.clip - placeholderapi - 2.10.10 - provided - - - com.gitlab.ruany - LiteBansAPI - 0.3.4 - provided - - - - 11 - 11 - - diff --git a/galaxy/pom.xml b/galaxy/pom.xml deleted file mode 100755 index 94e5320..0000000 --- a/galaxy/pom.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - 4.0.0 - - - 11 - 11 - - - - com.alttd.chat - Chat - 1.0 - ../pom.xml - - - galaxy-chat - jar - - - clean package - ${project.name} - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 16 - 16 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - - com.alttd.chat:chat-api - - - - - META-INF/*.MF - - - - - - package - - shade - - - - - - - - src/main/resources - true - - - - - - - placeholderapi - https://repo.extendedclip.com/content/repositories/placeholderapi/ - - - dv8tion - m2-dv8tion - https://m2.dv8tion.net/releases - - - jitpack.io - https://jitpack.io - - - - - - com.alttd.chat - chat-api - ${project.version} - compile - - - com.alttd - Galaxy-API - 1.18.1-R0.1-SNAPSHOT - - - org.slf4j - slf4j-api - 1.7.32 - - - me.clip - placeholderapi - 2.10.10 - provided - - - com.gitlab.ruany - LiteBansAPI - 0.3.4 - provided - - - \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..84d1f85 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100755 index aa4ce13..0000000 --- a/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - 4.0.0 - - com.alttd.chat - Chat - 1.0 - pom - - Chat - - - UTF-8 - 11 - 11 - - - - - Alttd-Nexus - http://leo:8081/snapshots/ - - - - - install - ${project.artifactId} - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - default-deploy - deploy - - deploy - - - - - - - - - api - galaxy - velocity - - - - - velocitypowered-repo - https://repo.velocitypowered.com/releases/ - - - minecraft-libraries - https://libraries.minecraft.net/ - - - sonatype-oss-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sponge-repo - Sponge Maven Repository - https://repo.spongepowered.org/maven - - - AlttdRepo-snapshots - Altitude Maven Repo - https://repo.destro.xyz/snapshots - - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..5728efd --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,25 @@ +rootProject.name = "Chat" + +include(":api") +include(":galaxy") +include(":velocity") + +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy + maven("https://oss.sonatype.org/content/groups/public/") // Adventure + maven("https://nexus.velocitypowered.com/repository/maven-public/") // Velocity + maven("https://repo.spongepowered.org/maven") // Configurate + maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // Papi + maven("https://jitpack.io") + } + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) +} + +pluginManagement { + repositories { + gradlePluginPortal() + } +} diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts new file mode 100644 index 0000000..5e02352 --- /dev/null +++ b/velocity/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + `maven-publish` +} + +dependencies { + implementation(project(":api")) // API + compileOnly("com.velocitypowered:velocity-api:3.0.0") // Velocity + annotationProcessor("com.velocitypowered:velocity-api:3.0.0") + implementation("mysql:mysql-connector-java:8.0.23") // mysql + compileOnly("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") // Minimessage +} \ No newline at end of file diff --git a/velocity/dependency-reduced-pom.xml b/velocity/dependency-reduced-pom.xml deleted file mode 100644 index e185451..0000000 --- a/velocity/dependency-reduced-pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - Chat - com.alttd.chat - 1.0 - - 4.0.0 - velocity-chat - - clean package - - - true - src/main/resources - - - ${project.name} - - - maven-compiler-plugin - 3.8.1 - - 11 - 11 - - - - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - - - net.kyori:adventure-text-minimessage - com.alttd.chat:chat-api - mysql:mysql-connector-java - - - META-INF/*.MF - - - - - META-INF/services/java.sql.Driver - - - - - - - - - com.velocitypowered - velocity-api - 3.1.0 - provided - - - net.luckperms - api - 5.3 - provided - - - com.google.inject - guice - 5.0.1 - provided - - - - 11 - 11 - - diff --git a/velocity/pom.xml b/velocity/pom.xml deleted file mode 100755 index 3477229..0000000 --- a/velocity/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - 4.0.0 - - - 11 - 11 - - - - com.alttd.chat - Chat - 1.0 - ../pom.xml - - - velocity-chat - jar - - - clean package - ${project.name} - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 11 - 11 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - - net.kyori:adventure-text-minimessage - com.alttd.chat:chat-api - mysql:mysql-connector-java - - - META-INF/*.MF - - - - - META-INF/services/java.sql.Driver - - - - - - package - - shade - - - - - - - - src/main/resources - true - - - - - - - com.velocitypowered - velocity-api - 3.1.0 - provided - - - net.luckperms - api - 5.3 - provided - - - com.alttd.chat - chat-api - ${project.version} - compile - - - com.google.inject - guice - 5.0.1 - provided - - - mysql - mysql-connector-java - 8.0.23 - - - net.kyori - adventure-text-minimessage - 4.1.0-SNAPSHOT - - - - - \ No newline at end of file