From 454d3389b6f16e6970ae7bab858804f3e381cffb Mon Sep 17 00:00:00 2001 From: SashegDev Date: Tue, 5 May 2026 11:36:36 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20shell=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF?= =?UTF-8?q?=D1=82=20launcher.sh=20=D0=B4=D0=BB=D1=8F=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D1=83=D1=81=D0=BA=D0=B0=20=D1=81=20javafx=20module-path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/dependency-reduced-pom.xml | 17 ++++++----------- launcher/pom.xml | 12 +++++++++--- launcher/src/main/resources/launcher.sh | 12 ++++++++++++ 3 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 launcher/src/main/resources/launcher.sh diff --git a/launcher/dependency-reduced-pom.xml b/launcher/dependency-reduced-pom.xml index add5618..657096e 100644 --- a/launcher/dependency-reduced-pom.xml +++ b/launcher/dependency-reduced-pom.xml @@ -43,15 +43,9 @@ - org.openjfx:javafx-* + org.openjfx:* - **/*-linux.jar - - - - *:javafx-* - - * + **/* @@ -60,6 +54,9 @@ false true runtime + + org.openjfx:* + @@ -142,9 +139,7 @@ - - *${javafx.classifier}.jar - + diff --git a/launcher/pom.xml b/launcher/pom.xml index e20f898..bb237bc 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -260,11 +260,17 @@ - + + + + + + includes="ZernMCLauncher.exe,ZernMCLauncher.jar,jre21/**,lib-javafx/**,launcher.sh" + excludes="build.version"/> diff --git a/launcher/src/main/resources/launcher.sh b/launcher/src/main/resources/launcher.sh new file mode 100644 index 0000000..2aaa882 --- /dev/null +++ b/launcher/src/main/resources/launcher.sh @@ -0,0 +1,12 @@ +#!/bin/bash +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +JAVA_HOME="$SCRIPT_DIR/jre21" +JAVA="$JAVA_HOME/bin/java" + +JAVAFX_PATH="$SCRIPT_DIR/lib-javafx" + +exec "$JAVA" \ + --module-path="$JAVAFX_PATH" \ + --add-modules=javafx.controls,javafx.web \ + --add-reads=javafx.graphics=ALL-UNNAMED \ + -jar "$SCRIPT_DIR/ZernMCLauncher.jar" "$@" \ No newline at end of file