diff --git a/HMCL/build.gradle b/HMCL/build.gradle index 3322f31be..8fa6df987 100755 --- a/HMCL/build.gradle +++ b/HMCL/build.gradle @@ -24,9 +24,9 @@ import java.util.zip.ZipEntry import java.util.zip.ZipFile plugins { - id "edu.sc.seis.macAppBundle" version "2.1.6" - id "me.tatarka.retrolambda" version "3.5.0" - id 'edu.sc.seis.launch4j' version '2.3.0' + id "edu.sc.seis.macAppBundle" version "2.1.8" + id "me.tatarka.retrolambda" version "3.7.0" + id 'edu.sc.seis.launch4j' version '2.4.2' //id "org.jetbrains.kotlin.jvm" version "1.1.2-2" } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/AbstractMinecraftLoader.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/AbstractMinecraftLoader.java index 54e15ba54..fc1cea0d2 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/AbstractMinecraftLoader.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/core/launch/AbstractMinecraftLoader.java @@ -88,8 +88,7 @@ public abstract class AbstractMinecraftLoader implements IMinecraftLoader { if (jv == null || !jv.isEarlyAccess()) { if (jv != null && jv.getParsedVersion() >= JdkVersion.JAVA_17) res.add("-XX:+UseG1GC"); - else - res.add("-Xincgc"); + res.add("-XX:-UseAdaptiveSizePolicy"); res.add("-XX:-OmitStackTraceInFastThrow"); diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/Java.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/Java.java index fb64cd31f..0069dc854 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/Java.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/Java.java @@ -121,6 +121,8 @@ public class Java { try { queryJava(ans, "HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\"); queryJava(ans, "HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\"); + queryJava(ans, "HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\JRE\\"); + queryJava(ans, "HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\JDK\\"); } catch (IOException | InterruptedException ex) { HMCLog.err("Faield to query java", ex); } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b8b110b75..9d452e951 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-4.2.1-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-4.3-bin.zip diff --git a/settings.gradle b/settings.gradle index 81398a812..732062622 100755 --- a/settings.gradle +++ b/settings.gradle @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see {http://www.gnu.org/licenses/}. */ -rootProject.name = 'Hello Minecraft' +rootProject.name = 'Hello_Minecraft' // Find the directories containing a "build.gradle" file in the root directory // of the project. That is, every directory containing a "build.gradle" will