From 08417efe2fc220778963d3b7539b35b93bac1586 Mon Sep 17 00:00:00 2001
From: SashegDev <gdsasheg@gmail.com>
Date: Tue, 5 May 2026 11:23:59 +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=20JavaFX=20module-path=20=D0=B8=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20GUI=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 launcher/dependency-reduced-pom.xml           | 13 ++++++++++++-
 launcher/pom.xml                              | 11 ++++++++---
 .../me/sashegdev/zernmc/launcher/Main.java    | 19 +++++++++++--------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/launcher/dependency-reduced-pom.xml b/launcher/dependency-reduced-pom.xml
index 728e240..15c2fc1 100644
--- a/launcher/dependency-reduced-pom.xml
+++ b/launcher/dependency-reduced-pom.xml
@@ -42,6 +42,12 @@
                     <exclude>META-INF/*.RSA</exclude>
                   </excludes>
                 </filter>
+                <filter>
+                  <artifact>org.openjfx:javafx-*</artifact>
+                  <excludes>
+                    <exclude>**/*-linux.jar</exclude>
+                  </excludes>
+                </filter>
               </filters>
               <dependencySet>
                 <outputDirectory>/</outputDirectory>
@@ -85,11 +91,16 @@
             <configuration>
               <outfile>../server/builds/ZernMCLauncher-${project.version}.exe</outfile>
               <jar>../server/builds/ZernMCLauncher.jar</jar>
-              <headerType>console</headerType>
+              <headerType>gui</headerType>
               <dontWrapJar>false</dontWrapJar>
               <jre>
                 <path>jre21</path>
                 <minVersion>21</minVersion>
+                <opts>
+                  <opt>--module-path=lib-javafx</opt>
+                  <opt>--add-modules=javafx.controls,javafx.web</opt>
+                  <opt>--add-reads=javafx.graphics=ALL-UNNAMED</opt>
+                </opts>
               </jre>
               <versionInfo>
                 <fileVersion>${project.version}.0</fileVersion>
diff --git a/launcher/pom.xml b/launcher/pom.xml
index 4185558..1df6b72 100644
--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@@ -187,11 +187,16 @@
                         <configuration>
                             <outfile>../server/builds/ZernMCLauncher-${project.version}.exe</outfile>
                             <jar>../server/builds/ZernMCLauncher.jar</jar>
-                            <headerType>console</headerType>
+                            <headerType>gui</headerType>
                             <dontWrapJar>false</dontWrapJar>
                             <jre>
                                 <path>jre21</path>
                                 <minVersion>21</minVersion>
+                                <opts>
+                                    <opt>--module-path=lib-javafx</opt>
+                                    <opt>--add-modules=javafx.controls,javafx.web</opt>
+                                    <opt>--add-reads=javafx.graphics=ALL-UNNAMED</opt>
+                                </opts>
                             </jre>
                             <versionInfo>
                                 <fileVersion>${project.version}.0</fileVersion>
@@ -227,10 +232,10 @@
                                     <fileset dir="${user.home}/launcher/jre/jre21"/>
                                 </copy>
 
-                                <!-- Создаём zip только с .exe и jre21 (без .jar и build.version) -->
+                                <!-- Создаём zip с .exe, jre21 и lib-javafx (без .jar и build.version) -->
                                 <zip destfile="../server/builds/ZernMCLauncher-${project.version}.zip"
                                      basedir="../server/builds"
-                                     includes="ZernMCLauncher.exe,jre21/**"
+                                     includes="ZernMCLauncher.exe,jre21/**,lib-javafx/**"
                                      excludes="*.jar,build.version"/>
                             </target>
                         </configuration>
diff --git a/launcher/src/main/java/me/sashegdev/zernmc/launcher/Main.java b/launcher/src/main/java/me/sashegdev/zernmc/launcher/Main.java
index 23f981a..f50ddab 100644
--- a/launcher/src/main/java/me/sashegdev/zernmc/launcher/Main.java
+++ b/launcher/src/main/java/me/sashegdev/zernmc/launcher/Main.java
@@ -34,6 +34,7 @@ public class Main {
                 startWebUI(args);
             } catch (Exception e) {
                 System.err.println(ZAnsi.red("UI не запустился: " + e.getMessage()));
+                e.printStackTrace();
                 System.out.println(ZAnsi.yellow("Переключаюсь на режим TUI..."));
                 runTUI(args);
             }
@@ -70,14 +71,16 @@ public class Main {
         // Даем серверу время запуститься
         Thread.sleep(1000);
 
-        // Проверяем headless перед запуском JavaFX
-        boolean isHeadless = java.awt.GraphicsEnvironment.isHeadless();
-        String display = System.getenv("DISPLAY");
-        if (isHeadless && (display == null || display.isEmpty())) {
-            System.out.println(ZAnsi.yellow("Дисплей недоступен, переключаюсь на TUI..."));
-            WebServer.stop();
-            runTUI(args);
-            return;
+        // Проверяем headless перед запуском JavaFX (только для не-Windows систем)
+        if (!System.getProperty("os.name").toLowerCase().contains("win")) {
+            boolean isHeadless = java.awt.GraphicsEnvironment.isHeadless();
+            String display = System.getenv("DISPLAY");
+            if (isHeadless && (display == null || display.isEmpty())) {
+                System.out.println(ZAnsi.yellow("Дисплей недоступен, переключаюсь на TUI..."));
+                WebServer.stop();
+                runTUI(args);
+                return;
+            }
         }
 
         // Проверка обновлений лаунчера