diff --git a/quilt/.editorconfig b/quilt/.editorconfig new file mode 100644 index 0000000..73cec8a --- /dev/null +++ b/quilt/.editorconfig @@ -0,0 +1,33 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +tab_width = 4 +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false + +[*.gradle] +indent_style = tab + +[*.java] +indent_style = tab + +[*.json] +indent_style = space +indent_size = 2 + +[quilt.mod.json] +indent_style = tab +tab_width = 2 + +[*.toml] +indent_style = tab +tab_width = 2 + +[*.properties] +indent_style = space +indent_size = 2 diff --git a/quilt/.gitattributes b/quilt/.gitattributes new file mode 100644 index 0000000..8db5209 --- /dev/null +++ b/quilt/.gitattributes @@ -0,0 +1,30 @@ +*.java text eol=lf diff=java +*.gradle text eol=lf diff=java +*.kt text eol=lf diff=kotlin +*.kts text eol=lf diff=kotlin +gradlew text eol=lf +*.bat text eol=crlf + +*.md text eol=lf diff=markdown + +.editorconfig text eol=lf + +*.json text eol=lf +*.json5 text eol=lf +*.properties text eol=lf +*.toml text eol=lf +*.xml text eol=lf diff=html + +# Modding specific +*.accesswidener text eol=lf + +# These files are binary and should be left untouched +# (binary is a macro for -text -diff) +*.class binary +*.dll binary +*.ear binary +*.jar binary +*.jks binary +*.png binary +*.so binary +*.war binary diff --git a/quilt/.gitignore b/quilt/.gitignore new file mode 100644 index 0000000..de6cdcf --- /dev/null +++ b/quilt/.gitignore @@ -0,0 +1,34 @@ +# Gradle +.gradle/ +build/ +out/ +classes/ + +# Quilt Loom +remappedSrc/ +run/ + +# Eclipse +*.launch + +# IntelliJ Idea +.idea/ +*.iml +*.ipr +*.iws + +# Fleet +.fleet/ + +# Visual Studio Code +.settings/ +.vscode/ +bin/ +.classpath +.project + +# Eclipse JDT LS +workspace/ + +# macOS +*.DS_Store diff --git a/quilt/build.gradle b/quilt/build.gradle new file mode 100644 index 0000000..4c930ff --- /dev/null +++ b/quilt/build.gradle @@ -0,0 +1,109 @@ +plugins { + id 'maven-publish' + alias libs.plugins.quilt.loom + id 'org.jetbrains.kotlin.jvm' version '1.8.20' +} + +archivesBaseName = project.archives_base_name +version = "${project.version}+${libs.versions.minecraft.get()}" +group = project.maven_group + +repositories { + mavenCentral() + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +// maven { url "https://maven.terraformersmc.com/releases/" } +// maven { url "https://maven.shedaniel.me/" } +} + +// All the dependencies are declared at gradle/libs.version.toml and referenced with "libs." +// See https://docs.gradle.org/current/userguide/platforms.html for information on how version catalogs work. +dependencies { + minecraft libs.minecraft + mappings variantOf(libs.quilt.mappings) { classifier 'intermediary-v2' } + // Replace the above line with the block below if you want to use Mojang mappings as your primary mappings, falling back on QM for parameters and Javadocs + /* + mappings loom.layered { + mappings "org.quiltmc:quilt-mappings:${libs.versions.quilt.mappings.get()}:intermediary-v2" + officialMojangMappings() + } + */ + modImplementation libs.quilt.loader + + // QSL is not a complete API; You will need Quilted Fabric API to fill in the gaps. + // Quilted Fabric API will automatically pull in the correct QSL version. +// modImplementation libs.quilted.fabric.api +// modApi("me.shedaniel.cloth:cloth-config-fabric:9.0.94") { +// exclude(group: "net.fabricmc.fabric-api") +// } + modImplementation "org.quiltmc.quilt-kotlin-libraries:quilt-kotlin-libraries:2.0.1+kt.1.8.20+flk.1.9.3" +// implementation "io.netty:netty-codec-http:4.1.82.Final" + include(implementation("org.java-websocket:Java-WebSocket:1.5.3")) +// implementation "com.neovisionaries:nv-websocket-client:2.14" + // modImplementation libs.bundles.quilted.fabric.api // If you wish to use Fabric API's deprecated modules, you can replace the above line with this one +} + +processResources { + inputs.property 'version', version + + filesMatching('quilt.mod.json') { + expand "version": version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.encoding = 'UTF-8' + // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. + it.options.release = 17 +} + +java { + // Still required by IDEs such as Eclipse and Visual Studio Code + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + // If this mod is going to be a library, then it should also generate Javadocs in order to aid with development. + // Uncomment this line to generate them. + // withJavadocJar() +} + +// If you plan to use a different file for the license, don't forget to change the file name here! +jar { + from('LICENSE') { + rename { "${it}_${archivesBaseName}" } + } +} + +// Configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} +compileKotlin { + kotlinOptions { + jvmTarget = "17" + } +} +compileTestKotlin { + kotlinOptions { + jvmTarget = "17" + } +} diff --git a/quilt/gradle.properties b/quilt/gradle.properties new file mode 100644 index 0000000..e658aed --- /dev/null +++ b/quilt/gradle.properties @@ -0,0 +1,10 @@ +# Gradle Properties +org.gradle.jvmargs = -Xmx1G +org.gradle.parallel = true + +# Mod Properties +version = 1.0.0 +maven_group = vg.skye +archives_base_name = e4mc_quilt + +# Dependencies are managed at gradle/libs.versions.toml diff --git a/quilt/gradle/libs.versions.toml b/quilt/gradle/libs.versions.toml new file mode 100644 index 0000000..2592f45 --- /dev/null +++ b/quilt/gradle/libs.versions.toml @@ -0,0 +1,22 @@ +[versions] +# The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html +minecraft = "1.19.3" +quilt_mappings = "1.19.3+build.26" +quilt_loader = "0.18.3" + +quilted_fabric_api = "5.0.0-beta.8+0.75.1-1.19.3" + +[libraries] +minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } +quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_mappings" } +quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" } + +quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilted_fabric_api" } +quilted_fabric_api_deprecated = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api-deprecated", version.ref = "quilted_fabric_api" } + +# If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example". +[bundles] +quilted_fabric_api = ["quilted_fabric_api", "quilted_fabric_api_deprecated"] + +[plugins] +quilt_loom = { id = "org.quiltmc.loom", version = "1.1.+" } diff --git a/quilt/gradle/wrapper/gradle-wrapper.jar b/quilt/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..ccebba7 Binary files /dev/null and b/quilt/gradle/wrapper/gradle-wrapper.jar differ diff --git a/quilt/gradle/wrapper/gradle-wrapper.properties b/quilt/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..bdc9a83 --- /dev/null +++ b/quilt/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/quilt/gradlew b/quilt/gradlew new file mode 100755 index 0000000..79a61d4 --- /dev/null +++ b/quilt/gradlew @@ -0,0 +1,244 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# 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*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + 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/quilt/gradlew.bat b/quilt/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/quilt/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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/quilt/settings.gradle b/quilt/settings.gradle new file mode 100644 index 0000000..d969e34 --- /dev/null +++ b/quilt/settings.gradle @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + maven { + name = 'Quilt' + url = 'https://maven.quiltmc.org/repository/release' + } + // Currently needed for Intermediary and other temporary dependencies + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/quilt/src/main/java/vg/skye/e4mc_quilt/E4mcAddressSetter.kt b/quilt/src/main/java/vg/skye/e4mc_quilt/E4mcAddressSetter.kt new file mode 100644 index 0000000..0215b26 --- /dev/null +++ b/quilt/src/main/java/vg/skye/e4mc_quilt/E4mcAddressSetter.kt @@ -0,0 +1,16 @@ +package vg.skye.e4mc_quilt + +import io.netty.channel.ChannelHandlerContext +import io.netty.channel.ChannelInboundHandlerAdapter +import vg.skye.e4mc_quilt.mixin.ClientConnectionAddressSetter +import java.net.InetSocketAddress + +class E4mcAddressSetter : ChannelInboundHandlerAdapter() { + override fun channelRead(ctx: ChannelHandlerContext, msg: Any) { + if (msg is InetSocketAddress) { + (ctx.channel().pipeline().get("packet_handler") as ClientConnectionAddressSetter).setAddress(msg) + } else { + super.channelRead(ctx, msg) + } + } +} diff --git a/quilt/src/main/java/vg/skye/e4mc_quilt/E4mcChannelInitializer.kt b/quilt/src/main/java/vg/skye/e4mc_quilt/E4mcChannelInitializer.kt new file mode 100644 index 0000000..9787080 --- /dev/null +++ b/quilt/src/main/java/vg/skye/e4mc_quilt/E4mcChannelInitializer.kt @@ -0,0 +1,23 @@ +package vg.skye.e4mc_quilt + +import io.netty.channel.Channel +import io.netty.channel.ChannelHandler +import io.netty.channel.ChannelInitializer +import io.netty.channel.local.LocalAddress +import io.netty.channel.local.LocalChannel +import vg.skye.e4mc_quilt.mixin.ChannelInitializerInvoker + + +class E4mcChannelInitializer(private val channelInitializer: ChannelInitializerInvoker) : + ChannelInitializer() { + + @Throws(java.lang.Exception::class) + override fun initChannel(channel: Channel) { + channelInitializer.invokeInitChannel(channel) + if (channel.localAddress() != LocalAddress("e4mc-relay")) { + return + } + channel.pipeline() + .addAfter("timeout", "e4mc-address-setter", E4mcAddressSetter()) + } +} diff --git a/quilt/src/main/java/vg/skye/e4mc_quilt/E4mcClient.kt b/quilt/src/main/java/vg/skye/e4mc_quilt/E4mcClient.kt new file mode 100644 index 0000000..c1d6e52 --- /dev/null +++ b/quilt/src/main/java/vg/skye/e4mc_quilt/E4mcClient.kt @@ -0,0 +1,25 @@ +package vg.skye.e4mc_quilt + +import net.fabricmc.api.EnvType +import org.quiltmc.loader.api.ModContainer +import org.quiltmc.loader.api.minecraft.ClientOnly +import org.quiltmc.loader.api.minecraft.DedicatedServerOnly +import org.quiltmc.loader.api.minecraft.MinecraftQuiltLoader +import org.slf4j.Logger +import org.slf4j.LoggerFactory + +class E4mcClient { +// override fun onInitialize(mod: ModContainer) { +// if (MinecraftQuiltLoader.getEnvironmentType().equals(EnvType.SERVER)) { +// LOGGER.warn("e4mc running on Dedicated Server; This works, but isn't recommended as e4mc is designed for short-lived LAN servers") +// } +// } + + companion object { + // This logger is used to write text to the console and the log file. + // It is considered best practice to use your mod name as the logger's name. + // That way, it's clear which mod wrote info, warnings, and errors. + @JvmField + val LOGGER: Logger = LoggerFactory.getLogger("E4mc Quilt") + } +} diff --git a/quilt/src/main/java/vg/skye/e4mc_quilt/E4mcRelayHandler.kt b/quilt/src/main/java/vg/skye/e4mc_quilt/E4mcRelayHandler.kt new file mode 100644 index 0000000..5799170 --- /dev/null +++ b/quilt/src/main/java/vg/skye/e4mc_quilt/E4mcRelayHandler.kt @@ -0,0 +1,168 @@ +package vg.skye.e4mc_quilt + +import com.google.gson.Gson +import com.google.gson.JsonObject +import io.netty.bootstrap.Bootstrap +import io.netty.buffer.ByteBuf +import io.netty.channel.* +import io.netty.channel.local.LocalAddress +import io.netty.channel.local.LocalChannel +import io.netty.channel.nio.NioEventLoopGroup +import net.fabricmc.api.EnvType +import net.minecraft.client.MinecraftClient +import net.minecraft.text.Text +import net.minecraft.text.Texts +import org.java_websocket.client.WebSocketClient +import org.java_websocket.handshake.ServerHandshake +import org.quiltmc.loader.api.minecraft.ClientOnly +import org.quiltmc.loader.api.minecraft.MinecraftQuiltLoader +import java.lang.Exception +import java.net.InetSocketAddress +import java.net.URI +import java.nio.ByteBuffer +import java.util.concurrent.ArrayBlockingQueue + + +data class DomainAssignedMessage(val DomainAssigned: String) +data class ChannelOpenMessage(val ChannelOpen: List) +data class ChannelClosedMessage(val ChannelClosed: Number) + +class E4mcRelayHandler: WebSocketClient(URI("wss://e4mc.skyevg.systems")) { + private val gson = Gson() + private val childChannels = mutableMapOf() + private val messageQueue = mutableMapOf>() + private val eventLoopGroup = NioEventLoopGroup() + + override fun onOpen(handshakedata: ServerHandshake?) { + // not much to do here + } + + override fun onMessage(message: String?) { + E4mcClient.LOGGER.info("WebSocket Text message: {}", message) + val json = gson.fromJson(message, JsonObject::class.java) + when { + json.has("DomainAssigned") -> handleDomainAssigned(json) + json.has("ChannelOpen") -> handleChannelOpen(json) + json.has("ChannelClosed") -> handleChannelClosed(json) + else -> E4mcClient.LOGGER.warn("Unhandled WebSocket Text message: $message") + } + } + + override fun onMessage(bytes: ByteBuffer) { + val channelId = bytes.get() + val rest = bytes.slice() + val channel = childChannels[channelId.toInt()] + if (channel == null) { + if (messageQueue[channelId.toInt()] == null) { + E4mcClient.LOGGER.info("Creating queue for channel: {}", channelId) + messageQueue[channelId.toInt()] = ArrayBlockingQueue(8) + } + messageQueue[channelId.toInt()]!!.add(rest) + } else { + val byteBuf = channel.alloc().buffer(rest.remaining()) + byteBuf.writeBytes(rest) + channel.writeAndFlush(byteBuf).sync() + } + } + + override fun onClose(code: Int, reason: String?, remote: Boolean) { + childChannels.forEach { (_, channel) -> channel.close() } + } + + override fun onError(ex: java.lang.Exception) { + ex.printStackTrace() + } + + private fun handleDomainAssigned(json: JsonObject) { + val msg = gson.fromJson(json, DomainAssignedMessage::class.java) + if (MinecraftQuiltLoader.getEnvironmentType().equals(EnvType.SERVER)) { + E4mcClient.LOGGER.warn("e4mc running on Dedicated Server; This works, but isn't recommended as e4mc is designed for short-lived LAN servers") + } + E4mcClient.LOGGER.info("Domain assigned: ${msg.DomainAssigned}") + if (MinecraftQuiltLoader.getEnvironmentType().equals(EnvType.CLIENT)) { + alertUser(msg.DomainAssigned) + } + } + + @ClientOnly + private fun alertUser(domain: String) { + try { + MinecraftClient.getInstance().inGameHud.chatHud.addMessage( + Text.translatable( + "text.e4mc_quilt.domainAssigned", + Texts.copiable(domain) + ) + ) + } catch (e: Exception) { + e.printStackTrace() + } + } + + private fun handleChannelOpen(json: JsonObject) { + val msg = gson.fromJson(json, ChannelOpenMessage::class.java) + val channelId = msg.ChannelOpen[0] as Number + val clientInfo = msg.ChannelOpen[1] as String + E4mcClient.LOGGER.info("Channel opened: channelId=$channelId, clientInfo=$clientInfo") + val host = clientInfo.substringBeforeLast(':') + val port = clientInfo.substringAfterLast(':').toInt() + val addr = InetSocketAddress(host, port) + + val self = this + + Bootstrap() + .channel(LocalChannel::class.java) + .handler(object : ChannelInitializer() { + @Throws(java.lang.Exception::class) + override fun initChannel(ch: LocalChannel) { + ch.pipeline().addLast(ChildHandler(self, addr, channelId.toInt())) + } + }) + .group(eventLoopGroup) + .connect(LocalAddress("e4mc-relay")) + } + + private fun handleChannelClosed(json: JsonObject) { + val msg = gson.fromJson(json, ChannelClosedMessage::class.java) + val channelId = msg.ChannelClosed.toInt() + E4mcClient.LOGGER.info("Closing channel as requested: {}", channelId) + childChannels.remove(channelId)?.let { + it.pipeline().get(ChildHandler::class.java).isClosedFromServer = true + it.close() + E4mcClient.LOGGER.info("Channel closed: channelId=$channelId") + } + } + + class ChildHandler(private val parent: E4mcRelayHandler, private val address: InetSocketAddress, private val channelId: Int): SimpleChannelInboundHandler() { + var isClosedFromServer = false + override fun channelActive(ctx: ChannelHandlerContext) { +// ctx.writeAndFlush(address) + if (parent.messageQueue[channelId] != null) { + parent.messageQueue[channelId]!!.forEach { buf -> + run { + E4mcClient.LOGGER.info("Handling queued buffer: {}", buf) + val byteBuf = ctx.alloc().buffer(buf.remaining()) + byteBuf.writeBytes(buf) + ctx.writeAndFlush(byteBuf) + } + } + parent.messageQueue.remove(channelId) + } + parent.childChannels[channelId] = ctx.channel() as LocalChannel + } + + override fun channelRead0(ctx: ChannelHandlerContext, msg: ByteBuf) { + val buf = ByteArray(msg.readableBytes() + 1) + buf[0] = channelId.toByte() + msg.readBytes(buf, 1, msg.readableBytes()) + parent.send(buf) + } + + override fun channelInactive(ctx: ChannelHandlerContext) { + E4mcClient.LOGGER.info("Channel closed: {}", channelId) + if (!isClosedFromServer) { + parent.send(parent.gson.toJson(ChannelClosedMessage(channelId))) + } + parent.childChannels.remove(channelId) + } + } +} diff --git a/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/ChannelInitializerInvoker.java b/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/ChannelInitializerInvoker.java new file mode 100644 index 0000000..8cd43df --- /dev/null +++ b/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/ChannelInitializerInvoker.java @@ -0,0 +1,13 @@ +package vg.skye.e4mc_quilt.mixin; + +import io.netty.channel.Channel; +import io.netty.channel.ChannelInitializer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(ChannelInitializer.class) +public interface ChannelInitializerInvoker { + + @Invoker(value = "initChannel", remap = false) + public void invokeInitChannel(Channel ch) throws Exception; +} diff --git a/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/ClientConnectionAddressSetter.java b/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/ClientConnectionAddressSetter.java new file mode 100644 index 0000000..236b94e --- /dev/null +++ b/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/ClientConnectionAddressSetter.java @@ -0,0 +1,13 @@ +package vg.skye.e4mc_quilt.mixin; + +import net.minecraft.network.ClientConnection; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import java.net.SocketAddress; + +@Mixin(ClientConnection.class) +public interface ClientConnectionAddressSetter { + @Accessor + void setAddress(SocketAddress address); +} diff --git a/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/ClientConnectionMixin.java b/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/ClientConnectionMixin.java new file mode 100644 index 0000000..7a0cb09 --- /dev/null +++ b/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/ClientConnectionMixin.java @@ -0,0 +1,28 @@ +package vg.skye.e4mc_quilt.mixin; + +import io.netty.channel.Channel; +import io.netty.channel.local.LocalAddress; +import net.minecraft.network.ClientConnection; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import vg.skye.e4mc_quilt.E4mcClient; + +@Mixin(ClientConnection.class) +public class ClientConnectionMixin { + @Shadow + private Channel channel; + + @Inject(method = "isLocal", at = @At("RETURN"), cancellable = true) + private void isLocalInject(CallbackInfoReturnable cir) { + if ((boolean) cir.getReturnValue()) { + if (this.channel.localAddress().equals(new LocalAddress("e4mc-relay"))) { + // e4mc-relay connections are only seemingly local + E4mcClient.LOGGER.info("Hijacked isLocal to false because this is an e4mc connection"); + cir.setReturnValue(false); + } + } + } +} diff --git a/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/PublishCommandMixin.java b/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/PublishCommandMixin.java new file mode 100644 index 0000000..b29000e --- /dev/null +++ b/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/PublishCommandMixin.java @@ -0,0 +1,16 @@ +package vg.skye.e4mc_quilt.mixin; + +import net.minecraft.server.command.PublishCommand; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(PublishCommand.class) +public class PublishCommandMixin { + @Inject(method = "createPublishStartedText", at = @At("HEAD"), cancellable = true) + private static void createPublishStartedTextInject(CallbackInfoReturnable cir) { + cir.setReturnValue(Text.translatable("text.e4mc_quilt.publishStarted")); + } +} diff --git a/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/ServerNetworkIoMixin.java b/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/ServerNetworkIoMixin.java new file mode 100644 index 0000000..0dd4ddb --- /dev/null +++ b/quilt/src/main/java/vg/skye/e4mc_quilt/mixin/ServerNetworkIoMixin.java @@ -0,0 +1,46 @@ +package vg.skye.e4mc_quilt.mixin; + +import io.netty.bootstrap.AbstractBootstrap; +import io.netty.bootstrap.ServerBootstrap; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ServerChannel; +import io.netty.channel.local.LocalAddress; +import io.netty.channel.local.LocalChannel; +import io.netty.channel.local.LocalServerChannel; +import io.netty.channel.unix.DomainSocketAddress; +import io.netty.channel.epoll.EpollServerDomainSocketChannel; +import io.netty.channel.socket.ServerSocketChannel; +import net.minecraft.server.ServerNetworkIo; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import vg.skye.e4mc_quilt.E4mcChannelInitializer; +import vg.skye.e4mc_quilt.E4mcRelayHandler; + +import java.net.InetAddress; + +@Mixin(ServerNetworkIo.class) +public abstract class ServerNetworkIoMixin { + @Inject(method = "bind", at = @At("HEAD")) + private void bind(InetAddress address, int port, CallbackInfo ci) { + new E4mcRelayHandler().connect(); + } + + @Redirect(method = "bind", at = @At(value = "INVOKE", target = "Lio/netty/bootstrap/ServerBootstrap;channel(Ljava/lang/Class;)Lio/netty/bootstrap/AbstractBootstrap;", remap = false)) + private AbstractBootstrap redirectChannel(ServerBootstrap instance, Class aClass) { + return instance.channel(LocalServerChannel.class); + } + + @Redirect(method = "bind", at = @At(value = "INVOKE", target = "Lio/netty/bootstrap/ServerBootstrap;localAddress(Ljava/net/InetAddress;I)Lio/netty/bootstrap/AbstractBootstrap;", remap = false)) + private AbstractBootstrap redirectAddress(ServerBootstrap instance, InetAddress address, int port) { + return instance.localAddress(new LocalAddress("e4mc-relay")); + } + +// @Redirect(method = "bind", at = @At(value = "INVOKE", target = "Lio/netty/bootstrap/ServerBootstrap;childHandler(Lio/netty/channel/ChannelHandler;)Lio/netty/bootstrap/ServerBootstrap;", remap = false)) +// private ServerBootstrap addE4mcChannelSupport(ServerBootstrap bootstrap, ChannelHandler childHandler) { +// return bootstrap.childHandler(new E4mcChannelInitializer(((ChannelInitializerInvoker) childHandler))); +// } +} diff --git a/quilt/src/main/resources/assets/e4mc_quilt/lang/en_us.json b/quilt/src/main/resources/assets/e4mc_quilt/lang/en_us.json new file mode 100644 index 0000000..7543134 --- /dev/null +++ b/quilt/src/main/resources/assets/e4mc_quilt/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "text.e4mc_quilt.domainAssigned": "Local game hosted on domain %s", + "text.e4mc_quilt.publishStarted": "Publishing local game" +} diff --git a/quilt/src/main/resources/e4mc_quilt.mixins.json b/quilt/src/main/resources/e4mc_quilt.mixins.json new file mode 100644 index 0000000..bac4edd --- /dev/null +++ b/quilt/src/main/resources/e4mc_quilt.mixins.json @@ -0,0 +1,18 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "vg.skye.e4mc_quilt.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "ServerNetworkIoMixin", + "ClientConnectionMixin", + "ClientConnectionAddressSetter", + "ChannelInitializerInvoker" + ], + "client": [ + "PublishCommandMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/quilt/src/main/resources/quilt.mod.json b/quilt/src/main/resources/quilt.mod.json new file mode 100644 index 0000000..1577696 --- /dev/null +++ b/quilt/src/main/resources/quilt.mod.json @@ -0,0 +1,40 @@ +{ + "schema_version": 1, + "quilt_loader": { + "group": "vg.skye", + "id": "e4mc_quilt", + "version": "${version}", + "metadata": { + "name": "E4mc Quilt", + "description": "An e4mc client for the Quilt mod loader.", + "contributors": { + "skyevg": "Owner" + }, + "contact": { + "homepage": "https://git.skye.vg/me/e4mc", + "issues": "https://git.skye.vg/me/e4mc/issues", + "sources": "https://git.skye.vg/me/e4mc" + } + }, + "intermediate_mappings": "net.fabricmc:intermediary", + "depends": [ + { + "id": "quilt_loader", + "versions": ">=0.18.3-" + }, + { + "id": "minecraft", + "versions": ">=1.19.3" + }, + { + "id": "qkl", + "versions": "^2.0.1" + }, + { + "id": "quilted_fabric_api", + "versions": "*" + } + ] + }, + "mixin": "e4mc_quilt.mixins.json" +}