All of the broken legacy things work.

1 files changed, 141 insertions, 79 deletions

diff --git a/logic/minecraft/VersionBuilder.cpp b/logic/minecraft/VersionBuilder.cpp
index 56eef424..d19c2877 100644
--- a/logic/minecraft/VersionBuilder.cpp
+++ b/logic/minecraft/VersionBuilder.cpp
@@ -23,12 +23,17 @@
 #include <QObject>
 #include <QDir>
 #include <QDebug>
+#include <qresource.h>
 #include <modutils.h>
 
+#include "MultiMC.h"
 #include "logic/minecraft/VersionBuilder.h"
 #include "logic/minecraft/VersionFinal.h"
 #include "logic/minecraft/OneSixRule.h"
+#include "logic/minecraft/VersionPatch.h"
 #include "logic/minecraft/VersionFile.h"
+#include "VersionBuildError.h"
+#include "MinecraftVersionList.h"
 
 #include "logic/OneSixInstance.h"
 #include "logic/MMCJson.h"
@@ -39,16 +44,17 @@ VersionBuilder::VersionBuilder()
 {
 }
 
-void VersionBuilder::build(VersionFinal *version, OneSixInstance *instance, const QStringList &external)
+void VersionBuilder::build(VersionFinal *version, OneSixInstance *instance,
+						   const QStringList &external)
 {
 	VersionBuilder builder;
 	builder.m_version = version;
 	builder.m_instance = instance;
-	builder.buildInternal(external);
+	builder.external_patches = external;
+	builder.buildInternal();
 }
 
-void VersionBuilder::readJsonAndApplyToVersion(VersionFinal *version,
-													 const QJsonObject &obj)
+void VersionBuilder::readJsonAndApplyToVersion(VersionFinal *version, const QJsonObject &obj)
 {
 	VersionBuilder builder;
 	builder.m_version = version;
@@ -56,88 +62,143 @@ void VersionBuilder::readJsonAndApplyToVersion(VersionFinal *version,
 	builder.readJsonAndApply(obj);
 }
 
-void VersionBuilder::buildInternal(const QStringList &external)
+void VersionBuilder::buildFromCustomJson()
 {
-	m_version->versionFiles.clear();
+	QLOG_INFO() << "Building version from custom.json within the instance.";
+	QLOG_INFO() << "Reading custom.json";
+	auto file = parseJsonFile(QFileInfo(instance_root.absoluteFilePath("custom.json")), false);
+	file->name = "custom.json";
+	file->filename = "custom.json";
+	file->fileId = "org.multimc.custom.json";
+	file->order = -1;
+	file->version = QString();
+	m_version->VersionPatches.append(file);
+	// QObject::tr("The version descriptors of this instance are not compatible with the
+	// current version of MultiMC"));
+	// QObject::tr("Error while applying %1. Please check MultiMC-0.log for more info.")
+	// some final touches
+	m_version->finalize();
+	return;
+}
 
-	QDir root(m_instance->instanceRoot());
-	QDir patches(root.absoluteFilePath("patches/"));
+void VersionBuilder::buildFromVersionJson()
+{
+	QLOG_INFO() << "Building version from version.json and patches within the instance.";
+	QLOG_INFO() << "Reading version.json";
+	auto file = parseJsonFile(QFileInfo(instance_root.absoluteFilePath("version.json")), false);
+	file->name = "Minecraft";
+	file->fileId = "org.multimc.version.json";
+	file->order = -1;
+	file->version = m_instance->intendedVersionId();
+	file->mcVersion = m_instance->intendedVersionId();
+	m_version->VersionPatches.append(file);
 
-	// if we do external files, do just those.
-	if (!external.isEmpty())
+	// load all patches, put into map for ordering, apply in the right order
+	readInstancePatches();
+
+	// some final touches
+	m_version->finalize();
+}
+
+void VersionBuilder::readInstancePatches()
+{
+	QDir patches(instance_root.absoluteFilePath("patches/"));
+	QMap<int, QPair<QString, VersionFilePtr>> files;
+	for (auto info : patches.entryInfoList(QStringList() << "*.json", QDir::Files))
 	{
-		int externalOrder = -1;
-		for (auto fileName : external)
+		QLOG_INFO() << "Reading" << info.fileName();
+		auto file = parseJsonFile(info, true);
+		if(file->fileId == "net.minecraft")
+			continue;
+		if(file->fileId == "org.lwjgl")
+			continue;
+		if (files.contains(file->order))
 		{
-			QLOG_INFO() << "Reading" << fileName;
-			auto file =
-				parseJsonFile(QFileInfo(fileName), false, fileName.endsWith("pack.json"));
-			file->name = QFileInfo(fileName).fileName();
-			file->fileId = "org.multimc.external." + file->name;
-			file->order = (externalOrder += 1);
-			file->version = QString();
-			file->mcVersion = QString();
-			m_version->versionFiles.append(file);
+			throw VersionBuildError(QObject::tr("%1 has the same order as %2")
+										.arg(file->fileId, files[file->order].second->fileId));
 		}
+		files.insert(file->order, qMakePair(info.fileName(), file));
 	}
-	// else, if there's custom json, we just do that.
-	else if (QFile::exists(root.absoluteFilePath("custom.json")))
-	{
-		QLOG_INFO() << "Reading custom.json";
-		auto file = parseJsonFile(QFileInfo(root.absoluteFilePath("custom.json")), false);
-		file->name = "custom.json";
-		file->filename = "custom.json";
-		file->fileId = "org.multimc.custom.json";
-		file->order = -1;
-		file->version = QString();
-		m_version->versionFiles.append(file);
-		// QObject::tr("The version descriptors of this instance are not compatible with the
-		// current version of MultiMC"));
-		// QObject::tr("Error while applying %1. Please check MultiMC-0.log for more info.")
+	for (auto order : files.keys())
+	{
+		auto &filePair = files[order];
+		m_version->VersionPatches.append(filePair.second);
 	}
-	// version.json -> patches/*.json -> user.json
-	else
-		do
-		{
-			// version.json
-			QLOG_INFO() << "Reading version.json";
-			auto file = parseJsonFile(QFileInfo(root.absoluteFilePath("version.json")), false);
-			file->name = "Minecraft";
-			file->fileId = "org.multimc.version.json";
-			file->order = -1;
-			file->version = m_instance->intendedVersionId();
-			file->mcVersion = m_instance->intendedVersionId();
-			m_version->versionFiles.append(file);
-			// QObject::tr("Error while applying %1. Please check MultiMC-0.log for more
-			// info.").arg(root.absoluteFilePath("version.json")));
-
-			// patches/
-			// load all, put into map for ordering, apply in the right order
-
-			QMap<int, QPair<QString, VersionFilePtr>> files;
-			for (auto info : patches.entryInfoList(QStringList() << "*.json", QDir::Files))
-			{
-				QLOG_INFO() << "Reading" << info.fileName();
-				auto file = parseJsonFile(info, true);
-				if (files.contains(file->order))
-				{
-					throw VersionBuildError(QObject::tr("%1 has the same order as %2").arg(
-						file->fileId, files[file->order].second->fileId));
-				}
-				files.insert(file->order, qMakePair(info.fileName(), file));
-			}
-			for (auto order : files.keys())
-			{
-				auto &filePair = files[order];
-				m_version->versionFiles.append(filePair.second);
-			}
-		} while (0);
+}
 
+void VersionBuilder::buildFromExternalPatches()
+{
+	QLOG_INFO() << "Building version from external files.";
+	int externalOrder = -1;
+	for (auto fileName : external_patches)
+	{
+		QLOG_INFO() << "Reading" << fileName;
+		auto file = parseJsonFile(QFileInfo(fileName), false, fileName.endsWith("pack.json"));
+		file->name = QFileInfo(fileName).fileName();
+		file->fileId = "org.multimc.external." + file->name;
+		file->order = (externalOrder += 1);
+		file->version = QString();
+		file->mcVersion = QString();
+		m_version->VersionPatches.append(file);
+	}
 	// some final touches
 	m_version->finalize();
 }
 
+void VersionBuilder::buildFromMultilayer()
+{
+	QLOG_INFO() << "Building version from multilayered sources.";
+	// just the builtin stuff for now
+	auto minecraftList = MMC->minecraftlist();
+	auto mcversion = minecraftList->findVersion(m_instance->intendedVersionId());
+	auto minecraftPatch = std::dynamic_pointer_cast<VersionPatch>(mcversion);
+	if(!minecraftPatch)
+	{
+		throw VersionIncomplete("net.minecraft");
+	}
+	minecraftPatch->setOrder(-2);
+	m_version->VersionPatches.append(minecraftPatch);
 
+	QResource LWJGL(":/versions/LWJGL/2.9.1.json");
+	auto lwjgl = parseJsonFile(LWJGL.absoluteFilePath(), false, false);
+	auto lwjglPatch = std::dynamic_pointer_cast<VersionPatch>(lwjgl);
+	if(!lwjglPatch)
+	{
+		throw VersionIncomplete("org.lwjgl");
+	}
+	lwjglPatch->setOrder(-1);
+	m_version->VersionPatches.append(lwjglPatch);
+
+	// load all patches, put into map for ordering, apply in the right order
+	readInstancePatches();
+
+	m_version->finalize();
+}
+
+void VersionBuilder::buildInternal()
+{
+	m_version->VersionPatches.clear();
+	instance_root = QDir(m_instance->instanceRoot());
+	// if we do external files, do just those.
+	if (!external_patches.isEmpty())
+	{
+		buildFromExternalPatches();
+	}
+	// else, if there's custom json, we just do that.
+	else if (QFile::exists(instance_root.absoluteFilePath("custom.json")))
+	{
+		buildFromCustomJson();
+	}
+	// version.json -> patches/*.json
+	else if (QFile::exists(instance_root.absoluteFilePath("version.json")))
+	{
+		buildFromVersionJson();
+	}
+	else
+	{
+		buildFromMultilayer();
+	}
+}
 
 void VersionBuilder::readJsonAndApply(const QJsonObject &obj)
 {
@@ -147,14 +208,14 @@ void VersionBuilder::readJsonAndApply(const QJsonObject &obj)
 	// QObject::tr("Error while reading. Please check MultiMC-0.log for more info."));
 
 	file->applyTo(m_version);
-	m_version->versionFiles.append(file);
+	m_version->VersionPatches.append(file);
 	// QObject::tr("Error while applying. Please check MultiMC-0.log for more info."));
 	// QObject::tr("The version descriptors of this instance are not compatible with the current
 	// version of MultiMC"));
 }
 
-VersionFilePtr VersionBuilder::parseJsonFile(const QFileInfo &fileInfo,
-												   const bool requireOrder, bool isFTB)
+VersionFilePtr VersionBuilder::parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder,
+											 bool isFTB)
 {
 	QFile file(fileInfo.absoluteFilePath());
 	if (!file.open(QFile::ReadOnly))
@@ -166,9 +227,10 @@ VersionFilePtr VersionBuilder::parseJsonFile(const QFileInfo &fileInfo,
 	QJsonDocument doc = QJsonDocument::fromJson(file.readAll(), &error);
 	if (error.error != QJsonParseError::NoError)
 	{
-		throw JSONValidationError(QObject::tr("Unable to process the version file %1: %2 at %3.")
-									  .arg(fileInfo.fileName(), error.errorString())
-									  .arg(error.offset));
+		throw JSONValidationError(
+			QObject::tr("Unable to process the version file %1: %2 at %3.")
+				.arg(fileInfo.fileName(), error.errorString())
+				.arg(error.offset));
 	}
 	return VersionFile::fromJson(doc, file.fileName(), requireOrder, isFTB);
 	// QObject::tr("Error while reading %1. Please check MultiMC-0.log for more
@@ -226,7 +288,7 @@ QMap<QString, int> VersionBuilder::readOverrideOrders(OneSixInstance *instance)
 }
 
 bool VersionBuilder::writeOverrideOrders(const QMap<QString, int> &order,
-											   OneSixInstance *instance)
+										 OneSixInstance *instance)
 {
 	QJsonObject obj;
 	for (auto it = order.cbegin(); it != order.cend(); ++it)