From 91bc9657a4d9623761dc74e97b9a43a461c11788 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Tue, 25 Apr 2023 22:07:05 +0100 Subject: [PATCH] Rewrite to move to a Geyser extension --- .github/workflows/build.yml | 36 ++ .github/workflows/pullrequest.yml | 35 +- .gitignore | 96 ++-- Jenkinsfile | 77 --- README.md | 10 +- build.gradle | 59 +++ docker/Dockerfile | 5 - docker/README.md | 10 - gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 240 +++++++++ gradlew.bat | 91 ++++ pom.xml | 160 ------ settings.gradle | 2 + .../geysermc/connect/GeyserConnectConfig.java | 110 ---- .../org/geysermc/connect/MasterServer.java | 209 -------- .../org/geysermc/connect/PacketHandler.java | 427 --------------- .../connect/extension/GeyserConnect.java | 61 +++ .../connect/extension/PacketHandler.java | 142 +++++ .../config/Config.java} | 17 +- .../extension/config/ConfigLoader.java | 60 +++ .../config/CustomServersSection.java | 14 + .../config/MySQLConnectionSection.java | 9 + .../extension/config/VirtualHostSection.java | 8 + .../storage/AbstractSQLStorageManager.java | 54 +- .../storage/AbstractStorageManager.java | 27 +- .../storage/DisabledStorageManager.java | 10 +- .../storage/JsonStorageManager.java | 27 +- .../storage/MySQLStorageManager.java | 13 +- .../storage/SQLiteStorageManager.java | 9 +- .../connect/extension/ui/UIHandler.java | 314 +++++++++++ .../connect/{ => extension}/utils/Server.java | 85 +-- .../{ => extension}/utils/ServerCategory.java | 9 +- .../extension/utils/ServerManager.java | 43 ++ .../connect/extension/utils/Utils.java | 51 ++ .../connect/proxy/GeyserProxyBootstrap.java | 141 ----- .../proxy/GeyserProxyConfiguration.java | 42 -- .../connect/proxy/GeyserProxyLogger.java | 42 -- .../connect/proxy/GeyserProxySession.java | 60 --- .../ProxyConnectorServerEventHandler.java | 43 -- .../java/org/geysermc/connect/ui/FormID.java | 60 --- .../org/geysermc/connect/ui/UIHandler.java | 494 ------------------ .../connect/utils/GeyserConnectFileUtils.java | 63 --- .../org/geysermc/connect/utils/Logger.java | 92 ---- .../org/geysermc/connect/utils/Player.java | 318 ----------- src/main/resources/config.yml | 43 +- src/main/resources/extension.yml | 6 + src/main/resources/log4j2.xml | 21 - src/main/resources/proxy_config.yml | 196 ------- 49 files changed, 1350 insertions(+), 2796 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 Jenkinsfile create mode 100644 build.gradle delete mode 100644 docker/Dockerfile delete mode 100644 docker/README.md create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat delete mode 100644 pom.xml create mode 100644 settings.gradle delete mode 100644 src/main/java/org/geysermc/connect/GeyserConnectConfig.java delete mode 100644 src/main/java/org/geysermc/connect/MasterServer.java delete mode 100644 src/main/java/org/geysermc/connect/PacketHandler.java create mode 100644 src/main/java/org/geysermc/connect/extension/GeyserConnect.java create mode 100644 src/main/java/org/geysermc/connect/extension/PacketHandler.java rename src/main/java/org/geysermc/connect/{GeyserConnect.java => extension/config/Config.java} (76%) create mode 100644 src/main/java/org/geysermc/connect/extension/config/ConfigLoader.java create mode 100644 src/main/java/org/geysermc/connect/extension/config/CustomServersSection.java create mode 100644 src/main/java/org/geysermc/connect/extension/config/MySQLConnectionSection.java create mode 100644 src/main/java/org/geysermc/connect/extension/config/VirtualHostSection.java rename src/main/java/org/geysermc/connect/{ => extension}/storage/AbstractSQLStorageManager.java (56%) rename src/main/java/org/geysermc/connect/{ => extension}/storage/AbstractStorageManager.java (72%) rename src/main/java/org/geysermc/connect/{ => extension}/storage/DisabledStorageManager.java (84%) rename src/main/java/org/geysermc/connect/{ => extension}/storage/JsonStorageManager.java (66%) rename src/main/java/org/geysermc/connect/{ => extension}/storage/MySQLStorageManager.java (74%) rename src/main/java/org/geysermc/connect/{ => extension}/storage/SQLiteStorageManager.java (83%) create mode 100644 src/main/java/org/geysermc/connect/extension/ui/UIHandler.java rename src/main/java/org/geysermc/connect/{ => extension}/utils/Server.java (59%) rename src/main/java/org/geysermc/connect/{ => extension}/utils/ServerCategory.java (93%) create mode 100644 src/main/java/org/geysermc/connect/extension/utils/ServerManager.java create mode 100644 src/main/java/org/geysermc/connect/extension/utils/Utils.java delete mode 100644 src/main/java/org/geysermc/connect/proxy/GeyserProxyBootstrap.java delete mode 100644 src/main/java/org/geysermc/connect/proxy/GeyserProxyConfiguration.java delete mode 100644 src/main/java/org/geysermc/connect/proxy/GeyserProxyLogger.java delete mode 100644 src/main/java/org/geysermc/connect/proxy/GeyserProxySession.java delete mode 100644 src/main/java/org/geysermc/connect/proxy/ProxyConnectorServerEventHandler.java delete mode 100644 src/main/java/org/geysermc/connect/ui/FormID.java delete mode 100644 src/main/java/org/geysermc/connect/ui/UIHandler.java delete mode 100644 src/main/java/org/geysermc/connect/utils/GeyserConnectFileUtils.java delete mode 100644 src/main/java/org/geysermc/connect/utils/Logger.java delete mode 100644 src/main/java/org/geysermc/connect/utils/Player.java create mode 100644 src/main/resources/extension.yml delete mode 100644 src/main/resources/log4j2.xml delete mode 100644 src/main/resources/proxy_config.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..e42123d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,36 @@ +name: Build Pull Request + +on: + push: + paths-ignore: + - '.idea/copyright/*.xml' + - '.gitignore' + - 'LICENSE' + - 'README.md' + - 'bind9/**' + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + distribution: temurin + + - name: Checkout repository + uses: actions/checkout@v1 + + - name: Build Geyser + uses: gradle/gradle-build-action@v2 + with: + arguments: build + + - name: Archive artifacts + uses: actions/upload-artifact@v1 + if: success() + with: + name: Build + path: build/libs/GeyserConnect.jar diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 6694a06..f17c350 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -1,29 +1,36 @@ name: Build Pull Request -on: [pull_request] +on: + pull_request: + paths-ignore: + - '.idea/copyright/*.xml' + - '.gitignore' + - 'LICENSE' + - 'README.md' + - 'bind9/**' jobs: build: - runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Set up JDK 16 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 16 - - name: Build with Maven - run: mvn -B package + java-version: 17 + distribution: temurin + + - name: Checkout repository + uses: actions/checkout@v1 + + - name: Build Geyser + uses: gradle/gradle-build-action@v2 + with: + arguments: build + - name: Archive artifacts uses: actions/upload-artifact@v1 if: success() with: name: Build - path: target/GeyserConnect.jar + path: build/libs/GeyserConnect.jar diff --git a/.gitignore b/.gitignore index 74191e5..f11ee9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -# Created by https://www.gitignore.io/api/git,java,maven,eclipse,netbeans,jetbrains+all -# Edit at https://www.gitignore.io/?templates=git,java,maven,eclipse,netbeans,jetbrains+all +# Created by https://www.toptal.com/developers/gitignore/api/git,java,gradle,eclipse,netbeans,jetbrains+all +# Edit at https://www.toptal.com/developers/gitignore?templates=git,java,gradle,eclipse,netbeans,jetbrains+all ### Eclipse ### .metadata @@ -53,22 +53,19 @@ local.properties # Annotation Processing .apt_generated/ +.apt_generated_test/ # Scala IDE specific (Scala & Java development for Eclipse) .cache-main .scala_dependencies .worksheet +# Uncomment this line if you wish to ignore the project description file. +# Typically, this file would be tracked if it contains build/dependency configurations: +#.project + ### Eclipse Patch ### -# Eclipse Core -.project - -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# Annotation Processing -.apt_generated - +# Spring Boot Tooling .sts4-cache/ ### Git ### @@ -110,9 +107,10 @@ local.properties # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +replay_pid* ### JetBrains+all ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff @@ -122,6 +120,9 @@ hs_err_pid* .idea/**/dictionaries .idea/**/shelf +# AWS User-specific +.idea/**/aws.xml + # Generated files .idea/**/contentModel.xml @@ -142,6 +143,9 @@ hs_err_pid* # 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/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml # .idea/modules.xml # .idea/*.iml # .idea/modules @@ -169,6 +173,9 @@ atlassian-ide-plugin.xml # Cursive Clojure plugin .idea/replstate.xml +# SonarLint plugin +.idea/sonarlint/ + # Crashlytics plugin (for Android Studio and IntelliJ) com_crashlytics_export_strings.xml crashlytics.properties @@ -182,32 +189,13 @@ fabric.properties .idea/caches/build_file_checksums.ser ### JetBrains+all Patch ### -# Ignores the whole .idea folder and all .iml files -# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 +# Ignore everything but code style settings and run configurations +# that are supposed to be shared within teams. -#.idea/ +.idea/* -# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 - -*.iml -modules.xml -.idea/misc.xml -*.ipr - -# Sonarlint plugin -.idea/sonarlint - -### Maven ### -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -.mvn/wrapper/maven-wrapper.jar +!.idea/codeStyles +!.idea/runConfigurations ### NetBeans ### **/nbproject/private/ @@ -219,15 +207,35 @@ dist/ nbdist/ .nb-gradle/ -# End of https://www.gitignore.io/api/git,java,maven,eclipse,netbeans,jetbrains+all +### Gradle ### +.gradle +**/build/ +!src/**/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Avoid ignore Gradle wrappper properties +!gradle-wrapper.properties + +# Cache of project +.gradletasknamecache + +# Eclipse Gradle plugin generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath + +### Gradle Patch ### +# Java heap dump +*.hprof + +# End of https://www.toptal.com/developers/gitignore/api/git,java,gradle,eclipse,netbeans,jetbrains+all # Copyright header files .idea/* !.idea/copyright/ - -/config.yml -/welcome.txt -/logs/ -/locales/ -/players/ -players.db \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index cb2ba9d..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,77 +0,0 @@ -pipeline { - agent any - - tools { - maven 'Maven 3' - jdk 'Java 16' - } - - parameters{ - booleanParam(defaultValue: false, description: 'Skip Discord notification', name: 'SKIP_DISCORD') - } - - options { - buildDiscarder(logRotator(artifactNumToKeepStr: '20')) - } - - stages { - stage ('Build') { - steps { - sh 'git submodule update --init --recursive' - rtMavenRun( - pom: 'pom.xml', - goals: 'clean package' - ) - } - post { - success { - archiveArtifacts artifacts: 'target/*.jar', excludes: 'target/geyser-connect-*.jar', fingerprint: true - } - } - } - } - - post { - always { - script { - def changeLogSets = currentBuild.changeSets - def message = "**Changes:**" - - if (changeLogSets.size() == 0) { - message += "\n*No changes.*" - } else { - def repositoryUrl = scm.userRemoteConfigs[0].url.replace(".git", "") - def count = 0; - def extra = 0; - for (int i = 0; i < changeLogSets.size(); i++) { - def entries = changeLogSets[i].items - for (int j = 0; j < entries.length; j++) { - if (count <= 10) { - def entry = entries[j] - def commitId = entry.commitId.substring(0, 6) - message += "\n - [`${commitId}`](${repositoryUrl}/commit/${entry.commitId}) ${entry.msg}" - count++ - } else { - extra++; - } - } - } - - if (extra != 0) { - message += "\n - ${extra} more commits" - } - } - - env.changes = message - } - deleteDir() - script { - if(!params.SKIP_DISCORD) { - withCredentials([string(credentialsId: 'geyser-discord-webhook', variable: 'DISCORD_WEBHOOK')]) { - discordSend description: "**Build:** [${currentBuild.id}](${env.BUILD_URL})\n**Status:** [${currentBuild.currentResult}](${env.BUILD_URL})\n${changes}\n\n[**Artifacts on Jenkins**](https://ci.nukkitx.com/job/GeyserMC/job/GeyserConnect)", footer: 'Cloudburst Jenkins', link: env.BUILD_URL, successful: currentBuild.resultIsBetterOrEqualTo('SUCCESS'), title: "${env.JOB_NAME} #${currentBuild.id}", webhookURL: DISCORD_WEBHOOK - } - } - } - } - } -} diff --git a/README.md b/README.md index 2437eb4..b83b520 100644 --- a/README.md +++ b/README.md @@ -3,17 +3,13 @@ [![forthebadge made-with-java](https://forthebadge.com/images/badges/made-with-java.svg)](https://java.com/) [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) -[![Build Status](https://ci.nukkitx.com/job/GeyserMC/job/GeyserConnect/job/master/badge/icon)](https://ci.nukkitx.com/job/GeyserMC/job/GeyserConnect/job/master/) +[![Build Status](https://github.com/GeyserMC/GeyserConnect/actions/workflows/build.yml/badge.svg)](https://github.com/GeyserMC/GeyserConnect/actions/workflows/build.yml) [![Discord](https://img.shields.io/discord/613163671870242838.svg?color=%237289da&label=discord)](http://discord.geysermc.org/) [![HitCount](http://hits.dwyl.com/GeyserMC/GeyserConnect.svg)](http://hits.dwyl.io/GeyserMC/GeyserConnect) GeyserConnect is an easy way for Bedrock Edition clients to connect to any Java Edition servers without having to run anything. ## What is GeyserConnect? -GeyserConnect is a server that Minecraft: Bedrock Edition clients can connect to that allows for a list of Minecraft: Java Edition servers to be displayed and accessed through 1 public Geyser instance. It is effectively a combination of [BedrockConnect](https://github.com/Pugmatt/BedrockConnect) and [Geyser](https://github.com/GeyserMC/Geyser). +GeyserConnect is an extension for Geyser that allows for a list of Minecraft: Java Edition servers to be displayed and accessed through 1 public Geyser instance. It is effectively give the customisability of [BedrockConnect](https://github.com/Pugmatt/BedrockConnect) to [Geyser](https://github.com/GeyserMC/Geyser). -**Please note, this project is still a work in progress and should not be used on production. Expect bugs!** - -If you wish to run this in docker and/or use DNS redirection please see the appropriate folders in this repo. -#### Docker: [here](docker) -#### DNS: [here](bind9) +If you wish to use DNS redirection please see the [bind9](bind9) folder in this repository. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..3a033bc --- /dev/null +++ b/build.gradle @@ -0,0 +1,59 @@ +plugins { + id 'java-library' + id 'java' +} + +group 'org.geysermc.connect.extension' +version '1.0.0' + +repositories { + mavenLocal() + mavenCentral() + maven { + url 'https://repo.opencollab.dev/main' + } + maven { + url 'https://oss.sonatype.org/content/repositories/snapshots' + mavenContent { + snapshotsOnly() + } + } + maven { + url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + } + maven { + url 'https://jitpack.io' + } +} + +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' + + compileOnly 'org.geysermc.geyser:api:2.1.0-SNAPSHOT' + compileOnly('org.geysermc.geyser:core:2.1.0-SNAPSHOT') { + exclude group: 'io.netty' + } + + implementation 'org.xerial:sqlite-jdbc:3.41.2.1' + implementation 'com.mysql:mysql-connector-j:8.0.33' +} + +jar { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + + archiveFileName = "${project.name}.jar" + + from { + configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } + } +} + +test { + useJUnitPlatform() +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 2415c64..0000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM openjdk:8-jre-slim -RUN mkdir /gsc -WORKDIR /gsc -EXPOSE 19132/udp -CMD ["java", "-Xms1G", "-jar", "GeyserConnect.jar"] \ No newline at end of file diff --git a/docker/README.md b/docker/README.md deleted file mode 100644 index 7ef8aff..0000000 --- a/docker/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# GeyserConnect using Docker -This contains the docker image and a basic way of running GeyserConnect - -## Setup -1. Download GeyserConnect to a subfolder called `data` -2. Build the docker file using `docker build -t geyser-connect .` -3. Start geyser using this: -``` -docker run --name "geyser-c" -d --restart always -p 19132:19132/udp -v $(pwd)/data:/gsc geyser-connect -``` \ 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 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + 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 \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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 0000000..f127cfd --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,91 @@ +@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% equ 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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 7549594..0000000 --- a/pom.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - 4.0.0 - - org.geysermc - geyser-connect - 1.0-SNAPSHOT - - GeyserConnect - Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers via a server list. - https://geysermc.org - - - GeyserConnect - UTF-8 - UTF-8 - 16 - 16 - - - - GeyserMC - https://github.com/GeyserMC/GeyserConnect/blob/master/pom.xml - - - - scm:git:https://github.com/GeyserMC/GeyserConnect.git - scm:git:git@github.com:GeyserMC/GeyserConnect.git - https://github.com/GeyserMC/GeyserConnect - - - - - jitpack.io - https://jitpack.io - - - opencollab-release-repo - https://repo.opencollab.dev/maven-releases/ - - true - - - false - - - - opencollab-snapshot-repo - https://repo.opencollab.dev/maven-snapshots/ - - false - - - true - - - - sonatype-s01 - https://s01.oss.sonatype.org/content/repositories/snapshots/ - - - - - - org.projectlombok - lombok - 1.18.20 - provided - - - org.geysermc.geyser - core - 2.1.0-SNAPSHOT - - - net.minecrell - terminalconsoleappender - 1.1.1 - - - org.xerial - sqlite-jdbc - 3.31.1 - - - mysql - mysql-connector-java - 8.0.28 - - - - - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.geysermc.connect.GeyserConnect - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - com.github.edwgiz - maven-shade-plugin.log4j2-cachefile-transformer - 2.8.1 - - - - - package - - shade - - - ${outputName} - - - - - - - *:* - - META-INF/versions/9/module-info.class - - - - - - org.geysermc.connect.GeyserConnect - - true - - - - - - ${project.build.directory}/dependency-reduced-pom.xml - - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..4bedb10 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'GeyserConnect' + diff --git a/src/main/java/org/geysermc/connect/GeyserConnectConfig.java b/src/main/java/org/geysermc/connect/GeyserConnectConfig.java deleted file mode 100644 index 43d4531..0000000 --- a/src/main/java/org/geysermc/connect/GeyserConnectConfig.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2019-2020 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/GeyserConnect - */ - -package org.geysermc.connect; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import org.geysermc.connect.storage.AbstractStorageManager; -import org.geysermc.connect.utils.Server; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -@Getter -@JsonIgnoreProperties(ignoreUnknown = true) -public class GeyserConnectConfig { - - private String address; - - private int port; - - @JsonProperty("max-players") - private int maxPlayers; - - private String motd; - - private String submotd = "GeyserConnect"; - - @JsonProperty("welcome-file") - private String welcomeFile = "welcome.txt"; - - @JsonProperty("debug-mode") - private boolean debugMode; - - private GeyserConfigSection geyser; - - private List servers = new ArrayList<>(); - - @JsonProperty("custom-servers") - private CustomServersSection customServers; - - private VirtualHostSection vhost; - - @Getter - public static class GeyserConfigSection { - - @JsonProperty("allow-password-authentication") - private boolean allowPasswordAuthentication = false; - - @JsonProperty("debug-mode") - private boolean debugMode; - - @JsonProperty("saved-user-logins") - private List savedUserLogins = Collections.emptyList(); - } - - @Getter - public static class CustomServersSection { - - private boolean enabled; - private int max; - - @JsonProperty("storage-type") - private AbstractStorageManager.StorageType storageType; - - private MySQLConnectionSection mysql; - } - - @Getter - public static class MySQLConnectionSection { - - private String user; - private String pass; - private String database; - private String host; - private int port; - } - - @Getter - public static class VirtualHostSection { - - private boolean enabled; - @JsonProperty("base-domain") - private String baseDomain; - } -} diff --git a/src/main/java/org/geysermc/connect/MasterServer.java b/src/main/java/org/geysermc/connect/MasterServer.java deleted file mode 100644 index b40a013..0000000 --- a/src/main/java/org/geysermc/connect/MasterServer.java +++ /dev/null @@ -1,209 +0,0 @@ -/* - * Copyright (c) 2019-2020 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/GeyserConnect - */ - -package org.geysermc.connect; - -import com.nukkitx.protocol.bedrock.*; -import io.netty.channel.DefaultEventLoopGroup; -import io.netty.util.concurrent.DefaultThreadFactory; -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import lombok.Getter; -import org.geysermc.connect.proxy.GeyserProxyBootstrap; -import org.geysermc.connect.storage.AbstractStorageManager; -import org.geysermc.connect.storage.DisabledStorageManager; -import org.geysermc.connect.utils.*; -import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.GameProtocol; -import org.geysermc.geyser.util.FileUtils; - -import java.io.File; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.*; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.stream.Collectors; - -public class MasterServer { - - private BedrockServer bdServer; - - @Getter - private boolean shuttingDown = false; - - @Getter - private static MasterServer instance; - - @Getter - private final Logger logger; - - @Getter - private final ScheduledExecutorService generalThreadPool; - - @Getter - private final List players = new ObjectArrayList<>(); - - @Getter - private GeyserProxyBootstrap geyserProxy; - - @Getter - private GeyserConnectConfig geyserConnectConfig; - - @Getter - private AbstractStorageManager storageManager; - - @Getter - private final DefaultEventLoopGroup eventLoopGroup = new DefaultEventLoopGroup(new DefaultThreadFactory("Geyser player thread")); - - public MasterServer() { - instance = this; - - logger = new Logger(); - - try { - File configFile = GeyserConnectFileUtils.fileOrCopiedFromResource(new File("config.yml"), "config.yml", (x) -> x); - this.geyserConnectConfig = FileUtils.loadConfig(configFile, GeyserConnectConfig.class); - } catch (IOException ex) { - logger.severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!", ex); - ex.printStackTrace(); - } - - logger.setDebug(geyserConnectConfig.isDebugMode()); - - // As this is only used for fixing the form image bug, we don't need to handle many threads - this.generalThreadPool = Executors.newSingleThreadScheduledExecutor(); - - // Start a timer to keep the thread running - Timer timer = new Timer(); - TimerTask task = new TimerTask() { public void run() { } }; - timer.scheduleAtFixedRate(task, 0L, 1000L); - - if (!geyserConnectConfig.getCustomServers().isEnabled()) { - // Force the storage manager if we have it disabled - storageManager = new DisabledStorageManager(); - logger.info("Disabled custom player servers"); - } else { - try { - storageManager = geyserConnectConfig.getCustomServers().getStorageType().getStorageManager().newInstance(); - } catch (Exception e) { - logger.severe("Invalid storage manager class!", e); - return; - } - } - - storageManager.setupStorage(); - - // Create the base welcome.txt file - try { - GeyserConnectFileUtils.fileOrCopiedFromResource(new File(getGeyserConnectConfig().getWelcomeFile()), "welcome.txt", (x) -> x); - } catch (IOException ignored) { } - - start(geyserConnectConfig.getPort()); - - logger.start(); - } - - private void start(int port) { - logger.info("Starting..."); - - InetSocketAddress bindAddress = new InetSocketAddress(geyserConnectConfig.getAddress(), port); - bdServer = new BedrockServer(bindAddress); - - bdServer.setHandler(new BedrockServerEventHandler() { - @Override - public boolean onConnectionRequest(InetSocketAddress address) { - return true; // Connection will be accepted - } - - @Override - public BedrockPong onQuery(InetSocketAddress address) { - int playerCount = players.size() + GeyserImpl.getInstance().getSessionManager().size(); - - String subMotd = geyserConnectConfig.getSubmotd(); - if (subMotd == null || subMotd.isEmpty()) { - subMotd = "GeyserConnect"; - } - - BedrockPong bdPong = new BedrockPong(); - bdPong.setEdition("MCPE"); - bdPong.setMotd(geyserConnectConfig.getMotd()); - bdPong.setSubMotd(subMotd); - bdPong.setPlayerCount(playerCount); - bdPong.setMaximumPlayerCount(geyserConnectConfig.getMaxPlayers()); - bdPong.setGameType("Survival"); - bdPong.setIpv4Port(port); - bdPong.setProtocolVersion(GameProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()); - bdPong.setVersion(GameProtocol.DEFAULT_BEDROCK_CODEC.getMinecraftVersion()); - return bdPong; - } - - @Override - public void onSessionCreation(BedrockServerSession session) { - session.setPacketHandler(new PacketHandler(session, instance)); - } - }); - - // Start server up - bdServer.bind().join(); - - // Create the Geyser instance - createGeyserProxy(); - - logger.info("Server started on " + geyserConnectConfig.getAddress() + ":" + port); - } - - public void shutdown() { - shuttingDown = true; - bdServer.close(); - - shutdownGeyserProxy(); - - generalThreadPool.shutdown(); - storageManager.closeStorage(); - System.exit(0); - } - - public void createGeyserProxy() { - if (geyserProxy == null) { - // Make sure Geyser doesn't start the listener - GeyserImpl.setShouldStartListener(false); - - this.geyserProxy = new GeyserProxyBootstrap(); - geyserProxy.onEnable(); - GeyserImpl.getInstance().getPendingMicrosoftAuthentication().setStoreServerInformation(); - } - } - - public void shutdownGeyserProxy() { - if (geyserProxy != null) { - geyserProxy.onDisable(); - geyserProxy = null; - } - } - - public List getServers(ServerCategory serverCategory) { - return getGeyserConnectConfig().getServers().stream().filter(server -> server.getCategory() == serverCategory).collect(Collectors.toList()); - } -} diff --git a/src/main/java/org/geysermc/connect/PacketHandler.java b/src/main/java/org/geysermc/connect/PacketHandler.java deleted file mode 100644 index 9056c0f..0000000 --- a/src/main/java/org/geysermc/connect/PacketHandler.java +++ /dev/null @@ -1,427 +0,0 @@ -/* - * Copyright (c) 2019-2020 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/GeyserConnect - */ - -package org.geysermc.connect; - -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectReader; -import com.fasterxml.jackson.databind.node.JsonNodeType; -import com.nimbusds.jose.JWSObject; -import com.nimbusds.jose.crypto.factories.DefaultJWSVerifierFactory; -import com.nimbusds.jose.shaded.json.JSONArray; -import com.nukkitx.network.util.DisconnectReason; -import com.nukkitx.protocol.bedrock.BedrockPacketCodec; -import com.nukkitx.protocol.bedrock.BedrockServerSession; -import com.nukkitx.protocol.bedrock.data.AttributeData; -import com.nukkitx.protocol.bedrock.data.ExperimentData; -import com.nukkitx.protocol.bedrock.data.PacketCompressionAlgorithm; -import com.nukkitx.protocol.bedrock.handler.BedrockPacketHandler; -import com.nukkitx.protocol.bedrock.packet.*; -import com.nukkitx.protocol.bedrock.util.EncryptionUtils; -import com.nukkitx.protocol.bedrock.v471.Bedrock_v471; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.geysermc.connect.proxy.GeyserProxySession; -import org.geysermc.connect.ui.FormID; -import org.geysermc.connect.ui.UIHandler; -import org.geysermc.connect.utils.GeyserConnectFileUtils; -import org.geysermc.connect.utils.Player; -import org.geysermc.connect.utils.Server; -import org.geysermc.cumulus.Form; -import org.geysermc.cumulus.response.CustomFormResponse; -import org.geysermc.cumulus.response.FormResponse; -import org.geysermc.cumulus.response.SimpleFormResponse; -import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.api.network.AuthType; -import org.geysermc.geyser.api.network.RemoteServer; -import org.geysermc.geyser.entity.attribute.GeyserAttributeType; -import org.geysermc.geyser.network.GameProtocol; -import org.geysermc.geyser.registry.Registries; -import org.geysermc.geyser.session.PendingMicrosoftAuthentication.*; -import org.geysermc.geyser.session.auth.AuthData; -import org.geysermc.geyser.session.auth.BedrockClientData; -import org.geysermc.geyser.util.FileUtils; - -import java.io.File; -import java.io.IOException; -import java.security.interfaces.ECPublicKey; -import java.util.Collections; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -public class PacketHandler implements BedrockPacketHandler { - - private final BedrockServerSession session; - private final MasterServer masterServer; - - private Player player; - - private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); - - public PacketHandler(BedrockServerSession session, MasterServer masterServer) { - this.session = session; - this.masterServer = masterServer; - - session.addDisconnectHandler(this::disconnect); - } - - public void disconnect(DisconnectReason reason) { - if (player != null) { - masterServer.getLogger().info(player.getAuthData().name() + " has disconnected from the master server (" + reason + ")"); - masterServer.getStorageManager().saveServers(player); - - masterServer.getPlayers().remove(player); - } - } - - private boolean checkedProtocol = false; - - @Override - public boolean handle(RequestNetworkSettingsPacket packet) { - if (checkProtocol(packet.getProtocolVersion())) { - PacketCompressionAlgorithm algorithm = PacketCompressionAlgorithm.ZLIB; - - NetworkSettingsPacket responsePacket = new NetworkSettingsPacket(); - responsePacket.setCompressionAlgorithm(algorithm); - responsePacket.setCompressionThreshold(512); - session.sendPacketImmediately(responsePacket); - - session.setCompression(algorithm); - } - return true; - } - - private boolean checkProtocol(int protocolVersion) { - BedrockPacketCodec packetCodec = GameProtocol.getBedrockCodec(protocolVersion); - if (packetCodec == null) { - session.setPacketCodec(GameProtocol.DEFAULT_BEDROCK_CODEC); - - String message = "disconnectionScreen.internalError.cantConnect"; - PlayStatusPacket status = new PlayStatusPacket(); - if (protocolVersion > GameProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()) { - status.setStatus(PlayStatusPacket.Status.LOGIN_FAILED_SERVER_OLD); - message = "disconnectionScreen.outdatedServer"; - } else if (protocolVersion < GameProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()) { - status.setStatus(PlayStatusPacket.Status.LOGIN_FAILED_CLIENT_OLD); - message = "disconnectionScreen.outdatedClient"; - } - session.sendPacket(status); - session.disconnect(message); - - return false; - } - - // Set the session codec - session.setPacketCodec(packetCodec); - return true; - } - - @Override - public boolean handle(LoginPacket packet) { - masterServer.getLogger().debug("Login: " + packet.toString()); - - if (!checkedProtocol) { - if (!checkProtocol(packet.getProtocolVersion())) { - return false; - } - checkedProtocol = true; - } - - // Read the raw chain data - JsonNode rawChainData; - try { - rawChainData = OBJECT_MAPPER.readTree(packet.getChainData().toByteArray()); - } catch (IOException e) { - throw new AssertionError("Unable to read chain data!"); - } - - // Get the parsed chain data - JsonNode chainData = rawChainData.get("chain"); - if (chainData.getNodeType() != JsonNodeType.ARRAY) { - throw new AssertionError("Invalid chain data!"); - } - - try { - // Convert the chainData to a JSONArray - ObjectReader reader = OBJECT_MAPPER.readerFor(new TypeReference>() { }); - JSONArray array = new JSONArray(); - array.addAll(reader.readValue(chainData)); - - // Verify the chain data - if (!EncryptionUtils.verifyChain(array)) { - // Disconnect the client - session.disconnect("disconnectionScreen.internalError.cantConnect"); - throw new AssertionError("Failed to login, due to invalid chain data!"); - } - - // Parse the signed jws object - JWSObject jwsObject; - jwsObject = JWSObject.parse(chainData.get(chainData.size() - 1).asText()); - - // Read the JWS payload - JsonNode payload = OBJECT_MAPPER.readTree(jwsObject.getPayload().toBytes()); - - // Check the identityPublicKey is there - if (payload.get("identityPublicKey").getNodeType() != JsonNodeType.STRING) { - throw new AssertionError("Missing identity public key!"); - } - - // Create an ECPublicKey from the identityPublicKey - ECPublicKey identityPublicKey = EncryptionUtils.generateKey(payload.get("identityPublicKey").textValue()); - - // Get the skin data to validate the JWS token - JWSObject skinData = JWSObject.parse(packet.getSkinData().toString()); - if (skinData.verify(new DefaultJWSVerifierFactory().createJWSVerifier(skinData.getHeader(), identityPublicKey))) { - // Make sure the client sent over the username, xuid and other info - if (payload.get("extraData").getNodeType() != JsonNodeType.OBJECT) { - throw new AssertionError("Missing client data"); - } - - // Fetch the client data - JsonNode extraData = payload.get("extraData"); - - AuthData authData = new AuthData( - extraData.get("displayName").asText(), - UUID.fromString(extraData.get("identity").asText()), - extraData.get("XUID").asText() - ); - - // Create a new player and add it to the players list - player = new Player(authData, session); - masterServer.getPlayers().add(player); - - player.setChainData(chainData); - - // Store the full client data - player.setClientData(OBJECT_MAPPER.convertValue(OBJECT_MAPPER.readTree(skinData.getPayload().toBytes()), BedrockClientData.class)); - player.getClientData().setOriginalString(packet.getSkinData().toString()); - - // Tell the client we have logged in successfully - PlayStatusPacket playStatusPacket = new PlayStatusPacket(); - playStatusPacket.setStatus(PlayStatusPacket.Status.LOGIN_SUCCESS); - session.sendPacket(playStatusPacket); - - // Tell the client there are no resourcepacks - ResourcePacksInfoPacket resourcePacksInfo = new ResourcePacksInfoPacket(); - session.sendPacket(resourcePacksInfo); - } else { - throw new AssertionError("Invalid identity public key!"); - } - } catch (Exception e) { - // Disconnect the client - session.disconnect("disconnectionScreen.internalError.cantConnect"); - throw new AssertionError("Failed to login", e); - } - - return false; - } - - @Override - public boolean handle(ResourcePackClientResponsePacket packet) { - switch (packet.getStatus()) { - case COMPLETED: - masterServer.getLogger().info("Logged in " + player.getAuthData().name() + " (" + player.getAuthData().xuid() + ", " + player.getAuthData().uuid() + ")"); - - ProxyAuthenticationTask task = (ProxyAuthenticationTask) GeyserImpl.getInstance() - .getPendingMicrosoftAuthentication().getTask(player.getAuthData().xuid()); - if (task != null && task.getAuthentication().isDone()) { - String address = task.getServer(); - int port = task.getPort(); - player.setCurrentServer(new Server(address, port, true, false)); - GeyserProxySession session = player.createGeyserSession(false); - session.remoteServer(player.getCurrentServer()); - - session.onMicrosoftLoginComplete(task); - } else { - player.sendStartGame(); - } - break; - case HAVE_ALL_PACKS: - ResourcePackStackPacket stack = new ResourcePackStackPacket(); - stack.setExperimentsPreviouslyToggled(false); - stack.setForcedToAccept(false); - stack.setGameVersion("*"); - - if (!Registries.ITEMS.forVersion(session.getPacketCodec().getProtocolVersion()).getComponentItemData().isEmpty()) { - // Allow custom items to work - stack.getExperiments().add(new ExperimentData("data_driven_items", true)); - } - - if (session.getPacketCodec().getProtocolVersion() <= Bedrock_v471.V471_CODEC.getProtocolVersion()) { - // Allow extended world height in the overworld to work for pre-1.18 clients - stack.getExperiments().add(new ExperimentData("caves_and_cliffs", true)); - } - - session.sendPacket(stack); - break; - default: - session.disconnect("disconnectionScreen.resourcePack"); - break; - } - - return true; - } - - @Override - public boolean handle(SetLocalPlayerAsInitializedPacket packet) { - masterServer.getLogger().debug("Player initialized: " + player.getAuthData().name()); - - if (player.getCurrentServer() != null) { - // Player is already logged in via delayed Microsoft authentication - return false; - } - - // Handle the virtual host if specified - GeyserConnectConfig.VirtualHostSection vhost = MasterServer.getInstance().getGeyserConnectConfig().getVhost(); - if (vhost.isEnabled()) { - String domain = player.getClientData().getServerAddress().split(":")[0]; - if (!domain.equals(vhost.getBaseDomain()) && domain.endsWith("." + vhost.getBaseDomain())) { - String address = ""; - int port = 25565; - boolean online = true; - - // Parse the address used - String[] domainParts = domain.replaceFirst("\\." + vhost.getBaseDomain() + "$", "").split("\\._"); - for (int i = 0; i < domainParts.length; i++) { - String part = domainParts[i]; - if (i == 0) { - address = part; - } else if (part.startsWith("p")) { - port = Integer.parseInt(part.substring(1)); - } else if (part.startsWith("o")) { - online = false; - } - } - - // They didn't specify an address so disconnect them - if (address.startsWith("_")) { - session.disconnect("disconnectionScreen.invalidIP"); - return false; - } - - // Log the virtual host usage - masterServer.getLogger().info(player.getAuthData().name() + " is using virtualhost: " + address + ":" + port + (!online ? " (offline)" : "")); - - // Send the player to the wanted server - player.sendToServer(new Server(address, port, online, false)); - - return false; - } - } - - String message = ""; - try { - File messageFile = GeyserConnectFileUtils.fileOrCopiedFromResource(new File(MasterServer.getInstance().getGeyserConnectConfig().getWelcomeFile()), "welcome.txt", (x) -> x); - message = new String(FileUtils.readAllBytes(messageFile)); - } catch (IOException ignored) { } - - if (!message.trim().isEmpty()) { - player.sendWindow(FormID.WELCOME, UIHandler.getMessageWindow(message)); - } else { - player.sendWindow(FormID.MAIN, UIHandler.getMainMenu()); - } - - return false; - } - - @Override - public boolean handle(ModalFormResponsePacket packet) { - // Make sure the form is valid - FormID id = FormID.fromId(packet.getFormId()); - if (id != player.getCurrentWindowId()) - return false; - - // Fetch the form and parse the response - Form window = player.getCurrentWindow(); - FormResponse response = window.parseResponse(packet.getFormData() == null ? null : packet.getFormData().trim()); - - // Resend the form if they closed it - if (!response.isCorrect() && !id.isHandlesNull()) { - player.resendWindow(); - } else { - // Send the response to the correct response function - switch (id) { - case WELCOME: - player.sendWindow(FormID.MAIN, UIHandler.getMainMenu()); - break; - - case MAIN: - UIHandler.handleMainMenuResponse(player, (SimpleFormResponse) response); - break; - - case LIST_SERVERS: - UIHandler.handleServerListResponse(player, (SimpleFormResponse) response); - break; - - case DIRECT_CONNECT: - UIHandler.handleDirectConnectResponse(player, (CustomFormResponse) response); - break; - - case EDIT_SERVERS: - UIHandler.handleEditServerListResponse(player, (SimpleFormResponse) response); - break; - - case ADD_SERVER: - UIHandler.handleAddServerResponse(player, (CustomFormResponse) response); - break; - - case SERVER_OPTIONS: - UIHandler.handleServerOptionsResponse(player, (SimpleFormResponse) response); - break; - - case REMOVE_SERVER: - UIHandler.handleServerRemoveResponse(player, (SimpleFormResponse) response); - break; - - case EDIT_SERVER: - UIHandler.handleEditServerResponse(player, (CustomFormResponse) response); - break; - - default: - player.resendWindow(); - break; - } - } - - return true; - } - - @Override - public boolean handle(NetworkStackLatencyPacket packet) { - // This is to fix a bug in the client where it doesn't load form images - UpdateAttributesPacket updateAttributesPacket = new UpdateAttributesPacket(); - updateAttributesPacket.setRuntimeEntityId(1); - List attributes = Collections.singletonList(GeyserAttributeType.EXPERIENCE_LEVEL.getAttribute(0f)); - updateAttributesPacket.setAttributes(attributes); - - // Doesn't work 100% of the time but fixes it most of the time - MasterServer.getInstance().getGeneralThreadPool().schedule(() -> session.sendPacket(updateAttributesPacket), 500, TimeUnit.MILLISECONDS); - - return false; - } -} diff --git a/src/main/java/org/geysermc/connect/extension/GeyserConnect.java b/src/main/java/org/geysermc/connect/extension/GeyserConnect.java new file mode 100644 index 0000000..585960f --- /dev/null +++ b/src/main/java/org/geysermc/connect/extension/GeyserConnect.java @@ -0,0 +1,61 @@ +package org.geysermc.connect.extension; + +import org.cloudburstmc.protocol.bedrock.packet.BedrockPacketHandler; +import org.geysermc.connect.extension.config.Config; +import org.geysermc.connect.extension.config.ConfigLoader; +import org.geysermc.connect.extension.storage.AbstractStorageManager; +import org.geysermc.connect.extension.storage.DisabledStorageManager; +import org.geysermc.event.subscribe.Subscribe; +import org.geysermc.geyser.api.event.bedrock.SessionInitializeEvent; +import org.geysermc.geyser.api.event.lifecycle.GeyserPostInitializeEvent; +import org.geysermc.geyser.api.extension.Extension; +import org.geysermc.geyser.session.GeyserSession; + +public class GeyserConnect implements Extension { + private static GeyserConnect instance; + private Config config; + private AbstractStorageManager storageManager; + + public GeyserConnect() { + instance = this; + } + + public static GeyserConnect instance() { + return instance; + } + + public Config config() { + return config; + } + + public AbstractStorageManager storageManager() { + return storageManager; + } + + @Subscribe + public void onPostInitialize(GeyserPostInitializeEvent event) { + config = ConfigLoader.load(this, GeyserConnect.class, Config.class); + + if (!config.customServers().enabled()) { + // Force the storage manager if we have it disabled + storageManager = new DisabledStorageManager(); + this.logger().info("Disabled custom player servers"); + } else { + try { + storageManager = config.customServers().storageType().storageManager().getDeclaredConstructor().newInstance(); + } catch (Exception e) { + this.logger().severe("Invalid storage manager class!", e); + return; + } + } + + storageManager.setupStorage(); + } + + @Subscribe + public void onSessionInitialize(SessionInitializeEvent event) { + GeyserSession session = (GeyserSession) event.connection(); + BedrockPacketHandler packetHandler = session.getUpstream().getSession().getPacketHandler(); + session.getUpstream().getSession().setPacketHandler(new PacketHandler(this, session, packetHandler)); + } +} \ No newline at end of file diff --git a/src/main/java/org/geysermc/connect/extension/PacketHandler.java b/src/main/java/org/geysermc/connect/extension/PacketHandler.java new file mode 100644 index 0000000..36ed72d --- /dev/null +++ b/src/main/java/org/geysermc/connect/extension/PacketHandler.java @@ -0,0 +1,142 @@ +/* + * Copyright (c) 2019-2020 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/GeyserConnect + */ + +package org.geysermc.connect.extension; + +import org.cloudburstmc.protocol.bedrock.data.AttributeData; +import org.cloudburstmc.protocol.bedrock.packet.BedrockPacketHandler; +import org.cloudburstmc.protocol.bedrock.packet.NetworkStackLatencyPacket; +import org.cloudburstmc.protocol.bedrock.packet.SetLocalPlayerAsInitializedPacket; +import org.cloudburstmc.protocol.bedrock.packet.UpdateAttributesPacket; +import org.cloudburstmc.protocol.common.PacketSignal; +import org.geysermc.connect.extension.ui.UIHandler; +import org.geysermc.connect.extension.utils.ServerManager; +import org.geysermc.connect.extension.utils.Utils; +import org.geysermc.geyser.GeyserImpl; +import org.geysermc.geyser.entity.attribute.GeyserAttributeType; +import org.geysermc.geyser.network.UpstreamPacketHandler; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.util.DimensionUtils; + +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeUnit; + +public class PacketHandler extends UpstreamPacketHandler { + + private final GeyserSession session; + private final GeyserConnect geyserConnect; + private final BedrockPacketHandler originalPacketHandler; + + public PacketHandler(GeyserConnect geyserConnect, GeyserSession session, BedrockPacketHandler packetHandler) { + super(GeyserImpl.getInstance(), session); + + this.session = session; + this.geyserConnect = geyserConnect; + this.originalPacketHandler = packetHandler; + + // Spawn the player in the end (it just looks better) + session.setDimension(DimensionUtils.THE_END); + DimensionUtils.setBedrockDimension(session, DimensionUtils.THE_END); + } + + @Override + public void onDisconnect(String reason) { + geyserConnect.logger().info(Utils.displayName(session) + " has disconnected (" + reason + ")"); + ServerManager.unloadServers(session); + } + + @Override + public PacketSignal handle(SetLocalPlayerAsInitializedPacket packet) { + if (session.getPlayerEntity().getGeyserId() == packet.getRuntimeEntityId()) { + if (!session.getUpstream().isInitialized()) { + session.getUpstream().setInitialized(true); + + // Load the players servers + ServerManager.loadServers(session); + + geyserConnect.logger().debug("Player initialized: " + Utils.displayName(session)); + + UIHandler uiHandler = new UIHandler(session, packet, originalPacketHandler); + uiHandler.initialiseSession(); + } + } + + // Handle the virtual host if specified +// GeyserConnectConfig.VirtualHostSection vhost = MasterServer.getInstance().getGeyserConnectConfig().getVhost(); +// if (vhost.isEnabled()) { +// String domain = player.getClientData().getServerAddress().split(":")[0]; +// if (!domain.equals(vhost.getBaseDomain()) && domain.endsWith("." + vhost.getBaseDomain())) { +// String address = ""; +// int port = 25565; +// boolean online = true; +// +// // Parse the address used +// String[] domainParts = domain.replaceFirst("\\." + vhost.getBaseDomain() + "$", "").split("\\._"); +// for (int i = 0; i < domainParts.length; i++) { +// String part = domainParts[i]; +// if (i == 0) { +// address = part; +// } else if (part.startsWith("p")) { +// port = Integer.parseInt(part.substring(1)); +// } else if (part.startsWith("o")) { +// online = false; +// } +// } +// +// // They didn't specify an address so disconnect them +// if (address.startsWith("_")) { +// session.disconnect("disconnectionScreen.invalidIP"); +// return false; +// } +// +// // Log the virtual host usage +// masterServer.getLogger().info(player.getAuthData().name() + " is using virtualhost: " + address + ":" + port + (!online ? " (offline)" : "")); +// +// // Send the player to the wanted server +// player.sendToServer(new Server(address, port, online, false)); +// +// return false; +// } +// } + + return PacketSignal.HANDLED; + } + + @Override + public PacketSignal handle(NetworkStackLatencyPacket packet) { + // This is to fix a bug in the client where it doesn't load form images + UpdateAttributesPacket updateAttributesPacket = new UpdateAttributesPacket(); + updateAttributesPacket.setRuntimeEntityId(1); + List attributes = Collections.singletonList(GeyserAttributeType.EXPERIENCE_LEVEL.getAttribute(0f)); + updateAttributesPacket.setAttributes(attributes); + + // Doesn't work 100% of the time but fixes it most of the time + GeyserImpl.getInstance().getScheduledThread().schedule(() -> session.sendUpstreamPacket(updateAttributesPacket), 500, TimeUnit.MILLISECONDS); + + return super.handle(packet); + } +} + diff --git a/src/main/java/org/geysermc/connect/GeyserConnect.java b/src/main/java/org/geysermc/connect/extension/config/Config.java similarity index 76% rename from src/main/java/org/geysermc/connect/GeyserConnect.java rename to src/main/java/org/geysermc/connect/extension/config/Config.java index 802d4ed..76463ff 100644 --- a/src/main/java/org/geysermc/connect/GeyserConnect.java +++ b/src/main/java/org/geysermc/connect/extension/config/Config.java @@ -23,11 +23,16 @@ * @link https://github.com/GeyserMC/GeyserConnect */ -package org.geysermc.connect; +package org.geysermc.connect.extension.config; -public class GeyserConnect { +import com.fasterxml.jackson.annotation.JsonProperty; +import org.geysermc.connect.extension.utils.Server; - public static void main(String[] args) { - new MasterServer(); - } -} +import java.util.List; + +public record Config( + @JsonProperty("welcome-file") String welcomeFile, + List servers, + @JsonProperty("custom-servers") CustomServersSection customServers, + VirtualHostSection vhost) { +} \ No newline at end of file diff --git a/src/main/java/org/geysermc/connect/extension/config/ConfigLoader.java b/src/main/java/org/geysermc/connect/extension/config/ConfigLoader.java new file mode 100644 index 0000000..07127c4 --- /dev/null +++ b/src/main/java/org/geysermc/connect/extension/config/ConfigLoader.java @@ -0,0 +1,60 @@ +package org.geysermc.connect.extension.config; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; +import org.geysermc.geyser.api.extension.Extension; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.net.URISyntaxException; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.util.Collections; + +public class ConfigLoader { + public static T load(Extension extension, Class extensionClass, Class configClass) { + File configFile = extension.dataFolder().resolve("config.yml").toFile(); + + // Ensure the data folder exists + if (!extension.dataFolder().toFile().exists()) { + if (!extension.dataFolder().toFile().mkdirs()) { + extension.logger().error("Failed to create data folder"); + return null; + } + } + + // Create the config file if it doesn't exist + if (!configFile.exists()) { + try (FileWriter writer = new FileWriter(configFile)) { + try (FileSystem fileSystem = FileSystems.newFileSystem(new File(extensionClass.getProtectionDomain().getCodeSource().getLocation().toURI()).toPath(), Collections.emptyMap())) { + try (InputStream input = Files.newInputStream(fileSystem.getPath("config.yml"))) { + byte[] bytes = new byte[input.available()]; + + input.read(bytes); + + writer.write(new String(bytes).toCharArray()); + + writer.flush(); + } + } + } catch (IOException | URISyntaxException e) { + extension.logger().error("Failed to create config", e); + return null; + } + } + + // Load the config file + try { + return new ObjectMapper(new YAMLFactory()) + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .readValue(configFile, configClass); + } catch (IOException e) { + extension.logger().error("Failed to load config", e); + return null; + } + } +} diff --git a/src/main/java/org/geysermc/connect/extension/config/CustomServersSection.java b/src/main/java/org/geysermc/connect/extension/config/CustomServersSection.java new file mode 100644 index 0000000..fd8cda6 --- /dev/null +++ b/src/main/java/org/geysermc/connect/extension/config/CustomServersSection.java @@ -0,0 +1,14 @@ +package org.geysermc.connect.extension.config; + +//import com.fasterxml.jackson.annotation.JsonProperty; +//import org.geysermc.connect.extension.storage.AbstractStorageManager; + +import com.fasterxml.jackson.annotation.JsonProperty; +import org.geysermc.connect.extension.storage.AbstractStorageManager; + +public record CustomServersSection( + boolean enabled, + int max, + @JsonProperty("storage-type") AbstractStorageManager.StorageType storageType, + MySQLConnectionSection mysql) { +} diff --git a/src/main/java/org/geysermc/connect/extension/config/MySQLConnectionSection.java b/src/main/java/org/geysermc/connect/extension/config/MySQLConnectionSection.java new file mode 100644 index 0000000..3e9aaed --- /dev/null +++ b/src/main/java/org/geysermc/connect/extension/config/MySQLConnectionSection.java @@ -0,0 +1,9 @@ +package org.geysermc.connect.extension.config; + +public record MySQLConnectionSection( + String user, + String pass, + String database, + String host, + int port) { +} diff --git a/src/main/java/org/geysermc/connect/extension/config/VirtualHostSection.java b/src/main/java/org/geysermc/connect/extension/config/VirtualHostSection.java new file mode 100644 index 0000000..3820144 --- /dev/null +++ b/src/main/java/org/geysermc/connect/extension/config/VirtualHostSection.java @@ -0,0 +1,8 @@ +package org.geysermc.connect.extension.config; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public record VirtualHostSection( + boolean enabled, + @JsonProperty("base-domain") String baseDomain) { +} diff --git a/src/main/java/org/geysermc/connect/storage/AbstractSQLStorageManager.java b/src/main/java/org/geysermc/connect/extension/storage/AbstractSQLStorageManager.java similarity index 56% rename from src/main/java/org/geysermc/connect/storage/AbstractSQLStorageManager.java rename to src/main/java/org/geysermc/connect/extension/storage/AbstractSQLStorageManager.java index 62996ac..9fced8b 100644 --- a/src/main/java/org/geysermc/connect/storage/AbstractSQLStorageManager.java +++ b/src/main/java/org/geysermc/connect/extension/storage/AbstractSQLStorageManager.java @@ -23,22 +23,26 @@ * @link https://github.com/GeyserMC/GeyserConnect */ -package org.geysermc.connect.storage; +package org.geysermc.connect.extension.storage; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.geysermc.connect.MasterServer; -import org.geysermc.connect.utils.Player; -import org.geysermc.connect.utils.Server; +import org.geysermc.connect.extension.GeyserConnect; +import org.geysermc.connect.extension.utils.Server; +import org.geysermc.connect.extension.utils.ServerManager; +import org.geysermc.connect.extension.utils.Utils; +import org.geysermc.geyser.session.GeyserSession; import java.io.IOException; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; import java.util.ArrayList; import java.util.List; public abstract class AbstractSQLStorageManager extends AbstractStorageManager { - private final ObjectMapper mapper = new ObjectMapper(); - protected Connection connection; @Override @@ -49,8 +53,19 @@ public abstract class AbstractSQLStorageManager extends AbstractStorageManager { try (Statement createPlayersTable = connection.createStatement()) { createPlayersTable.executeUpdate("CREATE TABLE IF NOT EXISTS players (xuid VARCHAR(32), servers TEXT, PRIMARY KEY(xuid));"); } + + try (PreparedStatement getPlayersServers = connection.prepareStatement("SELECT xuid, servers FROM players")) { + ResultSet rs = getPlayersServers.executeQuery(); + + while (rs.next()) { + List loadedServers = Utils.OBJECT_MAPPER.readValue(rs.getString("servers"), new TypeReference<>() {}); + GeyserConnect.instance().logger().info("Loaded " + loadedServers.size() + " servers for " + rs.getString("xuid")); + } + } catch (IOException | SQLException exception) { + GeyserConnect.instance().logger().error("Couldn't load servers", exception); + } } catch (ClassNotFoundException | SQLException e) { - MasterServer.getInstance().getLogger().severe("Unable to connect to MySQL database!", e); + GeyserConnect.instance().logger().severe("Unable to connect to MySQL database!", e); } } @@ -61,37 +76,38 @@ public abstract class AbstractSQLStorageManager extends AbstractStorageManager { try { connection.close(); } catch (SQLException exception) { - MasterServer.getInstance().getLogger().error("Failed to close SQL connection", exception); + GeyserConnect.instance().logger().error("Failed to close SQL connection", exception); } } @Override - public void saveServers(Player player) { + public void saveServers(GeyserSession session) { // replace into works on MySQL and SQLite try (PreparedStatement updatePlayersServers = connection.prepareStatement("REPLACE INTO players(xuid, servers) VALUES(?, ?)")) { - updatePlayersServers.setString(1, player.getAuthData().xuid()); - updatePlayersServers.setString(2, mapper.writeValueAsString(player.getServers())); + updatePlayersServers.setString(1, session.getAuthData().xuid()); + updatePlayersServers.setString(2, Utils.OBJECT_MAPPER.writeValueAsString(ServerManager.getServers(session))); updatePlayersServers.executeUpdate(); } catch (IOException | SQLException exception) { - MasterServer.getInstance().getLogger().error("Couldn't save servers for " + player.getAuthData().name(), exception); + GeyserConnect.instance().logger().error("Couldn't save servers for " + session.getAuthData().name(), exception); } } @Override - public List loadServers(Player player) { + public List loadServers(GeyserSession session) { List servers = new ArrayList<>(); try (PreparedStatement getPlayersServers = connection.prepareStatement("SELECT servers FROM players WHERE xuid=?")) { - getPlayersServers.setString(1, player.getAuthData().xuid()); + getPlayersServers.setString(1, session.getAuthData().xuid()); ResultSet rs = getPlayersServers.executeQuery(); while (rs.next()) { - List loadedServers = mapper.readValue(rs.getString("servers"), new TypeReference<>() { - }); - servers.addAll(loadedServers); + List loadedServers = Utils.OBJECT_MAPPER.readValue(rs.getString("servers"), new TypeReference<>() {}); + if (loadedServers != null) { + servers.addAll(loadedServers); + } } } catch (IOException | SQLException exception) { - MasterServer.getInstance().getLogger().error("Couldn't load servers for " + player.getAuthData().name(), exception); + GeyserConnect.instance().logger().error("Couldn't load servers for " + session.getAuthData().name(), exception); } return servers; diff --git a/src/main/java/org/geysermc/connect/storage/AbstractStorageManager.java b/src/main/java/org/geysermc/connect/extension/storage/AbstractStorageManager.java similarity index 72% rename from src/main/java/org/geysermc/connect/storage/AbstractStorageManager.java rename to src/main/java/org/geysermc/connect/extension/storage/AbstractStorageManager.java index 28ee1a5..dea7c95 100644 --- a/src/main/java/org/geysermc/connect/storage/AbstractStorageManager.java +++ b/src/main/java/org/geysermc/connect/extension/storage/AbstractStorageManager.java @@ -23,12 +23,12 @@ * @link https://github.com/GeyserMC/GeyserConnect */ -package org.geysermc.connect.storage; +package org.geysermc.connect.extension.storage; import com.fasterxml.jackson.annotation.JsonValue; -import lombok.Getter; -import org.geysermc.connect.utils.Player; -import org.geysermc.connect.utils.Server; +import org.geysermc.connect.extension.utils.Server; +import org.geysermc.geyser.session.GeyserSession; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; @@ -39,26 +39,33 @@ public class AbstractStorageManager { public void closeStorage() { } - public void saveServers(Player player) { } + public void saveServers(GeyserSession session) { } - public List loadServers(Player player) { + public List loadServers(GeyserSession session) { return new ArrayList<>(); } - @Getter public enum StorageType { JSON("json", JsonStorageManager.class), SQLITE("sqlite", SQLiteStorageManager.class), MYSQL("mysql", MySQLStorageManager.class); @JsonValue - private final String name; + private final String configName; private final Class storageManager; - StorageType(String name, Class storageManager) { - this.name = name; + StorageType(String configName, Class storageManager) { + this.configName = configName; this.storageManager = storageManager; } + + public String configName() { + return configName; + } + + public Class storageManager() { + return storageManager; + } } } diff --git a/src/main/java/org/geysermc/connect/storage/DisabledStorageManager.java b/src/main/java/org/geysermc/connect/extension/storage/DisabledStorageManager.java similarity index 84% rename from src/main/java/org/geysermc/connect/storage/DisabledStorageManager.java rename to src/main/java/org/geysermc/connect/extension/storage/DisabledStorageManager.java index 8ca6eb8..23ebbdf 100644 --- a/src/main/java/org/geysermc/connect/storage/DisabledStorageManager.java +++ b/src/main/java/org/geysermc/connect/extension/storage/DisabledStorageManager.java @@ -23,10 +23,10 @@ * @link https://github.com/GeyserMC/GeyserConnect */ -package org.geysermc.connect.storage; +package org.geysermc.connect.extension.storage; -import org.geysermc.connect.utils.Player; -import org.geysermc.connect.utils.Server; +import org.geysermc.connect.extension.utils.Server; +import org.geysermc.geyser.session.GeyserSession; import java.util.ArrayList; import java.util.List; @@ -38,12 +38,12 @@ public class DisabledStorageManager extends AbstractStorageManager { } @Override - public void saveServers(Player player) { + public void saveServers(GeyserSession session) { } @Override - public List loadServers(Player player) { + public List loadServers(GeyserSession session) { return new ArrayList<>(); } } diff --git a/src/main/java/org/geysermc/connect/storage/JsonStorageManager.java b/src/main/java/org/geysermc/connect/extension/storage/JsonStorageManager.java similarity index 66% rename from src/main/java/org/geysermc/connect/storage/JsonStorageManager.java rename to src/main/java/org/geysermc/connect/extension/storage/JsonStorageManager.java index cd07ed8..1a895a2 100644 --- a/src/main/java/org/geysermc/connect/storage/JsonStorageManager.java +++ b/src/main/java/org/geysermc/connect/extension/storage/JsonStorageManager.java @@ -23,12 +23,14 @@ * @link https://github.com/GeyserMC/GeyserConnect */ -package org.geysermc.connect.storage; +package org.geysermc.connect.extension.storage; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.geysermc.connect.utils.Player; -import org.geysermc.connect.utils.Server; +import org.geysermc.connect.extension.GeyserConnect; +import org.geysermc.connect.extension.utils.Server; +import org.geysermc.connect.extension.utils.ServerManager; +import org.geysermc.connect.extension.utils.Utils; +import org.geysermc.geyser.session.GeyserSession; import java.io.IOException; import java.nio.file.Path; @@ -37,31 +39,32 @@ import java.util.ArrayList; import java.util.List; public class JsonStorageManager extends AbstractStorageManager { - - private final ObjectMapper mapper = new ObjectMapper(); - private final Path dataFolder = Paths.get("players/"); + private Path dataFolder; @Override public void setupStorage() { + dataFolder = GeyserConnect.instance().dataFolder().resolve("players/"); if (!dataFolder.toFile().exists()) { dataFolder.toFile().mkdirs(); } } @Override - public void saveServers(Player player) { + public void saveServers(GeyserSession session) { try { - mapper.writeValue(dataFolder.resolve(player.getAuthData().xuid() + ".json").toFile(), player.getServers()); + Utils.OBJECT_MAPPER.writeValue(dataFolder.resolve(session.getAuthData().xuid() + ".json").toFile(), ServerManager.getServers(session)); } catch (IOException ignored) { } } @Override - public List loadServers(Player player) { + public List loadServers(GeyserSession session) { List servers = new ArrayList<>(); try { - List loadedServers = mapper.readValue(dataFolder.resolve(player.getAuthData().xuid() + ".json").toFile(), new TypeReference<>(){}); - servers.addAll(loadedServers); + List loadedServers = Utils.OBJECT_MAPPER.readValue(dataFolder.resolve(session.getAuthData().xuid() + ".json").toFile(), new TypeReference<>(){}); + if (loadedServers != null) { + servers.addAll(loadedServers); + } } catch (IOException ignored) { } return servers; diff --git a/src/main/java/org/geysermc/connect/storage/MySQLStorageManager.java b/src/main/java/org/geysermc/connect/extension/storage/MySQLStorageManager.java similarity index 74% rename from src/main/java/org/geysermc/connect/storage/MySQLStorageManager.java rename to src/main/java/org/geysermc/connect/extension/storage/MySQLStorageManager.java index be12187..8852d63 100644 --- a/src/main/java/org/geysermc/connect/storage/MySQLStorageManager.java +++ b/src/main/java/org/geysermc/connect/extension/storage/MySQLStorageManager.java @@ -23,18 +23,19 @@ * @link https://github.com/GeyserMC/GeyserConnect */ -package org.geysermc.connect.storage; +package org.geysermc.connect.extension.storage; -import org.geysermc.connect.GeyserConnectConfig; -import org.geysermc.connect.MasterServer; +import org.geysermc.connect.extension.GeyserConnect; +import org.geysermc.connect.extension.config.MySQLConnectionSection; -import java.sql.*; +import java.sql.DriverManager; +import java.sql.SQLException; public class MySQLStorageManager extends AbstractSQLStorageManager { @Override protected void connectToDatabase() throws ClassNotFoundException, SQLException { Class.forName("com.mysql.cj.jdbc.Driver"); - GeyserConnectConfig.MySQLConnectionSection connectionInformation = MasterServer.getInstance().getGeyserConnectConfig().getCustomServers().getMysql(); - connection = DriverManager.getConnection("jdbc:mysql://" + connectionInformation.getHost() + ":" + connectionInformation.getPort() + "/" + connectionInformation.getDatabase(), connectionInformation.getUser(), connectionInformation.getPass()); + MySQLConnectionSection connectionInformation = GeyserConnect.instance().config().customServers().mysql(); + connection = DriverManager.getConnection("jdbc:mysql://" + connectionInformation.host() + ":" + connectionInformation.port() + "/" + connectionInformation.database(), connectionInformation.user(), connectionInformation.pass()); } } diff --git a/src/main/java/org/geysermc/connect/storage/SQLiteStorageManager.java b/src/main/java/org/geysermc/connect/extension/storage/SQLiteStorageManager.java similarity index 83% rename from src/main/java/org/geysermc/connect/storage/SQLiteStorageManager.java rename to src/main/java/org/geysermc/connect/extension/storage/SQLiteStorageManager.java index be21f9c..957e331 100644 --- a/src/main/java/org/geysermc/connect/storage/SQLiteStorageManager.java +++ b/src/main/java/org/geysermc/connect/extension/storage/SQLiteStorageManager.java @@ -23,14 +23,17 @@ * @link https://github.com/GeyserMC/GeyserConnect */ -package org.geysermc.connect.storage; +package org.geysermc.connect.extension.storage; -import java.sql.*; +import org.geysermc.connect.extension.GeyserConnect; + +import java.sql.DriverManager; +import java.sql.SQLException; public class SQLiteStorageManager extends AbstractSQLStorageManager { @Override protected void connectToDatabase() throws ClassNotFoundException, SQLException { Class.forName("org.sqlite.JDBC"); - connection = DriverManager.getConnection("jdbc:sqlite:players.db"); + connection = DriverManager.getConnection("jdbc:sqlite:" + GeyserConnect.instance().dataFolder().resolve("players.db")); } } diff --git a/src/main/java/org/geysermc/connect/extension/ui/UIHandler.java b/src/main/java/org/geysermc/connect/extension/ui/UIHandler.java new file mode 100644 index 0000000..e9f56f3 --- /dev/null +++ b/src/main/java/org/geysermc/connect/extension/ui/UIHandler.java @@ -0,0 +1,314 @@ +package org.geysermc.connect.extension.ui; + +import org.cloudburstmc.protocol.bedrock.packet.BedrockPacketHandler; +import org.cloudburstmc.protocol.bedrock.packet.SetLocalPlayerAsInitializedPacket; +import org.cloudburstmc.protocol.bedrock.packet.TransferPacket; +import org.geysermc.connect.extension.GeyserConnect; +import org.geysermc.connect.extension.utils.Server; +import org.geysermc.connect.extension.utils.ServerCategory; +import org.geysermc.connect.extension.utils.ServerManager; +import org.geysermc.connect.extension.utils.Utils; +import org.geysermc.cumulus.form.CustomForm; +import org.geysermc.cumulus.form.ModalForm; +import org.geysermc.cumulus.form.SimpleForm; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.util.FileUtils; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.List; + +public class UIHandler { + private final GeyserSession session; + private final SetLocalPlayerAsInitializedPacket initializedPacket; + private final BedrockPacketHandler originalPacketHandler; + + public UIHandler(GeyserSession session, SetLocalPlayerAsInitializedPacket packet, BedrockPacketHandler originalPacketHandler) { + this.session = session; + this.initializedPacket = new SetLocalPlayerAsInitializedPacket(); + this.initializedPacket.setRuntimeEntityId(packet.getRuntimeEntityId()); + this.originalPacketHandler = originalPacketHandler; + } + + private void sendToServer(Server server) { + GeyserConnect.instance().logger().info("Sending " + Utils.displayName(session) + " to " + server.title()); + GeyserConnect.instance().logger().debug(server.toString()); + + if (server.bedrock()) { + // Send them to the bedrock server + TransferPacket transferPacket = new TransferPacket(); + transferPacket.setAddress(server.address()); + transferPacket.setPort(server.port()); + session.sendUpstreamPacket(transferPacket); + } else { + // Save the players servers since we are changing packet handlers + ServerManager.unloadServers(session); + + // Restore the original packet handler + session.getUpstream().getSession().setPacketHandler(originalPacketHandler); + + // Set the remote server and un-initialize the session + session.remoteServer(server); + session.getUpstream().setInitialized(false); + + // Hand back to core geyser + originalPacketHandler.handle(initializedPacket); + } + } + + public void initialiseSession() { + String message = ""; + try { + File messageFile = Utils.fileOrCopiedFromResource(GeyserConnect.instance().config().welcomeFile(), "welcome.txt"); + message = new String(FileUtils.readAllBytes(messageFile), StandardCharsets.UTF_8); + } catch (IOException ignored) { } + + if (!message.trim().isEmpty()) { + session.sendForm(CustomForm.builder() + .title("Notice") + .label(message) + .resultHandler((customForm, customFormResponseFormResponseResult) -> { + sendMainMenu(); +// this.sendToServer(new Server("test.geysermc.org", 25565)); + }) + .build()); + } else { + sendMainMenu(); + } + } + + public void sendMainMenu() { + SimpleForm.Builder mainMenu = SimpleForm.builder() + .title("Main Menu") + .button("Official Servers") + .button("Geyser Servers"); + + // Add a buttons for custom servers + if (GeyserConnect.instance().config().customServers().enabled()) { + mainMenu.button("Custom Servers"); + mainMenu.button("Direct connect"); + } + + mainMenu + .button("Disconnect") + .closedResultHandler(response -> { + sendMainMenu(); + }) + .invalidResultHandler(response -> { + session.disconnect("disconnectionScreen.disconnected"); + }) + .validResultHandler(response -> { + switch (response.clickedButtonId()) { + case 0: + sendServersMenu(ServerCategory.OFFICIAL); + return; + case 1: + sendServersMenu(ServerCategory.GEYSER); + return; + default: + if (GeyserConnect.instance().config().customServers().enabled()) { + switch (response.clickedButtonId()) { + case 2: + sendServersMenu(ServerCategory.CUSTOM); + return; + case 3: + sendDirectConnectMenu(); + return; + } + } + break; + } + + session.disconnect("disconnectionScreen.disconnected"); + }); + + session.sendForm(mainMenu); + } + + public void sendServersMenu(ServerCategory category) { + SimpleForm.Builder serversMenu = SimpleForm.builder() + .title(category.title() + " Servers"); + + List servers; + if (category == ServerCategory.CUSTOM) { + servers = ServerManager.getServers(session); + } else { + servers = Utils.getServers(category); + } + + for (Server server : servers) { + serversMenu.button(server.title(), server.formImage()); + } + + if (category == ServerCategory.CUSTOM) { + serversMenu.button("Edit servers"); + } + + serversMenu + .button("Back") + .closedOrInvalidResultHandler(response -> { + sendMainMenu(); + }) + .validResultHandler(response -> { + if (category == ServerCategory.CUSTOM) { + if (response.clickedButtonId() == servers.size()) { + sendEditServersMenu(); + return; + } else if (response.clickedButtonId() == servers.size() + 1) { + sendMainMenu(); + return; + } + } else if (response.clickedButtonId() == servers.size()) { + sendMainMenu(); + return; + } + + Server server = servers.get(response.clickedButtonId()); + sendToServer(server); + }); + + session.sendForm(serversMenu); + } + + public void sendEditServersMenu() { + SimpleForm.Builder editServersMenu = SimpleForm.builder() + .title("Edit Servers") + .content("Select a server to edit"); + + List servers = ServerManager.getServers(session); + + for (Server server : servers) { + editServersMenu.button(server.title(), server.formImage()); + } + + editServersMenu + .button("Add server") + .button("Back") + .closedOrInvalidResultHandler(response -> { + sendServersMenu(ServerCategory.CUSTOM); + }) + .validResultHandler(response -> { + if (response.clickedButtonId() == servers.size()) { + sendAddServerMenu(); + return; + } else if (response.clickedButtonId() == servers.size() + 1) { + sendServersMenu(ServerCategory.CUSTOM); + return; + } + + Server server = servers.get(response.clickedButtonId()); + sendServerOptionsMenu(server); + }); + + session.sendForm(editServersMenu); + } + + public void sendAddServerMenu() { + session.sendForm(CustomForm.builder() + .title("Add Server") + .input("IP", "play.cubecraft.net") + .input("Port", "25565", "25565") + .toggle("Online mode", true) + .toggle("Bedrock/Geyser server", false) + .closedOrInvalidResultHandler(response -> { + sendEditServersMenu(); + }) + .validResultHandler(response -> { + String ip = response.asInput(0); + int port = Integer.parseInt(response.asInput(1)); + boolean onlineMode = response.asToggle(2); + boolean geyserServer = response.asToggle(3); + + Server server = new Server(ip, port, onlineMode, geyserServer, null, null, ServerCategory.CUSTOM); + ServerManager.addServer(session, server); + sendEditServersMenu(); + })); + } + + public void sendServerOptionsMenu(Server server) { + session.sendForm(SimpleForm.builder() + .title("Server Options") + .content(server.title()) + .button("Edit server") + .button("Delete server") + .button("Back") + .closedOrInvalidResultHandler(response -> { + sendEditServersMenu(); + }) + .validResultHandler(response -> { + switch (response.clickedButtonId()) { + case 0: + sendEditServerMenu(server); + return; + case 1: + sendDeleteServerMenu(server); + return; + case 2: + sendEditServersMenu(); + return; + } + })); + } + + public void sendEditServerMenu(Server server) { + int serverIndex = ServerManager.getServerIndex(session, server); + session.sendForm(CustomForm.builder() + .title("Edit Server") + .input("IP", server.address(), server.address()) + .input("Port", String.valueOf(server.port()), String.valueOf(server.port())) + .toggle("Online mode", server.online()) + .toggle("Bedrock/Geyser server", server.bedrock()) + .closedOrInvalidResultHandler(response -> { + sendServerOptionsMenu(server); + }) + .validResultHandler(response -> { + String ip = response.asInput(0); + int port = Integer.parseInt(response.asInput(1)); + boolean onlineMode = response.asToggle(2); + boolean geyserServer = response.asToggle(3); + + Server newServer = new Server(ip, port, onlineMode, geyserServer, null, null, ServerCategory.CUSTOM); + ServerManager.updateServer(session, serverIndex, newServer); + sendServerOptionsMenu(newServer); + })); + } + + public void sendDeleteServerMenu(Server server) { + session.sendForm(ModalForm.builder() + .title("Delete Server") + .content("Are you sure you want to delete " + server.title() + "?") + .button1("Yes") + .button2("No") + .closedOrInvalidResultHandler(response -> { + sendServerOptionsMenu(server); + }) + .validResultHandler(response -> { + if (response.clickedButtonId() == 0) { + ServerManager.removeServer(session, server); + } + sendEditServersMenu(); + })); + } + + public void sendDirectConnectMenu() { + session.sendForm(CustomForm.builder() + .title("Direct Connect") + .input("IP", "play.cubecraft.net") + .input("Port", "25565", "25565") + .toggle("Online mode", true) + .toggle("Bedrock/Geyser server", false) + .closedOrInvalidResultHandler(response -> { + sendMainMenu(); + }) + .validResultHandler(response -> { + String ip = response.asInput(0); + int port = Integer.parseInt(response.asInput(1)); + boolean onlineMode = response.asToggle(2); + boolean geyserServer = response.asToggle(3); + + Server server = new Server(ip, port, onlineMode, geyserServer, null, null, ServerCategory.CUSTOM); + sendToServer(server); + })); + } +} diff --git a/src/main/java/org/geysermc/connect/utils/Server.java b/src/main/java/org/geysermc/connect/extension/utils/Server.java similarity index 59% rename from src/main/java/org/geysermc/connect/utils/Server.java rename to src/main/java/org/geysermc/connect/extension/utils/Server.java index 2777f45..56aa9e3 100644 --- a/src/main/java/org/geysermc/connect/utils/Server.java +++ b/src/main/java/org/geysermc/connect/extension/utils/Server.java @@ -23,80 +23,32 @@ * @link https://github.com/GeyserMC/GeyserConnect */ -package org.geysermc.connect.utils; +package org.geysermc.connect.extension.utils; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; import org.checkerframework.checker.nullness.qual.NonNull; import org.geysermc.cumulus.util.FormImage; import org.geysermc.geyser.api.network.AuthType; import org.geysermc.geyser.api.network.RemoteServer; -@Getter -@AllArgsConstructor -@NoArgsConstructor -public class Server implements RemoteServer { - - private String address; - private int port = -1; - private boolean online = true; - private boolean bedrock = false; - private String name = null; - private String imageUrl = null; - private ServerCategory category = null; - - public Server(String address) { - this(address, -1); - } - +public record Server( + String address, + int port, + boolean online, + boolean bedrock, + String name, + String imageUrl, + ServerCategory category +) implements RemoteServer { public Server(String address, int port) { - this(address, port, true); - } - - public Server(String address, int port, boolean online) { - this(address, port, online, false); - } - - public Server(String address, int port, boolean online, boolean bedrock) { - this(address, port, online, bedrock, null); - } - - public Server(String address, int port, boolean online, boolean bedrock, String name) { - this(address, port, online, bedrock, name, null); - } - - public Server(String address, int port, boolean online, boolean bedrock, String name, String imageUrl) { - this(address.replaceAll(" ", ""), port, online, bedrock, name, imageUrl, ServerCategory.CUSTOM); + this(address, port, true, false, null, null, ServerCategory.CUSTOM); } private int defaultPort() { return bedrock ? 19132 : 25565; } - public int getPort() { return port < 0 ? defaultPort() : port; } - - @Override - public String toString() { - return name != null ? name : address + (getPort() != defaultPort() ? ":" + getPort() : ""); - } - - @JsonIgnore - public FormImage getFormImage() { - if (imageUrl != null && !imageUrl.isEmpty()) { - return FormImage.of(FormImage.Type.URL, imageUrl); - } else { - return FormImage.of(FormImage.Type.URL, "https://eu.mc-api.net/v3/server/favicon/" + address + ":" + port + ".png?use-fallback-icon=true"); - } - } - - @Override - public String address() { - return address; - } - @Override public int port() { - return port; + return port < 0 ? defaultPort() : port; } @Override @@ -104,6 +56,15 @@ public class Server implements RemoteServer { return this.online ? AuthType.ONLINE : AuthType.OFFLINE; } + @JsonIgnore + public FormImage formImage() { + if (imageUrl != null && !imageUrl.isEmpty()) { + return FormImage.of(FormImage.Type.URL, imageUrl); + } else { + return FormImage.of(FormImage.Type.URL, "https://eu.mc-api.net/v3/server/favicon/" + address + ":" + port + ".png?use-fallback-icon=true"); + } + } + @Override public String minecraftVersion() { return null; @@ -113,4 +74,8 @@ public class Server implements RemoteServer { public int protocolVersion() { return 0; } + + public String title() { + return name != null ? name : address + (port() != defaultPort() ? ":" + port() : ""); + } } diff --git a/src/main/java/org/geysermc/connect/utils/ServerCategory.java b/src/main/java/org/geysermc/connect/extension/utils/ServerCategory.java similarity index 93% rename from src/main/java/org/geysermc/connect/utils/ServerCategory.java rename to src/main/java/org/geysermc/connect/extension/utils/ServerCategory.java index a7ade38..349f92e 100644 --- a/src/main/java/org/geysermc/connect/utils/ServerCategory.java +++ b/src/main/java/org/geysermc/connect/extension/utils/ServerCategory.java @@ -23,11 +23,8 @@ * @link https://github.com/GeyserMC/GeyserConnect */ -package org.geysermc.connect.utils; +package org.geysermc.connect.extension.utils; -import lombok.Getter; - -@Getter public enum ServerCategory { OFFICIAL("Official"), GEYSER("Geyser"), @@ -38,4 +35,8 @@ public enum ServerCategory { ServerCategory(String title) { this.title = title; } + + public String title() { + return title; + } } diff --git a/src/main/java/org/geysermc/connect/extension/utils/ServerManager.java b/src/main/java/org/geysermc/connect/extension/utils/ServerManager.java new file mode 100644 index 0000000..5d19f21 --- /dev/null +++ b/src/main/java/org/geysermc/connect/extension/utils/ServerManager.java @@ -0,0 +1,43 @@ +package org.geysermc.connect.extension.utils; + +import org.geysermc.connect.extension.GeyserConnect; +import org.geysermc.geyser.session.GeyserSession; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class ServerManager { + private static final Map> servers = new HashMap<>(); + + public static void loadServers(GeyserSession session) { + GeyserConnect.instance().logger().debug("Loading servers for " + Utils.displayName(session)); + servers.put(session.xuid(), GeyserConnect.instance().storageManager().loadServers(session)); + } + + public static void unloadServers(GeyserSession session) { + GeyserConnect.instance().logger().debug("Saving and unloading servers for " + Utils.displayName(session)); + GeyserConnect.instance().storageManager().saveServers(session); + servers.remove(session.xuid()); + } + + public static List getServers(GeyserSession session) { + return servers.get(session.xuid()); + } + + public static void addServer(GeyserSession session, Server server) { + servers.get(session.xuid()).add(server); + } + + public static void removeServer(GeyserSession session, Server server) { + getServers(session).remove(server); + } + + public static int getServerIndex(GeyserSession session, Server server) { + return getServers(session).indexOf(server); + } + + public static void updateServer(GeyserSession session, int serverIndex, Server server) { + getServers(session).set(serverIndex, server); + } +} diff --git a/src/main/java/org/geysermc/connect/extension/utils/Utils.java b/src/main/java/org/geysermc/connect/extension/utils/Utils.java new file mode 100644 index 0000000..6a7e062 --- /dev/null +++ b/src/main/java/org/geysermc/connect/extension/utils/Utils.java @@ -0,0 +1,51 @@ +package org.geysermc.connect.extension.utils; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.geysermc.connect.extension.GeyserConnect; +import org.geysermc.geyser.session.GeyserSession; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.net.URISyntaxException; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.util.Collections; +import java.util.List; + +public class Utils { + public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + + public static List getServers(ServerCategory category) { + return GeyserConnect.instance().config().servers().stream().filter(server -> server.category() == category).toList(); + } + + public static File fileOrCopiedFromResource(String fileName, String name) throws IOException { + File file = GeyserConnect.instance().dataFolder().resolve(fileName).toFile(); + + if (!file.exists()) { + try (FileWriter writer = new FileWriter(file)) { + try (FileSystem fileSystem = FileSystems.newFileSystem(new File(GeyserConnect.class.getProtectionDomain().getCodeSource().getLocation().toURI()).toPath(), Collections.emptyMap())) { + try (InputStream input = Files.newInputStream(fileSystem.getPath(name))) { + byte[] bytes = new byte[input.available()]; + + input.read(bytes); + + writer.write(new String(bytes).toCharArray()); + + writer.flush(); + } + } + } catch (URISyntaxException ignored) { } + } + + return file; + } + + public static String displayName(GeyserSession session) { + return session.bedrockUsername() + " (" + session.xuid() + ")"; + } +} diff --git a/src/main/java/org/geysermc/connect/proxy/GeyserProxyBootstrap.java b/src/main/java/org/geysermc/connect/proxy/GeyserProxyBootstrap.java deleted file mode 100644 index a41afa7..0000000 --- a/src/main/java/org/geysermc/connect/proxy/GeyserProxyBootstrap.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Copyright (c) 2019-2020 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/GeyserConnect - */ - -package org.geysermc.connect.proxy; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import org.geysermc.common.PlatformType; -import org.geysermc.connect.GeyserConnectConfig; -import org.geysermc.connect.MasterServer; -import org.geysermc.geyser.GeyserBootstrap; -import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.command.GeyserCommandManager; -import org.geysermc.geyser.configuration.GeyserConfiguration; -import org.geysermc.geyser.dump.BootstrapDumpInfo; -import org.geysermc.geyser.ping.GeyserLegacyPingPassthrough; -import org.geysermc.geyser.ping.IGeyserPingPassthrough; -import org.geysermc.geyser.text.GeyserLocale; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.stream.Collectors; - -public class GeyserProxyBootstrap implements GeyserBootstrap { - - private GeyserCommandManager geyserCommandManager; - private GeyserProxyConfiguration geyserConfig; - private GeyserProxyLogger geyserLogger; - private IGeyserPingPassthrough geyserPingPassthrough; - - private GeyserImpl geyser; - - @Override - public void onEnable() { - GeyserLocale.init(this); - - // Setup a logger - geyserLogger = new GeyserProxyLogger(); - - // Read the static config from resources - try { - InputStream configFile = GeyserProxyBootstrap.class.getClassLoader().getResourceAsStream("proxy_config.yml"); - - // Grab the config as text and replace static strings to the main config variables - String text = new BufferedReader(new InputStreamReader(configFile, StandardCharsets.UTF_8)).lines().collect(Collectors.joining("\n")); - GeyserConnectConfig multiConfig = MasterServer.getInstance().getGeyserConnectConfig(); - text = text.replaceAll("%MOTD%", multiConfig.getMotd()); - text = text.replace("%PLAYERS%", String.valueOf(multiConfig.getMaxPlayers())); - text = text.replace("%ALLOWPASSWORDAUTHENTICATION%", String.valueOf(multiConfig.getGeyser().isAllowPasswordAuthentication())); - - ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory()); - geyserConfig = objectMapper.readValue(text, GeyserProxyConfiguration.class); - - geyserConfig.getSavedUserLogins().clear(); - for (String savedUserLogin : MasterServer.getInstance().getGeyserConnectConfig().getGeyser().getSavedUserLogins()) { - geyserConfig.getSavedUserLogins().add(savedUserLogin); - } - - } catch (IOException ex) { - geyserLogger.severe("Failed to read proxy_config.yml! Make sure it's up to date and/or readable+writable!", ex); - return; - } - - // Not sure there is a point in doing this as its a static config - GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger); - - // Create the connector and command manager - geyser = GeyserImpl.load(PlatformType.STANDALONE, this); - GeyserImpl.start(); - geyserCommandManager = new GeyserCommandManager(geyser); - - // Start the ping passthrough thread, again don't think there is a point - geyserPingPassthrough = GeyserLegacyPingPassthrough.init(geyser); - - // Swap the normal handler to our custom handler so we can change some - geyser.getBedrockServer().setHandler(new ProxyConnectorServerEventHandler(geyser)); - } - - @Override - public void onDisable() { - geyser.shutdown(); - } - - @Override - public GeyserConfiguration getGeyserConfig() { - return geyserConfig; - } - - @Override - public GeyserProxyLogger getGeyserLogger() { - return geyserLogger; - } - - @Override - public GeyserCommandManager getGeyserCommandManager() { - return geyserCommandManager; - } - - @Override - public IGeyserPingPassthrough getGeyserPingPassthrough() { - return geyserPingPassthrough; - } - - @Override - public Path getConfigFolder() { - return Paths.get(System.getProperty("user.dir")); - } - - @Override - public BootstrapDumpInfo getDumpInfo() { - return new BootstrapDumpInfo(); - } -} - diff --git a/src/main/java/org/geysermc/connect/proxy/GeyserProxyConfiguration.java b/src/main/java/org/geysermc/connect/proxy/GeyserProxyConfiguration.java deleted file mode 100644 index d7a93ae..0000000 --- a/src/main/java/org/geysermc/connect/proxy/GeyserProxyConfiguration.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2019-2020 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/GeyserConnect - */ - -package org.geysermc.connect.proxy; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import lombok.Getter; -import org.geysermc.geyser.configuration.GeyserJacksonConfiguration; - -import java.nio.file.Path; -import java.nio.file.Paths; - -@Getter -@JsonIgnoreProperties(ignoreUnknown = true) -public class GeyserProxyConfiguration extends GeyserJacksonConfiguration { - @Override - public Path getFloodgateKeyPath() { - return Paths.get(getFloodgateKeyFile()); - } -} diff --git a/src/main/java/org/geysermc/connect/proxy/GeyserProxyLogger.java b/src/main/java/org/geysermc/connect/proxy/GeyserProxyLogger.java deleted file mode 100644 index 69a631d..0000000 --- a/src/main/java/org/geysermc/connect/proxy/GeyserProxyLogger.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2019-2020 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/GeyserConnect - */ - -package org.geysermc.connect.proxy; - -import lombok.extern.log4j.Log4j2; -import org.geysermc.connect.MasterServer; -import org.geysermc.connect.utils.Logger; - -@Log4j2 -public class GeyserProxyLogger extends Logger { - - /** - * Disable debug messages depending on config - */ - public void debug(String message) { - if (MasterServer.getInstance().getGeyserConnectConfig().getGeyser().isDebugMode()) - super.debug(message); - } -} diff --git a/src/main/java/org/geysermc/connect/proxy/GeyserProxySession.java b/src/main/java/org/geysermc/connect/proxy/GeyserProxySession.java deleted file mode 100644 index 192128d..0000000 --- a/src/main/java/org/geysermc/connect/proxy/GeyserProxySession.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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/GeyserConnect - */ - -package org.geysermc.connect.proxy; - -import com.nukkitx.protocol.bedrock.BedrockServerSession; -import io.netty.channel.EventLoop; -import org.geysermc.connect.utils.Player; -import org.geysermc.connect.utils.Server; -import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.session.GeyserSession; -import org.geysermc.geyser.session.PendingMicrosoftAuthentication.*; - -public class GeyserProxySession extends GeyserSession { - private final Player player; - - public GeyserProxySession(GeyserImpl geyser, BedrockServerSession bedrockServerSession, EventLoop eventLoop, Player player, boolean initialized) { - super(geyser, bedrockServerSession, eventLoop); - sentSpawnPacket = initialized; - this.player = player; - } - - @Override - protected void disableSrvResolving() { - // Do nothing - } - - @Override - public void disconnect(String reason) { - ProxyAuthenticationTask task = (ProxyAuthenticationTask) getGeyser().getPendingMicrosoftAuthentication().getTask(this.xuid()); - if (task != null) { - Server server = player.getCurrentServer(); - task.setServer(server.getAddress()); - task.setPort(server.getPort()); - } - super.disconnect(reason); - } -} diff --git a/src/main/java/org/geysermc/connect/proxy/ProxyConnectorServerEventHandler.java b/src/main/java/org/geysermc/connect/proxy/ProxyConnectorServerEventHandler.java deleted file mode 100644 index c067813..0000000 --- a/src/main/java/org/geysermc/connect/proxy/ProxyConnectorServerEventHandler.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2019-2020 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/GeyserConnect - */ - -package org.geysermc.connect.proxy; - -import com.nukkitx.protocol.bedrock.BedrockServerSession; -import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.network.ConnectorServerEventHandler; - -public class ProxyConnectorServerEventHandler extends ConnectorServerEventHandler { - - public ProxyConnectorServerEventHandler(GeyserImpl geyser) { - super(geyser); - } - - @Override - public void onSessionCreation(BedrockServerSession bedrockServerSession) { - super.onSessionCreation(bedrockServerSession); - bedrockServerSession.disconnect("Not sure how you managed it, but you shouldn't be here!"); - } -} diff --git a/src/main/java/org/geysermc/connect/ui/FormID.java b/src/main/java/org/geysermc/connect/ui/FormID.java deleted file mode 100644 index 2cef258..0000000 --- a/src/main/java/org/geysermc/connect/ui/FormID.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2019-2020 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/GeyserConnect - */ - -package org.geysermc.connect.ui; - -import lombok.Getter; - -@Getter -public enum FormID { - - WELCOME, - MAIN, - DIRECT_CONNECT(true), - LIST_SERVERS(true), - EDIT_SERVERS(true), - SERVER_OPTIONS(true), - ADD_SERVER(true), - REMOVE_SERVER, - EDIT_SERVER(true), - CONNECTING, - ERROR; - - private final boolean handlesNull; - - private static final FormID[] VALUES = values(); - - FormID() { - this(false); - } - - FormID(boolean handlesNull) { - this.handlesNull = handlesNull; - } - - public static FormID fromId(int id) { - return id >= 0 && id < VALUES.length ? VALUES[id] : ERROR; - } -} \ No newline at end of file diff --git a/src/main/java/org/geysermc/connect/ui/UIHandler.java b/src/main/java/org/geysermc/connect/ui/UIHandler.java deleted file mode 100644 index 9739504..0000000 --- a/src/main/java/org/geysermc/connect/ui/UIHandler.java +++ /dev/null @@ -1,494 +0,0 @@ -/* - * Copyright (c) 2019-2020 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/GeyserConnect - */ - -package org.geysermc.connect.ui; - -import org.geysermc.connect.MasterServer; -import org.geysermc.connect.utils.Player; -import org.geysermc.connect.utils.Server; -import org.geysermc.connect.utils.ServerCategory; -import org.geysermc.cumulus.CustomForm; -import org.geysermc.cumulus.Form; -import org.geysermc.cumulus.SimpleForm; -import org.geysermc.cumulus.component.InputComponent; -import org.geysermc.cumulus.component.LabelComponent; -import org.geysermc.cumulus.component.ToggleComponent; -import org.geysermc.cumulus.response.CustomFormResponse; -import org.geysermc.cumulus.response.SimpleFormResponse; -import org.geysermc.cumulus.util.FormImage; - -import java.util.List; - -public class UIHandler { - - /** - * Create a list of servers for the client based on the passed servers list - * - * @return A {@link SimpleForm} object - */ - public static Form getMainMenu() { - SimpleForm.Builder window = SimpleForm.builder().title("Main Menu"); - - window.button("Official Servers"); - window.button("Geyser Servers"); - - // Add a buttons for custom servers - if (MasterServer.getInstance().getGeyserConnectConfig().getCustomServers().isEnabled()) { - window.button("Custom Servers"); - window.button("Direct connect"); - } - - window.button("Disconnect"); - - return window.build(); - } - - /** - * Create a list of servers for the client based on the passed servers list - * - * @param servers A list of {@link Server} objects - * @param category The category of the current list - * @return A {@link SimpleForm} object - */ - public static Form getServerList(List servers, ServerCategory category) { - SimpleForm.Builder window = SimpleForm.builder().title(category.getTitle() + " Servers"); - - // Add a button for each global server - for (Server server : servers) { - // These images would be better if there was a default to fall back on - // But that would require a web api as bedrock doesn't support doing that - window.button(server.toString(), server.getFormImage()); - } - - // Add a button for editing - if (category == ServerCategory.CUSTOM) { - window.button("Edit servers"); - } - - window.button("Back"); - - return window.build(); - } - - /** - * Create a direct connect form - * - * @return A {@link CustomForm} object - */ - public static Form getDirectConnect() { - return CustomForm.builder().title("Direct Connect") - .component(InputComponent.of("IP", "play.cubecraft.net")) - .component(InputComponent.of("Port", "25565", "25565")) - .component(ToggleComponent.of("Online mode", true)) - .component(ToggleComponent.of("Bedrock/Geyser server", false)) - .build(); - } - - /** - * Create a list of servers for the client to edit - * - * @param servers A list of {@link Server} objects - * @return A {@link SimpleForm} object - */ - public static Form getEditServerList(List servers) { - SimpleForm.Builder window = SimpleForm.builder().title("Edit Servers").content("Select a server to edit"); - - // Add a button for each personal server - for (Server server : servers) { - window.button(server.toString(), FormImage.of(FormImage.Type.URL, - "https://eu.mc-api.net/v3/server/favicon/" + server.getAddress() + ":" + server.getPort() + ".png")); - } - - window.button("Add server"); - window.button("Back"); - - return window.build(); - } - - /** - * Create a add server form - * - * @return A {@link CustomForm} object - */ - public static Form getAddServer() { - return CustomForm.builder().title("Add Server") - .component(InputComponent.of("IP", "play.cubecraft.net")) - .component(InputComponent.of("Port", "25565", "25565")) - .component(ToggleComponent.of("Online mode", true)) - .component(ToggleComponent.of("Bedrock/Geyser server", false)) - .build(); - } - - /** - * Create a server options form - * - * @param server A {@link Server} object to show options for - * @return A {@link SimpleForm} object - */ - public static Form getServerOptions(Server server) { - SimpleForm.Builder window = SimpleForm.builder().title("Server Options").content(server.toString()); - - window.button("Edit"); - window.button("Remove"); - window.button("Back"); - - return window.build(); - } - - /** - * Create a remove server form - * - * @param server A {@link Server} object to remove - * @return A {@link SimpleForm} object - */ - public static Form getRemoveServer(Server server) { - return SimpleForm.builder() - .title("Remove Server") - .content("Are you sure you want to remove server: " + server) - .button("Remove") - .button("Cancel") - .build(); - } - - /** - * Create a edit server form - * - * @param server A {@link Server} object to edit - * @return A {@link CustomForm} object - */ - public static Form getEditServer(int serverIndex, Server server) { - String port = String.valueOf(server.getPort()); - return CustomForm.builder() - .component(LabelComponent.of("Server at index: " + serverIndex)) - .component(InputComponent.of("IP", server.getAddress(), server.getAddress())) - .component(InputComponent.of("Port", port, port)) - .component(ToggleComponent.of("Online mode", server.isOnline())) - .component(ToggleComponent.of("Bedrock/Geyser server", server.isBedrock())) - .build(); - } - - /** - * Show a basic form window with a message - * - * @param message The message to display - * @return A {@link CustomForm} object - */ - public static Form getMessageWindow(String message) { - return CustomForm.builder() - .title("Notice") - .component(LabelComponent.of(message)) - .build(); - } - - /** - * Handle the main menu response - * - * @param player The player that submitted the response - * @param data The form response data - */ - public static void handleMainMenuResponse(Player player, SimpleFormResponse data) { - switch (data.getClickedButtonId()) { - case 0: - player.setServerCategory(ServerCategory.OFFICIAL); - break; - - case 1: - player.setServerCategory(ServerCategory.GEYSER); - break; - - default: - // If we have custom servers enabled there are a few extra buttons - if (MasterServer.getInstance().getGeyserConnectConfig().getCustomServers().isEnabled()) { - switch (data.getClickedButtonId()) { - case 2: - player.setServerCategory(ServerCategory.CUSTOM); - break; - case 3: - player.sendWindow(FormID.DIRECT_CONNECT, getDirectConnect()); - return; - - default: - player.getSession().disconnect("disconnectionScreen.disconnected"); - return; - } - } else { - player.getSession().disconnect("disconnectionScreen.disconnected"); - return; - } - break; - } - - // Send the server list - player.sendWindow(FormID.LIST_SERVERS, getServerList(player.getCurrentServers(), player.getServerCategory())); - } - - /** - * Handle the server list response - * - * @param player The player that submitted the response - * @param data The form response data - */ - public static void handleServerListResponse(Player player, SimpleFormResponse data) { - List servers = player.getCurrentServers(); - - if (player.getServerCategory() == ServerCategory.CUSTOM) { - if (!data.isCorrect() || data.getClickedButtonId() == servers.size() + 1) { - player.sendWindow(FormID.MAIN, UIHandler.getMainMenu()); - } else if (data.getClickedButtonId() == servers.size()) { - player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getCurrentServers())); - } else { - // Get the server - Server server = servers.get(data.getClickedButtonId()); - - player.sendToServer(server); - } - } else { - if (!data.isCorrect() || data.getClickedButtonId() == servers.size()) { - player.sendWindow(FormID.MAIN, UIHandler.getMainMenu()); - } else { - // Get the server - Server server = servers.get(data.getClickedButtonId()); - - player.sendToServer(server); - } - } - } - - /** - * Handle the direct connect response - * - * @param player The player that submitted the response - * @param data The form response data - */ - public static void handleDirectConnectResponse(Player player, CustomFormResponse data) { - // Take them back to the main menu if they close the direct connect window - if (!data.isCorrect()) { - player.sendWindow(FormID.MAIN, getMainMenu()); - return; - } - - try { - String address = data.getInput(0); - int port = Integer.parseInt(data.getInput(1)); - boolean online = data.getToggle(2); - boolean bedrock = data.getToggle(3); - - // Make sure we got an address - if (address == null || "".equals(address)) { - player.sendWindow(FormID.MAIN, getMainMenu()); - return; - } - - // Make sure we got a valid port - if (port <= 0 || port >= 65535) { - player.resendWindow(); - return; - } - - player.sendToServer(new Server(address, port, online, bedrock)); - } catch (NumberFormatException e) { - player.resendWindow(); - } - } - - /** - * Handle the edit server list response - * - * @param player The player that submitted the response - * @param data The form response data - */ - public static void handleEditServerListResponse(Player player, SimpleFormResponse data) { - List servers = player.getCurrentServers(); - - // Take them back to the main menu if they close the edit server list window - if (!data.isCorrect()) { - player.sendWindow(FormID.LIST_SERVERS, getServerList(servers, player.getServerCategory())); - return; - } - - if (data.getClickedButtonId() == servers.size()) { - player.sendWindow(FormID.ADD_SERVER, getAddServer()); - } else if (data.getClickedButtonId() == servers.size() + 1) { - player.sendWindow(FormID.LIST_SERVERS, getServerList(servers, player.getServerCategory())); - } else { - Server server = player.getServers().get(data.getClickedButtonId()); - player.sendWindow(FormID.SERVER_OPTIONS, getServerOptions(server)); - } - } - - /** - * Handle the add server response - * - * @param player The player that submitted the response - * @param data The form response data - */ - public static void handleAddServerResponse(Player player, CustomFormResponse data) { - // Take them back to the edit server list menu if they close the add server window - if (!data.isCorrect()) { - player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); - return; - } - - try { - String address = data.getInput(0); - int port = Integer.parseInt(data.getInput(1)); - boolean online = data.getToggle(2); - boolean bedrock = data.getToggle(3); - - // Make sure we got an address - if (address == null || "".equals(address)) { - player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); - return; - } - - // Make sure we got a valid port - if (port <= 0 || port >= 65535) { - player.resendWindow(); - return; - } - - player.getServers().add(new Server(address, port, online, bedrock)); - - // Send them back to the edit screen - player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); - } catch (NumberFormatException e) { - player.resendWindow(); - } - } - - /** - * Handle the server options response - * - * @param player The player that submitted the response - * @param data The form response data - */ - public static void handleServerOptionsResponse(Player player, SimpleFormResponse data) { - // Take them back to the main menu if they close the edit server list window - if (!data.isCorrect()) { - player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); - return; - } - - SimpleForm window = (SimpleForm) player.getCurrentWindow(); - Server selectedServer = null; - for (Server server : player.getServers()) { - if (server.toString().equals(window.getContent())) { - selectedServer = server; - break; - } - } - - if (selectedServer == null) { - player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); - return; - } - - switch (data.getClickedButtonId()) { - case 0: - player.sendWindow(FormID.EDIT_SERVER, getEditServer(player.getServers().indexOf(selectedServer), selectedServer)); - break; - - case 1: - player.sendWindow(FormID.REMOVE_SERVER, getRemoveServer(selectedServer)); - break; - - default: - player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); - break; - } - } - - /** - * Handle the server remove response - * - * @param player The player that submitted the response - * @param data The form response data - */ - public static void handleServerRemoveResponse(Player player, SimpleFormResponse data) { - SimpleForm window = (SimpleForm) player.getCurrentWindow(); - String serverName = window.getContent().split(":")[1].trim(); - Server selectedServer = null; - for (Server server : player.getServers()) { - if (server.toString().equals(serverName)) { - selectedServer = server; - break; - } - } - - if (selectedServer == null) { - player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); - return; - } - - if (data.getClickedButtonId() == 0) { - player.getServers().remove(selectedServer); - player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); - } else { - player.sendWindow(FormID.SERVER_OPTIONS, getServerOptions(selectedServer)); - } - } - - /** - * Handle the edit server response - * - * @param player The player that submitted the response - * @param data The form response data - */ - public static void handleEditServerResponse(Player player, CustomFormResponse data) { - // Take them back to the edit server list menu if they close the add server window - if (!data.isCorrect()) { - player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); - return; - } - - try { - int serverIndex = Integer.parseInt(((CustomForm)player.getCurrentWindow()).getContent().get(0).getText().split(":")[1].trim()); - - String address = data.getInput(1); - int port = Integer.parseInt(data.getInput(2)); - boolean online = data.getToggle(3); - boolean bedrock = data.getToggle(4); - - // Make sure we got an address - if (address == null || "".equals(address)) { - player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); - return; - } - - // Make sure we got a valid port - if (port <= 0 || port >= 65535) { - player.resendWindow(); - return; - } - - player.getServers().set(serverIndex, new Server(address, port, online, bedrock)); - - // Send them back to the edit screen - player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); - } catch (NumberFormatException e) { - player.resendWindow(); - } - } -} diff --git a/src/main/java/org/geysermc/connect/utils/GeyserConnectFileUtils.java b/src/main/java/org/geysermc/connect/utils/GeyserConnectFileUtils.java deleted file mode 100644 index 56b12a4..0000000 --- a/src/main/java/org/geysermc/connect/utils/GeyserConnectFileUtils.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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/GeyserConnect - */ - -package org.geysermc.connect.utils; - -import org.geysermc.connect.MasterServer; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.function.Function; - -public final class GeyserConnectFileUtils { - - public static File fileOrCopiedFromResource(File file, String name, Function format) throws IOException { - if (!file.exists()) { - //noinspection ResultOfMethodCallIgnored - file.createNewFile(); - try (FileOutputStream fos = new FileOutputStream(file)) { - try (InputStream input = MasterServer.class.getClassLoader().getResourceAsStream(name)) { - byte[] bytes = new byte[input.available()]; - - //noinspection ResultOfMethodCallIgnored - input.read(bytes); - - for(char c : format.apply(new String(bytes)).toCharArray()) { - fos.write(c); - } - - fos.flush(); - } - } - } - - return file; - } - - private GeyserConnectFileUtils() { - } -} diff --git a/src/main/java/org/geysermc/connect/utils/Logger.java b/src/main/java/org/geysermc/connect/utils/Logger.java deleted file mode 100644 index 01975b5..0000000 --- a/src/main/java/org/geysermc/connect/utils/Logger.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2019-2020 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/GeyserConnect - */ - -package org.geysermc.connect.utils; - -import lombok.extern.log4j.Log4j2; -import net.minecrell.terminalconsole.SimpleTerminalConsole; -import org.apache.logging.log4j.core.config.Configurator; -import org.geysermc.connect.MasterServer; -import org.geysermc.geyser.GeyserLogger; -import org.geysermc.geyser.text.ChatColor; - -@Log4j2 -public class Logger extends SimpleTerminalConsole implements GeyserLogger { - - @Override - protected boolean isRunning() { - return !MasterServer.getInstance().isShuttingDown(); - } - - @Override - protected void runCommand(String line) { - // Dont do anything rn - } - - @Override - protected void shutdown() { - MasterServer.getInstance().shutdown(); - } - - public void severe(String message) { - log.fatal(printConsole(ChatColor.DARK_RED + message)); - } - - public void severe(String message, Throwable error) { - log.fatal(printConsole(ChatColor.DARK_RED + message), error); - } - - public void error(String message) { - log.error(printConsole(ChatColor.RED + message)); - } - - public void error(String message, Throwable error) { - log.error(printConsole(ChatColor.RED + message), error); - } - - public void warning(String message) { - log.warn(printConsole(ChatColor.YELLOW + message)); - } - - public void info(String message) { - log.info(printConsole(ChatColor.WHITE + message)); - } - - public void debug(String message) { - log.debug(printConsole(ChatColor.GRAY + message)); - } - - public static String printConsole(String message) { - return ChatColor.toANSI(message + ChatColor.RESET); - } - - public void setDebug(boolean debug) { - Configurator.setLevel(log.getName(), debug ? org.apache.logging.log4j.Level.DEBUG : log.getLevel()); - } - - public boolean isDebug() { - return log.isDebugEnabled(); - } -} diff --git a/src/main/java/org/geysermc/connect/utils/Player.java b/src/main/java/org/geysermc/connect/utils/Player.java deleted file mode 100644 index 6b0ad00..0000000 --- a/src/main/java/org/geysermc/connect/utils/Player.java +++ /dev/null @@ -1,318 +0,0 @@ -/* - * Copyright (c) 2019-2020 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/GeyserConnect - */ - -package org.geysermc.connect.utils; - -import com.fasterxml.jackson.databind.JsonNode; -import com.nukkitx.math.vector.Vector2f; -import com.nukkitx.math.vector.Vector3f; -import com.nukkitx.math.vector.Vector3i; -import com.nukkitx.nbt.NbtMap; -import com.nukkitx.protocol.bedrock.BedrockServerSession; -import com.nukkitx.protocol.bedrock.data.*; -import com.nukkitx.protocol.bedrock.packet.*; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import it.unimi.dsi.fastutil.longs.Long2ObjectMap; -import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; -import lombok.Getter; -import lombok.Setter; -import org.geysermc.connect.MasterServer; -import org.geysermc.connect.proxy.GeyserProxySession; -import org.geysermc.connect.ui.FormID; -import org.geysermc.cumulus.Form; -import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.api.network.AuthType; -import org.geysermc.geyser.network.UpstreamPacketHandler; -import org.geysermc.geyser.registry.BlockRegistries; -import org.geysermc.geyser.registry.Registries; -import org.geysermc.geyser.registry.type.ItemMappings; -import org.geysermc.geyser.session.auth.AuthData; -import org.geysermc.geyser.session.auth.BedrockClientData; -import org.geysermc.geyser.util.ChunkUtils; -import org.geysermc.geyser.util.DimensionUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -@Getter -public class Player { - private static final byte[] EMPTY_CHUNK_DATA; - - static { - ByteBuf byteBuf = Unpooled.buffer(); - try { - for (int i = 0; i < 32; i++) { - byteBuf.writeBytes(ChunkUtils.EMPTY_BIOME_DATA); - } - - byteBuf.writeByte(0); // Border - - EMPTY_CHUNK_DATA = new byte[byteBuf.readableBytes()]; - byteBuf.readBytes(EMPTY_CHUNK_DATA); - } finally { - byteBuf.release(); - } - } - - private final AuthData authData; - @Setter - private JsonNode chainData; - - private final BedrockServerSession session; - - private final List servers = new ArrayList<>(); - private final Long2ObjectMap forms = new Long2ObjectOpenHashMap<>(); - - private Form currentWindow; - private FormID currentWindowId; - - @Setter - private Server currentServer; - - @Setter - private BedrockClientData clientData; - - @Setter - private ServerCategory serverCategory; - - public Player(AuthData authData, BedrockServerSession session) { - this.authData = authData; - this.session = session; - - // Should fetch the servers from some form of db - if (MasterServer.getInstance().getGeyserConnectConfig().getCustomServers().isEnabled()) { - servers.addAll(MasterServer.getInstance().getStorageManager().loadServers(this)); - } - } - - /** - * Send a few different packets to get the client to load in - */ - public void sendStartGame() { - ItemMappings itemMappings = Registries.ITEMS.forVersion(session.getPacketCodec().getProtocolVersion()); - - // A lot of this likely doesn't need to be changed - StartGamePacket startGamePacket = new StartGamePacket(); - startGamePacket.setUniqueEntityId(1); - startGamePacket.setRuntimeEntityId(1); - startGamePacket.setPlayerGameType(GameType.CREATIVE); - startGamePacket.setPlayerPosition(Vector3f.from(0, 64 + 2, 0)); - startGamePacket.setRotation(Vector2f.ONE); - - startGamePacket.setSeed(-1L); - startGamePacket.setDimensionId(2); - startGamePacket.setGeneratorId(1); - startGamePacket.setLevelGameType(GameType.CREATIVE); - startGamePacket.setDifficulty(0); - startGamePacket.setDefaultSpawn(Vector3i.ZERO); - startGamePacket.setAchievementsDisabled(true); - startGamePacket.setCurrentTick(-1); - startGamePacket.setEduEditionOffers(0); - startGamePacket.setEduFeaturesEnabled(false); - startGamePacket.setRainLevel(0); - startGamePacket.setLightningLevel(0); - startGamePacket.setMultiplayerGame(true); - startGamePacket.setBroadcastingToLan(true); - startGamePacket.getGamerules().add(new GameRuleData<>("showcoordinates", true)); - startGamePacket.setPlatformBroadcastMode(GamePublishSetting.PUBLIC); - startGamePacket.setXblBroadcastMode(GamePublishSetting.PUBLIC); - startGamePacket.setCommandsEnabled(true); - startGamePacket.setTexturePacksRequired(false); - startGamePacket.setBonusChestEnabled(false); - startGamePacket.setStartingWithMap(false); - startGamePacket.setTrustingPlayers(true); - startGamePacket.setDefaultPlayerPermission(PlayerPermission.VISITOR); - startGamePacket.setServerChunkTickRange(4); - startGamePacket.setBehaviorPackLocked(false); - startGamePacket.setResourcePackLocked(false); - startGamePacket.setFromLockedWorldTemplate(false); - startGamePacket.setUsingMsaGamertagsOnly(false); - startGamePacket.setFromWorldTemplate(false); - startGamePacket.setWorldTemplateOptionLocked(false); - - startGamePacket.setLevelId(""); - startGamePacket.setLevelName("GeyserConnect"); - startGamePacket.setPremiumWorldTemplateId(""); - startGamePacket.setCurrentTick(0); - startGamePacket.setEnchantmentSeed(0); - startGamePacket.setMultiplayerCorrelationId(""); - startGamePacket.setItemEntries(itemMappings.getItemEntries()); - startGamePacket.setInventoriesServerAuthoritative(true); - startGamePacket.setServerEngine(""); - startGamePacket.setPlayerPropertyData(NbtMap.EMPTY); - startGamePacket.setWorldTemplateId(UUID.randomUUID()); - startGamePacket.setChatRestrictionLevel(ChatRestrictionLevel.NONE); - - SyncedPlayerMovementSettings settings = new SyncedPlayerMovementSettings(); - settings.setMovementMode(AuthoritativeMovementMode.CLIENT); - settings.setRewindHistorySize(0); - settings.setServerAuthoritativeBlockBreaking(false); - startGamePacket.setPlayerMovementSettings(settings); - - startGamePacket.setVanillaVersion("*"); - session.sendPacket(startGamePacket); - - if (!itemMappings.getComponentItemData().isEmpty()) { - ItemComponentPacket itemComponentPacket = new ItemComponentPacket(); - itemComponentPacket.getItems().addAll(itemMappings.getComponentItemData()); - session.sendPacket(itemComponentPacket); - } - - // Send an empty chunk - LevelChunkPacket data = new LevelChunkPacket(); - data.setChunkX(0); - data.setChunkZ(0); - data.setSubChunksLength(0); - data.setData(EMPTY_CHUNK_DATA); - data.setCachingEnabled(false); - session.sendPacket(data); - - // Send the biomes - BiomeDefinitionListPacket biomeDefinitionListPacket = new BiomeDefinitionListPacket(); - biomeDefinitionListPacket.setDefinitions(Registries.BIOMES_NBT.get()); - session.sendPacket(biomeDefinitionListPacket); - - AvailableEntityIdentifiersPacket entityPacket = new AvailableEntityIdentifiersPacket(); - entityPacket.setIdentifiers(Registries.BEDROCK_ENTITY_IDENTIFIERS.get()); - session.sendPacket(entityPacket); - - // Send a CreativeContentPacket - required for 1.16.100 - CreativeContentPacket creativeContentPacket = new CreativeContentPacket(); - creativeContentPacket.setContents(itemMappings.getCreativeItems()); - session.sendPacket(creativeContentPacket); - - // Let the client know the player can spawn - PlayStatusPacket playStatusPacket = new PlayStatusPacket(); - playStatusPacket.setStatus(PlayStatusPacket.Status.PLAYER_SPAWN); - session.sendPacket(playStatusPacket); - - // Freeze the player - SetEntityMotionPacket setEntityMotionPacket = new SetEntityMotionPacket(); - setEntityMotionPacket.setRuntimeEntityId(1); - setEntityMotionPacket.setMotion(Vector3f.ZERO); - session.sendPacket(setEntityMotionPacket); - } - - /** - * Send a window with the specified id and content - * Also cache it against the player for later use - * - * @param id The {@link FormID} to use for the form - * @param window The {@link Form} to turn into json and send - */ - public void sendWindow(FormID id, Form window) { - this.currentWindow = window; - this.currentWindowId = id; - - ModalFormRequestPacket modalFormRequestPacket = new ModalFormRequestPacket(); - modalFormRequestPacket.setFormId(id.ordinal()); - modalFormRequestPacket.setFormData(window.getJsonData()); - session.sendPacket(modalFormRequestPacket); - - // This packet is used to fix the image loading bug - NetworkStackLatencyPacket networkStackLatencyPacket = new NetworkStackLatencyPacket(); - networkStackLatencyPacket.setFromServer(true); - networkStackLatencyPacket.setTimestamp(System.currentTimeMillis()); - session.sendPacket(networkStackLatencyPacket); - } - - public void resendWindow() { - sendWindow(currentWindowId, currentWindow); - } - - /** - * Send the player to the Geyser proxy server or straight to the bedrock server if it is - */ - public void connectToProxy() { - if (currentServer.isBedrock()) { - TransferPacket transferPacket = new TransferPacket(); - transferPacket.setAddress(currentServer.getAddress()); - transferPacket.setPort(currentServer.getPort()); - session.sendPacket(transferPacket); - } else { - GeyserProxySession geyserSession = createGeyserSession(true); - GeyserImpl geyser = geyserSession.getGeyser(); - - geyserSession.setDimension(DimensionUtils.THE_END); - - geyserSession.remoteServer(currentServer); - - // Tell Geyser to handle the login - SetLocalPlayerAsInitializedPacket initializedPacket = new SetLocalPlayerAsInitializedPacket(); - initializedPacket.setRuntimeEntityId(geyserSession.getPlayerEntity().getGeyserId()); - session.getPacketHandler().handle(initializedPacket); - - if (geyser.getConfig().getSavedUserLogins().contains(authData.name())) { - String refreshToken = geyser.refreshTokenFor(authData.name()); - if (refreshToken != null) { - geyserSession.authenticateWithRefreshToken(refreshToken); - } - } - - if (geyserSession.remoteServer().authType() != AuthType.ONLINE) { - geyserSession.authenticate(geyserSession.getAuthData().name()); - } - } - } - - public GeyserProxySession createGeyserSession(boolean initialized) { - GeyserProxySession geyserSession = new GeyserProxySession(GeyserImpl.getInstance(), session, - MasterServer.getInstance().getEventLoopGroup().next(), this, initialized); - session.setPacketHandler(new UpstreamPacketHandler(GeyserImpl.getInstance(), geyserSession)); - // The player will be tracked from Geyser from here - MasterServer.getInstance().getPlayers().remove(this); - GeyserImpl.getInstance().getSessionManager().addPendingSession(geyserSession); - - geyserSession.getUpstream().getSession().setPacketCodec(session.getPacketCodec()); - - // Set the block translation based off of version - geyserSession.setBlockMappings(BlockRegistries.BLOCKS.forVersion(session.getPacketCodec().getProtocolVersion())); - geyserSession.setItemMappings(Registries.ITEMS.forVersion(session.getPacketCodec().getProtocolVersion())); - - geyserSession.setAuthData(authData); - geyserSession.setCertChainData(chainData); - geyserSession.setClientData(clientData); - - return geyserSession; - } - - public void sendToServer(Server server) { - // Geyser will show a "please wait" message in action bar - - // Send the user over to the server - setCurrentServer(server); - connectToProxy(); - } - - public List getCurrentServers() { - if (serverCategory == ServerCategory.CUSTOM) { - return servers; - } - - return MasterServer.getInstance().getServers(serverCategory); - } -} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 44f8518..637bacc 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -2,39 +2,10 @@ # GeyserConnect Configuration File # -------------------------------- -# The IP address that will listen for connections -address: 0.0.0.0 - -# The port that will listen for connections -port: 19132 - -# If debug messages should be sent through console -debug-mode: false - -# Maximum amount of players that can connect -max-players: 100 - -# MOTD to display -motd: "GeyserConnect Proxy" -#Sub-MOTD to display. Will be "GeyserConnect" by default if left blank -submotd: "GeyserConnect" - # Welcome message file, if file exists and is not empty this will show on join # This is loaded live so will update without a server restart welcome-file: welcome.txt -# Config for the Geyser listener -geyser: - # If password authentication should be allowed in online mode. - allow-password-authentication: false - - # If debug messages should be sent through console, has to be enabled in both places to work - debug-mode: false - - saved-user-logins: - - ThisExampleUsernameShouldBeLongEnoughToNeverBeAnXboxUsername - - ThisOtherExampleUsernameShouldAlsoBeLongEnough - # A global list of servers sent to all clients servers: - name: The Hive @@ -42,49 +13,49 @@ servers: port: 19132 bedrock: true category: OFFICIAL - imageUrl: 'https://i.imgur.com/VQJW6XG.png' + imageUrl: 'https://i.imgur.com/myXmr7B.png' - name: CubeCraft address: 94.23.159.81 port: 19132 bedrock: true category: OFFICIAL - imageUrl: 'https://www.cubecraft.net/attachments/q3pmrsod_400x400-png.53219/' + imageUrl: 'https://i.imgur.com/f83ZeDS.jpg' - name: Galaxite address: 54.39.243.199 port: 19132 bedrock: true category: OFFICIAL - imageUrl: 'https://pbs.twimg.com/profile_images/1275867042583896066/UMPF5nTM_400x400.jpg' + imageUrl: 'https://i.imgur.com/PEkLROT.jpg' - name: Lifeboat Network address: 63.143.54.198 port: 19132 bedrock: true category: OFFICIAL - imageUrl: 'https://lbsg.net/wp-content/uploads/2017/06/lifeboat-square.png' + imageUrl: 'https://i.imgur.com/GjsxhCI.png' - name: Mineplex address: 108.178.12.38 port: 19132 bedrock: true category: OFFICIAL - imageUrl: 'https://www.mineplex.com/assets/www-mp/img/footer/footer_smalllogo.png' + imageUrl: 'https://i.imgur.com/xB6yncS.png' - name: MineVille address: 52.234.130.255 port: 19132 bedrock: true category: OFFICIAL - imageUrl: 'https://pbs.twimg.com/profile_images/1332400307050045441/MHQvGEUP_400x400.jpg' + imageUrl: 'https://i.imgur.com/yqrfMhP.jpg' - name: Pixel Paradise address: 40.87.84.59 port: 19132 bedrock: true category: OFFICIAL - imageUrl: 'https://xforgeassets001.xboxlive.com/pf-title-b63a0803d3653643-20ca2/fa7681c4-673d-40e4-9b6a-61d5d0f93d14/PixelParadise.jpg' + imageUrl: 'https://i.imgur.com/fXQdou8.jpg' - name: Official Geyser Test Server address: test.geysermc.org diff --git a/src/main/resources/extension.yml b/src/main/resources/extension.yml new file mode 100644 index 0000000..f9b1443 --- /dev/null +++ b/src/main/resources/extension.yml @@ -0,0 +1,6 @@ +id: geyserconnect +name: GeyserConnect +main: org.geysermc.connect.extension.GeyserConnect +api: 1.0.0 +version: 1.0.0 +authors: [rtm516] \ No newline at end of file diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml deleted file mode 100644 index 9574154..0000000 --- a/src/main/resources/log4j2.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/proxy_config.yml b/src/main/resources/proxy_config.yml deleted file mode 100644 index dbbac0d..0000000 --- a/src/main/resources/proxy_config.yml +++ /dev/null @@ -1,196 +0,0 @@ -# -------------------------------- -# Geyser Configuration File -# -# A bridge between Minecraft: Bedrock Edition and Minecraft: Java Edition. -# -# GitHub: https://github.com/GeyserMC/Geyser -# Discord: https://discord.geysermc.org/ -# -------------------------------- - -bedrock: - # The IP address that will listen for connections. - # There is no reason to change this unless you want to limit what IPs can connect to your server. - address: 0.0.0.0 - # The port that will listen for connections - port: 19132 - # Some hosting services change your Java port everytime you start the server and require the same port to be used for Bedrock. - # This option makes the Bedrock port the same as the Java port every time you start the server. - # This option is for the plugin version only. - clone-remote-port: false - # The MOTD that will be broadcasted to Minecraft: Bedrock Edition clients. This is irrelevant if "passthrough-motd" is set to true - # If either of these are empty, the respective string will default to "Geyser" - motd1: "%MOTD%" - motd2: "%MOTD%" - # The Server Name that will be sent to Minecraft: Bedrock Edition clients. This is visible in both the pause menu and the settings menu. - server-name: "Geyser" - # How much to compress network traffic to the Bedrock client. The higher the number, the more CPU usage used, but - # the smaller the bandwidth used. Does not have any effect below -1 or above 9. Set to -1 to disable. - compression-level: 6 - # Whether to enable PROXY protocol or not for clients. You DO NOT WANT this feature unless you run UDP reverse proxy - # in front of your Geyser instance. - enable-proxy-protocol: false - # A list of allowed PROXY protocol speaking proxy IP addresses/subnets. Only effective when "enable-proxy-protocol" is enabled, and - # should really only be used when you are not able to use a proper firewall (usually true with shared hosting providers etc.). - # Keeping this list empty means there is no IP address whitelist. - # Both IP addresses and subnets are supported. - #proxy-protocol-whitelisted-ips: [ "127.0.0.1", "172.18.0.0/16" ] -remote: - # The IP address of the remote (Java Edition) server - # If it is "auto", for standalone version the remote address will be set to 127.0.0.1, - # for plugin versions, Geyser will attempt to find the best address to connect to. - address: auto - # The port of the remote (Java Edition) server - # For plugin versions, if address has been set to "auto", the port will also follow the server's listening port. - port: 25565 - # Authentication type. Can be offline, online, or floodgate (see https://github.com/GeyserMC/Geyser/wiki/Floodgate). - auth-type: online - # Allow for password-based authentication methods through Geyser. Only useful in online mode. - # If this is false, users must authenticate to Microsoft using a code provided by Geyser on their desktop. - allow-password-authentication: %ALLOWPASSWORDAUTHENTICATION% - # Whether to enable PROXY protocol or not while connecting to the server. - # This is useful only when: - # 1) Your server supports PROXY protocol (it probably doesn't) - # 2) You run Velocity or BungeeCord with the option enabled in the proxy's main config. - # IF YOU DON'T KNOW WHAT THIS IS, DON'T TOUCH IT! - use-proxy-protocol: false - # Forward the hostname that the Bedrock client used to connect over to the Java server - # This is designed to be used for forced hosts on proxies - forward-hostname: false - -# Floodgate uses encryption to ensure use from authorised sources. -# This should point to the public key generated by Floodgate (Bungee or CraftBukkit) -# You can ignore this when not using Floodgate. -floodgate-key-file: public-key.pem - -saved-user-logins: - - ThisExampleUsernameShouldBeLongEnoughToNeverBeAnXboxUsername - - ThisOtherExampleUsernameShouldAlsoBeLongEnough - -# Bedrock clients can freeze when opening up the command prompt for the first time if given a lot of commands. -# Disabling this will prevent command suggestions from being sent and solve freezing for Bedrock clients. -command-suggestions: false - -# The following three options enable "ping passthrough" - the MOTD, player count and/or protocol name gets retrieved from the Java server. -# Relay the MOTD from the remote server to Bedrock players. -passthrough-motd: false -# Relay the protocol name (e.g. BungeeCord [X.X], Paper 1.X) - only really useful when using a custom protocol name! -# This will also show up on sites like MCSrvStatus. -passthrough-protocol-name: false -# Relay the player count and max players from the remote server to Bedrock players. -passthrough-player-counts: false -# Enable LEGACY ping passthrough. There is no need to enable this unless your MOTD or player count does not appear properly. -# This option does nothing on standalone. -legacy-ping-passthrough: false -# How often to ping the remote server, in seconds. Only relevant for standalone or legacy ping passthrough. -# Increase if you are getting BrokenPipe errors. -ping-passthrough-interval: 3 - -# Whether to forward player ping to the server. While enabling this will allow Bedrock players to have more accurate -# ping, it may also cause players to time out more easily. -forward-player-ping: false - -# Maximum amount of players that can connect. This is only visual at this time and does not actually limit player count. -max-players: %PLAYERS% - -# If debug messages should be sent through console -debug-mode: false - -# Thread pool size -general-thread-pool: 32 - -# Allow third party capes to be visible. Currently allowing: -# OptiFine capes, LabyMod capes, 5Zig capes and MinecraftCapes -allow-third-party-capes: true - -# Allow third party deadmau5 ears to be visible. Currently allowing: -# MinecraftCapes -allow-third-party-ears: false - -# Allow a fake cooldown indicator to be sent. Bedrock players do not see a cooldown as they still use 1.8 combat -# Can be title, actionbar or false -show-cooldown: title - -# Controls if coordinates are shown to players. -show-coordinates: true - -# If set, when a Bedrock player performs any emote, it will swap the offhand and mainhand items, just like the Java Edition keybind -# There are three options this can be set to: -# disabled - the default/fallback, which doesn't apply this workaround -# no-emotes - emotes will NOT be sent to other Bedrock clients and offhand will be swapped. This effectively disables all emotes from being seen. -# emotes-and-offhand - emotes will be sent to Bedrock clients and offhand will be swapped -emote-offhand-workaround: "disabled" - -# The default locale if we dont have the one the client requested. Uncomment to not use the default system language. -# default-locale: en_us - -# Configures if chunk caching should be enabled or not. This keeps an individual -# record of each block the client loads in. This feature does allow for a few things -# such as more accurate movement that causes less problems with anticheat (meaning -# you're less likely to be banned) and allows block break animations to show up in -# creative mode (and other features). Although this increases RAM usage, it likely -# won't have much of an effect for the vast majority of people. However, if you're -# running out of RAM or are in a RAM-sensitive environment, you may want to disable -# this. When using the Spigot version of Geyser, support for features or -# implementations this allows is automatically enabled without the additional caching -# as Geyser has direct access to the server itself. -cache-chunks: true - -# Specify how many days images will be cached to disk to save downloading them from the internet. -# A value of 0 is disabled. (Default: 0) -cache-images: 0 - -# Allows custom skulls to be displayed. Keeping them enabled may cause a performance decrease on older/weaker devices. -allow-custom-skulls: true - -# Whether to add (at this time, only) the furnace minecart as a separate item in the game, which normally does not exist in Bedrock Edition. -# This should only need to be disabled if using a proxy that does not use the "transfer packet" style of server switching. -# If this is disabled, furnace minecart items will be mapped to hopper minecart items. -# This option requires a restart of Geyser in order to change its setting. -add-non-bedrock-items: true - -# Bedrock prevents building and displaying blocks above Y127 in the Nether - -# enabling this config option works around that by changing the Nether dimension ID -# to the End ID. The main downside to this is that the sky will resemble that of -# the end sky in the nether, but ultimately it's the only way for this feature to work. -above-bedrock-nether-building: false - -# Force clients to load all resource packs if there are any. -# If set to false, it allows the user to connect to the server even if they don't -# want to download the resource packs. -force-resource-packs: true - -# Allows Xbox achievements to be unlocked. -# THIS DISABLES ALL COMMANDS FROM SUCCESSFULLY RUNNING FOR BEDROCK IN-GAME, as otherwise Bedrock thinks you are cheating. -xbox-achievements-enabled: false - -# bStats is a stat tracker that is entirely anonymous and tracks only basic information -# about Geyser, such as how many people are online, how many servers are using Geyser, -# what OS is being used, etc. You can learn more about bStats here: https://bstats.org/. -# https://bstats.org/plugin/server-implementation/GeyserMC -metrics: - # If metrics should be enabled - enabled: false - # UUID of server, don't change! - uuid: generateduuid - -# ADVANCED OPTIONS - DO NOT TOUCH UNLESS YOU KNOW WHAT YOU ARE DOING! - -# Geyser updates the Scoreboard after every Scoreboard packet, but when Geyser tries to handle -# a lot of scoreboard packets per second can cause serious lag. -# This option allows you to specify after how many Scoreboard packets per seconds -# the Scoreboard updates will be limited to four updates per second. -scoreboard-packet-threshold: 20 - -# Allow connections from ProxyPass and Waterdog. -# See https://www.spigotmc.org/wiki/firewall-guide/ for assistance - use UDP instead of TCP. -enable-proxy-connections: false - -# The internet supports a maximum MTU of 1492 but could cause issues with packet fragmentation. -# 1400 is the default. -# mtu: 1400 - -# Whether to use direct server methods to retrieve information such as block states. -# Turning this off for Spigot will stop NMS from being used but will have a performance impact. -use-adapters: true - -config-version: 4 \ No newline at end of file