diff --git a/.editorconfig b/.editorconfig index 72764c8e8..b4b1641f5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,5 +14,5 @@ max_line_length = 100 max_line_length = off trim_trailing_whitespace = false -[*.rs] -indent_size = 4 \ No newline at end of file +[*.{rs,java,kts}] +indent_size = 4 diff --git a/.idea/code.iml b/.idea/code.iml index a4489beac..aeca7f8c1 100644 --- a/.idea/code.iml +++ b/.idea/code.iml @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/.idea/modules.xml b/.idea/modules.xml index aa7113fc6..23968dc67 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -5,4 +5,4 @@ - + \ No newline at end of file diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml index 179e88784..f19a0620b 100644 --- a/packages/app-lib/Cargo.toml +++ b/packages/app-lib/Cargo.toml @@ -76,6 +76,9 @@ ariadne.workspace = true [target.'cfg(windows)'.dependencies] winreg.workspace = true +[build-dependencies] +dunce.workspace = true + [features] tauri = ["dep:tauri"] cli = ["dep:indicatif"] diff --git a/packages/app-lib/build.rs b/packages/app-lib/build.rs new file mode 100644 index 000000000..251c4e848 --- /dev/null +++ b/packages/app-lib/build.rs @@ -0,0 +1,44 @@ +use std::ffi::OsString; +use std::path::PathBuf; +use std::process::{Command, exit}; +use std::{env, fs}; + +fn main() { + println!("cargo::rerun-if-changed=java/gradle"); + println!("cargo::rerun-if-changed=java/src"); + println!("cargo::rerun-if-changed=java/build.gradle.kts"); + println!("cargo::rerun-if-changed=java/settings.gradle.kts"); + println!("cargo::rerun-if-changed=java/gradle.properties"); + + let out_dir = + dunce::canonicalize(PathBuf::from(env::var_os("OUT_DIR").unwrap())) + .unwrap(); + + println!( + "cargo::rustc-env=JAVA_JARS_DIR={}", + out_dir.join("java/libs").display() + ); + + let gradle_path = fs::canonicalize( + #[cfg(target_os = "windows")] + "java\\gradlew.bat", + #[cfg(not(target_os = "windows"))] + "java/gradlew", + ) + .unwrap(); + + let mut build_dir_str = OsString::from("-Dorg.gradle.project.buildDir="); + build_dir_str.push(out_dir.join("java")); + let exit_status = Command::new(gradle_path) + .arg(build_dir_str) + .arg("build") + .arg("--no-daemon") + .arg("--console=rich") + .current_dir(dunce::canonicalize("java").unwrap()) + .status() + .expect("Failed to wait on Gradle build"); + if !exit_status.success() { + println!("cargo::error=Gradle build failed with {exit_status}"); + exit(exit_status.code().unwrap_or(1)); + } +} diff --git a/packages/app-lib/java/.gitattributes b/packages/app-lib/java/.gitattributes new file mode 100644 index 000000000..f91f64602 --- /dev/null +++ b/packages/app-lib/java/.gitattributes @@ -0,0 +1,12 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + +# Binary files should be left untouched +*.jar binary + diff --git a/packages/app-lib/java/.gitignore b/packages/app-lib/java/.gitignore new file mode 100644 index 000000000..1b6985c00 --- /dev/null +++ b/packages/app-lib/java/.gitignore @@ -0,0 +1,5 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/packages/app-lib/java/build.gradle.kts b/packages/app-lib/java/build.gradle.kts new file mode 100644 index 000000000..bef8c8594 --- /dev/null +++ b/packages/app-lib/java/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + java + id("com.diffplug.spotless") version "7.0.4" +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation(libs.junit.jupiter) + testRuntimeOnly("org.junit.platform:junit-platform-launcher") +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } +} + +tasks.withType().configureEach { + options.compilerArgs.addAll(listOf("-Xlint:all", "-Werror")) +} + +spotless { + java { + palantirJavaFormat() + removeUnusedImports() + } +} + +tasks.jar { + archiveFileName = "theseus.jar" +} + +tasks.named("test") { + useJUnitPlatform() +} + +tasks.withType().configureEach { + isPreserveFileTimestamps = false + isReproducibleFileOrder = true +} diff --git a/packages/app-lib/java/gradle.properties b/packages/app-lib/java/gradle.properties new file mode 100644 index 000000000..377538c99 --- /dev/null +++ b/packages/app-lib/java/gradle.properties @@ -0,0 +1,5 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.configuration-cache=true + diff --git a/packages/app-lib/java/gradle/libs.versions.toml b/packages/app-lib/java/gradle/libs.versions.toml new file mode 100644 index 000000000..cd6495556 --- /dev/null +++ b/packages/app-lib/java/gradle/libs.versions.toml @@ -0,0 +1,5 @@ +[versions] +junit-jupiter = "5.12.1" + +[libraries] +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" } diff --git a/packages/app-lib/java/gradle/wrapper/gradle-wrapper.jar b/packages/app-lib/java/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..1b33c55ba Binary files /dev/null and b/packages/app-lib/java/gradle/wrapper/gradle-wrapper.jar differ diff --git a/packages/app-lib/java/gradle/wrapper/gradle-wrapper.properties b/packages/app-lib/java/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..ff23a68d7 --- /dev/null +++ b/packages/app-lib/java/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/packages/app-lib/java/gradlew b/packages/app-lib/java/gradlew new file mode 100755 index 000000000..23d15a936 --- /dev/null +++ b/packages/app-lib/java/gradlew @@ -0,0 +1,251 @@ +#!/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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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/platforms/jvm/plugins-application/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##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# 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="\\\"\\\"" + + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +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=SC2039,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=SC2039,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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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/packages/app-lib/java/gradlew.bat b/packages/app-lib/java/gradlew.bat new file mode 100644 index 000000000..db3a6ac20 --- /dev/null +++ b/packages/app-lib/java/gradlew.bat @@ -0,0 +1,94 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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/packages/app-lib/java/settings.gradle.kts b/packages/app-lib/java/settings.gradle.kts new file mode 100644 index 000000000..01d2944d7 --- /dev/null +++ b/packages/app-lib/java/settings.gradle.kts @@ -0,0 +1,6 @@ +plugins { + // Apply the foojay-resolver plugin to allow automatic download of JDKs + id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0" +} + +rootProject.name = "theseus" diff --git a/packages/app-lib/java/src/main/java/com/modrinth/theseus/JavaInfo.java b/packages/app-lib/java/src/main/java/com/modrinth/theseus/JavaInfo.java new file mode 100644 index 000000000..ef182e9f9 --- /dev/null +++ b/packages/app-lib/java/src/main/java/com/modrinth/theseus/JavaInfo.java @@ -0,0 +1,21 @@ +package com.modrinth.theseus; + +public final class JavaInfo { + private static final String[] CHECKED_PROPERTIES = new String[] {"os.arch", "java.version"}; + + public static void main(String[] args) { + int returnCode = 0; + + for (String key : CHECKED_PROPERTIES) { + String property = System.getProperty(key); + + if (property != null) { + System.out.println(key + "=" + property); + } else { + returnCode = 1; + } + } + + System.exit(returnCode); + } +} diff --git a/packages/app-lib/java/src/main/java/com/modrinth/theseus/MinecraftLaunch.java b/packages/app-lib/java/src/main/java/com/modrinth/theseus/MinecraftLaunch.java new file mode 100644 index 000000000..f32e25a57 --- /dev/null +++ b/packages/app-lib/java/src/main/java/com/modrinth/theseus/MinecraftLaunch.java @@ -0,0 +1,118 @@ +package com.modrinth.theseus; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; + +public final class MinecraftLaunch { + public static void main(String[] args) throws IOException, ReflectiveOperationException { + final String mainClass = args[0]; + final String[] gameArgs = Arrays.copyOfRange(args, 1, args.length); + + System.setProperty("modrinth.process.args", String.join("\u001f", gameArgs)); + parseInput(); + + relaunch(mainClass, gameArgs); + } + + private static void parseInput() throws IOException { + final ByteArrayOutputStream line = new ByteArrayOutputStream(); + while (true) { + final int b = System.in.read(); + if (b < 0) { + throw new IllegalStateException("Stdin terminated while parsing"); + } + if (b != '\n') { + line.write(b); + continue; + } + if (handleLine(line.toString("UTF-8"))) { + break; + } + line.reset(); + } + } + + private static boolean handleLine(String line) { + final String[] parts = line.split("\t", 2); + switch (parts[0]) { + case "property": { + final String[] keyValue = parts[1].split("\t", 2); + System.setProperty(keyValue[0], keyValue[1]); + return false; + } + case "launch": + return true; + } + + System.err.println("Unknown input line " + line); + return false; + } + + private static void relaunch(String mainClassName, String[] args) throws ReflectiveOperationException { + final int javaVersion = getJavaVersion(); + final Class mainClass = Class.forName(mainClassName); + + if (javaVersion >= 25) { + Method mainMethod; + try { + mainMethod = findMainMethodJep512(mainClass); + } catch (ReflectiveOperationException e) { + System.err.println( + "[MODRINTH] Unable to call JDK findMainMethod. Falling back to pre-Java 25 main method finding."); + // If the above fails due to JDK implementation details changing + try { + mainMethod = findSimpleMainMethod(mainClass); + } catch (ReflectiveOperationException innerE) { + e.addSuppressed(innerE); + throw e; + } + } + if (mainMethod == null) { + throw new IllegalArgumentException("Could not find main() method"); + } + + Object thisObject = null; + if (!Modifier.isStatic(mainMethod.getModifiers())) { + thisObject = mainClass.getDeclaredConstructor().newInstance(); + } + + final Object[] parameters = mainMethod.getParameterCount() > 0 ? new Object[] {args} : new Object[] {}; + + mainMethod.invoke(thisObject, parameters); + } else { + findSimpleMainMethod(mainClass).invoke(null, new Object[] {args}); + } + } + + private static int getJavaVersion() { + String javaVersion = System.getProperty("java.version"); + + final int dotIndex = javaVersion.indexOf('.'); + if (dotIndex != -1) { + javaVersion = javaVersion.substring(0, dotIndex); + } + + final int dashIndex = javaVersion.indexOf('-'); + if (dashIndex != -1) { + javaVersion = javaVersion.substring(0, dashIndex); + } + + return Integer.parseInt(javaVersion); + } + + private static Method findMainMethodJep512(Class mainClass) throws ReflectiveOperationException { + // BEWARE BELOW: This code may break if JDK internals to find the main method + // change. + final Class methodFinderClass = Class.forName("jdk.internal.misc.MethodFinder"); + final Method methodFinderMethod = methodFinderClass.getDeclaredMethod("findMainMethod", Class.class); + final Object result = methodFinderMethod.invoke(null, mainClass); + return (Method) result; + } + + private static Method findSimpleMainMethod(Class mainClass) throws NoSuchMethodException { + return mainClass.getMethod("main", String[].class); + } +} diff --git a/packages/app-lib/library/JavaInfo.class b/packages/app-lib/library/JavaInfo.class deleted file mode 100644 index 69ffc97b4..000000000 Binary files a/packages/app-lib/library/JavaInfo.class and /dev/null differ diff --git a/packages/app-lib/library/JavaInfo.java b/packages/app-lib/library/JavaInfo.java deleted file mode 100644 index b10ed9363..000000000 --- a/packages/app-lib/library/JavaInfo.java +++ /dev/null @@ -1,22 +0,0 @@ -public final class JavaInfo { - private static final String[] CHECKED_PROPERTIES = new String[] { - "os.arch", - "java.version" - }; - - public static void main(String[] args) { - int returnCode = 0; - - for (String key : CHECKED_PROPERTIES) { - String property = System.getProperty(key); - - if (property != null) { - System.out.println(key + "=" + property); - } else { - returnCode = 1; - } - } - - System.exit(returnCode); - } -} diff --git a/packages/app-lib/library/MinecraftLaunch.class b/packages/app-lib/library/MinecraftLaunch.class deleted file mode 100644 index 4d3af86e4..000000000 Binary files a/packages/app-lib/library/MinecraftLaunch.class and /dev/null differ diff --git a/packages/app-lib/library/MinecraftLaunch.java b/packages/app-lib/library/MinecraftLaunch.java deleted file mode 100644 index 2ed3cb820..000000000 --- a/packages/app-lib/library/MinecraftLaunch.java +++ /dev/null @@ -1,118 +0,0 @@ -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.Arrays; - -public final class MinecraftLaunch { - public static void main(String[] args) throws IOException, ReflectiveOperationException { - final String mainClass = args[0]; - final String[] gameArgs = Arrays.copyOfRange(args, 1, args.length); - - System.setProperty("modrinth.process.args", String.join("\u001f", gameArgs)); - parseInput(); - - relaunch(mainClass, gameArgs); - } - - private static void parseInput() throws IOException { - final ByteArrayOutputStream line = new ByteArrayOutputStream(); - while (true) { - final int b = System.in.read(); - if (b < 0) { - throw new IllegalStateException("Stdin terminated while parsing"); - } - if (b != '\n') { - line.write(b); - continue; - } - if (handleLine(line.toString("UTF-8"))) { - break; - } - line.reset(); - } - } - - private static boolean handleLine(String line) { - final String[] parts = line.split("\t", 2); - switch (parts[0]) { - case "property": { - final String[] keyValue = parts[1].split("\t", 2); - System.setProperty(keyValue[0], keyValue[1]); - return false; - } - case "launch": - return true; - } - - System.err.println("Unknown input line " + line); - return false; - } - - private static void relaunch(String mainClassName, String[] args) throws ReflectiveOperationException { - final int javaVersion = getJavaVersion(); - final Class mainClass = Class.forName(mainClassName); - - if (javaVersion >= 25) { - Method mainMethod; - try { - mainMethod = findMainMethodJep512(mainClass); - } catch (ReflectiveOperationException e) { - System.err - .println("[MODRINTH] Unable to call JDK findMainMethod. Falling back to pre-Java 25 main method finding."); - // If the above fails due to JDK implementation details changing - try { - mainMethod = findSimpleMainMethod(mainClass); - } catch (ReflectiveOperationException innerE) { - e.addSuppressed(innerE); - throw e; - } - } - if (mainMethod == null) { - throw new IllegalArgumentException("Could not find main() method"); - } - - Object thisObject = null; - if (!Modifier.isStatic(mainMethod.getModifiers())) { - thisObject = mainClass.getDeclaredConstructor().newInstance(); - } - - final Object[] parameters = mainMethod.getParameterCount() > 0 - ? new Object[] { args } - : new Object[] {}; - - mainMethod.invoke(thisObject, parameters); - } else { - findSimpleMainMethod(mainClass).invoke(null, new Object[] { args }); - } - } - - private static int getJavaVersion() { - String javaVersion = System.getProperty("java.version"); - - final int dotIndex = javaVersion.indexOf('.'); - if (dotIndex != -1) { - javaVersion = javaVersion.substring(0, dotIndex); - } - - final int dashIndex = javaVersion.indexOf('-'); - if (dashIndex != -1) { - javaVersion = javaVersion.substring(0, dashIndex); - } - - return Integer.parseInt(javaVersion); - } - - private static Method findMainMethodJep512(Class mainClass) throws ReflectiveOperationException { - // BEWARE BELOW: This code may break if JDK internals to find the main method - // change. - final Class methodFinderClass = Class.forName("jdk.internal.misc.MethodFinder"); - final Method methodFinderMethod = methodFinderClass.getDeclaredMethod("findMainMethod", Class.class); - final Object result = methodFinderMethod.invoke(null, mainClass); - return (Method) result; - } - - private static Method findSimpleMainMethod(Class mainClass) throws NoSuchMethodException { - return mainClass.getMethod("main", String[].class); - } -} diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs index 3f91b261f..f1affa923 100644 --- a/packages/app-lib/src/launcher/mod.rs +++ b/packages/app-lib/src/launcher/mod.rs @@ -590,7 +590,7 @@ pub async fn launch_minecraft( } let (main_class_keep_alive, main_class_path) = - get_resource_file!("../../library" / "MinecraftLaunch.class")?; + get_resource_file!(env "JAVA_JARS_DIR" / "theseus.jar")?; command.args( args::get_jvm_arguments( @@ -602,7 +602,7 @@ pub async fn launch_minecraft( &args::get_class_paths( &state.directories.libraries_dir(), version_info.libraries.as_slice(), - &[main_class_path.parent().unwrap(), &client_path], + &[&main_class_path, &client_path], &java_version.architecture, minecraft_updated, )?, @@ -625,7 +625,7 @@ pub async fn launch_minecraft( } command - .arg("MinecraftLaunch") + .arg("com.modrinth.theseus.MinecraftLaunch") .arg(version_info.main_class.clone()) .args( args::get_minecraft_arguments( diff --git a/packages/app-lib/src/util/io.rs b/packages/app-lib/src/util/io.rs index c6abf9a0f..7321f3d94 100644 --- a/packages/app-lib/src/util/io.rs +++ b/packages/app-lib/src/util/io.rs @@ -302,7 +302,7 @@ pub async fn metadata( /// Gets a resource file from the executable. Returns `theseus::Result<(TempDir, PathBuf)>`. #[macro_export] macro_rules! get_resource_file { - ($relative_dir:literal / $file_name:literal) => { + (directory: $relative_dir:expr, file: $file_name:expr) => { 'get_resource_file: { let dir = match tempfile::tempdir() { Ok(dir) => dir, @@ -330,4 +330,12 @@ macro_rules! get_resource_file { $crate::Result::Ok((dir, path)) } }; + + ($relative_dir:literal / $file_name:literal) => { + get_resource_file!(directory: $relative_dir, file: $file_name) + }; + + (env $dir_env_name:literal / $file_name:literal) => { + get_resource_file!(directory: env!($dir_env_name), file: $file_name) + }; } diff --git a/packages/app-lib/src/util/jre.rs b/packages/app-lib/src/util/jre.rs index 1c5e42653..ed197a32b 100644 --- a/packages/app-lib/src/util/jre.rs +++ b/packages/app-lib/src/util/jre.rs @@ -273,12 +273,12 @@ pub async fn check_java_at_filepath(path: &Path) -> crate::Result { }; let (_temp, file_path) = - get_resource_file!("../../library" / "JavaInfo.class")?; + get_resource_file!(env "JAVA_JARS_DIR" / "theseus.jar")?; let output = Command::new(&java) .arg("-cp") - .arg(file_path.parent().unwrap()) - .arg("JavaInfo") + .arg(file_path) + .arg("com.modrinth.theseus.JavaInfo") .env_remove("_JAVA_OPTIONS") .output()?;