diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-01-02 00:35:54 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-01-02 00:35:54 +0100 |
| commit | a008efd24e81441a23ff3e81320ac3522251327e (patch) | |
| tree | f73886925814cc4cfb397be9f8342f7963d8f8d7 /logic/minecraft | |
| parent | 5f57df81109d268c79b34aac799fc7694ec5882a (diff) | |
| download | MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.tar MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.tar.gz MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.tar.lz MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.tar.xz MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.zip | |
GH-1365 rework java version parsing and sorting
Diffstat (limited to 'logic/minecraft')
| -rw-r--r-- | logic/minecraft/MinecraftInstance.cpp | 5 | ||||
| -rw-r--r-- | logic/minecraft/VersionFilterData.cpp | 1 | ||||
| -rw-r--r-- | logic/minecraft/VersionFilterData.h | 2 |
3 files changed, 3 insertions, 5 deletions
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 <pathmatcher/RegexpMatcher.h> #include <pathmatcher/MultiMatcher.h> #include <FileSystem.h> +#include <java/JavaVersion.h> #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<QString> 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; |