diff --git a/.gitignore b/.gitignore
index 958dc45..36e1257 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,15 @@
-lib
+# Package Files
+*.jar
+
+# Gradle
+.gradle
+**/build/
+!gradle/wrapper/gradle-wrapper.jar
+steamwar.properties
+
+# IntelliJ IDEA
.idea
-target
-dependency-reduced-pom.xml
\ No newline at end of file
+*.iml
+
+# Other
+lib
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..b56c21e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,249 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020 SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+
+import org.apache.tools.ant.taskdefs.condition.Os
+
+import java.util.function.BiConsumer
+
+plugins {
+ // Adding the base plugin fixes the following gradle warnings in IntelliJ:
+ //
+ // Warning: root project 'module-work-multi': Unable to resolve all content root directories
+ // Details: java.lang.IllegalStateException: No value has been specified for this provider.
+ //
+ // Warning: root project 'module-work-multi': Unable to resolve additional project configuration.
+ // Details: java.lang.IllegalStateException: No value has been specified for this provider.
+ id 'base'
+ id 'java'
+ id 'application'
+
+ id 'com.github.johnrengelman.shadow' version '5.0.0'
+}
+
+group 'de.steamwar'
+version ''
+
+Properties steamwarProperties = new Properties()
+if (file("steamwar.properties").exists()) {
+ steamwarProperties.load(file("steamwar.properties").newDataInputStream())
+}
+
+ext {
+ buildName = 'BungeeCore'
+ artifactName = 'bungeecore'
+
+ uberJarName = "${buildName}-all.jar"
+ jarName = "${artifactName}.jar"
+ libs = "${buildDir}/libs"
+
+ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+ operatingSystem = "windows"
+ } else {
+ operatingSystem = "unix"
+ }
+}
+
+compileJava.options.encoding = 'UTF-8'
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+mainClassName = ''
+
+sourceSets {
+ main {
+ java {
+ srcDirs = ['src/']
+ }
+ resources {
+ srcDirs = ['src/']
+ exclude '**/*.java', '**/*.kt'
+ }
+ }
+}
+
+repositories {
+ mavenCentral()
+ maven {
+ url 'https://m2.dv8tion.net/releases'
+ }
+}
+
+dependencies {
+ compileOnly 'org.projectlombok:lombok:1.18.22'
+ testCompileOnly 'org.projectlombok:lombok:1.18.22'
+ annotationProcessor 'org.projectlombok:lombok:1.18.22'
+ testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
+
+ implementation files("${projectDir}/lib/BungeeCord.jar")
+ implementation files("${projectDir}/lib/PersistentBungeeCore.jar")
+ implementation files("${projectDir}/lib/BungeeTabListPlus.jar")
+ implementation("net.dv8tion:JDA:4.3.0_299") {
+ exclude module: 'opus-java'
+ }
+}
+
+task buildProject {
+ description 'Build this project'
+ group "Steamwar"
+
+ dependsOn build
+}
+
+task finalizeProject {
+ description 'Finalize this project'
+ group "Steamwar"
+
+ doLast {
+ if ("${buildDir}" == null) {
+ return
+ }
+ delete fileTree("${libs}").matching {
+ exclude("${uberJarName}")
+ }
+ file(libs + "/" + uberJarName).renameTo(file(libs + "/" + jarName))
+ }
+}
+build.finalizedBy(finalizeProject)
+
+if (steamwarProperties.containsKey("hostname")) {
+ String hostname = steamwarProperties.get("hostname")
+ String uploadPath = steamwarProperties.getOrDefault("uploadPath", "~")
+
+ String server = steamwarProperties.getOrDefault("server", "DevBungee")
+ String serverStartFlags = steamwarProperties.getOrDefault("serverStartFlags", "")
+
+ task uploadProject {
+ description 'Upload this project'
+ group "Steamwar"
+
+ doLast {
+ await(shell("scp ${libs}/${jarName} ${hostname}:${uploadPath}/${server}/plugins"))
+ if (steamwarProperties.getOrDefault("directStart", "false") == "false" && !answer("Start ${server} server?")) {
+ return
+ }
+ serverStart(server, serverStartFlags, hostname)
+ }
+ }
+ uploadProject.dependsOn(buildProject)
+
+ task startDevServer {
+ description 'Start the DevBungee'
+ group "Steamwar"
+
+ doLast {
+ serverStart(server, serverStartFlags, hostname)
+ }
+ }
+}
+
+private def await(Process proc) {
+ def out = new StringBuilder()
+ def err = new StringBuilder()
+ proc.waitForProcessOutput(out, err)
+ return [out, err, proc.exitValue()]
+}
+
+private def shell(String command) {
+ if (operatingSystem == "unix") {
+ return ['bash', '-c', command].execute()
+ } else {
+ return ["cmd", "/c", command].execute()
+ }
+}
+
+private def serverStart(String serverName, String serverFlags, String hostname) {
+ def proc = shell("ssh -t ${hostname} \"./mc ${serverFlags} ${serverName}\"")
+
+ Set strings = new HashSet<>()
+ File file = new File("${projectDir}/ignoredlog");
+ if (file.exists()) {
+ new BufferedReader(new InputStreamReader(new FileInputStream(file))).readLines().forEach({ s ->
+ strings.add(s)
+ })
+ }
+
+ Thread outputThread = new Thread({
+ Reader reader = proc.getInputStream().newReader();
+ Writer writer = System.out.newWriter();
+ try {
+ while (proc.alive) {
+ String s = reader.readLine()
+ if (s == null) {
+ return
+ }
+ if (strings.stream().anyMatch({check -> s.contains(check)})) {
+ continue
+ }
+ writer.write(s + "\n")
+ writer.flush()
+ }
+ } catch (IOException e) {
+ // Ignored
+ }
+ })
+ outputThread.setName("${serverName} - OutputThread")
+ outputThread.start()
+
+ Writer writer
+ Thread inputThread = new Thread({
+ Reader reader = System.in.newReader()
+ writer = proc.getOutputStream().newWriter()
+ try {
+ while (proc.alive) {
+ String s = reader.readLine()
+ writer.write(s + "\n")
+ writer.flush()
+ }
+ } catch (IOException e) {
+ // Ignored
+ }
+ })
+ inputThread.setName("${serverName} - InputThread")
+ inputThread.start()
+
+ gradle.buildFinished { buildResult ->
+ if (!proc.alive) {
+ return
+ }
+ writer = proc.getOutputStream().newWriter()
+ writer.write("stop\n")
+ writer.flush()
+ awaitClose(proc, outputThread, inputThread)
+ }
+ awaitClose(proc, outputThread, inputThread)
+};
+
+private static def awaitClose(Process proc, Thread outputThread, Thread inputThread) {
+ while (proc.alive) {
+ Thread.sleep(10)
+ }
+ proc.closeStreams()
+ outputThread.interrupt()
+ inputThread.interrupt()
+}
+
+private def answer(String question) {
+ while (System.in.available() > 0) System.in.read()
+ println(question)
+ boolean valid = "Yy".contains(((char) System.in.read()).toString())
+ while (System.in.available() > 0) System.in.read()
+ return valid
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..dc56501
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,22 @@
+#
+# This file is a part of the SteamWar software.
+#
+# Copyright (C) 2020 SteamWar.de-Serverteam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+
+org.gradle.daemon = true
+org.gradle.parallel = true
+org.gradle.workers.max = 4
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..f3d88b1
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 0000000..0f5795e
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sat Apr 10 23:34:12 CEST 2021
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..2fe81a7
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,183 @@
+#!/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..9618d8d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,100 @@
+@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 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 init
+
+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 init
+
+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
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+: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 %CMD_LINE_ARGS%
+
+: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 100644
index 8bb101a..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
- 4.0.0
-
- de.steamwar
- BungeeCore
- 1.0
- jar
- BungeeCore
-
-
- UTF-8
- ${project.basedir}
-
-
-
- src
-
-
- src
-
- **/*.java
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.6.1
-
- 8
- 8
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 3.2.4
-
-
- package
-
- shade
-
-
-
-
-
- bungeecore
-
-
-
-
- dv8tion
- m2-dv8tion
- https://m2.dv8tion.net/releases
-
-
-
-
-
- steamwar
- BungeeCord
- 1.0
- system
- ${main.basedir}/lib/BungeeCord.jar
-
-
- steamwar
- PersistentBungeeCore
- 1.0
- system
- ${main.basedir}/lib/PersistentBungeeCore.jar
-
-
- steamwar
- BungeeTabListPlus
- 1.0
- system
- ${main.basedir}/lib/BungeeTabListPlus.jar
-
-
- net.dv8tion
- JDA
- 4.3.0_299
- compile
-
-
- club.minnced
- opus-java
-
-
-
-
- org.projectlombok
- lombok
- 1.18.20
- provided
-
-
-
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..973f0c6
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,20 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020 SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+rootProject.name = 'BungeeCore'
diff --git a/steamwarci.yml b/steamwarci.yml
index 432a095..c4198d7 100644
--- a/steamwarci.yml
+++ b/steamwarci.yml
@@ -1,6 +1,7 @@
build:
- "ln -s /home/gitea/lib"
- - "mvn package -B"
+ - "cp ~/gradle.properties ."
+ - "./gradlew buildProject"
artifacts:
- "/binarys/bungeecore.jar": "target/bungeecore.jar"
+ "/binarys/bungeecore.jar": "builds/libs/bungeecore.jar"