Merge branch 'fix_ftb' into integration_json_and_tools

logic/BaseInstance.h

@@ -25,6 +25,7 @@
 #include "logic/auth/MojangAccount.h"
 
 class QDialog;
+class QDir;
 class Task;
 class MinecraftProcess;
 class OneSixUpdate;
@@ -51,6 +52,9 @@ public:
 	/// virtual destructor to make sure the destruction is COMPLETE
 	virtual ~BaseInstance() {};
 
+	virtual void init() {}
+	virtual void copy(const QDir &newDir) {}
+
 	/// nuke thoroughly - deletes the instance contents, notifies the list/model which is
 	/// responsible of cleaning up the husk
 	void nuke();

logic/InstanceFactory.cpp

@@ -75,6 +75,7 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst
 	{
 		return InstanceFactory::UnknownLoadError;
 	}
+	inst->init();
 	return NoLoadError;
 }
 
@@ -156,6 +157,8 @@ InstanceFactory::InstCreateError InstanceFactory::createInstance(BaseInstance *&
 		return InstanceFactory::NoSuchVersion;
 	}
 
+	inst->init();
+
 	// FIXME: really, how do you even know?
 	return InstanceFactory::NoCreateError;
 }
@@ -181,6 +184,8 @@ InstanceFactory::InstCreateError InstanceFactory::copyInstance(BaseInstance *&ne
 	if(inst_type == "LegacyFTB")
 		m_settings->set("InstanceType", "Legacy");
 
+	oldInstance->copy(instDir);
+
 	auto error = loadInstance(newInstance, instDir);
 
 	switch (error)

logic/OneSixFTBInstance.cpp

@@ -5,7 +5,10 @@
 #include "tasks/SequentialTask.h"
 #include "ForgeInstaller.h"
 #include "lists/ForgeVersionList.h"
+#include "OneSixInstance_p.h"
+#include "OneSixVersionBuilder.h"
 #include "MultiMC.h"
+#include "pathutils.h"
 
 class OneSixFTBInstanceForge : public Task
 {
@@ -80,13 +83,74 @@ private:
 OneSixFTBInstance::OneSixFTBInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) :
 	OneSixInstance(rootDir, settings, parent)
 {
-	QFile f(QDir(minecraftRoot()).absoluteFilePath("pack.json"));
+}
-	if (f.open(QFile::ReadOnly))
+
+void OneSixFTBInstance::init()
 {
-		QString data = QString::fromUtf8(f.readAll());
+	reloadVersion();
-		QRegularExpressionMatch match = QRegularExpression("net.minecraftforge:minecraftforge:[\\.\\d]*").match(data);
+}
-		m_forge.reset(new OneSixLibrary(match.captured()));
+
-		m_forge->finalize();
+void OneSixFTBInstance::copy(const QDir &newDir)
+{
+	QStringList libraryNames;
+	// create patch file
+	{
+		QLOG_DEBUG() << "Creating patch file for FTB instance...";
+		QFile f(minecraftRoot() + "/pack.json");
+		if (!f.open(QFile::ReadOnly))
+		{
+			QLOG_ERROR() << "Couldn't open" << f.fileName() << ":" << f.errorString();
+			return;
+		}
+		QJsonObject root = QJsonDocument::fromJson(f.readAll()).object();
+		QJsonArray libs = root.value("libraries").toArray();
+		QJsonArray outLibs;
+		for (auto lib : libs)
+		{
+			QJsonObject libObj = lib.toObject();
+			libObj.insert("MMC-hint", QString("local"));
+			libObj.insert("insert", QString("prepend"));
+			libraryNames.append(libObj.value("name").toString());
+			outLibs.append(libObj);
+		}
+		root.remove("libraries");
+		root.remove("id");
+		root.insert("+libraries", outLibs);
+		root.insert("order", 1);
+		root.insert("fileId", QString("org.multimc.ftb.pack.json"));
+		root.insert("name", name());
+		root.insert("mcVersion", intendedVersionId());
+		root.insert("version", intendedVersionId());
+		ensureFilePathExists(newDir.absoluteFilePath("patches/ftb.json"));
+		QFile out(newDir.absoluteFilePath("patches/ftb.json"));
+		if (!out.open(QFile::WriteOnly | QFile::Truncate))
+		{
+			QLOG_ERROR() << "Couldn't open" << out.fileName() << ":" << out.errorString();
+			return;
+		}
+		out.write(QJsonDocument(root).toJson());
+	}
+	// copy libraries
+	{
+		QLOG_DEBUG() << "Copying FTB libraries";
+		for (auto library : libraryNames)
+		{
+			OneSixLibrary *lib = new OneSixLibrary(library);
+			lib->finalize();
+			const QString out = QDir::current().absoluteFilePath("libraries/" + lib->storagePath());
+			if (QFile::exists(out))
+			{
+				continue;
+			}
+			if (!ensureFilePathExists(out))
+			{
+				QLOG_ERROR() << "Couldn't create folder structure for" << out;
+			}
+			if (!QFile::copy(librariesPath().absoluteFilePath(lib->storagePath()), out))
+			{
+				QLOG_ERROR() << "Couldn't copy" << lib->rawName();
+			}
+		}
 	}
 }
 
@@ -95,6 +159,27 @@ QString OneSixFTBInstance::id() const
 	return "FTB/" + BaseInstance::id();
 }
 
+QDir OneSixFTBInstance::librariesPath() const
+{
+	return QDir(MMC->settings()->get("FTBRoot").toString() + "/libraries");
+}
+QDir OneSixFTBInstance::versionsPath() const
+{
+	return QDir(MMC->settings()->get("FTBRoot").toString() + "/versions");
+}
+
+QStringList OneSixFTBInstance::externalPatches() const
+{
+	I_D(OneSixInstance);
+	return QStringList() << versionsPath().absoluteFilePath(intendedVersionId() + "/" + intendedVersionId() + ".json")
+						 << minecraftRoot() + "/pack.json";
+}
+
+bool OneSixFTBInstance::providesVersionFile() const
+{
+	return true;
+}
+
 QString OneSixFTBInstance::getStatusbarDescription()
 {
 	return "OneSix FTB: " + intendedVersionId();
@@ -106,18 +191,7 @@ bool OneSixFTBInstance::menuActionEnabled(QString action_name) const
 
 std::shared_ptr<Task> OneSixFTBInstance::doUpdate()
 {
-	std::shared_ptr<SequentialTask> task;
+	return OneSixInstance::doUpdate();
-	task.reset(new SequentialTask(this));
-	if (!MMC->forgelist()->isLoaded())
-	{
-		task->addTask(std::shared_ptr<Task>(MMC->forgelist()->getLoadTask()));
-	}
-	task->addTask(OneSixInstance::doUpdate());
-	task->addTask(std::shared_ptr<Task>(new OneSixFTBInstanceForge(m_forge->version(), this, this)));
-	//FIXME: yes. this may appear dumb. but the previous step can change the list, so we do it all again.
-	//TODO: Add a graph task. Construct graphs of tasks so we may capture the logic properly.
-	task->addTask(OneSixInstance::doUpdate());
-	return task;
 }
 
 #include "OneSixFTBInstance.moc"

logic/OneSixFTBInstance.h

@@ -10,6 +10,10 @@ class OneSixFTBInstance : public OneSixInstance
 public:
 	explicit OneSixFTBInstance(const QString &rootDir, SettingsObject *settings,
 							QObject *parent = 0);
+
+	void init() override;
+	void copy(const QDir &newDir) override;
+
 	virtual QString getStatusbarDescription();
 	virtual bool menuActionEnabled(QString action_name) const;
 
@@ -17,6 +21,11 @@ public:
 
 	virtual QString id() const;
 
+	QDir librariesPath() const override;
+	QDir versionsPath() const override;
+	QStringList externalPatches() const override;
+	bool providesVersionFile() const override;
+
 private:
 	std::shared_ptr<OneSixLibrary> m_forge;
 };

logic/OneSixInstance.cpp

@@ -36,6 +36,10 @@ OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *settings,
 	d->m_settings->registerSetting("ShouldUpdate", false);
 	d->version.reset(new OneSixVersion(this, this));
 	d->vanillaVersion.reset(new OneSixVersion(this, this));
+}
+
+void OneSixInstance::init()
+{
 	if (QDir(instanceRoot()).exists("version.json"))
 	{
 		reloadVersion();
@@ -192,12 +196,10 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(AuthSessionPtr session)
 		auto libs = version->getActiveNormalLibs();
 		for (auto lib : libs)
 		{
-			QFileInfo fi(QString("libraries/") + lib->storagePath());
+			launchScript += "cp " + librariesPath().absoluteFilePath(lib->storagePath()) + "\n";
-			launchScript += "cp " + fi.absoluteFilePath() + "\n";
 		}
-		QString targetstr = "versions/" + version->id + "/" + version->id + ".jar";
+		QString targetstr = version->id + "/" + version->id + ".jar";
-		QFileInfo fi(targetstr);
+		launchScript += "cp " + versionsPath().absoluteFilePath(targetstr) + "\n";
-		launchScript += "cp " + fi.absoluteFilePath() + "\n";
 	}
 	launchScript += "mainClass " + version->mainClass + "\n";
 
@@ -318,11 +320,12 @@ bool OneSixInstance::reloadVersion(QWidget *widgetParent)
 {
 	I_D(OneSixInstance);
 
-	bool ret = d->version->reload(widgetParent);
+	bool ret = d->version->reload(widgetParent, false, externalPatches());
 	if (ret)
 	{
-		ret = d->vanillaVersion->reload(widgetParent, true);
+		ret = d->vanillaVersion->reload(widgetParent, true, externalPatches());
 	}
+
 	emit versionReloaded();
 	return ret;
 }
@@ -374,6 +377,25 @@ QString OneSixInstance::getStatusbarDescription()
 	return descr;
 }
 
+QDir OneSixInstance::librariesPath() const
+{
+	return QDir::current().absoluteFilePath("libraries");
+}
+QDir OneSixInstance::versionsPath() const
+{
+	return QDir::current().absoluteFilePath("versions");
+}
+
+QStringList OneSixInstance::externalPatches() const
+{
+	return QStringList();
+}
+
+bool OneSixInstance::providesVersionFile() const
+{
+	return false;
+}
+
 QString OneSixInstance::loaderModsDir() const
 {
 	return PathCombine(minecraftRoot(), "mods");

logic/OneSixInstance.h

@@ -27,6 +27,8 @@ public:
 	explicit OneSixInstance(const QString &rootDir, SettingsObject *settings,
 						  QObject *parent = 0);
 
+	virtual void init() override;
+
 	//////  Mod Lists  //////
 	std::shared_ptr<ModList> loaderModList();
 	std::shared_ptr<ModList> resourcePackList();
@@ -68,6 +70,11 @@ public:
 	virtual bool menuActionEnabled(QString action_name) const override;
 	virtual QString getStatusbarDescription() override;
 
+	virtual QDir librariesPath() const;
+	virtual QDir versionsPath() const;
+	virtual QStringList externalPatches() const;
+	virtual bool providesVersionFile() const;
+
 signals:
 	void versionReloaded();
 

logic/OneSixUpdate.cpp

@@ -35,7 +35,7 @@
 #include "pathutils.h"
 #include <JlCompress.h>
 
-OneSixUpdate::OneSixUpdate(BaseInstance *inst, QObject *parent)
+OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent)
 	: Task(parent), m_inst(inst)
 {
 }
@@ -73,6 +73,11 @@ void OneSixUpdate::executeTask()
 
 void OneSixUpdate::versionFileStart()
 {
+	if (m_inst->providesVersionFile())
+	{
+		jarlibStart();
+		return;
+	}
 	QLOG_INFO() << m_inst->name() << ": getting version file.";
 	setStatus(tr("Getting the version files from Mojang..."));
 

logic/OneSixUpdate.h

@@ -23,13 +23,13 @@
 #include "logic/tasks/Task.h"
 
 class MinecraftVersion;
-class BaseInstance;
+class OneSixInstance;
 
 class OneSixUpdate : public Task
 {
 	Q_OBJECT
 public:
-	explicit OneSixUpdate(BaseInstance *inst, QObject *parent = 0);
+	explicit OneSixUpdate(OneSixInstance *inst, QObject *parent = 0);
 	virtual void executeTask();
 
 private
@@ -55,5 +55,5 @@ private:
 
 	// target version, determined during this task
 	std::shared_ptr<MinecraftVersion> targetVersion;
-	BaseInstance *m_inst = nullptr;
+	OneSixInstance *m_inst = nullptr;
 };

logic/OneSixVersion.cpp

@@ -26,10 +26,10 @@ OneSixVersion::OneSixVersion(OneSixInstance *instance, QObject *parent)
 	clear();
 }
 
-bool OneSixVersion::reload(QWidget *widgetParent, const bool onlyVanilla)
+bool OneSixVersion::reload(QWidget *widgetParent, const bool onlyVanilla, const QStringList &external)
 {
 	beginResetModel();
-	bool ret = OneSixVersionBuilder::build(this, m_instance, widgetParent, onlyVanilla);
+	bool ret = OneSixVersionBuilder::build(this, m_instance, widgetParent, onlyVanilla, external);
 	endResetModel();
 	return ret;
 }

logic/OneSixVersion.h

@@ -37,7 +37,7 @@ public:
 	virtual int columnCount(const QModelIndex &parent) const;
 	virtual Qt::ItemFlags flags(const QModelIndex &index) const;
 
-	bool reload(QWidget *widgetParent, const bool onlyVanilla = false);
+	bool reload(QWidget *widgetParent, const bool onlyVanilla = false, const QStringList &external = QStringList());
 	void clear();
 
 	void dump() const;

logic/OneSixVersionBuilder.cpp

@@ -192,7 +192,7 @@ struct VersionFile
 		return out;
 	}
 	static VersionFile fromJson(const QJsonDocument &doc, const QString &filename,
-								const bool requireOrder, bool &isError)
+								const bool requireOrder, bool &isError, const OneSixVersionBuilder::ParseFlags flags = OneSixVersionBuilder::NoFlags)
 	{
 		VersionFile out;
 		isError = true;
@@ -251,7 +251,10 @@ struct VersionFile
 			}
 		};
 
+		if (!(flags & OneSixVersionBuilder::IsFTBPackJson))
+		{
 			readString("id", out.id);
+		}
 		readString("mainClass", out.mainClass);
 		readString("processArguments", out.processArguments);
 		readString("minecraftArguments", out.overwriteMinecraftArguments);
@@ -343,7 +346,7 @@ struct VersionFile
 
 		if (root.contains("libraries"))
 		{
-			out.shouldOverwriteLibs = true;
+			out.shouldOverwriteLibs = !(flags & OneSixVersionBuilder::IsFTBPackJson);
 			QJsonValue librariesVal = root.value("libraries");
 			if (!librariesVal.isArray())
 			{
@@ -367,9 +370,18 @@ struct VersionFile
 					QLOG_ERROR() << "Error while reading a library entry in" << filename;
 					return out;
 				}
+				if (flags & OneSixVersionBuilder::IsFTBPackJson)
+				{
+					lib.hint = "local";
+					lib.insertType = Library::Prepend;
+					out.addLibs.prepend(lib);
+				}
+				else
+				{
 					out.overwriteLibs.append(lib);
 				}
 			}
+		}
 		if (root.contains("+libraries"))
 		{
 			QJsonValue librariesVal = root.value("+libraries");
@@ -775,13 +787,13 @@ OneSixVersionBuilder::OneSixVersionBuilder()
 }
 
 bool OneSixVersionBuilder::build(OneSixVersion *version, OneSixInstance *instance,
-								 QWidget *widgetParent, const bool onlyVanilla)
+								 QWidget *widgetParent, const bool onlyVanilla, const QStringList &external)
 {
 	OneSixVersionBuilder builder;
 	builder.m_version = version;
 	builder.m_instance = instance;
 	builder.m_widgetParent = widgetParent;
-	return builder.build(onlyVanilla);
+	return builder.build(onlyVanilla, external);
 }
 
 bool OneSixVersionBuilder::read(OneSixVersion *version, const QJsonObject &obj)
@@ -793,13 +805,15 @@ bool OneSixVersionBuilder::read(OneSixVersion *version, const QJsonObject &obj)
 	return builder.read(obj);
 }
 
-bool OneSixVersionBuilder::build(const bool onlyVanilla)
+bool OneSixVersionBuilder::build(const bool onlyVanilla, const QStringList &external)
 {
 	m_version->clear();
 
 	QDir root(m_instance->instanceRoot());
 	QDir patches(root.absoluteFilePath("patches/"));
 
+	if (external.isEmpty())
+	{
 		if (QFile::exists(root.absoluteFilePath("custom.json")))
 		{
 			QLOG_INFO() << "Reading custom.json";
@@ -929,6 +943,35 @@ bool OneSixVersionBuilder::build(const bool onlyVanilla)
 #endif
 			}
 		}
+	}
+	else
+	{
+		for (auto fileName : external)
+		{
+			QLOG_INFO() << "Reading" << fileName;
+			VersionFile file;
+			ParseFlags flags = fileName.endsWith("pack.json") ? IsFTBPackJson : NoFlags;
+			if (!read(QFileInfo(fileName), false, &file, flags))
+			{
+				return false;
+			}
+			file.name = QFileInfo(fileName).fileName();
+			file.fileId = "org.multimc.external." + file.name;
+			file.version = QString();
+			file.mcVersion = QString();
+			bool isError = false;
+			file.applyTo(m_version, isError);
+			if (isError)
+			{
+				QMessageBox::critical(
+							m_widgetParent, QObject::tr("Error"),
+							QObject::tr(
+								"Error while applying %1. Please check MultiMC-0.log for more info.")
+							.arg(fileName));
+				return false;
+			}
+		}
+	}
 
 	// some final touches
 	{
@@ -986,7 +1029,7 @@ bool OneSixVersionBuilder::read(const QJsonObject &obj)
 }
 
 bool OneSixVersionBuilder::read(const QFileInfo &fileInfo, const bool requireOrder,
-								VersionFile *out)
+								VersionFile *out, const ParseFlags flags)
 {
 	QFile file(fileInfo.absoluteFilePath());
 	if (!file.open(QFile::ReadOnly))
@@ -1007,7 +1050,7 @@ bool OneSixVersionBuilder::read(const QFileInfo &fileInfo, const bool requireOrd
 		return false;
 	}
 	bool isError = false;
-	*out = VersionFile::fromJson(doc, file.fileName(), requireOrder, isError);
+	*out = VersionFile::fromJson(doc, file.fileName(), requireOrder, isError, flags);
 	if (isError)
 	{
 		QMessageBox::critical(

logic/OneSixVersionBuilder.h

@@ -29,19 +29,27 @@ class OneSixVersionBuilder
 {
 	OneSixVersionBuilder();
 public:
-	static bool build(OneSixVersion *version, OneSixInstance *instance, QWidget *widgetParent, const bool onlyVanilla);
+	static bool build(OneSixVersion *version, OneSixInstance *instance, QWidget *widgetParent, const bool onlyVanilla, const QStringList &external);
 	static bool read(OneSixVersion *version, const QJsonObject &obj);
 	static QMap<QString, int> readOverrideOrders(OneSixInstance *instance);
 	static bool writeOverrideOrders(const QMap<QString, int> &order, OneSixInstance *instance);
 
+	enum ParseFlag
+	{
+		NoFlags = 0x0,
+		IsFTBPackJson = 0x1
+	};
+	Q_DECLARE_FLAGS(ParseFlags, ParseFlag)
+
 private:
 	OneSixVersion *m_version;
 	OneSixInstance *m_instance;
 	QWidget *m_widgetParent;
 
-	bool build(const bool onlyVanilla);
+	bool build(const bool onlyVanilla, const QStringList &external);
 	bool read(const QJsonObject &obj);
 
-	bool read(const QFileInfo &fileInfo, const bool requireOrder, VersionFile *out);
+	bool read(const QFileInfo &fileInfo, const bool requireOrder, VersionFile *out, const ParseFlags flags = NoFlags);
-
 };
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(OneSixVersionBuilder::ParseFlags)

logic/lists/InstanceList.cpp

@@ -336,8 +336,6 @@ QList<FTBRecord> InstanceList::discoverFTBInstances()
 					if (!test.exists())
 						continue;
 					record.name = attrs.value("name").toString();
-					if(record.name.contains("voxel", Qt::CaseInsensitive))
-						continue;
 					record.logo = attrs.value("logo").toString();
 					record.mcVersion = attrs.value("mcVersion").toString();
 					record.description = attrs.value("description").toString();