From 7014c4a455b7dbdab6900e856d63afc6052657c1 Mon Sep 17 00:00:00 2001
From: SashegDev <gdsasheg@gmail.com>
Date: Mon, 11 May 2026 12:21:29 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20java.exe=20=D0=B2=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=BE=20javaw.exe=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8,=20inheritIO=20?=
 =?UTF-8?q?=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20=D1=80=D1=83=D1=87=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D1=87=D1=82=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sashegdev/zernmc/launcher/Bootstrap.java  | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/launcher/bootstrap/src/main/java/me/sashegdev/zernmc/launcher/Bootstrap.java b/launcher/bootstrap/src/main/java/me/sashegdev/zernmc/launcher/Bootstrap.java
index 3f09365..77a1b82 100644
--- a/launcher/bootstrap/src/main/java/me/sashegdev/zernmc/launcher/Bootstrap.java
+++ b/launcher/bootstrap/src/main/java/me/sashegdev/zernmc/launcher/Bootstrap.java
@@ -105,7 +105,7 @@ public class Bootstrap {
     
     private static void launchInNewProcess(String[] args) throws Exception {
         String os = System.getProperty("os.name").toLowerCase();
-        String javaExe = os.contains("windows") ? "javaw.exe" : "java";
+        String javaExe = os.contains("windows") ? "java.exe" : "java";
         
         Path javaBin = findJava(false);
         Path javafxPath = baseDir.resolve("lib").resolve("javafx");
@@ -130,23 +130,12 @@ public class Bootstrap {
         
         ProcessBuilder pb = new ProcessBuilder(cmd);
         pb.directory(baseDir.toFile());
-        pb.redirectErrorStream(true);
+        pb.inheritIO();
+        
+        log("Запуск процесса: " + String.join(" ", cmd));
         
         Process p = pb.start();
-        
-        Thread outputThread = new Thread(() -> {
-            try (BufferedReader reader = new BufferedReader(
-                    new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    System.out.println(line);
-                }
-            } catch (Exception ignored) {}
-        });
-        outputThread.start();
-        
         int code = p.waitFor();
-        outputThread.interrupt();
         
         log("JFX процесс завершился с кодом: " + code);
         System.exit(code);
@@ -154,13 +143,7 @@ public class Bootstrap {
     
     private static Path findJava(boolean preferConsole) {
         String os = System.getProperty("os.name").toLowerCase();
-        String javaExe;
-        
-        if (preferConsole || !os.contains("windows")) {
-            javaExe = "java";
-        } else {
-            javaExe = "javaw.exe";
-        }
+        String javaExe = "java.exe";
         
         Path javaBin = baseDir.resolve("jre21").resolve("bin").resolve(javaExe);
         if (!Files.exists(javaBin)) {