From a23323a01ee2713209619ad99d8859616aa99cdb Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Sun, 7 Jul 2013 18:12:09 +0200
Subject: Small tweaks to the assets - delete extra files

---
 libmultimc/src/gameupdatetask.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'libmultimc/src')

diff --git a/libmultimc/src/gameupdatetask.cpp b/libmultimc/src/gameupdatetask.cpp
index c718ce71..49f9335f 100644
--- a/libmultimc/src/gameupdatetask.cpp
+++ b/libmultimc/src/gameupdatetask.cpp
@@ -47,7 +47,13 @@ void GameUpdateTask::executeTask()
 	// Get a pointer to the version object that corresponds to the instance's version.
 	MinecraftVersion *targetVersion = (MinecraftVersion *)MinecraftVersionList::getMainList().
 			findVersion(m_inst->intendedVersion());
-	Q_ASSERT_X(targetVersion != NULL, "game update", "instance's intended version is not an actual version");
+	if(targetVersion == NULL)
+	{
+		//Q_ASSERT_X(targetVersion != NULL, "game update", "instance's intended version is not an actual version");
+		setState(StateFinished);
+		emit gameUpdateComplete(m_response);
+		return;
+	}
 	
 	// Make directories
 	QDir binDir(m_inst->binDir());
-- 
cgit 


From ee5583251d92d47f96b03c3b447c115bab901c17 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Sun, 7 Jul 2013 23:51:26 +0200
Subject: Legacy versions downloaded from the new location are treated as
 legacy versions!

---
 libmultimc/src/gameupdatetask.cpp | 196 +++++++++++++++++++-------------------
 1 file changed, 96 insertions(+), 100 deletions(-)

(limited to 'libmultimc/src')

diff --git a/libmultimc/src/gameupdatetask.cpp b/libmultimc/src/gameupdatetask.cpp
index 49f9335f..fee2aa29 100644
--- a/libmultimc/src/gameupdatetask.cpp
+++ b/libmultimc/src/gameupdatetask.cpp
@@ -27,25 +27,20 @@
 #include "minecraftversionlist.h"
 
 #include "pathutils.h"
-#include "netutils.h"
 
 GameUpdateTask::GameUpdateTask(const LoginResponse &response, Instance *inst, QObject *parent) :
 	Task(parent), m_response(response)
 {
 	m_inst = inst;
 	m_updateState = StateInit;
-	m_currentDownload = 0;
 }
 
 void GameUpdateTask::executeTask()
 {
 	updateStatus();
 	
-	QNetworkAccessManager networkMgr;
-	netMgr = &networkMgr;
-	
 	// Get a pointer to the version object that corresponds to the instance's version.
-	MinecraftVersion *targetVersion = (MinecraftVersion *)MinecraftVersionList::getMainList().
+	targetVersion = (MinecraftVersion *)MinecraftVersionList::getMainList().
 			findVersion(m_inst->intendedVersion());
 	if(targetVersion == NULL)
 	{
@@ -55,16 +50,6 @@ void GameUpdateTask::executeTask()
 		return;
 	}
 	
-	// Make directories
-	QDir binDir(m_inst->binDir());
-	if (!binDir.exists() && !binDir.mkpath("."))
-	{
-		error("Failed to create bin folder.");
-		return;
-	}
-	
-	
-	
 	/////////////////////////
 	// BUILD DOWNLOAD LIST //
 	/////////////////////////
@@ -72,90 +57,116 @@ void GameUpdateTask::executeTask()
 	
 	setState(StateDetermineURLs);
 	
-	
-	// Add the URL for minecraft.jar
-	
-	// This will be either 'minecraft' or the version number, depending on where
-	// we're downloading from.
-	QString jarFilename = "minecraft";
-	
-	// FIXME: this is NOT enough
 	if (targetVersion->launcherVersion() == MinecraftVersion::Launcher16)
-		jarFilename = targetVersion->descriptor();
-	
-	QUrl mcJarURL = targetVersion->downloadURL() + jarFilename + ".jar";
-	qDebug() << mcJarURL.toString();
-	m_downloadList.append(FileToDownload::Create(mcJarURL, PathCombine(m_inst->minecraftDir(), "bin/minecraft.jar")));
-	
-	
-	
-	////////////////////
-	// DOWNLOAD FILES //
-	////////////////////
-	setState(StateDownloadFiles);
-	for (int i = 0; i < m_downloadList.length(); i++)
 	{
-		m_currentDownload = i;
-		if (!downloadFile(m_downloadList[i]))
-			return;
+		determineNewVersion();
 	}
+	else
+	{
+		getLegacyJar();
+	}
+	QEventLoop loop;
+	loop.exec();
+}
+
+void GameUpdateTask::determineNewVersion()
+{
+	QString urlstr("http://s3.amazonaws.com/Minecraft.Download/versions/");
+	urlstr += targetVersion->descriptor() + "/" + targetVersion->descriptor() + ".json";
+	auto dljob = DownloadJob::create(QUrl(urlstr));
+	specificVersionDownloadJob.reset(new JobList());
+	specificVersionDownloadJob->add(dljob);
+	connect(specificVersionDownloadJob.data(), SIGNAL(finished()), SLOT(versionFileFinished()));
+	connect(specificVersionDownloadJob.data(), SIGNAL(failed()), SLOT(versionFileFailed()));
+	connect(specificVersionDownloadJob.data(), SIGNAL(progress(qint64,qint64)), SLOT(updateDownloadProgress(qint64,qint64)));
+	download_queue.enqueue(specificVersionDownloadJob);
+}
+
+void GameUpdateTask::versionFileFinished()
+{
+	JobPtr firstJob = specificVersionDownloadJob->getFirstJob();
+	auto DlJob = firstJob.dynamicCast<DownloadJob>();
+	QJsonParseError jsonError;
+	QJsonDocument jsonDoc = QJsonDocument::fromJson(DlJob->m_data, &jsonError);
 	
+	if (jsonError.error != QJsonParseError::NoError)
+	{
+		error(QString( "Error reading version file :") + " " + jsonError.errorString());
+		exit(0);
+	}
 	
+	Q_ASSERT_X(jsonDoc.isObject(), "loadFromVList", "jsonDoc is not an object");
+	if(!jsonDoc.isObject())
+	{
+		error("Error reading version file.");
+		exit(0);
+	}
+	QJsonObject root = jsonDoc.object();
 	
-	///////////////////
-	// INSTALL FILES //
-	///////////////////
-	setState(StateInstall);
-	
-	// Nothing to do here yet
-	
+	QString args = root.value("processArguments").toString("legacy");
+	if(args == "legacy")
+	{
+		getLegacyJar();
+		return;
+	}
 	
 	
-	//////////////
-	// FINISHED //
-	//////////////
-	setState(StateFinished);
-	emit gameUpdateComplete(m_response);
+	error("MC 1.6 isn't supported yet...");
+	exit(0);
 }
 
-bool GameUpdateTask::downloadFile( const FileToDownloadPtr file )
+void GameUpdateTask::versionFileFailed()
 {
-	setSubStatus("Downloading " + file->url().toString());
-	QNetworkReply *reply = netMgr->get(QNetworkRequest(file->url()));
-	
-	this->connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
-				  SLOT(updateDownloadProgress(qint64,qint64)));
-	
-	NetUtils::waitForNetRequest(reply);
-	
-	if (reply->error() == QNetworkReply::NoError)
+	error("Failed to download the version description. Try again.");
+	exit(0);
+}
+
+
+// this is legacy minecraft...
+void GameUpdateTask::getLegacyJar()
+{
+	// Make directories
+	QDir binDir(m_inst->binDir());
+	if (!binDir.exists() && !binDir.mkpath("."))
 	{
-        QString filePath = file->path();
-		QFile outFile(filePath);
-		if (outFile.exists() && !outFile.remove())
-		{
-			error("Can't delete old file " + file->path() + ": " + outFile.errorString());
-			return false;
-		}
-		
-		if (!outFile.open(QIODevice::WriteOnly))
-		{
-			error("Can't write to " + file->path() + ": " + outFile.errorString());
-			return false;
-		}
-		
-		outFile.write(reply->readAll());
-		outFile.close();
+		error("Failed to create bin folder.");
+		return;
 	}
-	else
+	
+	// Add the URL for minecraft.jar
+	// This will be either 'minecraft' or the version number, depending on where
+	// we're downloading from.
+	QString jarFilename = "minecraft";
+	if (targetVersion->launcherVersion() == MinecraftVersion::Launcher16)
 	{
-		error("Can't download " + file->url().toString() + ": " + reply->errorString());
-		return false;
+		jarFilename = targetVersion->descriptor();
 	}
 	
-	// TODO: Check file integrity after downloading.
+	QUrl mcJarURL = targetVersion->downloadURL() + jarFilename + ".jar";
+	qDebug() << mcJarURL.toString();
+	auto dljob = DownloadJob::create(mcJarURL, PathCombine(m_inst->minecraftDir(), "bin/minecraft.jar"));
+	
+	legacyDownloadJob.reset(new JobList());
+	legacyDownloadJob->add(dljob);
+	connect(legacyDownloadJob.data(), SIGNAL(finished()), SLOT(legacyJarFinished()));
+	connect(legacyDownloadJob.data(), SIGNAL(failed()), SLOT(legacyJarFailed()));
+	connect(legacyDownloadJob.data(), SIGNAL(progress(qint64,qint64)), SLOT(updateDownloadProgress(qint64,qint64)));
 	
-	return true;
+	download_queue.enqueue(legacyDownloadJob);
+}
+
+
+void GameUpdateTask::legacyJarFinished()
+{
+	setState(StateFinished);
+	emit gameUpdateComplete(m_response);
+	exit(1);
+}
+
+void GameUpdateTask::legacyJarFailed()
+{
+	emit gameUpdateError("failed to download the minecraft.jar");
+	exit(0);
 }
 
 int GameUpdateTask::state() const
@@ -229,22 +240,7 @@ void GameUpdateTask::error(const QString &msg)
 void GameUpdateTask::updateDownloadProgress(qint64 current, qint64 total)
 {
 	// The progress on the current file is current / total
-	float currentDLProgress = (float) current / (float) total; // Cast ALL the values!
-	
-	// The overall progress is (current progress + files downloaded) / total files to download
-	float overallDLProgress = ((currentDLProgress + m_currentDownload) / (float) m_downloadList.length());
-	
-	// Multiply by 100 to make it a percentage.
-	setProgress((int)(overallDLProgress * 100));
-}
-
-FileToDownloadPtr FileToDownload::Create(const QUrl &url, const QString &path, QObject *parent)
-{
-	return FileToDownloadPtr(new FileToDownload (url, path, parent));
+	float currentDLProgress = (float) current / (float) total;
+	setProgress((int)(currentDLProgress * 100)); // convert to percentage
 }
 
-FileToDownload::FileToDownload(const QUrl &url, const QString &path, QObject *parent) : 
-	QObject(parent), m_dlURL(url), m_dlPath(path)
-{
-	
-}
-- 
cgit 


From dd86061f0ff6d19482e9a43af99156a55e60cf00 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Tue, 9 Jul 2013 00:52:03 +0200
Subject: Piddle-farting with 1.6 instances. Now with more json!

---
 libmultimc/src/gameupdatetask.cpp | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'libmultimc/src')

diff --git a/libmultimc/src/gameupdatetask.cpp b/libmultimc/src/gameupdatetask.cpp
index fee2aa29..54e47410 100644
--- a/libmultimc/src/gameupdatetask.cpp
+++ b/libmultimc/src/gameupdatetask.cpp
@@ -95,7 +95,6 @@ void GameUpdateTask::versionFileFinished()
 		exit(0);
 	}
 	
-	Q_ASSERT_X(jsonDoc.isObject(), "loadFromVList", "jsonDoc is not an object");
 	if(!jsonDoc.isObject())
 	{
 		error("Error reading version file.");
@@ -103,6 +102,10 @@ void GameUpdateTask::versionFileFinished()
 	}
 	QJsonObject root = jsonDoc.object();
 	
+	/*
+	 * FIXME: this distinction is pretty weak. The only other option
+	 * is to have a list of all the legacy versions.
+	 */
 	QString args = root.value("processArguments").toString("legacy");
 	if(args == "legacy")
 	{
@@ -110,8 +113,26 @@ void GameUpdateTask::versionFileFinished()
 		return;
 	}
 	
+	// save the version file in $instanceId/version.json and versions/$version/$version.json
+	QString version_id = targetVersion->descriptor();
+	QString mc_dir = m_inst->minecraftDir();
+	QString inst_dir = m_inst->rootDir();
+	QString version1 =  PathCombine(inst_dir, "/version.json");
+	QString version2 =  QString("versions/") + version_id + "/" + version_id + ".json";
+	DownloadJob::ensurePathExists(version1);
+	DownloadJob::ensurePathExists(version2);
+	QFile  vfile1 (version1);
+	QFile  vfile2 (version2);
+	vfile1.open(QIODevice::Truncate | QIODevice::WriteOnly );
+	vfile2.open(QIODevice::Truncate | QIODevice::WriteOnly );
+	vfile1.write(DlJob->m_data);
+	vfile2.write(DlJob->m_data);
+	vfile1.close();
+	vfile2.close();
+	
+	// download the right jar, save it in versions/$version/$version.jar
+	// determine and download all the libraries, save them in libraries/whatever...
 	
-	error("MC 1.6 isn't supported yet...");
 	exit(0);
 }
 
-- 
cgit 


From c96ac2460522b9567a10831bcd1d8a6bc9f36d9d Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Tue, 9 Jul 2013 22:46:33 +0200
Subject: Replace one line. Get downloading of 1.6 jars working. Yay.

---
 libmultimc/src/gameupdatetask.cpp | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'libmultimc/src')

diff --git a/libmultimc/src/gameupdatetask.cpp b/libmultimc/src/gameupdatetask.cpp
index 54e47410..a8abb0b6 100644
--- a/libmultimc/src/gameupdatetask.cpp
+++ b/libmultimc/src/gameupdatetask.cpp
@@ -131,8 +131,32 @@ void GameUpdateTask::versionFileFinished()
 	vfile2.close();
 	
 	// download the right jar, save it in versions/$version/$version.jar
-	// determine and download all the libraries, save them in libraries/whatever...
+	QString urlstr("http://s3.amazonaws.com/Minecraft.Download/versions/");
+	urlstr += targetVersion->descriptor() + "/" + targetVersion->descriptor() + ".jar";
+	QString targetstr ("versions/");
+	targetstr += targetVersion->descriptor() + "/" + targetVersion->descriptor() + ".jar";
+	auto dljob = DownloadJob::create(QUrl(urlstr), targetstr);
 	
+	jarlibDownloadJob.reset(new JobList());
+	jarlibDownloadJob->add(dljob);
+	connect(jarlibDownloadJob.data(), SIGNAL(finished()), SLOT(jarlibFinished()));
+	connect(jarlibDownloadJob.data(), SIGNAL(failed()), SLOT(jarlibFailed()));
+	connect(jarlibDownloadJob.data(), SIGNAL(progress(qint64,qint64)), SLOT(updateDownloadProgress(qint64,qint64)));
+	// determine and download all the libraries, save them in libraries/whatever...
+	download_queue.enqueue(jarlibDownloadJob);
+}
+
+void GameUpdateTask::jarlibFinished()
+{
+	exit(1);
+	// YAYAYAYAYYAYAAUAYAYYAYYY!!!!
+	// WEE DID IT!
+	// YESSSSS!
+}
+
+void GameUpdateTask::jarlibFailed()
+{
+	error("Failed to download the binary garbage. Try again. Maybe. IF YOU DARE");
 	exit(0);
 }
 
-- 
cgit 


From 33b9b25da7d3d29f949c9418295de257d437c9f8 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Sun, 14 Jul 2013 18:33:31 +0200
Subject: More work on the downloader and 1.6 instance creation

---
 libmultimc/src/gameupdatetask.cpp | 51 ++++++++++++++++++++++++++++++++++++---
 libmultimc/src/instance.cpp       |  2 +-
 2 files changed, 49 insertions(+), 4 deletions(-)

(limited to 'libmultimc/src')

diff --git a/libmultimc/src/gameupdatetask.cpp b/libmultimc/src/gameupdatetask.cpp
index a8abb0b6..b6c1f936 100644
--- a/libmultimc/src/gameupdatetask.cpp
+++ b/libmultimc/src/gameupdatetask.cpp
@@ -112,6 +112,52 @@ void GameUpdateTask::versionFileFinished()
 		getLegacyJar();
 		return;
 	}
+	/*
+	// Iterate through the list.
+	QJsonObject groupList = root.value("libraries").toObject();
+	
+	for (QJsonObject::iterator iter = groupList.begin(); 
+			iter != groupList.end(); iter++)
+	{
+		QString groupName = iter.key();
+		
+		// If not an object, complain and skip to the next one.
+		if (!iter.value().isObject())
+		{
+			qWarning(QString("Group '%1' in the group list should "
+								"be an object.").arg(groupName).toUtf8());
+			continue;
+		}
+		
+		QJsonObject groupObj = iter.value().toObject();
+		
+		// Create the group object.
+		InstanceGroup *group = new InstanceGroup(groupName, this);
+		groups.push_back(group);
+		
+		// If 'hidden' isn't a bool value, just assume it's false.
+		if (groupObj.value("hidden").isBool() && groupObj.value("hidden").toBool())
+		{
+			group->setHidden(groupObj.value("hidden").toBool());
+		}
+		
+		if (!groupObj.value("instances").isArray())
+		{
+			qWarning(QString("Group '%1' in the group list is invalid. "
+								"It should contain an array "
+								"called 'instances'.").arg(groupName).toUtf8());
+			continue;
+		}
+		
+		// Iterate through the list of instances in the group.
+		QJsonArray instancesArray = groupObj.value("instances").toArray();
+		
+		for (QJsonArray::iterator iter2 = instancesArray.begin(); 
+				iter2 != instancesArray.end(); iter2++)
+		{
+			groupMap[(*iter2).toString()] = groupName;
+		}
+	}*/
 	
 	// save the version file in $instanceId/version.json and versions/$version/$version.json
 	QString version_id = targetVersion->descriptor();
@@ -148,10 +194,9 @@ void GameUpdateTask::versionFileFinished()
 
 void GameUpdateTask::jarlibFinished()
 {
+	m_inst->setCurrentVersion(targetVersion->descriptor());
+	m_inst->setShouldUpdate(false);
 	exit(1);
-	// YAYAYAYAYYAYAAUAYAYYAYYY!!!!
-	// WEE DID IT!
-	// YESSSSS!
 }
 
 void GameUpdateTask::jarlibFailed()
diff --git a/libmultimc/src/instance.cpp b/libmultimc/src/instance.cpp
index 08cd6605..fde31cf3 100644
--- a/libmultimc/src/instance.cpp
+++ b/libmultimc/src/instance.cpp
@@ -34,7 +34,7 @@ Instance::Instance(const QString &rootDir, QObject *parent) :
 	settings().registerSetting(new Setting("iconKey", "default"));
 	settings().registerSetting(new Setting("notes", ""));
 	settings().registerSetting(new Setting("NeedsRebuild", true));
-	settings().registerSetting(new Setting("ShouldForceUpdate", false));
+	settings().registerSetting(new Setting("ShouldUpdate", false));
 	settings().registerSetting(new Setting("JarVersion", "Unknown"));
 	settings().registerSetting(new Setting("LwjglVersion", "2.9.0"));
 	settings().registerSetting(new Setting("IntendedJarVersion", ""));
-- 
cgit 


From e2ee6d6d254285284f07b07cb60409fbda0bf7ad Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Tue, 16 Jul 2013 00:30:32 +0200
Subject: Finalize the instance settings dialog, add setting reset mechanism

---
 libmultimc/src/instance.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'libmultimc/src')

diff --git a/libmultimc/src/instance.cpp b/libmultimc/src/instance.cpp
index fde31cf3..c1506a02 100644
--- a/libmultimc/src/instance.cpp
+++ b/libmultimc/src/instance.cpp
@@ -62,6 +62,18 @@ Instance::Instance(const QString &rootDir, QObject *parent) :
 	
 	// Auto login
 	settings().registerSetting(new OverrideSetting("AutoLogin", globalSettings->getSetting("AutoLogin")));
+	
+	// Console
+	settings().registerSetting(new OverrideSetting("ShowConsole", globalSettings->getSetting("ShowConsole")));
+	settings().registerSetting(new OverrideSetting("AutoCloseConsole", globalSettings->getSetting("AutoCloseConsole")));
+	
+	// Overrides
+	settings().registerSetting(new Setting("OverrideConsole", false));
+	settings().registerSetting(new Setting("OverrideWindow", false));
+	settings().registerSetting(new Setting("OverrideLogin", false));
+	settings().registerSetting(new Setting("OverrideMemory", false));
+	settings().registerSetting(new Setting("OverrideJava", false));
+	settings().registerSetting(new Setting("OverrideCommands", false));
 }
 
 QString Instance::id() const
-- 
cgit 


From 18853ca3fa185f5fe5288a1d0c8ed6cf8c678007 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Mon, 22 Jul 2013 02:01:56 +0200
Subject: Parsing the version files, part I

---
 libmultimc/src/fullversion.cpp        |   4 ++
 libmultimc/src/fullversionfactory.cpp | 113 ++++++++++++++++++++++++++++++++++
 libmultimc/src/gameupdatetask.cpp     |  71 +++------------------
 libmultimc/src/library.cpp            |  18 ++++++
 4 files changed, 143 insertions(+), 63 deletions(-)
 create mode 100644 libmultimc/src/fullversion.cpp
 create mode 100644 libmultimc/src/fullversionfactory.cpp
 create mode 100644 libmultimc/src/library.cpp

(limited to 'libmultimc/src')

diff --git a/libmultimc/src/fullversion.cpp b/libmultimc/src/fullversion.cpp
new file mode 100644
index 00000000..d66ce5bb
--- /dev/null
+++ b/libmultimc/src/fullversion.cpp
@@ -0,0 +1,4 @@
+#include "fullversion.h"
+
+
+// ECHO, echo, echo, ....
\ No newline at end of file
diff --git a/libmultimc/src/fullversionfactory.cpp b/libmultimc/src/fullversionfactory.cpp
new file mode 100644
index 00000000..8873ee2d
--- /dev/null
+++ b/libmultimc/src/fullversionfactory.cpp
@@ -0,0 +1,113 @@
+#include "fullversionfactory.h"
+#include "fullversion.h"
+
+QSharedPointer<FullVersion> FullVersionFactory::parse4(QJsonObject root, QSharedPointer<FullVersion> product)
+{
+	product->id = root.value("id").toString();
+	
+	// if it's on our legacy list, it's legacy
+	if(legacyWhitelist.contains(product->id))
+		product->isLegacy = true;
+	
+	product->mainClass = root.value("mainClass").toString();
+	auto procArgsValue = root.value("processArguments");
+	if(procArgsValue.isString())
+	{
+		product->processArguments = procArgsValue.toString();
+		QString toCompare = product->processArguments.toLower();
+		if(toCompare == "legacy")
+		{
+			product->minecraftArguments = " ${auth_player_name} ${auth_session}";
+			product->isLegacy = true;
+		}
+		else if(toCompare == "username_session")
+		{
+			product->minecraftArguments = "--username ${auth_player_name} --session ${auth_session}";
+		}
+		else if(toCompare == "username_session_version")
+		{
+			product->minecraftArguments = "--username ${auth_player_name} --session ${auth_session} --version ${profile_name}";
+		}
+	}
+	
+	auto minecraftArgsValue = root.value("minecraftArguments");
+	if(minecraftArgsValue.isString())
+	{
+		product->minecraftArguments = minecraftArgsValue.toString();
+	}
+	
+	product->releaseTime = root.value("releaseTime").toString();
+	product->time = root.value("time").toString();
+	
+	// Iterate through the list.
+	auto librariesValue = root.value("libraries");
+	if(librariesValue.isArray())
+	{
+		QJsonArray libList = root.value("libraries").toArray();
+		for (auto lib : libList)
+		{
+			if (!lib.isObject())
+			{
+				continue;
+			}
+			
+			QJsonObject libObj = lib.toObject();
+			
+			QString crud = libObj.value("name").toString();
+			product->libraries.append(crud);
+			
+			// TODO: improve!
+			/*
+			auto parts = crud.split(':');
+			int zz = parts.size();
+			*/
+		}
+	}
+	return product;
+}
+
+QSharedPointer<FullVersion> FullVersionFactory::parse(QByteArray data)
+{
+	QSharedPointer<FullVersion> readVersion(new FullVersion());
+	
+	QJsonParseError jsonError;
+	QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
+	
+	if (jsonError.error != QJsonParseError::NoError)
+	{
+		error_string = QString( "Error reading version file :") + " " + jsonError.errorString();
+		m_error = FullVersionFactory::ParseError;
+		return QSharedPointer<FullVersion>();
+	}
+	
+	if(!jsonDoc.isObject())
+	{
+		error_string = "Error reading version file.";
+		m_error = FullVersionFactory::ParseError;
+		return QSharedPointer<FullVersion>();
+	}
+	QJsonObject root = jsonDoc.object();
+	
+	readVersion->minimumLauncherVersion = root.value("minimumLauncherVersion").toDouble();
+	switch(readVersion->minimumLauncherVersion)
+	{
+		case 1:
+		case 2:
+		case 3:
+		case 4:
+			return parse4(root, readVersion);
+		// ADD MORE HERE :D
+		default:
+			error_string = "Version file was for an unrecognized launcher version. RIP";
+			m_error = FullVersionFactory::UnsupportedVersion;
+			return QSharedPointer<FullVersion>();
+	}
+}
+
+
+FullVersionFactory::FullVersionFactory()
+{
+	m_error = FullVersionFactory::AllOK;
+	legacyWhitelist.append("1.5.1");
+	legacyWhitelist.append("1.5.2");
+}
diff --git a/libmultimc/src/gameupdatetask.cpp b/libmultimc/src/gameupdatetask.cpp
index b6c1f936..61880118 100644
--- a/libmultimc/src/gameupdatetask.cpp
+++ b/libmultimc/src/gameupdatetask.cpp
@@ -25,9 +25,12 @@
 #include <QDebug>
 
 #include "minecraftversionlist.h"
+#include "fullversionfactory.h"
+#include <fullversion.h>
 
 #include "pathutils.h"
 
+
 GameUpdateTask::GameUpdateTask(const LoginResponse &response, Instance *inst, QObject *parent) :
 	Task(parent), m_response(response)
 {
@@ -86,78 +89,20 @@ void GameUpdateTask::versionFileFinished()
 {
 	JobPtr firstJob = specificVersionDownloadJob->getFirstJob();
 	auto DlJob = firstJob.dynamicCast<DownloadJob>();
-	QJsonParseError jsonError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(DlJob->m_data, &jsonError);
+	FullVersionFactory parser;
+	auto version = parser.parse(DlJob->m_data);
 	
-	if (jsonError.error != QJsonParseError::NoError)
+	if(!version)
 	{
-		error(QString( "Error reading version file :") + " " + jsonError.errorString());
+		error(parser.error_string);
 		exit(0);
 	}
 	
-	if(!jsonDoc.isObject())
-	{
-		error("Error reading version file.");
-		exit(0);
-	}
-	QJsonObject root = jsonDoc.object();
-	
-	/*
-	 * FIXME: this distinction is pretty weak. The only other option
-	 * is to have a list of all the legacy versions.
-	 */
-	QString args = root.value("processArguments").toString("legacy");
-	if(args == "legacy")
+	if(version->isLegacy)
 	{
 		getLegacyJar();
 		return;
 	}
-	/*
-	// Iterate through the list.
-	QJsonObject groupList = root.value("libraries").toObject();
-	
-	for (QJsonObject::iterator iter = groupList.begin(); 
-			iter != groupList.end(); iter++)
-	{
-		QString groupName = iter.key();
-		
-		// If not an object, complain and skip to the next one.
-		if (!iter.value().isObject())
-		{
-			qWarning(QString("Group '%1' in the group list should "
-								"be an object.").arg(groupName).toUtf8());
-			continue;
-		}
-		
-		QJsonObject groupObj = iter.value().toObject();
-		
-		// Create the group object.
-		InstanceGroup *group = new InstanceGroup(groupName, this);
-		groups.push_back(group);
-		
-		// If 'hidden' isn't a bool value, just assume it's false.
-		if (groupObj.value("hidden").isBool() && groupObj.value("hidden").toBool())
-		{
-			group->setHidden(groupObj.value("hidden").toBool());
-		}
-		
-		if (!groupObj.value("instances").isArray())
-		{
-			qWarning(QString("Group '%1' in the group list is invalid. "
-								"It should contain an array "
-								"called 'instances'.").arg(groupName).toUtf8());
-			continue;
-		}
-		
-		// Iterate through the list of instances in the group.
-		QJsonArray instancesArray = groupObj.value("instances").toArray();
-		
-		for (QJsonArray::iterator iter2 = instancesArray.begin(); 
-				iter2 != instancesArray.end(); iter2++)
-		{
-			groupMap[(*iter2).toString()] = groupName;
-		}
-	}*/
 	
 	// save the version file in $instanceId/version.json and versions/$version/$version.json
 	QString version_id = targetVersion->descriptor();
diff --git a/libmultimc/src/library.cpp b/libmultimc/src/library.cpp
new file mode 100644
index 00000000..b0490616
--- /dev/null
+++ b/libmultimc/src/library.cpp
@@ -0,0 +1,18 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "include/library.h"
+
+// default url for lib: https://s3.amazonaws.com/Minecraft.Download/libraries/
-- 
cgit 


From 97cf08f964ceebf4cb98b46f473bf952007a8a21 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Wed, 24 Jul 2013 23:44:00 +0200
Subject: Parsing the version files, part II

---
 libmultimc/src/fullversion.cpp        |   2 +-
 libmultimc/src/fullversionfactory.cpp | 137 ++++++++++++++++++++++++++--------
 libmultimc/src/library.cpp            |  19 +++++
 3 files changed, 126 insertions(+), 32 deletions(-)

(limited to 'libmultimc/src')

diff --git a/libmultimc/src/fullversion.cpp b/libmultimc/src/fullversion.cpp
index d66ce5bb..6f4662b4 100644
--- a/libmultimc/src/fullversion.cpp
+++ b/libmultimc/src/fullversion.cpp
@@ -1,4 +1,4 @@
+#include <QtCore>
 #include "fullversion.h"
 
-
 // ECHO, echo, echo, ....
\ No newline at end of file
diff --git a/libmultimc/src/fullversionfactory.cpp b/libmultimc/src/fullversionfactory.cpp
index 8873ee2d..9b4ae266 100644
--- a/libmultimc/src/fullversionfactory.cpp
+++ b/libmultimc/src/fullversionfactory.cpp
@@ -1,69 +1,144 @@
 #include "fullversionfactory.h"
 #include "fullversion.h"
+#include <library.h>
 
-QSharedPointer<FullVersion> FullVersionFactory::parse4(QJsonObject root, QSharedPointer<FullVersion> product)
+QSharedPointer<FullVersion> FullVersionFactory::parse4(QJsonObject root, QSharedPointer<FullVersion> fullVersion)
 {
-	product->id = root.value("id").toString();
+	fullVersion->id = root.value("id").toString();
 	
 	// if it's on our legacy list, it's legacy
-	if(legacyWhitelist.contains(product->id))
-		product->isLegacy = true;
+	if(legacyWhitelist.contains(fullVersion->id))
+		fullVersion->isLegacy = true;
 	
-	product->mainClass = root.value("mainClass").toString();
+	fullVersion->mainClass = root.value("mainClass").toString();
 	auto procArgsValue = root.value("processArguments");
 	if(procArgsValue.isString())
 	{
-		product->processArguments = procArgsValue.toString();
-		QString toCompare = product->processArguments.toLower();
+		fullVersion->processArguments = procArgsValue.toString();
+		QString toCompare = fullVersion->processArguments.toLower();
 		if(toCompare == "legacy")
 		{
-			product->minecraftArguments = " ${auth_player_name} ${auth_session}";
-			product->isLegacy = true;
+			fullVersion->minecraftArguments = " ${auth_player_name} ${auth_session}";
+			fullVersion->isLegacy = true;
 		}
 		else if(toCompare == "username_session")
 		{
-			product->minecraftArguments = "--username ${auth_player_name} --session ${auth_session}";
+			fullVersion->minecraftArguments = "--username ${auth_player_name} --session ${auth_session}";
 		}
 		else if(toCompare == "username_session_version")
 		{
-			product->minecraftArguments = "--username ${auth_player_name} --session ${auth_session} --version ${profile_name}";
+			fullVersion->minecraftArguments = "--username ${auth_player_name} --session ${auth_session} --version ${profile_name}";
 		}
 	}
 	
 	auto minecraftArgsValue = root.value("minecraftArguments");
 	if(minecraftArgsValue.isString())
 	{
-		product->minecraftArguments = minecraftArgsValue.toString();
+		fullVersion->minecraftArguments = minecraftArgsValue.toString();
 	}
 	
-	product->releaseTime = root.value("releaseTime").toString();
-	product->time = root.value("time").toString();
+	fullVersion->releaseTime = root.value("releaseTime").toString();
+	fullVersion->time = root.value("time").toString();
 	
-	// Iterate through the list.
+	// Iterate through the list, if it's a list.
 	auto librariesValue = root.value("libraries");
-	if(librariesValue.isArray())
+	if(!librariesValue.isArray())
+		return fullVersion;
+	
+	QJsonArray libList = root.value("libraries").toArray();
+	for (auto libVal : libList)
 	{
-		QJsonArray libList = root.value("libraries").toArray();
-		for (auto lib : libList)
+		QSharedPointer<Library> library(new Library());
+		if (!libVal.isObject())
+		{
+			continue;
+		}
+		
+		QJsonObject libObj = libVal.toObject();
+		
+		// Library name
+		auto nameVal = libObj.value("name");
+		if(!nameVal.isString())
+			continue;
+		library->name = nameVal.toString();
+		
+		// Extract excludes (if any)
+		auto extractVal = libObj.value("extract");
+		if(extractVal.isObject())
 		{
-			if (!lib.isObject())
+			QStringList excludes;
+			auto extractObj = extractVal.toObject();
+			auto excludesVal = extractObj.value("exclude");
+			if(!excludesVal.isArray())
+				goto SKIP_EXTRACTS;
+			auto excludesList = excludesVal.toArray();
+			for(auto excludeVal : excludesList)
 			{
-				continue;
+				if(excludeVal.isString())
+					excludes.append(excludeVal.toString());
 			}
+			library->extract_excludes = excludes;
+		}
+		SKIP_EXTRACTS:
+		
+		auto nativesVal = libObj.value("natives");
+		if(nativesVal.isObject())
+		{
+			auto nativesObj = nativesVal.toObject();
+			auto iter = nativesObj.begin();
+			while(iter != nativesObj.end())
+			{
+				auto osType = OpSys_fromString(iter.key());
+				if(osType == Os_Other)
+					continue;
+				if(!iter.value().isString())
+					continue;
+				library->natives[osType] = iter.value().toString();
+				iter++;
+			}
+		}
+		
+		// Library rules (if any)
+		auto rulesVal = libObj.value("rules");
+		if(rulesVal.isArray())
+		{
+			QList<QSharedPointer<Rule> > rules;
 			
-			QJsonObject libObj = lib.toObject();
-			
-			QString crud = libObj.value("name").toString();
-			product->libraries.append(crud);
-			
-			// TODO: improve!
-			/*
-			auto parts = crud.split(':');
-			int zz = parts.size();
-			*/
+			QJsonArray ruleList = rulesVal.toArray();
+			for(auto ruleVal : ruleList)
+			{
+				QSharedPointer<Rule> rule;
+				if(!ruleVal.isObject())
+					continue;
+				auto ruleObj = ruleVal.toObject();
+				auto actionVal = ruleObj.value("action");
+				if(!actionVal.isString())
+					continue;
+				auto action = RuleAction_fromString(actionVal.toString());
+				if(action == Defer)
+					continue;
+				
+				auto osVal = ruleObj.value("os");
+				if(!osVal.isObject())
+				{
+					rule.reset(new ImplicitRule(action));
+				}
+				else
+				{
+					auto osObj = osVal.toObject();
+					auto osNameVal = osObj.value("name");
+					if(!osNameVal.isString())
+						continue;
+					OpSys requiredOs = OpSys_fromString(osNameVal.toString());
+					QString versionRegex = osObj.value("version").toString();
+					rule.reset(new OsRule(action, requiredOs, versionRegex));
+				}
+				rules.append(rule);
+			}
+			library->rules = rules;
 		}
 	}
-	return product;
+	return fullVersion;
 }
 
 QSharedPointer<FullVersion> FullVersionFactory::parse(QByteArray data)
diff --git a/libmultimc/src/library.cpp b/libmultimc/src/library.cpp
index b0490616..0fb4f9d3 100644
--- a/libmultimc/src/library.cpp
+++ b/libmultimc/src/library.cpp
@@ -15,4 +15,23 @@
 
 #include "include/library.h"
 
+RuleAction RuleAction_fromString(QString name)
+{
+	if(name == "allow")
+		return Allow;
+	if(name == "disallow")
+		return Disallow;
+	return Defer;
+}
+
+OpSys OpSys_fromString(QString name)
+{
+	if(name == "linux")
+		return Os_Linux;
+	if(name == "windows")
+		return Os_Windows;
+	if(name == "osx")
+		return Os_OSX;
+	return Os_Other;
+}
 // default url for lib: https://s3.amazonaws.com/Minecraft.Download/libraries/
-- 
cgit 


From a7a84d4dbb58565f108cb0886da6cb786e34d10d Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Sat, 27 Jul 2013 11:41:45 +0200
Subject: Parsing the version files, part III

---
 libmultimc/src/fullversion.cpp        |   1 +
 libmultimc/src/fullversionfactory.cpp | 104 ++++++++++++++++++++--------------
 libmultimc/src/gameupdatetask.cpp     |   2 +
 libmultimc/src/instance.cpp           |   1 +
 libmultimc/src/library.cpp            |   2 +-
 5 files changed, 66 insertions(+), 44 deletions(-)

(limited to 'libmultimc/src')

diff --git a/libmultimc/src/fullversion.cpp b/libmultimc/src/fullversion.cpp
index 6f4662b4..53664c2a 100644
--- a/libmultimc/src/fullversion.cpp
+++ b/libmultimc/src/fullversion.cpp
@@ -1,4 +1,5 @@
 #include <QtCore>
 #include "fullversion.h"
+#include <library.h>
 
 // ECHO, echo, echo, ....
\ No newline at end of file
diff --git a/libmultimc/src/fullversionfactory.cpp b/libmultimc/src/fullversionfactory.cpp
index 9b4ae266..bb55b4a9 100644
--- a/libmultimc/src/fullversionfactory.cpp
+++ b/libmultimc/src/fullversionfactory.cpp
@@ -2,6 +2,61 @@
 #include "fullversion.h"
 #include <library.h>
 
+class LibraryFinalizer
+{
+public:
+	LibraryFinalizer(QSharedPointer<Library> library)
+	{
+		m_library = library;
+	}
+	
+	QSharedPointer<Library> m_library;
+};
+
+// Library rules (if any)
+QList<QSharedPointer<Rule> > FullVersionFactory::parse4rules(QJsonObject & baseObj)
+{
+	QList<QSharedPointer<Rule> > rules;
+	auto rulesVal = baseObj.value("rules");
+	if(rulesVal.isArray())
+	{
+		QJsonArray ruleList = rulesVal.toArray();
+		for(auto ruleVal : ruleList)
+		{
+			QSharedPointer<Rule> rule;
+			if(!ruleVal.isObject())
+				continue;
+			auto ruleObj = ruleVal.toObject();
+			auto actionVal = ruleObj.value("action");
+			if(!actionVal.isString())
+				continue;
+			auto action = RuleAction_fromString(actionVal.toString());
+			if(action == Defer)
+				continue;
+			
+			auto osVal = ruleObj.value("os");
+			if(!osVal.isObject())
+			{
+				// add a new implicit action rule
+				rules.append(ImplicitRule::create(action));
+			}
+			else
+			{
+				auto osObj = osVal.toObject();
+				auto osNameVal = osObj.value("name");
+				if(!osNameVal.isString())
+					continue;
+				OpSys requiredOs = OpSys_fromString(osNameVal.toString());
+				QString versionRegex = osObj.value("version").toString();
+				// add a new OS rule
+				rules.append(OsRule::create(action, requiredOs, versionRegex));
+			}
+		}
+	}
+	return rules;
+}
+
+
 QSharedPointer<FullVersion> FullVersionFactory::parse4(QJsonObject root, QSharedPointer<FullVersion> fullVersion)
 {
 	fullVersion->id = root.value("id").toString();
@@ -48,7 +103,6 @@ QSharedPointer<FullVersion> FullVersionFactory::parse4(QJsonObject root, QShared
 	QJsonArray libList = root.value("libraries").toArray();
 	for (auto libVal : libList)
 	{
-		QSharedPointer<Library> library(new Library());
 		if (!libVal.isObject())
 		{
 			continue;
@@ -60,7 +114,7 @@ QSharedPointer<FullVersion> FullVersionFactory::parse4(QJsonObject root, QShared
 		auto nameVal = libObj.value("name");
 		if(!nameVal.isString())
 			continue;
-		library->name = nameVal.toString();
+		QSharedPointer<Library> library(new Library(nameVal.toString()));
 		
 		// Extract excludes (if any)
 		auto extractVal = libObj.value("extract");
@@ -84,6 +138,7 @@ QSharedPointer<FullVersion> FullVersionFactory::parse4(QJsonObject root, QShared
 		auto nativesVal = libObj.value("natives");
 		if(nativesVal.isObject())
 		{
+			library->setIsNative();
 			auto nativesObj = nativesVal.toObject();
 			auto iter = nativesObj.begin();
 			while(iter != nativesObj.end())
@@ -93,50 +148,13 @@ QSharedPointer<FullVersion> FullVersionFactory::parse4(QJsonObject root, QShared
 					continue;
 				if(!iter.value().isString())
 					continue;
-				library->natives[osType] = iter.value().toString();
+				library->addNative(osType, iter.value().toString());
 				iter++;
 			}
 		}
-		
-		// Library rules (if any)
-		auto rulesVal = libObj.value("rules");
-		if(rulesVal.isArray())
-		{
-			QList<QSharedPointer<Rule> > rules;
-			
-			QJsonArray ruleList = rulesVal.toArray();
-			for(auto ruleVal : ruleList)
-			{
-				QSharedPointer<Rule> rule;
-				if(!ruleVal.isObject())
-					continue;
-				auto ruleObj = ruleVal.toObject();
-				auto actionVal = ruleObj.value("action");
-				if(!actionVal.isString())
-					continue;
-				auto action = RuleAction_fromString(actionVal.toString());
-				if(action == Defer)
-					continue;
-				
-				auto osVal = ruleObj.value("os");
-				if(!osVal.isObject())
-				{
-					rule.reset(new ImplicitRule(action));
-				}
-				else
-				{
-					auto osObj = osVal.toObject();
-					auto osNameVal = osObj.value("name");
-					if(!osNameVal.isString())
-						continue;
-					OpSys requiredOs = OpSys_fromString(osNameVal.toString());
-					QString versionRegex = osObj.value("version").toString();
-					rule.reset(new OsRule(action, requiredOs, versionRegex));
-				}
-				rules.append(rule);
-			}
-			library->rules = rules;
-		}
+		library->setRules(parse4rules(libObj));
+		library->finalize();
+		fullVersion->libraries.append(library);
 	}
 	return fullVersion;
 }
diff --git a/libmultimc/src/gameupdatetask.cpp b/libmultimc/src/gameupdatetask.cpp
index 61880118..bae85c17 100644
--- a/libmultimc/src/gameupdatetask.cpp
+++ b/libmultimc/src/gameupdatetask.cpp
@@ -141,6 +141,7 @@ void GameUpdateTask::jarlibFinished()
 {
 	m_inst->setCurrentVersion(targetVersion->descriptor());
 	m_inst->setShouldUpdate(false);
+	m_inst->setIsForNewLauncher(true);
 	exit(1);
 }
 
@@ -195,6 +196,7 @@ void GameUpdateTask::legacyJarFinished()
 {
 	setState(StateFinished);
 	emit gameUpdateComplete(m_response);
+	m_inst->setIsForNewLauncher(true);
 	exit(1);
 }
 
diff --git a/libmultimc/src/instance.cpp b/libmultimc/src/instance.cpp
index c1506a02..5fdb5064 100644
--- a/libmultimc/src/instance.cpp
+++ b/libmultimc/src/instance.cpp
@@ -34,6 +34,7 @@ Instance::Instance(const QString &rootDir, QObject *parent) :
 	settings().registerSetting(new Setting("iconKey", "default"));
 	settings().registerSetting(new Setting("notes", ""));
 	settings().registerSetting(new Setting("NeedsRebuild", true));
+	settings().registerSetting(new Setting("IsForNewLauncher", false));
 	settings().registerSetting(new Setting("ShouldUpdate", false));
 	settings().registerSetting(new Setting("JarVersion", "Unknown"));
 	settings().registerSetting(new Setting("LwjglVersion", "2.9.0"));
diff --git a/libmultimc/src/library.cpp b/libmultimc/src/library.cpp
index 0fb4f9d3..9d4cc6e3 100644
--- a/libmultimc/src/library.cpp
+++ b/libmultimc/src/library.cpp
@@ -34,4 +34,4 @@ OpSys OpSys_fromString(QString name)
 		return Os_OSX;
 	return Os_Other;
 }
-// default url for lib: https://s3.amazonaws.com/Minecraft.Download/libraries/
+// default url for lib: 
-- 
cgit