From c383972a5b16a07be2c3d0445c758e222131373d Mon Sep 17 00:00:00 2001
From: luki39 <ber.luki13@gmail.com>
Date: Thu, 19 May 2022 12:32:03 +0200
Subject: [PATCH] =?UTF-8?q?D=C3=A9marrage=20+=20java=2017=20avec=20ancienn?=
 =?UTF-8?q?e=20config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/js/processbuilder.js  | 14 ++++++++++++++
 app/assets/js/scripts/landing.js |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js
index 7013ff82..4e4083d3 100644
--- a/app/assets/js/processbuilder.js
+++ b/app/assets/js/processbuilder.js
@@ -409,6 +409,20 @@ class ProcessBuilder {
         }
         args.push('-Xmx' + ConfigManager.getMaxRAM())
         args.push('-Xms' + ConfigManager.getMinRAM())
+
+        const defaultjvmOption = [
+            '-XX:+UnlockExperimentalVMOptions',
+            '-XX:+UseG1GC',
+            '-XX:G1NewSizePercent=20',
+            '-XX:G1ReservePercent=20',
+            '-XX:MaxGCPauseMillis=50',
+            '-XX:G1HeapRegionSize=32M'
+        ]
+
+        if (ConfigManager.getJVMOptions().lenght < 6){
+            ConfigManager.setJVMOptions(defaultjvmOption)
+        }
+
         args = args.concat(ConfigManager.getJVMOptions())
 
         // Main Java Class
diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js
index bc80c8b7..a4473307 100644
--- a/app/assets/js/scripts/landing.js
+++ b/app/assets/js/scripts/landing.js
@@ -88,7 +88,7 @@ document.getElementById('launch_button').addEventListener('click', function(e){
     loggerLanding.log('Launching game..')
     const mcVersion = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer()).getMinecraftVersion()
     const jExe = ConfigManager.getJavaExecutable()
-    if(jExe == null){
+    if(jExe == null || jExe.includes('jdk8')){
         asyncSystemScan(mcVersion)
     } else {
 
@@ -260,7 +260,7 @@ function asyncSystemScan(mcVersion, launchAfter = true){
     sysAEx.on('message', (m) => {
 
         if(m.context === 'validateJava'){
-            if(m.result == null){
+            if(m.result == null || m.result.includes('jdk8')){
                 // If the result is null, no valid Java installation was found.
                 // Show this information to the user.
                 setOverlayContent(