Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances

Conflicts:
	gui/dialogs/OneSixModEditDialog.cpp
	logic/OneSixUpdate.cpp

24 files changed, 1581 insertions, 591 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c34f363f..ba28a042 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -411,10 +411,7 @@ logic/LegacyUpdate.cpp
 logic/LegacyForge.h
 logic/LegacyForge.cpp
 
-# 1.6 instances
-logic/OneSixInstance.h
-logic/OneSixInstance.cpp
-logic/OneSixInstance_p.h
+# OneSix instances
 logic/OneSixUpdate.h
 logic/OneSixUpdate.cpp
 logic/OneSixVersion.h
@@ -425,10 +422,17 @@ logic/OneSixRule.h
 logic/OneSixRule.cpp
 logic/OpSys.h
 logic/OpSys.cpp
+logic/BaseInstaller.h
+logic/BaseInstaller.cpp
 logic/ForgeInstaller.h
 logic/ForgeInstaller.cpp
 logic/LiteLoaderInstaller.h
 logic/LiteLoaderInstaller.cpp
+logic/OneSixInstance.h
+logic/OneSixInstance.cpp
+logic/OneSixInstance_p.h
+logic/OneSixVersionBuilder.h
+logic/OneSixVersionBuilder.cpp
 
 # Nostalgia
 logic/NostalgiaInstance.h
diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp
index 27315c69..1742ff80 100644
--- a/gui/dialogs/OneSixModEditDialog.cpp
+++ b/gui/dialogs/OneSixModEditDialog.cpp
@@ -55,7 +55,8 @@ OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
 		main_model->setSourceModel(m_version.get());
 		ui->libraryTreeView->setModel(main_model);
 		ui->libraryTreeView->installEventFilter(this);
-		ui->mainClassEdit->setText(m_version->mainClass);
+		connect(ui->libraryTreeView->selectionModel(), &QItemSelectionModel::currentChanged,
+				this, &OneSixModEditDialog::versionCurrent);
 		updateVersionControls();
 	}
 	else
@@ -81,6 +82,8 @@ OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
 		ui->resPackTreeView->installEventFilter(this);
 		m_resourcepacks->startWatching();
 	}
+
+	connect(m_inst, &OneSixInstance::versionReloaded, this, &OneSixModEditDialog::updateVersionControls);
 }
 
 OneSixModEditDialog::~OneSixModEditDialog()
@@ -92,98 +95,76 @@ OneSixModEditDialog::~OneSixModEditDialog()
 
 void OneSixModEditDialog::updateVersionControls()
 {
-	bool customVersion = m_inst->versionIsCustom();
-	ui->customizeBtn->setEnabled(!customVersion);
-	ui->revertBtn->setEnabled(customVersion);
 	ui->forgeBtn->setEnabled(true);
-	ui->liteloaderBtn->setEnabled(LiteLoaderInstaller(m_inst->intendedVersionId()).canApply());
-	ui->customEditorBtn->setEnabled(customVersion);
+	ui->liteloaderBtn->setEnabled(LiteLoaderInstaller().canApply(m_inst));
+	ui->mainClassEdit->setText(m_version->mainClass);
 }
 
 void OneSixModEditDialog::disableVersionControls()
 {
-	ui->customizeBtn->setEnabled(false);
-	ui->revertBtn->setEnabled(false);
 	ui->forgeBtn->setEnabled(false);
 	ui->liteloaderBtn->setEnabled(false);
-	ui->customEditorBtn->setEnabled(false);
+	ui->reloadLibrariesBtn->setEnabled(false);
+	ui->removeLibraryBtn->setEnabled(false);
+	ui->mainClassEdit->setText("");
 }
 
-void OneSixModEditDialog::on_customizeBtn_clicked()
+void OneSixModEditDialog::on_userEditorBtn_clicked()
 {
-	if (m_inst->customizeVersion())
+	QDir root(m_inst->instanceRoot());
+	if (!root.exists("user.json"))
 	{
-		m_version = m_inst->getFullVersion();
-		main_model->setSourceModel(m_version.get());
-		updateVersionControls();
+		QFile file(root.absoluteFilePath("user.json"));
+		if (!file.open(QFile::WriteOnly))
+		{
+			QMessageBox::critical(this, tr("Error"), tr("Couldn't write a skeletion user.json file: %1").arg(file.errorString()));
+			return;
+		}
+		file.write("{\n}");
+		file.close();
+	}
+	if (!MMC->openJsonEditor(root.absoluteFilePath("user.json")))
+	{
+		QMessageBox::warning(this, tr("Error"), tr("Unable to open user.json, check the settings"));
 	}
 }
 
-void OneSixModEditDialog::on_revertBtn_clicked()
+void OneSixModEditDialog::on_reloadLibrariesBtn_clicked()
 {
-	auto response = CustomMessageBox::selectable(
-		this, tr("Revert?"), tr("Do you want to revert the "
-								"version of this instance to its original configuration?"),
-		QMessageBox::Question, QMessageBox::Yes | QMessageBox::No)->exec();
-	if (response == QMessageBox::Yes)
-	{
-		if (m_inst->revertCustomVersion())
-		{
-			m_version = m_inst->getFullVersion();
-			main_model->setSourceModel(m_version.get());
-			updateVersionControls();
-		}
-	}
+	m_inst->reloadVersion(this);
 }
 
-void OneSixModEditDialog::on_customEditorBtn_clicked()
+void OneSixModEditDialog::on_removeLibraryBtn_clicked()
 {
-	if (m_inst->versionIsCustom())
+	if (ui->libraryTreeView->currentIndex().isValid())
 	{
-		if (!MMC->openJsonEditor(m_inst->instanceRoot() + "/custom.json"))
+		if (!m_version->remove(ui->libraryTreeView->currentIndex().row()))
+		{
+			QMessageBox::critical(this, tr("Error"), tr("Couldn't remove file"));
+		}
+		else
 		{
-			QMessageBox::warning(this, tr("Error"),
-								 tr("Unable to open custom.json, check the settings"));
+			m_inst->reloadVersion(this);
 		}
 	}
 }
 
 void OneSixModEditDialog::on_forgeBtn_clicked()
 {
+	if (QDir(m_inst->instanceRoot()).exists("custom.json"))
+	{
+		if (QMessageBox::question(this, tr("Revert?"), tr("This action will remove your custom.json. Continue?")) != QMessageBox::Yes)
+		{
+			return;
+		}
+		QDir(m_inst->instanceRoot()).remove("custom.json");
+	}
 	VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this);
 	vselect.setFilter(1, m_inst->currentVersionId());
 	vselect.setEmptyString(tr("No Forge versions are currently available for Minecraft ") +
 							  m_inst->currentVersionId());
 	if (vselect.exec() && vselect.selectedVersion())
 	{
-		if (m_inst->versionIsCustom())
-		{
-			auto reply = QMessageBox::question(
-				this, tr("Revert?"),
-				tr("This will revert any "
-				   "changes you did to the version up to this point. Is that "
-				   "OK?"),
-				QMessageBox::Yes | QMessageBox::No);
-			if (reply == QMessageBox::Yes)
-			{
-				m_inst->revertCustomVersion();
-				m_inst->customizeVersion();
-				{
-					m_version = m_inst->getFullVersion();
-					main_model->setSourceModel(m_version.get());
-					updateVersionControls();
-				}
-			}
-			else
-				return;
-		}
-		else
-		{
-			m_inst->customizeVersion();
-			m_version = m_inst->getFullVersion();
-			main_model->setSourceModel(m_version.get());
-			updateVersionControls();
-		}
 		ForgeVersionPtr forgeVersion =
 			std::dynamic_pointer_cast<ForgeVersion>(vselect.selectedVersion());
 		if (!forgeVersion)
@@ -200,9 +181,9 @@ void OneSixModEditDialog::on_forgeBtn_clicked()
 				// install
 				QString forgePath = entry->getFullPath();
 				ForgeInstaller forge(forgePath, forgeVersion->universal_url);
-				if (!forge.apply(m_version))
+				if (!forge.add(m_inst))
 				{
-					// failure notice
+					QLOG_ERROR() << "Failure installing forge";
 				}
 			}
 			else
@@ -215,18 +196,27 @@ void OneSixModEditDialog::on_forgeBtn_clicked()
 			// install
 			QString forgePath = entry->getFullPath();
 			ForgeInstaller forge(forgePath, forgeVersion->universal_url);
-			if (!forge.apply(m_version))
+			if (!forge.add(m_inst))
 			{
-				// failure notice
+				QLOG_ERROR() << "Failure installing forge";
 			}
 		}
 	}
+	m_inst->reloadVersion(this);
 }
 
 void OneSixModEditDialog::on_liteloaderBtn_clicked()
 {
-	LiteLoaderInstaller liteloader(m_inst->intendedVersionId());
-	if (!liteloader.canApply())
+	if (QDir(m_inst->instanceRoot()).exists("custom.json"))
+	{
+		if (QMessageBox::question(this, tr("Revert?"), tr("This action will remove your custom.json. Continue?")) != QMessageBox::Yes)
+		{
+			return;
+		}
+		QDir(m_inst->instanceRoot()).remove("custom.json");
+	}
+	LiteLoaderInstaller liteloader;
+	if (!liteloader.canApply(m_inst))
 	{
 		QMessageBox::critical(
 			this, tr("LiteLoader"),
@@ -234,19 +224,16 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked()
 			   "into this version of Minecraft"));
 		return;
 	}
-	if (!m_inst->versionIsCustom())
-	{
-		m_inst->customizeVersion();
-		m_version = m_inst->getFullVersion();
-		main_model->setSourceModel(m_version.get());
-		updateVersionControls();
-	}
-	if (!liteloader.apply(m_version))
+	if (!liteloader.add(m_inst))
 	{
 		QMessageBox::critical(this, tr("LiteLoader"),
 							  tr("For reasons unknown, the LiteLoader installation failed. "
 								 "Check your MultiMC log files for details."));
 	}
+	else
+	{
+		m_inst->reloadVersion(this);
+	}
 }
 
 bool OneSixModEditDialog::loaderListFilter(QKeyEvent *keyEvent)
@@ -365,3 +352,15 @@ void OneSixModEditDialog::loaderCurrent(QModelIndex current, QModelIndex previou
 	Mod &m = m_mods->operator[](row);
 	ui->frame->updateWithMod(m);
 }
+
+void OneSixModEditDialog::versionCurrent(const QModelIndex &current, const QModelIndex &previous)
+{
+	if (!current.isValid())
+	{
+		ui->removeLibraryBtn->setDisabled(true);
+	}
+	else
+	{
+		ui->removeLibraryBtn->setEnabled(m_version->canRemove(current.row()));
+	}
+}
diff --git a/gui/dialogs/OneSixModEditDialog.h b/gui/dialogs/OneSixModEditDialog.h
index 2510c59c..7e759f48 100644
--- a/gui/dialogs/OneSixModEditDialog.h
+++ b/gui/dialogs/OneSixModEditDialog.h
@@ -45,9 +45,9 @@ slots:
 	void on_buttonBox_rejected();
 	void on_forgeBtn_clicked();
 	void on_liteloaderBtn_clicked();
-	void on_customizeBtn_clicked();
-	void on_revertBtn_clicked();
-	void on_customEditorBtn_clicked();
+	void on_userEditorBtn_clicked();
+	void on_reloadLibrariesBtn_clicked();
+	void on_removeLibraryBtn_clicked();
 	void updateVersionControls();
 	void disableVersionControls();
 
@@ -66,4 +66,5 @@ private:
 public
 slots:
 	void loaderCurrent(QModelIndex current, QModelIndex previous);
+	void versionCurrent(const QModelIndex &current, const QModelIndex &previous);
 };
diff --git a/gui/dialogs/OneSixModEditDialog.ui b/gui/dialogs/OneSixModEditDialog.ui
index 899e0cbf..d90c6d93 100644
--- a/gui/dialogs/OneSixModEditDialog.ui
+++ b/gui/dialogs/OneSixModEditDialog.ui
@@ -26,7 +26,7 @@
       </size>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="libTab">
       <attribute name="title">
@@ -43,6 +43,9 @@
            <property name="horizontalScrollBarPolicy">
             <enum>Qt::ScrollBarAlwaysOff</enum>
            </property>
+           <attribute name="headerVisible">
+            <bool>true</bool>
+           </attribute>
           </widget>
          </item>
          <item>
@@ -85,61 +88,23 @@
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="customizeBtn">
-           <property name="toolTip">
-            <string>Create an customized copy of the base version</string>
-           </property>
-           <property name="text">
-            <string>Customize</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="revertBtn">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="toolTip">
-            <string>Revert to original base version</string>
-           </property>
-           <property name="text">
-            <string>Revert</string>
-           </property>
-          </widget>
-         </item>
-         <item>
           <widget class="Line" name="line">
-           <property name="frameShadow">
-            <enum>QFrame::Sunken</enum>
-           </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="addLibraryBtn">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="toolTip">
-            <string>Add new libraries</string>
-           </property>
+          <widget class="QPushButton" name="reloadLibrariesBtn">
            <property name="text">
-            <string>&amp;Add</string>
+            <string>Reload</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="removeLibraryBtn">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="toolTip">
-            <string>Remove selected libraries</string>
-           </property>
            <property name="text">
-            <string>&amp;Remove</string>
+            <string>Remove</string>
            </property>
           </widget>
          </item>
@@ -151,9 +116,9 @@
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="customEditorBtn">
+          <widget class="QPushButton" name="userEditorBtn">
            <property name="text">
-            <string>Open custom.json</string>
+            <string>Open user.json</string>
            </property>
           </widget>
          </item>
diff --git a/logic/BaseInstaller.cpp b/logic/BaseInstaller.cpp
new file mode 100644
index 00000000..92aa0c92
--- /dev/null
+++ b/logic/BaseInstaller.cpp
@@ -0,0 +1,66 @@
+/* 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 "BaseInstaller.h"
+
+#include <QFile>
+
+#include "OneSixVersion.h"
+#include "OneSixLibrary.h"
+#include "OneSixInstance.h"
+
+#include "cmdutils.h"
+
+BaseInstaller::BaseInstaller()
+{
+
+}
+
+bool BaseInstaller::isApplied(OneSixInstance *on)
+{
+	return QFile::exists(filename(on->instanceRoot()));
+}
+
+bool BaseInstaller::add(OneSixInstance *to)
+{
+	if (!patchesDir(to->instanceRoot()).exists())
+	{
+		QDir(to->instanceRoot()).mkdir("patches");
+	}
+
+	if (isApplied(to))
+	{
+		if (!remove(to))
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+bool BaseInstaller::remove(OneSixInstance *from)
+{
+	return QFile::remove(filename(from->instanceRoot()));
+}
+
+QString BaseInstaller::filename(const QString &root) const
+{
+	return patchesDir(root).absoluteFilePath(id() + ".json");
+}
+QDir BaseInstaller::patchesDir(const QString &root) const
+{
+	return QDir(root + "/patches/");
+}
diff --git a/logic/BaseInstaller.h b/logic/BaseInstaller.h
new file mode 100644
index 00000000..df7eab89
--- /dev/null
+++ b/logic/BaseInstaller.h
@@ -0,0 +1,39 @@
+/* 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.
+ */
+
+#pragma once
+
+#include <memory>
+
+class OneSixInstance;
+class QDir;
+class QString;
+
+class BaseInstaller
+{
+public:
+	BaseInstaller();
+
+	virtual bool canApply(OneSixInstance *instance) const { return true; }
+	bool isApplied(OneSixInstance *on);
+
+	virtual bool add(OneSixInstance *to);
+	virtual bool remove(OneSixInstance *from);
+
+protected:
+	virtual QString id() const = 0;
+	QString filename(const QString &root) const;
+	QDir patchesDir(const QString &root) const;
+};
diff --git a/logic/ForgeInstaller.cpp b/logic/ForgeInstaller.cpp
index 8d4c5b41..47c42694 100644
--- a/logic/ForgeInstaller.cpp
+++ b/logic/ForgeInstaller.cpp
@@ -21,7 +21,15 @@
 #include <quazipfile.h>
 #include <pathutils.h>
 #include <QStringList>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
 #include "MultiMC.h"
+#include "OneSixInstance.h"
+
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QSaveFile>
+#include <QCryptographicHash>
 
 ForgeInstaller::ForgeInstaller(QString filename, QString universal_url)
 {
@@ -66,6 +74,7 @@ ForgeInstaller::ForgeInstaller(QString filename, QString universal_url)
 	QJsonObject installObj = installVal.toObject();
 	QString libraryName = installObj.value("path").toString();
 	internalPath = installObj.value("filePath").toString();
+	m_forgeVersionString = installObj.value("version").toString().remove("Forge").trimmed();
 
 	// where do we put the library? decode the mojang path
 	OneSixLibrary lib(libraryName);
@@ -103,13 +112,22 @@ ForgeInstaller::ForgeInstaller(QString filename, QString universal_url)
 	realVersionId = m_forge_version->id = installObj.value("minecraft").toString();
 }
 
-bool ForgeInstaller::apply(std::shared_ptr<OneSixVersion> to)
+bool ForgeInstaller::add(OneSixInstance *to)
 {
+	if (!BaseInstaller::add(to))
+	{
+		return false;
+	}
+
+	QJsonObject obj;
+	obj.insert("order", 5);
+
 	if (!m_forge_version)
 		return false;
-	to->externalUpdateStart();
 	int sliding_insert_window = 0;
 	{
+		QJsonArray librariesPlus;
+
 		// for each library in the version we are adding (except for the blacklisted)
 		QSet<QString> blacklist{"lwjgl", "lwjgl_util", "lwjgl-platform"};
 		for (auto lib : m_forge_version->libraries)
@@ -128,28 +146,79 @@ bool ForgeInstaller::apply(std::shared_ptr<OneSixVersion> to)
 			if (blacklist.contains(libName))
 				continue;
 
-			// find an entry that matches this one
+			QJsonObject libObj = lib->toJson();
+
 			bool found = false;
-			for (auto tolib : to->libraries)
+			bool equals = false;
+			// find an entry that matches this one
+			for (auto tolib : to->getNonCustomVersion()->libraries)
 			{
 				if (tolib->name() != libName)
 					continue;
 				found = true;
+				if (tolib->toJson() == libObj)
+				{
+					equals = true;
+				}
 				// replace lib
-				tolib = lib;
+				libObj.insert("insert", QString("replace"));
 				break;
 			}
+			if (equals)
+			{
+				continue;
+			}
 			if (!found)
 			{
 				// add lib
-				to->libraries.insert(sliding_insert_window, lib);
+				libObj.insert("insert", QString("prepend-if-not-exists"));
 				sliding_insert_window++;
 			}
+			librariesPlus.prepend(libObj);
+		}
+		obj.insert("+libraries", librariesPlus);
+		obj.insert("mainClass", m_forge_version->mainClass);
+		QString args = m_forge_version->minecraftArguments;
+		QStringList tweakers;
+		{
+			QRegularExpression expression("--tweakClass ([a-zA-Z0-9\\.]*)");
+			QRegularExpressionMatch match = expression.match(args);
+			while (match.hasMatch())
+			{
+				tweakers.append(match.captured(1));
+				args.remove(match.capturedStart(), match.capturedLength());
+				match = expression.match(args);
+			}
+		}
+		if (!args.isEmpty() && args != to->getNonCustomVersion()->minecraftArguments)
+		{
+			obj.insert("minecraftArguments", args);
+		}
+		if (!tweakers.isEmpty())
+		{
+			obj.insert("+tweakers", QJsonArray::fromStringList(tweakers));
+		}
+		if (!m_forge_version->processArguments.isEmpty() &&
+			m_forge_version->processArguments != to->getNonCustomVersion()->processArguments)
+		{
+			obj.insert("processArguments", m_forge_version->processArguments);
 		}
-		to->mainClass = m_forge_version->mainClass;
-		to->minecraftArguments = m_forge_version->minecraftArguments;
-		to->processArguments = m_forge_version->processArguments;
 	}
-	to->externalUpdateFinish();
-	return to->toOriginalFile();
+
+	obj.insert("name", QString("Forge"));
+	obj.insert("fileId", id());
+	obj.insert("version", m_forgeVersionString);
+	obj.insert("mcVersion", to->intendedVersionId());
+
+	QFile file(filename(to->instanceRoot()));
+	if (!file.open(QFile::WriteOnly))
+	{
+		QLOG_ERROR() << "Error opening" << file.fileName()
+					 << "for reading:" << file.errorString();
+		return false;
+	}
+	file.write(QJsonDocument(obj).toJson());
+	file.close();
+
+	return true;
 }
diff --git a/logic/ForgeInstaller.h b/logic/ForgeInstaller.h
index 0b9f9c77..c5052092 100644
--- a/logic/ForgeInstaller.h
+++ b/logic/ForgeInstaller.h
@@ -14,17 +14,22 @@
  */
 
 #pragma once
+
+#include "BaseInstaller.h"
+
 #include <QString>
 #include <memory>
 
 class OneSixVersion;
 
-class ForgeInstaller
+class ForgeInstaller : public BaseInstaller
 {
 public:
 	ForgeInstaller(QString filename, QString universal_url);
 
-	bool apply(std::shared_ptr<OneSixVersion> to);
+	bool add(OneSixInstance *to) override;
+
+	QString id() const override { return "net.minecraftforge"; }
 
 private:
 	// the version, read from the installer
@@ -32,5 +37,6 @@ private:
 	QString internalPath;
 	QString finalPath;
 	QString realVersionId;
+	QString m_forgeVersionString;
 	QString m_universal_url;
 };
diff --git a/logic/InstanceFactory.cpp b/logic/InstanceFactory.cpp
index 1f1a5879..807bccd0 100644
--- a/logic/InstanceFactory.cpp
+++ b/logic/InstanceFactory.cpp
@@ -24,6 +24,7 @@
 #include "OneSixInstance.h"
 #include "OneSixFTBInstance.h"
 #include "NostalgiaInstance.h"
+#include "OneSixInstance.h"
 #include "BaseVersion.h"
 #include "MinecraftVersion.h"
 
@@ -50,13 +51,13 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst
 	QString inst_type = m_settings->get("InstanceType").toString();
 
 	// FIXME: replace with a map lookup, where instance classes register their types
-	if (inst_type == "Legacy")
+	if (inst_type == "OneSix")
 	{
-		inst = new LegacyInstance(instDir, m_settings, this);
+		inst = new OneSixInstance(instDir, m_settings, this);
 	}
-	else if (inst_type == "OneSix")
+	else if (inst_type == "Legacy")
 	{
-		inst = new OneSixInstance(instDir, m_settings, this);
+		inst = new LegacyInstance(instDir, m_settings, this);
 	}
 	else if (inst_type == "Nostalgia")
 	{
@@ -101,6 +102,7 @@ InstanceFactory::InstCreateError InstanceFactory::createInstance(BaseInstance *&
 		switch (mcVer->type)
 		{
 		case MinecraftVersion::Legacy:
+			// TODO new instance type
 			m_settings->set("InstanceType", "Legacy");
 			inst = new LegacyInstance(instDir, m_settings, this);
 			inst->setIntendedVersionId(version->descriptor());
diff --git a/logic/LiteLoaderInstaller.cpp b/logic/LiteLoaderInstaller.cpp
index 07fffff3..60a43d49 100644
--- a/logic/LiteLoaderInstaller.cpp
+++ b/logic/LiteLoaderInstaller.cpp
@@ -15,12 +15,19 @@
 
 #include "LiteLoaderInstaller.h"
 
+#include <QJsonArray>
+#include <QJsonDocument>
+
+#include "logger/QsLog.h"
+
 #include "OneSixVersion.h"
 #include "OneSixLibrary.h"
+#include "OneSixInstance.h"
 
 QMap<QString, QString> LiteLoaderInstaller::m_launcherWrapperVersionMapping;
 
-LiteLoaderInstaller::LiteLoaderInstaller(const QString &mcVersion) : m_mcVersion(mcVersion)
+LiteLoaderInstaller::LiteLoaderInstaller()
+	: BaseInstaller()
 {
 	if (m_launcherWrapperVersionMapping.isEmpty())
 	{
@@ -31,72 +38,59 @@ LiteLoaderInstaller::LiteLoaderInstaller(const QString &mcVersion) : m_mcVersion
 	}
 }
 
-bool LiteLoaderInstaller::canApply() const
+bool LiteLoaderInstaller::canApply(OneSixInstance *instance) const
 {
-	return m_launcherWrapperVersionMapping.contains(m_mcVersion);
+	return m_launcherWrapperVersionMapping.contains(instance->intendedVersionId());
 }
 
-bool LiteLoaderInstaller::apply(std::shared_ptr<OneSixVersion> to)
+bool LiteLoaderInstaller::add(OneSixInstance *to)
 {
-	to->externalUpdateStart();
-
-	applyLaunchwrapper(to);
-	applyLiteLoader(to);
-
-	to->mainClass = "net.minecraft.launchwrapper.Launch";
-	if (!to->minecraftArguments.contains(
-			 " --tweakClass com.mumfrey.liteloader.launch.LiteLoaderTweaker"))
+	if (!BaseInstaller::add(to))
 	{
-		to->minecraftArguments.append(
-			" --tweakClass com.mumfrey.liteloader.launch.LiteLoaderTweaker");
+		return false;
 	}
 
-	to->externalUpdateFinish();
-	return to->toOriginalFile();
-}
+	QJsonObject obj;
 
-void LiteLoaderInstaller::applyLaunchwrapper(std::shared_ptr<OneSixVersion> to)
-{
-	const QString intendedVersion = m_launcherWrapperVersionMapping[m_mcVersion];
+	obj.insert("mainClass", QString("net.minecraft.launchwrapper.Launch"));
+	obj.insert("+tweakers", QJsonArray::fromStringList(QStringList() << "com.mumfrey.liteloader.launch.LiteLoaderTweaker"));
+	obj.insert("order", 10);
 
-	QMutableListIterator<std::shared_ptr<OneSixLibrary>> it(to->libraries);
-	while (it.hasNext())
+	QJsonArray libraries;
+
+	// launchwrapper
 	{
-		it.next();
-		if (it.value()->rawName().startsWith("net.minecraft:launchwrapper:"))
-		{
-			if (it.value()->version() >= intendedVersion)
-			{
-				return;
-			}
-			else
-			{
-				it.remove();
-			}
-		}
+		OneSixLibrary launchwrapperLib("net.minecraft:launchwrapper:" + m_launcherWrapperVersionMapping[to->intendedVersionId()]);
+		launchwrapperLib.finalize();
+		QJsonObject lwLibObj = launchwrapperLib.toJson();
+		lwLibObj.insert("insert", QString("prepend-if-not-exists"));
+		libraries.append(lwLibObj);
 	}
 
-	std::shared_ptr<OneSixLibrary> lib(new OneSixLibrary(
-		"net.minecraft:launchwrapper:" + m_launcherWrapperVersionMapping[m_mcVersion]));
-	lib->finalize();
-	to->libraries.prepend(lib);
-}
+	// liteloader
+	{
+		OneSixLibrary liteloaderLib("com.mumfrey:liteloader:" + to->intendedVersionId());
+		liteloaderLib.setBaseUrl("http://dl.liteloader.com/versions/");
+		liteloaderLib.finalize();
+		QJsonObject llLibObj = liteloaderLib.toJson();
+		llLibObj.insert("insert", QString("prepend"));
+		libraries.append(llLibObj);
+	}
 
-void LiteLoaderInstaller::applyLiteLoader(std::shared_ptr<OneSixVersion> to)
-{
-	QMutableListIterator<std::shared_ptr<OneSixLibrary>> it(to->libraries);
-	while (it.hasNext())
+	obj.insert("+libraries", libraries);
+	obj.insert("name", QString("LiteLoader"));
+	obj.insert("fileId", id());
+	obj.insert("version", to->intendedVersionId());
+	obj.insert("mcVersion", to->intendedVersionId());
+
+	QFile file(filename(to->instanceRoot()));
+	if (!file.open(QFile::WriteOnly))
 	{
-		it.next();
-		if (it.value()->rawName().startsWith("com.mumfrey:liteloader:"))
-		{
-			it.remove();
-		}
+		QLOG_ERROR() << "Error opening" << file.fileName() << "for reading:" << file.errorString();
+		return false;
 	}
+	file.write(QJsonDocument(obj).toJson());
+	file.close();
 
-	std::shared_ptr<OneSixLibrary> lib(
-		new OneSixLibrary("com.mumfrey:liteloader:" + m_mcVersion));
-	lib->setBaseUrl("http://dl.liteloader.com/versions/");
-	lib->finalize();
-	to->libraries.prepend(lib);
+	return true;
 }
diff --git a/logic/LiteLoaderInstaller.h b/logic/