From 2ac0edbbdb27e12bae00c4779da135582bde89f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 30 Mar 2017 01:05:58 +0200
Subject: NOISSUE preview of LWJGL version changing

It still needs work - some LWJGL versions are exclusive to macOS.
This has to be encoded in the json.
---
 api/logic/minecraft/onesix/OneSixInstance.cpp      | 44 ++++++++++++++++++----
 api/logic/minecraft/onesix/OneSixInstance.h        |  4 +-
 .../minecraft/onesix/OneSixProfileStrategy.cpp     |  4 +-
 api/logic/minecraft/onesix/OneSixUpdate.cpp        |  4 +-
 4 files changed, 44 insertions(+), 12 deletions(-)

(limited to 'api/logic/minecraft/onesix')

diff --git a/api/logic/minecraft/onesix/OneSixInstance.cpp b/api/logic/minecraft/onesix/OneSixInstance.cpp
index 6e4a5bdc..d89f6f87 100644
--- a/api/logic/minecraft/onesix/OneSixInstance.cpp
+++ b/api/logic/minecraft/onesix/OneSixInstance.cpp
@@ -35,6 +35,7 @@ OneSixInstance::OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectP
 	: MinecraftInstance(globalSettings, settings, rootDir)
 {
 	m_settings->registerSetting({"IntendedVersion", "MinecraftVersion"}, "");
+	m_settings->registerSetting("LWJGLVersion", "");
 }
 
 void OneSixInstance::init()
@@ -480,7 +481,24 @@ std::shared_ptr<WorldList> OneSixInstance::worldList() const
 
 bool OneSixInstance::setIntendedVersionId(QString version)
 {
-	settings()->set("IntendedVersion", version);
+	return setComponentVersion("net.minecraft", version);
+}
+
+QString OneSixInstance::intendedVersionId() const
+{
+	return getComponentVersion("net.minecraft");
+}
+
+bool OneSixInstance::setComponentVersion(const QString& uid, const QString& version)
+{
+	if(uid == "net.minecraft")
+	{
+		settings()->set("IntendedVersion", version);
+	}
+	else if (uid == "org.lwjgl")
+	{
+		settings()->set("LWJGLVersion", version);
+	}
 	if(getMinecraftProfile())
 	{
 		clearProfile();
@@ -489,6 +507,24 @@ bool OneSixInstance::setIntendedVersionId(QString version)
 	return true;
 }
 
+QString OneSixInstance::getComponentVersion(const QString& uid) const
+{
+	if(uid == "net.minecraft")
+	{
+		return settings()->get("IntendedVersion").toString();
+	}
+	else if(uid == "org.lwjgl")
+	{
+		auto version = settings()->get("LWJGLVersion").toString();
+		if(version.isEmpty())
+		{
+			return "2.9.1";
+		}
+		return version;
+	}
+	return QString();
+}
+
 QList< Mod > OneSixInstance::getJarMods() const
 {
 	QList<Mod> mods;
@@ -500,12 +536,6 @@ QList< Mod > OneSixInstance::getJarMods() const
 	return mods;
 }
 
-
-QString OneSixInstance::intendedVersionId() const
-{
-	return settings()->get("IntendedVersion").toString();
-}
-
 void OneSixInstance::setShouldUpdate(bool)
 {
 }
diff --git a/api/logic/minecraft/onesix/OneSixInstance.h b/api/logic/minecraft/onesix/OneSixInstance.h
index 72c05ad7..ec8c2597 100644
--- a/api/logic/minecraft/onesix/OneSixInstance.h
+++ b/api/logic/minecraft/onesix/OneSixInstance.h
@@ -59,9 +59,11 @@ public:
 
 	virtual QString intendedVersionId() const override;
 	virtual bool setIntendedVersionId(QString version) override;
-
 	virtual QString currentVersionId() const override;
 
+	QString getComponentVersion(const QString &uid) const;
+	bool setComponentVersion(const QString &uid, const QString &version);
+
 	virtual bool shouldUpdate() const override;
 	virtual void setShouldUpdate(bool val) override;
 
diff --git a/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp b/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
index 8125b1d6..4a56a810 100644
--- a/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
+++ b/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
@@ -114,8 +114,8 @@ void OneSixProfileStrategy::loadDefaultBuiltinPatches()
 		profilePatch->setOrder(order);
 		profile->appendPatch(profilePatch);
 	};
-	addBuiltinPatch("net.minecraft", m_instance->intendedVersionId(), -2);
-	addBuiltinPatch("org.lwjgl", "2.9.1", -1);
+	addBuiltinPatch("net.minecraft", m_instance->getComponentVersion("net.minecraft"), -2);
+	addBuiltinPatch("org.lwjgl", m_instance->getComponentVersion("org.lwjgl"), -1);
 }
 
 void OneSixProfileStrategy::loadUserPatches()
diff --git a/api/logic/minecraft/onesix/OneSixUpdate.cpp b/api/logic/minecraft/onesix/OneSixUpdate.cpp
index 5bc76b01..bf234189 100644
--- a/api/logic/minecraft/onesix/OneSixUpdate.cpp
+++ b/api/logic/minecraft/onesix/OneSixUpdate.cpp
@@ -61,8 +61,8 @@ OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent)
 				m_tasks.append(task.unwrap());
 			}
 		};
-		loadVersion("org.lwjgl", "2.9.1");
-		loadVersion("net.minecraft", m_inst->intendedVersionId());
+		loadVersion("org.lwjgl", m_inst->getComponentVersion("org.lwjgl"));
+		loadVersion("net.minecraft", m_inst->getComponentVersion("net.minecraft"));
 	}
 
 	// libraries download
-- 
cgit v1.2.3