diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 1040b528..dca5cd1a 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -21,8 +21,8 @@ + + + + \ No newline at end of file diff --git a/api/build.gradle.kts b/api/build.gradle.kts new file mode 100644 index 00000000..e6b69051 --- /dev/null +++ b/api/build.gradle.kts @@ -0,0 +1,7 @@ +dependencies { + api("org.geysermc", "common", Versions.geyserVersion) + api("org.geysermc.cumulus", "cumulus", Versions.cumulusVersion) + compileOnly("io.netty", "netty-transport", Versions.nettyVersion) +} + +description = "api" diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts new file mode 100644 index 00000000..cc02e636 --- /dev/null +++ b/build-logic/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + `kotlin-dsl` +} + +repositories { + gradlePluginPortal() +} diff --git a/build-logic/src/main/kotlin/Versions.kt b/build-logic/src/main/kotlin/Versions.kt new file mode 100644 index 00000000..19ce1fda --- /dev/null +++ b/build-logic/src/main/kotlin/Versions.kt @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/Floodgate + */ + +object Versions { + const val geyserVersion= "2.0.0-SNAPSHOT" + const val cumulusVersion= "1.0-SNAPSHOT" + const val spigotVersion= "1.13-R0.1-SNAPSHOT" + const val fastutilVersion= "8.5.3" + const val lombokVersion= "1.18.20" + const val guiceVersion= "5.0.1" + const val nettyVersion= "4.1.49.Final" + const val snakeyamlVersion= "1.28" + const val cloudVersion= "1.5.0" + const val adventureApiVersion= "4.9.1" + const val adventurePlatformVersion= "4.0.0" + + const val javaWebsocketVersion = "1.5.2" + + const val checkerQual = "3.19.0" +} \ No newline at end of file diff --git a/build-logic/src/main/kotlin/floodgate.build-logic.gradle.kts b/build-logic/src/main/kotlin/floodgate.build-logic.gradle.kts new file mode 100644 index 00000000..e69de29b diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..39992c17 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,57 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +plugins { + `java-library` + id("floodgate.build-logic") apply false +// id("com.github.spotbugs") version "4.8.0" apply false + +// id("net.kyori.indra") +// id("net.kyori.indra.checkstyle") +// id("net.kyori.indra.license-header") + + id("com.github.johnrengelman.shadow") version "7.1.0" apply false + id("io.freefair.lombok") version "6.3.0" apply false +} + +allprojects { +// apply(plugin = "pmd") +// apply(plugin = "com.github.spotbugs") + + apply { + plugin("java-library") + plugin("com.github.johnrengelman.shadow") + plugin("io.freefair.lombok") + plugin("floodgate.build-logic") + } + + group = "org.geysermc.floodgate" + //todo make nicer + if (project.name in arrayOf("mysql", "sqlite")) { + group = group as String + ".database" + } + version = "2.1.1-SNAPSHOT" + + java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + dependencies { + compileOnly("org.checkerframework", "checker-qual", Versions.checkerQual) + } + + tasks { + val shadowJar = named("shadowJar") { + archiveBaseName.set("floodgate-${project.name}") + archiveVersion.set("") + archiveClassifier.set("") + } + named("build") { + dependsOn(shadowJar) + } + + compileJava { + options.encoding = Charsets.UTF_8.name() + } + } +} \ No newline at end of file diff --git a/bungee/build.gradle.kts b/bungee/build.gradle.kts new file mode 100644 index 00000000..5d8f57d4 --- /dev/null +++ b/bungee/build.gradle.kts @@ -0,0 +1,16 @@ +var bungeeCommit = "bda1605"; +var gsonVersion = "2.8.0"; +var guavaVersion = "21.0"; + +dependencies { + api(project(":core", "shadow")) + implementation("cloud.commandframework", "cloud-bungee", "1.5.0") + implementation("net.kyori", "adventure-text-serializer-gson", Versions.adventureApiVersion) + implementation("net.kyori", "adventure-text-serializer-bungeecord", Versions.adventurePlatformVersion) + compileOnly("com.github.SpigotMC.BungeeCord", "bungeecord-proxy", bungeeCommit) + compileOnly("com.google.code.gson", "gson", gsonVersion) + compileOnly("com.google.guava", "guava", guavaVersion) + compileOnly("org.yaml", "snakeyaml", Versions.snakeyamlVersion) +} + +description = "bungee" diff --git a/core/build.gradle.kts b/core/build.gradle.kts new file mode 100644 index 00000000..c0859bd0 --- /dev/null +++ b/core/build.gradle.kts @@ -0,0 +1,14 @@ +dependencies { + api(project(":api", "shadow")) + api("com.google.inject", "guice", Versions.guiceVersion) + api("com.nukkitx.fastutil", "fastutil-short-object-maps", Versions.fastutilVersion) + api("com.nukkitx.fastutil", "fastutil-int-object-maps", Versions.fastutilVersion) + api("org.java-websocket", "Java-WebSocket", Versions.javaWebsocketVersion) + api("net.kyori", "adventure-api", Versions.adventureApiVersion) + api("cloud.commandframework", "cloud-core", Versions.cloudVersion) + api("org.yaml", "snakeyaml", Versions.snakeyamlVersion) + compileOnly("io.netty", "netty-transport", Versions.nettyVersion) + compileOnly("io.netty", "netty-codec", Versions.nettyVersion) +} + +description = "core" diff --git a/core/src/main/resources/languages b/core/src/main/resources/languages new file mode 160000 index 00000000..d08abbfa --- /dev/null +++ b/core/src/main/resources/languages @@ -0,0 +1 @@ +Subproject commit d08abbfab6e15bee15ba356ba4aa2a7ac0e329ce diff --git a/database/mysql/build.gradle.kts b/database/mysql/build.gradle.kts new file mode 100644 index 00000000..3f785fed --- /dev/null +++ b/database/mysql/build.gradle.kts @@ -0,0 +1,10 @@ +plugins { + war +} + +dependencies { + providedCompile(projects.core) + implementation("org.mariadb.jdbc:mariadb-java-client:2.7.4") +} + +description = "mysql" diff --git a/database/sqlite/build.gradle.kts b/database/sqlite/build.gradle.kts new file mode 100644 index 00000000..85eba6e6 --- /dev/null +++ b/database/sqlite/build.gradle.kts @@ -0,0 +1,10 @@ +plugins { + war +} + +dependencies { + providedCompile(projects.core) + implementation("org.xerial:sqlite-jdbc:3.36.0.3") +} + +description = "sqlite" diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..af82e006 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +org.gradle.parallel=true \ 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 00000000..84d1f85f --- /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 100644 index 00000000..c53aefaa --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..107acd32 --- /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/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..ffac0eb4 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,58 @@ +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + // Geyser, Cumulus etc. + maven("https://repo.opencollab.dev/maven-releases") { + mavenContent { releasesOnly() } + } + maven("https://repo.opencollab.dev/maven-snapshots") { + mavenContent { snapshotsOnly() } + } + + // Paper, Velocity + maven("https://papermc.io/repo/repository/maven-public") + // Spigot + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") { + mavenContent { snapshotsOnly() } + } + + // BungeeCord + maven("https://oss.sonatype.org/content/repositories/snapshots") { + mavenContent { snapshotsOnly() } + } + + maven("https://libraries.minecraft.net") { + name = "minecraft" + mavenContent { releasesOnly() } + } + + mavenCentral() + + maven("https://jitpack.io") { + content { includeGroupByRegex("com\\.github\\..*") } + } + } +} + +pluginManagement { + plugins { + id("net.kyori.blossom") version "1.2.0" + id("com.github.johnrengelman.shadow") version "7.1.0" + } +} + +rootProject.name = "floodgate-parent" + +includeBuild("build-logic") + +include(":api") +include(":core") +include(":bungee") +include(":spigot") +include(":velocity") +include(":sqlite") +include(":mysql") +project(":sqlite").projectDir = file("database/sqlite") +project(":mysql").projectDir = file("database/mysql") diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts new file mode 100644 index 00000000..b108f738 --- /dev/null +++ b/spigot/build.gradle.kts @@ -0,0 +1,21 @@ +var authlibVersion = "1.5.21" +var guavaVersion = "21.0" +var gsonVersion = "2.8.5" + +dependencies { + api(project(":core", "shadow")) + + implementation("com.google.guava", "guava", guavaVersion) + implementation("cloud.commandframework", "cloud-bukkit", Versions.cloudVersion) + implementation("net.kyori", "adventure-text-serializer-legacy", Versions.adventureApiVersion) + implementation("net.kyori", "adventure-text-serializer-gson", Versions.adventureApiVersion) + + compileOnly("org.spigotmc", "spigot-api", Versions.spigotVersion) + compileOnly("com.mojang", "authlib", authlibVersion) + compileOnly("io.netty", "netty-transport", Versions.nettyVersion) + compileOnly("io.netty", "netty-codec", Versions.nettyVersion) + compileOnly("com.google.code.gson", "gson", gsonVersion) + compileOnly("org.yaml", "snakeyaml", Versions.snakeyamlVersion) +} + +description = "spigot" diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts new file mode 100644 index 00000000..973162eb --- /dev/null +++ b/velocity/build.gradle.kts @@ -0,0 +1,20 @@ +var velocityVersion = "3.0.1" +var log4jVersion = "2.11.2" +var gsonVersion = "2.8.8" +var guavaVersion = "25.1-jre" + +dependencies { + implementation(project(":core")) + api("cloud.commandframework", "cloud-velocity", Versions.cloudVersion) + compileOnly("net.kyori", "adventure-api", Versions.adventureApiVersion) + compileOnly("com.google.code.gson", "gson", gsonVersion) + compileOnly("com.google.guava", "guava", guavaVersion) + compileOnly("com.google.inject", "guice", Versions.guiceVersion) + compileOnly("org.yaml", "snakeyaml", Versions.snakeyamlVersion) + compileOnly("com.velocitypowered", "velocity-api", velocityVersion) + compileOnly("org.apache.logging.log4j", "log4j-core", log4jVersion) + compileOnly("io.netty", "netty-transport", Versions.nettyVersion) + compileOnly("io.netty", "netty-codec", Versions.nettyVersion) +} + +description = "velocity"