summaryrefslogtreecommitdiffstats
path: root/logic/java
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-05-02 12:44:37 +0200
committerPetr Mrázek <peterix@gmail.com>2015-05-02 12:44:37 +0200
commit4fc4a172562a76091721b8c488aafbd6ed2b01ed (patch)
tree618f1f0cb5e2308289178f2398550962f9eed2cd /logic/java
parentbb01c91469e3c5cbb250ce47c2d40f00f8be0c0a (diff)
downloadMultiMC-4fc4a172562a76091721b8c488aafbd6ed2b01ed.tar
MultiMC-4fc4a172562a76091721b8c488aafbd6ed2b01ed.tar.gz
MultiMC-4fc4a172562a76091721b8c488aafbd6ed2b01ed.tar.lz
MultiMC-4fc4a172562a76091721b8c488aafbd6ed2b01ed.tar.xz
MultiMC-4fc4a172562a76091721b8c488aafbd6ed2b01ed.zip
NOISSUE handle recommended versions better
Moved constants to the version data file Use recommended Minecraft instead of latest stable for new instances by default
Diffstat (limited to 'logic/java')
-rw-r--r--logic/java/JavaVersionList.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/logic/java/JavaVersionList.cpp b/logic/java/JavaVersionList.cpp
index d607ae72..7889853b 100644
--- a/logic/java/JavaVersionList.cpp
+++ b/logic/java/JavaVersionList.cpp
@@ -23,6 +23,7 @@
#include "java/JavaCheckerJob.h"
#include "java/JavaUtils.h"
#include "MMCStrings.h"
+#include "minecraft/VersionFilterData.h"
JavaVersionList::JavaVersionList(QObject *parent) : BaseVersionList(parent)
{
@@ -121,8 +122,8 @@ bool sortJavas(BaseVersionPtr left, BaseVersionPtr right)
if(archCompare != 0)
return archCompare > 0;
// dirty hack - 1.9 and above is too new
- auto labove19 = Strings::naturalCompare(rleft->name(), "1.9.0", Qt::CaseInsensitive) >= 0;
- auto rabove19 = Strings::naturalCompare(rright->name(), "1.9.0", Qt::CaseInsensitive) >= 0;
+ auto labove19 = Strings::naturalCompare(rleft->name(), g_VersionFilterData.discouragedJavaVersion, Qt::CaseInsensitive) >= 0;
+ auto rabove19 = Strings::naturalCompare(rright->name(), g_VersionFilterData.discouragedJavaVersion, Qt::CaseInsensitive) >= 0;
if(labove19 == rabove19)
{
// prefer higher versions in general