1 files changed, 91 insertions, 76 deletions

diff --git a/logic/OneSixFTBInstance.cpp b/logic/OneSixFTBInstance.cpp
index ca88142a..8f70ed08 100644
--- a/logic/OneSixFTBInstance.cpp
+++ b/logic/OneSixFTBInstance.cpp
@@ -1,102 +1,128 @@
 #include "OneSixFTBInstance.h"
 
-#include "OneSixVersion.h"
+#include "VersionFinal.h"
 #include "OneSixLibrary.h"
 #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
+OneSixFTBInstance::OneSixFTBInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) :
+	OneSixInstance(rootDir, settings, parent)
+{
+}
+
+void OneSixFTBInstance::init()
 {
-	Q_OBJECT
-public:
-	explicit OneSixFTBInstanceForge(const QString &version, OneSixFTBInstance *inst, QObject *parent = 0) :
-		Task(parent), instance(inst), version("Forge " + version)
+	try
+	{
+		reloadVersion();
+	}
+	catch(MMCError & e)
 	{
+		// QLOG_ERROR() << "Caught exception on instance init: " << e.cause();
 	}
+}
 
-	void executeTask()
+void OneSixFTBInstance::copy(const QDir &newDir)
+{
+	QStringList libraryNames;
+	// create patch file
 	{
-		for (int i = 0; i < MMC->forgelist()->count(); ++i)
+		QLOG_DEBUG() << "Creating patch file for FTB instance...";
+		QFile f(minecraftRoot() + "/pack.json");
+		if (!f.open(QFile::ReadOnly))
 		{
-			if (MMC->forgelist()->at(i)->name() == version)
-			{
-				forgeVersion = std::dynamic_pointer_cast<ForgeVersion>(MMC->forgelist()->at(i));
-				break;
-			}
-		}
-		if (!forgeVersion)
-		{
-			emitFailed(QString("Couldn't find forge version ") + version );
+			QLOG_ERROR() << "Couldn't open" << f.fileName() << ":" << f.errorString();
 			return;
 		}
-		entry = MMC->metacache()->resolveEntry("minecraftforge", forgeVersion->filename);
-		if (entry->stale)
+		QJsonObject root = QJsonDocument::fromJson(f.readAll()).object();
+		QJsonArray libs = root.value("libraries").toArray();
+		QJsonArray outLibs;
+		for (auto lib : libs)
 		{
-			setStatus(tr("Downloading Forge..."));
-			fjob = new NetJob("Forge download");
-			fjob->addNetAction(CacheDownload::make(forgeVersion->installer_url, entry));
-			connect(fjob, &NetJob::failed, [this](){emitFailed(m_failReason);});
-			connect(fjob, &NetJob::succeeded, this, &OneSixFTBInstanceForge::installForge);
-			connect(fjob, &NetJob::progress, [this](qint64 c, qint64 total){ setProgress(100 * c / total); });
-			fjob->start();
+			QJsonObject libObj = lib.toObject();
+			libObj.insert("MMC-hint", QString("local"));
+			libObj.insert("insert", QString("prepend"));
+			libraryNames.append(libObj.value("name").toString());
+			outLibs.append(libObj);
 		}
-		else
+		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))
 		{
-			installForge();
+			QLOG_ERROR() << "Couldn't open" << out.fileName() << ":" << out.errorString();
+			return;
 		}
+		out.write(QJsonDocument(root).toJson());
 	}
-
-private
-slots:
-	void installForge()
+	// copy libraries
 	{
-		setStatus(tr("Installing Forge..."));
-		QString forgePath = entry->getFullPath();
-		ForgeInstaller forge(forgePath, forgeVersion->universal_url);
-		if (!instance->reloadVersion())
-		{
-			emitFailed(tr("Couldn't load the version config"));
-			return;
-		}
-		auto version = instance->getFullVersion();
-		if (!forge.add(instance))
+		QLOG_DEBUG() << "Copying FTB libraries";
+		for (auto library : libraryNames)
 		{
-			emitFailed(tr("Couldn't install Forge"));
-			return;
+			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();
+			}
 		}
-		emitSucceeded();
 	}
+}
 
-private:
-	OneSixFTBInstance *instance;
-	QString version;
-	ForgeVersionPtr forgeVersion;
-	MetaEntryPtr entry;
-	NetJob *fjob;
-};
+QString OneSixFTBInstance::id() const
+{
+	return "FTB/" + BaseInstance::id();
+}
 
-OneSixFTBInstance::OneSixFTBInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) :
-	OneSixInstance(rootDir, settings, parent)
+QDir OneSixFTBInstance::librariesPath() const
 {
-	QFile f(QDir(minecraftRoot()).absoluteFilePath("pack.json"));
-	if (f.open(QFile::ReadOnly))
-	{
-		QString data = QString::fromUtf8(f.readAll());
-		QRegularExpressionMatch match = QRegularExpression("net.minecraftforge:minecraftforge:[\\.\\d]*").match(data);
-		m_forge.reset(new OneSixLibrary(match.captured()));
-		m_forge->finalize();
-	}
+	return QDir(MMC->settings()->get("FTBRoot").toString() + "/libraries");
+}
+QDir OneSixFTBInstance::versionsPath() const
+{
+	return QDir(MMC->settings()->get("FTBRoot").toString() + "/versions");
 }
 
-QString OneSixFTBInstance::id() const
+QStringList OneSixFTBInstance::externalPatches() const
 {
-	return "FTB/" + BaseInstance::id();
+	I_D(OneSixInstance);
+	return QStringList() << versionsPath().absoluteFilePath(intendedVersionId() + "/" + intendedVersionId() + ".json")
+						 << minecraftRoot() + "/pack.json";
+}
+
+bool OneSixFTBInstance::providesVersionFile() const
+{
+	return true;
 }
 
 QString OneSixFTBInstance::getStatusbarDescription()
 {
+	if (flags() & VersionBrokenFlag)
+	{
+		return "OneSix FTB: " + intendedVersionId() + " (broken)";
+	}
 	return "OneSix FTB: " + intendedVersionId();
 }
 bool OneSixFTBInstance::menuActionEnabled(QString action_name) const
@@ -106,18 +132,7 @@ bool OneSixFTBInstance::menuActionEnabled(QString action_name) const
 
 std::shared_ptr<Task> OneSixFTBInstance::doUpdate()
 {
-	std::shared_ptr<SequentialTask> task;
-	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;
+	return OneSixInstance::doUpdate();
 }
 
 #include "OneSixFTBInstance.moc"