diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2655716 --- /dev/null +++ b/.gitignore @@ -0,0 +1,132 @@ + +# Created by https://www.gitignore.io/api/java,gradle,intellij +# Edit at https://www.gitignore.io/?templates=java,gradle,intellij + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +.idea/ + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +.idea/sonarlint + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### 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/java,gradle,intellij diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..c52f3ed --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,49 @@ +plugins { + java + id("net.kyori.blossom") version "1.1.0" + id("com.github.johnrengelman.shadow") version "4.0.4" +} + +group = "com.actualplayer" +version = "1.0" +description = "A way for the user to login to the server he last connected to." + +repositories { + mavenCentral() + maven { + name = "velocity" + setUrl("https://repo.velocitypowered.com/snapshots/") + } + maven { + name = "sponge" + setUrl("https://repo.spongepowered.org/maven") + } +} + +defaultTasks("clean", "build", "shadowJar") + +dependencies { + compileOnly("org.projectlombok:lombok:1.18.8") + annotationProcessor("org.projectlombok:lombok:1.18.8") + + compileOnly("com.velocitypowered:velocity-api:1.0.3-SNAPSHOT") + annotationProcessor("com.velocitypowered:velocity-api:1.0.3-SNAPSHOT") + + implementation("org.spongepowered:configurate-yaml:3.6") { + exclude(group = "org.checkerframework", module = "checker-qual") + exclude(group = "com.google.guava", module = "guava") + } + + testImplementation("junit", "junit", "4.12") +} + +blossom { + replaceToken("@ID@", name.toLowerCase()) + replaceToken("@NAME@", name) + replaceToken("@VERSION@", version) + replaceToken("@DESCRIPTION@", description) +} + +configure { + sourceCompatibility = JavaVersion.VERSION_1_8 +} \ 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..87b738c 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..44e7c4d --- /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-5.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..af6708f --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## 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"' + +# 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, switch paths to Windows format before running java +if $cygwin ; 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=$((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" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..6d57edc --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@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" + +@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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..0141a8a --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'rememberme' + diff --git a/src/main/java/com/actualplayer/rememberme/RememberMe.java b/src/main/java/com/actualplayer/rememberme/RememberMe.java new file mode 100644 index 0000000..4f28231 --- /dev/null +++ b/src/main/java/com/actualplayer/rememberme/RememberMe.java @@ -0,0 +1,41 @@ +package com.actualplayer.rememberme; + +import com.actualplayer.rememberme.handlers.LoginHandler; +import com.actualplayer.rememberme.handlers.ServerChangeHandler; +import com.google.inject.Inject; +import com.velocitypowered.api.event.Subscribe; +import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; +import com.velocitypowered.api.plugin.Plugin; +import com.velocitypowered.api.plugin.annotation.DataDirectory; +import com.velocitypowered.api.proxy.ProxyServer; +import lombok.Getter; +import org.slf4j.Logger; + +import java.nio.file.Path; + +@Plugin(id = "@ID@", name = "@NAME@", version = "@VERSION@", description = "@Description@", authors = {"ActualPlayer"}) +public class RememberMe { + + @Getter + private final ProxyServer server; + + @Getter + private final Logger logger; + + @Inject + @DataDirectory + @Getter + private Path dataFolderPath; + + @Inject + public RememberMe(ProxyServer server, Logger logger) { + this.server = server; + this.logger = logger; + } + + @Subscribe + public void onProxyInitialization(ProxyInitializeEvent event) { + server.getEventManager().register(this, new LoginHandler(this)); + server.getEventManager().register(this, new ServerChangeHandler(this)); + } +} diff --git a/src/main/java/com/actualplayer/rememberme/handlers/LoginHandler.java b/src/main/java/com/actualplayer/rememberme/handlers/LoginHandler.java new file mode 100644 index 0000000..4dd3af5 --- /dev/null +++ b/src/main/java/com/actualplayer/rememberme/handlers/LoginHandler.java @@ -0,0 +1,50 @@ +package com.actualplayer.rememberme.handlers; + +import com.actualplayer.rememberme.RememberMe; +import com.actualplayer.rememberme.models.UserServer; +import com.actualplayer.rememberme.util.FileUtils; +import com.actualplayer.rememberme.util.YamlUtils; +import com.velocitypowered.api.event.Subscribe; +import com.velocitypowered.api.event.connection.LoginEvent; +import com.velocitypowered.api.proxy.server.RegisteredServer; + +import java.io.*; +import java.util.UUID; + +public class LoginHandler { + + private RememberMe rememberMe; + + public LoginHandler(RememberMe rememberMe) { + this.rememberMe = rememberMe; + } + + @Subscribe + public void onLoginEvent(LoginEvent loginEvent) { + // Ignore plugin when user has notransfer permission + if (!loginEvent.getPlayer().hasPermission("rememberme.notransfer")) { + RegisteredServer lastServer = getLastServer(loginEvent.getPlayer().getUniqueId()); + if (lastServer != null) { + loginEvent.getPlayer().createConnectionRequest(lastServer).connectWithIndication(); + } + } + } + + /** + * Gets last server for user + * @param uniqueId user's UUID + * @return server user last moved to or NULL if user hasn't joined yet + */ + private RegisteredServer getLastServer(UUID uniqueId) { + try { + File userFile = FileUtils.getOrCreate(rememberMe.getDataFolderPath().resolve("data"), uniqueId.toString() + ".yml"); + UserServer userServer = YamlUtils.readFile(userFile, UserServer.class); + + if(userServer == null) return null; + + return rememberMe.getServer().getServer(userServer.getServer()).orElse(null); + } catch (IOException ex) { + return null; + } + } +} diff --git a/src/main/java/com/actualplayer/rememberme/handlers/ServerChangeHandler.java b/src/main/java/com/actualplayer/rememberme/handlers/ServerChangeHandler.java new file mode 100644 index 0000000..a6af098 --- /dev/null +++ b/src/main/java/com/actualplayer/rememberme/handlers/ServerChangeHandler.java @@ -0,0 +1,33 @@ +package com.actualplayer.rememberme.handlers; + +import com.actualplayer.rememberme.RememberMe; +import com.actualplayer.rememberme.models.UserServer; +import com.actualplayer.rememberme.util.FileUtils; +import com.actualplayer.rememberme.util.YamlUtils; +import com.velocitypowered.api.event.Subscribe; +import com.velocitypowered.api.event.player.ServerConnectedEvent; +import org.yaml.snakeyaml.Yaml; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +public class ServerChangeHandler { + + private RememberMe rememberMe; + + public ServerChangeHandler(RememberMe rememberMe) { + this.rememberMe = rememberMe; + } + + @Subscribe + public void onServerConnectedEvent(ServerConnectedEvent serverConnectedEvent) throws IOException { + File userFile = FileUtils.getOrCreate(rememberMe.getDataFolderPath().resolve("data"), serverConnectedEvent.getPlayer().getUniqueId().toString() + ".yml"); + Map userServer = new HashMap<>(); + userServer.put("server", serverConnectedEvent.getServer().getServerInfo().getName()); + + YamlUtils.writeFile(userFile, userServer); + } +} diff --git a/src/main/java/com/actualplayer/rememberme/models/UserServer.java b/src/main/java/com/actualplayer/rememberme/models/UserServer.java new file mode 100644 index 0000000..6dc407c --- /dev/null +++ b/src/main/java/com/actualplayer/rememberme/models/UserServer.java @@ -0,0 +1,9 @@ +package com.actualplayer.rememberme.models; + + +import lombok.Data; + +@Data +public class UserServer { + private String server; +} diff --git a/src/main/java/com/actualplayer/rememberme/util/FileUtils.java b/src/main/java/com/actualplayer/rememberme/util/FileUtils.java new file mode 100644 index 0000000..7a727b4 --- /dev/null +++ b/src/main/java/com/actualplayer/rememberme/util/FileUtils.java @@ -0,0 +1,44 @@ +package com.actualplayer.rememberme.util; + +import com.actualplayer.rememberme.RememberMe; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; + +public class FileUtils { + + public static File getOrCreate(Path folder, String name) { + File directory = getOrCreateDirectory(folder.getParent(), folder.getFileName().toString()); + File file = new File(directory, name); + if (!file.exists()) { + try { + try (InputStream input = RememberMe.class.getResourceAsStream("/" + name)) { + if (input != null) { + Files.copy(input, file.toPath()); + } else { + file.createNewFile(); + } + } + } catch (IOException exception) { + exception.printStackTrace(); + } + } + return file; + } + + public static File getOrCreateDirectory(Path folder, String name) { + File file = new File(folder.toFile(), name); + if (file.exists()) { + if (!file.isDirectory()) { + file.delete(); + file.mkdirs(); + } + } else { + file.mkdirs(); + } + return file; + } +} diff --git a/src/main/java/com/actualplayer/rememberme/util/YamlUtils.java b/src/main/java/com/actualplayer/rememberme/util/YamlUtils.java new file mode 100644 index 0000000..61ab949 --- /dev/null +++ b/src/main/java/com/actualplayer/rememberme/util/YamlUtils.java @@ -0,0 +1,28 @@ +package com.actualplayer.rememberme.util; + +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; +import org.yaml.snakeyaml.constructor.Constructor; + +import java.io.*; + +public class YamlUtils { + + public static T readFile(File file, Class clazz) throws FileNotFoundException { + Yaml yaml = new Yaml(new Constructor(clazz)); + InputStream stream = new FileInputStream(file); + + return yaml.loadAs(stream, clazz); + } + + public static void writeFile(File file, Object object) throws IOException { + DumperOptions options = new DumperOptions(); + options.setIndent(2); + options.setPrettyFlow(true); + options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + + Yaml yaml = new Yaml(options); + + yaml.dump(object, new FileWriter(file)); + } +}