From a008efd24e81441a23ff3e81320ac3522251327e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 2 Jan 2016 00:35:54 +0100 Subject: GH-1365 rework java version parsing and sorting --- logic/minecraft/MinecraftInstance.cpp | 5 +++-- logic/minecraft/VersionFilterData.cpp | 1 - logic/minecraft/VersionFilterData.h | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'logic/minecraft') diff --git a/logic/minecraft/MinecraftInstance.cpp b/logic/minecraft/MinecraftInstance.cpp index 05dedf1d..405ccd26 100644 --- a/logic/minecraft/MinecraftInstance.cpp +++ b/logic/minecraft/MinecraftInstance.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #define IBUS "@im=ibus" @@ -104,8 +105,8 @@ QStringList MinecraftInstance::javaArguments() const args << QString("-Xmx%1m").arg(settings()->get("MaxMemAlloc").toInt()); // No PermGen in newer java. - auto javaVersion = settings()->get("JavaVersion"); - if(Strings::naturalCompare(javaVersion.toString(), "1.8.0", Qt::CaseInsensitive) < 0) + JavaVersion javaVersion(settings()->get("JavaVersion").toString()); + if(javaVersion.requiresPermGen()) { auto permgen = settings()->get("PermGen").toInt(); if (permgen != 64) diff --git a/logic/minecraft/VersionFilterData.cpp b/logic/minecraft/VersionFilterData.cpp index 8270a490..0c4a6e3d 100644 --- a/logic/minecraft/VersionFilterData.cpp +++ b/logic/minecraft/VersionFilterData.cpp @@ -72,5 +72,4 @@ VersionFilterData::VersionFilterData() // Version list magic recommendedMinecraftVersion = "1.7.10"; - discouragedJavaVersion = "1.9.0"; } diff --git a/logic/minecraft/VersionFilterData.h b/logic/minecraft/VersionFilterData.h index 98db2484..f7d4ebe7 100644 --- a/logic/minecraft/VersionFilterData.h +++ b/logic/minecraft/VersionFilterData.h @@ -28,7 +28,5 @@ struct VersionFilterData QSet lwjglWhitelist; // Currently recommended minecraft version QString recommendedMinecraftVersion; - // Currently discouraged java version (anything equal and above will be discouraged) - QString discouragedJavaVersion; }; extern VersionFilterData MULTIMC_LOGIC_EXPORT g_VersionFilterData; -- cgit v1.2.3