From f9ea3dbfdea0db5626a6afadcfd599a5f53d8abd Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Mon, 27 Jan 2014 19:20:07 +0100
Subject: Split parsing/applying. Better error logging. Fix crash.

---
 logic/OneSixInstance.cpp | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

(limited to 'logic/OneSixInstance.cpp')

diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
index c43a5187..19d5e112 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -35,13 +35,14 @@ OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *settings,
 	d->m_settings->registerSetting("IntendedVersion", "");
 	d->m_settings->registerSetting("ShouldUpdate", false);
 	d->version.reset(new OneSixVersion(this, this));
+	d->nonCustomVersion.reset(new OneSixVersion(this, this));
 	if (QDir(instanceRoot()).exists("version.json"))
 	{
-		reloadFullVersion();
+		reloadVersion();
 	}
 	else
 	{
-		clearFullVersion();
+		clearVersion();
 	}
 }
 
@@ -139,6 +140,10 @@ QStringList OneSixInstance::processMinecraftArgs(MojangAccountPtr account)
 	I_D(OneSixInstance);
 	auto version = d->version;
 	QString args_pattern = version->minecraftArguments;
+	for (auto tweaker : version->tweakers)
+	{
+		args_pattern += " --tweakClass " + tweaker;
+	}
 
 	QMap<QString, QString> token_mapping;
 	// yggdrasil!
@@ -287,7 +292,7 @@ bool OneSixInstance::setIntendedVersionId(QString version)
 	settings().set("IntendedVersion", version);
 	setShouldUpdate(true);
 	QFile::remove(PathCombine(instanceRoot(), "version.json"));
-	clearFullVersion();
+	clearVersion();
 	return true;
 }
 
@@ -323,28 +328,39 @@ QString OneSixInstance::currentVersionId() const
 	return intendedVersionId();
 }
 
-bool OneSixInstance::reloadFullVersion(QWidget *widgetParent)
+bool OneSixInstance::reloadVersion(QWidget *widgetParent)
 {
 	I_D(OneSixInstance);
 
 	bool ret = d->version->reload(widgetParent);
+	if (ret)
+	{
+		ret = d->nonCustomVersion->reload(widgetParent, true);
+	}
 	emit versionReloaded();
 	return ret;
 }
 
-void OneSixInstance::clearFullVersion()
+void OneSixInstance::clearVersion()
 {
 	I_D(OneSixInstance);
 	d->version->clear();
+	d->nonCustomVersion->clear();
 	emit versionReloaded();
 }
 
-std::shared_ptr<OneSixVersion> OneSixInstance::getFullVersion()
+std::shared_ptr<OneSixVersion> OneSixInstance::getFullVersion() const
 {
-	I_D(OneSixInstance);
+	I_D(const OneSixInstance);
 	return d->version;
 }
 
+std::shared_ptr<OneSixVersion> OneSixInstance::getNonCustomVersion() const
+{
+	I_D(const OneSixInstance);
+	return d->nonCustomVersion;
+}
+
 QString OneSixInstance::defaultBaseJar() const
 {
 	return "versions/" + intendedVersionId() + "/" + intendedVersionId() + ".jar";
-- 
cgit v1.2.3