diff --git a/.gitignore b/.gitignore index 65026171e..db7a8e84d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,27 @@ hs_err_pid* .classpath .project + +# Created by https://www.gitignore.io/api/gradle +# Edit at https://www.gitignore.io?templates=gradle + +### Gradle ### +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +### Gradle Patch ### +**/build/ + +# End of https://www.gitignore.io/api/gradle diff --git a/brigadier/build.gradle.kts b/brigadier/build.gradle.kts new file mode 100644 index 000000000..2760898fe --- /dev/null +++ b/brigadier/build.gradle.kts @@ -0,0 +1,14 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id("co.aikar.java-conventions") +} + +dependencies { + compileOnly(project(":acf-core")) + compileOnly("com.mojang:brigadier:1.0.17") +} + +description = "ACF (Brigadier)" diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 000000000..018784784 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,13 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + `kotlin-dsl` +} + +repositories { + // Use the plugin portal to apply community plugins in convention plugins. + gradlePluginPortal() +} diff --git a/buildSrc/src/main/kotlin/co.aikar.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/co.aikar.java-conventions.gradle.kts new file mode 100644 index 000000000..04233c778 --- /dev/null +++ b/buildSrc/src/main/kotlin/co.aikar.java-conventions.gradle.kts @@ -0,0 +1,71 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + `java-library` + `maven-publish` +} + +repositories { + mavenLocal() + maven { + url = uri("https://repo.aikar.co/content/groups/aikar/") + } + + maven { + url = uri("https://repo.maven.apache.org/maven2/") + } + + maven { + url = uri("https://libraries.minecraft.net/") + } + + maven { + url = uri("https://oss.sonatype.org/content/repositories/snapshots") + } + + maven { + url = uri("https://repo.spongepowered.org/maven/") + } + + maven { + url = uri("https://jcenter.bintray.com") + } + + maven { + url = uri("https://repo.velocitypowered.com/snapshots/") + } +} + +dependencies { + testImplementation("org.junit.jupiter:junit-jupiter-api:5.4.0") + testImplementation("org.junit.jupiter:junit-jupiter-engine:5.4.0") + testImplementation("org.junit.jupiter:junit-jupiter-params:5.4.0") + testImplementation("org.mockito:mockito-core:2.25.1") + testImplementation("org.mockito:mockito-junit-jupiter:2.25.1") + compileOnly("com.google.guava:guava:15.0") + compileOnly("org.jetbrains:annotations:15.0") + // TODO: Figure out how to get rid of duplication + testCompileOnly("com.google.guava:guava:15.0") + testCompileOnly("org.jetbrains:annotations:15.0") +} +// TODO: Add shading + +group = "co.aikar" +version = "0.5.0-SNAPSHOT" +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + withSourcesJar() +} + +publishing { + publications.create("maven") { + from(components["java"]) + } +} + +tasks.withType() { + options.encoding = "UTF-8" +} diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts new file mode 100644 index 000000000..76bab4ddd --- /dev/null +++ b/bukkit/build.gradle.kts @@ -0,0 +1,21 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id("co.aikar.java-conventions") +} + +description = "ACF (Bukkit)" + +dependencies { + api(project(":acf-core")) + implementation("co.aikar:minecraft-timings:1.0.4") + compileOnly("org.bukkit:bukkit:1.12-R0.1-SNAPSHOT") +} + +tasks { + processResources { + from("${project.projectDir}/../languages/minecraft/") + } +} diff --git a/bungee/build.gradle.kts b/bungee/build.gradle.kts new file mode 100644 index 000000000..2b9e6c248 --- /dev/null +++ b/bungee/build.gradle.kts @@ -0,0 +1,20 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id("co.aikar.java-conventions") +} + +dependencies { + api(project(":acf-core")) + compileOnly("net.md-5:bungeecord-api:1.14-SNAPSHOT") +} + +description = "ACF (Bungee)" + +tasks { + processResources { + from("${project.projectDir}/../languages/minecraft/") + } +} diff --git a/core/build.gradle.kts b/core/build.gradle.kts new file mode 100644 index 000000000..4b66e7b25 --- /dev/null +++ b/core/build.gradle.kts @@ -0,0 +1,21 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id("co.aikar.java-conventions") +} + +description = "ACF (Core)" + +dependencies { + api("co.aikar:Table:1.0.0-SNAPSHOT") + api("co.aikar:locales:1.0-SNAPSHOT") + api("net.jodah:expiringmap:0.5.9") +} + +tasks { + processResources { + from("${project.projectDir}/../languages/core/") + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..e708b1c02 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..be52383ef --- /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-6.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..4f906e0c8 --- /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 000000000..ac1b06f93 --- /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/jda/build.gradle.kts b/jda/build.gradle.kts new file mode 100644 index 000000000..db7407a3f --- /dev/null +++ b/jda/build.gradle.kts @@ -0,0 +1,20 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id("co.aikar.java-conventions") +} + +dependencies { + api(project(":acf-core")) + compileOnly("net.dv8tion:JDA:4.2.0_168") +} + +description = "ACF (JDA)" + +tasks { + processResources { + from("${project.projectDir}/../languages/minecraft/") + } +} diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts new file mode 100644 index 000000000..857bc7e6d --- /dev/null +++ b/paper/build.gradle.kts @@ -0,0 +1,16 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id("co.aikar.java-conventions") +} + +dependencies { + api(project(":acf-bukkit")) + api(project(":acf-brigadier")) + compileOnly("com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT") + compileOnly("com.destroystokyo.paper:paper-mojangapi:1.15.2-R0.1-SNAPSHOT") +} + +description = "ACF (Paper)" diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 000000000..925b13356 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,21 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = "acf-parent" +include(":acf-bukkit") +include(":acf-jda") +include(":acf-paper") +include(":acf-velocity") +include(":acf-core") +include(":acf-sponge") +include(":acf-brigadier") +include(":acf-bungee") +project(":acf-bukkit").projectDir = file("bukkit") +project(":acf-jda").projectDir = file("jda") +project(":acf-paper").projectDir = file("paper") +project(":acf-velocity").projectDir = file("velocity") +project(":acf-core").projectDir = file("core") +project(":acf-sponge").projectDir = file("sponge") +project(":acf-brigadier").projectDir = file("brigadier") +project(":acf-bungee").projectDir = file("bungee") diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts new file mode 100644 index 000000000..0ca7ad95d --- /dev/null +++ b/sponge/build.gradle.kts @@ -0,0 +1,20 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id("co.aikar.java-conventions") +} + +dependencies { + api(project(":acf-core")) + compileOnly("org.spongepowered:spongeapi:5.1.0") +} + +description = "ACF (Sponge)" + +tasks { + processResources { + from("${project.projectDir}/../languages/minecraft/") + } +} diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts new file mode 100644 index 000000000..c4e6f115a --- /dev/null +++ b/velocity/build.gradle.kts @@ -0,0 +1,20 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id("co.aikar.java-conventions") +} + +dependencies { + api(project(":acf-core")) + compileOnly("com.velocitypowered:velocity-api:1.0.0-SNAPSHOT") +} + +description = "ACF (Velocity)" + +tasks { + processResources { + from("${project.projectDir}/../languages/minecraft/") + } +}