Hotfix: Support Java 25 and environment injection for run scripts (v1.1.9)

Author: CalaKuad1

backend/server/server_handler.py

@@ -370,6 +370,18 @@ def _get_start_command(self):
                     self.output_callback("Critical error: No working Java installation was found. Please install Java.\n", "error")
                     return None, None
 
+        # Prepare environment for startup (injecting JAVA_HOME and PATH)
+        custom_env = os.environ.copy()
+        if java_path != "java":
+            # Extract installation root (assuming path/to/java-21/bin/java.exe)
+            java_bin_dir = os.path.dirname(java_path)
+            java_root = os.path.dirname(java_bin_dir)
+            custom_env["JAVA_HOME"] = java_root
+            # Prepend to PATH so scripts find this 'java' first
+            path_sep = ';' if sys.platform == "win32" else ':'
+            custom_env["PATH"] = f"{java_bin_dir}{path_sep}{custom_env.get('PATH', '')}"
+            logger.info(f"Injecting Java environment: JAVA_HOME={java_root}")
+        
         run_script = None
 
         # Universal check for startup scripts
@@ -385,9 +397,7 @@ def _get_start_command(self):
         # If a run script is found, prioritize it
         if run_script:
             self.output_callback(f"Detected startup script: {os.path.basename(run_script)}. Using it to launch.\n", "info")
-            # For Forge, we might need to set JVM_ARGS, but for now, a direct run is more universal.
-            # A more advanced implementation could parse the script to inject RAM settings.
-            return [run_script, '--nogui'], None
+            return [run_script, '--nogui'], custom_env
 
         # Fallback to JAR-based startup if no script is found
         self.output_callback("No startup script found. Using generic JAR startup method.\n", "info")
@@ -451,7 +461,7 @@ def _get_start_command(self):
 
         command.extend(['-jar', os.path.basename(server_jar_path), '--nogui'])
 
-        return command, None
+        return command, custom_env
 
     def _run_server(self, command, env):
         stdout_thread = None

backend/utils/java_manager.py

@@ -110,13 +110,16 @@ def get_required_java_version(self, minecraft_version: str) -> int:
 
                 if major_version == 1:
                     if minor_version >= 22:
-                        return 21 # Default to 21 for unknown future versions (e.g. 1.22+)
+                        return 25 # 1.22+ requiere Java 25
                     elif minor_version == 21 and patch_version >= 4:
-                        return 21 # 1.21.4+ works well with 21
+                        return 25 # 1.21.4+ requiere Java 25
                     elif minor_version >= 21:
                         return 21 
                     elif minor_version >= 17:
                         return 17 
+                elif major_version >= 26:
+                    # NeoForge or Future Versioning (e.g. 26.1.1)
+                    return 25
             except Exception as e:
                 logger.warning(f"Error parsing version {version}: {e}")
 
@@ -125,13 +128,13 @@ def get_required_java_version(self, minecraft_version: str) -> int:
             if major_minor in self.mc_java_requirements:
                 return self.mc_java_requirements[major_minor]
 
-            # Para versiones no mapeadas y muy nuevas, asumir Java 21
-            logger.warning(f"Unknown Minecraft version {version}, defaulting to Java 21")
-            return 21
+            # Para versiones no mapeadas y muy nuevas (>= 26 o 1.22), asumir Java 25
+            logger.warning(f"Unknown Minecraft version {version}, defaulting to Java 25")
+            return 25
 
         # Fallback para versiones totalmente desconocidas
-        logger.warning(f"Unknown Minecraft version {version}, defaulting to Java 21")
-        return 21
+        logger.warning(f"Unknown Minecraft version {version}, defaulting to Java 25")
+        return 25
 
     def detect_system_java(self, java_path: str = "java") -> Optional[Tuple[int, str]]:
         """

changelog.txt

@@ -14,8 +14,9 @@
 
 ### ⚡ HOTFIX 1.1.9.1 (Included in v1.1.9):
 - **Fixed backend restart loop on Windows** — Watchdog now correctly monitors the Electron process using a passed PID, preventing premature restarts during installations.
-- **Improved Java version mapping** — Version detection now defaults to Java 21/17 for unknown future versions instead of Java 25.
-- **Robust Forge version handling** — Versions like "26.1.1" no longer trigger incorrect Java 25 snapshot logic.
+- **Improved Java version mapping** — Version detection now correctly maps high-version servers (NeoForge/NeoMinecraft 26.x+) to **Java 25**.
+- **Fixed Startup Scripts (run.bat/run.sh)** — Implemented **Environment Injection** (JAVA_HOME & PATH) to force startup scripts to use the app's managed Java version instead of the system default.
+- **Robust Forge version handling** — Versions like "26.1.1" now correctly trigger the Java 25 requirement.
 
 ### 🔧 IMPROVEMENTS:
 - **Smart close behavior** — App checks for running servers before deciding to hide or quit