NOISSUE merging of strategy into profile, onesix into minecraft

16 files changed, 0 insertions, 2392 deletions

diff --git a/api/logic/minecraft/onesix/OneSixInstance.cpp b/api/logic/minecraft/onesix/OneSixInstance.cpp
deleted file mode 100644
index 34253f02..00000000
--- a/api/logic/minecraft/onesix/OneSixInstance.cpp
+++ /dev/null
@@ -1,706 +0,0 @@
-/* Copyright 2013-2017 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 <QDebug>
-#include <minecraft/launch/DirectJavaLaunch.h>
-#include <minecraft/launch/LauncherPartLaunch.h>
-#include <Env.h>
-
-#include "OneSixInstance.h"
-#include "OneSixUpdate.h"
-#include "OneSixProfileStrategy.h"
-
-#include "minecraft/MinecraftProfile.h"
-#include "minecraft/launch/ModMinecraftJar.h"
-#include "MMCZip.h"
-
-#include "minecraft/AssetsUtils.h"
-#include "minecraft/WorldList.h"
-#include <FileSystem.h>
-
-OneSixInstance::OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
-	: MinecraftInstance(globalSettings, settings, rootDir)
-{
-	// set explicitly during instance creation
-	m_settings->registerSetting({"IntendedVersion", "MinecraftVersion"}, "");
-
-	// defaults to the version we've been using for years (2.9.1)
-	m_settings->registerSetting("LWJGLVersion", "2.9.1");
-
-	// optionals
-	m_settings->registerSetting("ForgeVersion", "");
-	m_settings->registerSetting("LiteloaderVersion", "");
-}
-
-void OneSixInstance::init()
-{
-	createProfile();
-}
-
-void OneSixInstance::createProfile()
-{
-	m_profile.reset(new MinecraftProfile(new OneSixProfileStrategy(this)));
-}
-
-QSet<QString> OneSixInstance::traits()
-{
-	auto version = getMinecraftProfile();
-	if (!version)
-	{
-		return {"version-incomplete"};
-	}
-	else
-	{
-		return version->getTraits();
-	}
-}
-
-shared_qobject_ptr<Task> OneSixInstance::createUpdateTask()
-{
-	return shared_qobject_ptr<Task>(new OneSixUpdate(this));
-}
-
-QString replaceTokensIn(QString text, QMap<QString, QString> with)
-{
-	QString result;
-	QRegExp token_regexp("\\$\\{(.+)\\}");
-	token_regexp.setMinimal(true);
-	QStringList list;
-	int tail = 0;
-	int head = 0;
-	while ((head = token_regexp.indexIn(text, head)) != -1)
-	{
-		result.append(text.mid(tail, head - tail));
-		QString key = token_regexp.cap(1);
-		auto iter = with.find(key);
-		if (iter != with.end())
-		{
-			result.append(*iter);
-		}
-		head += token_regexp.matchedLength();
-		tail = head;
-	}
-	result.append(text.mid(tail));
-	return result;
-}
-
-QStringList OneSixInstance::processMinecraftArgs(AuthSessionPtr session) const
-{
-	QString args_pattern = m_profile->getMinecraftArguments();
-	for (auto tweaker : m_profile->getTweakers())
-	{
-		args_pattern += " --tweakClass " + tweaker;
-	}
-
-	QMap<QString, QString> token_mapping;
-	// yggdrasil!
-	if(session)
-	{
-		token_mapping["auth_username"] = session->username;
-		token_mapping["auth_session"] = session->session;
-		token_mapping["auth_access_token"] = session->access_token;
-		token_mapping["auth_player_name"] = session->player_name;
-		token_mapping["auth_uuid"] = session->uuid;
-		token_mapping["user_properties"] = session->serializeUserProperties();
-		token_mapping["user_type"] = session->user_type;
-	}
-
-	// blatant self-promotion.
-	token_mapping["profile_name"] = token_mapping["version_name"] = "MultiMC5";
-	if(m_profile->isVanilla())
-	{
-		token_mapping["version_type"] = m_profile->getMinecraftVersionType();
-	}
-	else
-	{
-		token_mapping["version_type"] = "custom";
-	}
-
-	QString absRootDir = QDir(minecraftRoot()).absolutePath();
-	token_mapping["game_directory"] = absRootDir;
-	QString absAssetsDir = QDir("assets/").absolutePath();
-	auto assets = m_profile->getMinecraftAssets();
-	token_mapping["game_assets"] = AssetsUtils::reconstructAssets(assets->id).absolutePath();
-
-	// 1.7.3+ assets tokens
-	token_mapping["assets_root"] = absAssetsDir;
-	token_mapping["assets_index_name"] = assets->id;
-
-	QStringList parts = args_pattern.split(' ', QString::SkipEmptyParts);
-	for (int i = 0; i < parts.length(); i++)
-	{
-		parts[i] = replaceTokensIn(parts[i], token_mapping);
-	}
-	return parts;
-}
-
-QString OneSixInstance::getNativePath() const
-{
-	QDir natives_dir(FS::PathCombine(instanceRoot(), "natives/"));
-	return natives_dir.absolutePath();
-}
-
-QString OneSixInstance::getLocalLibraryPath() const
-{
-	QDir libraries_dir(FS::PathCombine(instanceRoot(), "libraries/"));
-	return libraries_dir.absolutePath();
-}
-
-QString OneSixInstance::createLaunchScript(AuthSessionPtr session)
-{
-	QString launchScript;
-
-	if (!m_profile)
-		return nullptr;
-
-	auto mainClass = getMainClass();
-	if (!mainClass.isEmpty())
-	{
-		launchScript += "mainClass " + mainClass + "\n";
-	}
-	auto appletClass = m_profile->getAppletClass();
-	if (!appletClass.isEmpty())
-	{
-		launchScript += "appletClass " + appletClass + "\n";
-	}
-
-	// generic minecraft params
-	for (auto param : processMinecraftArgs(session))
-	{
-		launchScript += "param " + param + "\n";
-	}
-
-	// window size, title and state, legacy
-	{
-		QString windowParams;
-		if (settings()->get("LaunchMaximized").toBool())
-			windowParams = "max";
-		else
-			windowParams = QString("%1x%2")
-							   .arg(settings()->get("MinecraftWinWidth").toInt())
-							   .arg(settings()->get("MinecraftWinHeight").toInt());
-		launchScript += "windowTitle " + windowTitle() + "\n";
-		launchScript += "windowParams " + windowParams + "\n";
-	}
-
-	// legacy auth
-	if(session)
-	{
-		launchScript += "userName " + session->player_name + "\n";
-		launchScript += "sessionId " + session->session + "\n";
-	}
-
-	// libraries and class path.
-	{
-		QStringList jars, nativeJars;
-		auto javaArchitecture = settings()->get("JavaArchitecture").toString();
-		m_profile->getLibraryFiles(javaArchitecture, jars, nativeJars, getLocalLibraryPath(), binRoot());
-		for(auto file: jars)
-		{
-			launchScript += "cp " + file + "\n";
-		}
-		for(auto file: nativeJars)
-		{
-			launchScript += "ext " + file + "\n";
-		}
-		launchScript += "natives " + getNativePath() + "\n";
-	}
-
-	for (auto trait : m_profile->getTraits())
-	{
-		launchScript += "traits " + trait + "\n";
-	}
-	launchScript += "launcher onesix\n";
-	return launchScript;
-}
-
-QStringList OneSixInstance::verboseDescription(AuthSessionPtr session)
-{
-	QStringList out;
-	out << "Main Class:" << "  " + getMainClass() << "";
-	out << "Native path:" << "  " + getNativePath() << "";
-
-
-	auto alltraits = traits();
-	if(alltraits.size())
-	{
-		out << "Traits:";
-		for (auto trait : alltraits)
-		{
-			out << "traits " + trait;
-		}
-		out << "";
-	}
-
-	// libraries and class path.
-	{
-		out << "Libraries:";
-		QStringList jars, nativeJars;
-		auto javaArchitecture = settings()->get("JavaArchitecture").toString();
-		m_profile->getLibraryFiles(javaArchitecture, jars, nativeJars, getLocalLibraryPath(), binRoot());
-		auto printLibFile = [&](const QString & path)
-		{
-			QFileInfo info(path);
-			if(info.exists())
-			{
-				out << "  " + path;
-			}
-			else
-			{
-				out << "  " + path + " (missing)";
-			}
-		};
-		for(auto file: jars)
-		{
-			printLibFile(file);
-		}
-		out << "";
-		out << "Native libraries:";
-		for(auto file: nativeJars)
-		{
-			printLibFile(file);
-		}
-		out << "";
-	}
-
-	if(loaderModList()->size())
-	{
-		out << "Mods:";
-		for(auto & mod: loaderModList()->allMods())
-		{
-			if(!mod.enabled())
-				continue;
-			if(mod.type() == Mod::MOD_FOLDER)
-				continue;
-			// TODO: proper implementation would need to descend into folders.
-
-			out << "  " + mod.filename().completeBaseName();
-		}
-		out << "";
-	}
-
-	if(coreModList()->size())
-	{
-		out << "Core Mods:";
-		for(auto & coremod: coreModList()->allMods())
-		{
-			if(!coremod.enabled())
-				continue;
-			if(coremod.type() == Mod::MOD_FOLDER)
-				continue;
-			// TODO: proper implementation would need to descend into folders.
-
-			out << "  " + coremod.filename().completeBaseName();
-		}
-		out << "";
-	}
-
-	auto & jarMods = m_profile->getJarMods();
-	if(jarMods.size())
-	{
-		out << "Jar Mods:";
-		for(auto & jarmod: jarMods)
-		{
-			auto displayname = jarmod->displayName(currentSystem);
-			auto realname = jarmod->filename(currentSystem);
-			if(displayname != realname)
-			{
-				out << "  " + displayname + " (" + realname + ")";
-			}
-			else
-			{
-				out << "  " + realname;
-			}
-		}
-		out << "";
-	}
-
-	auto params = processMinecraftArgs(nullptr);
-	out << "Params:";
-	out << "  " + params.join(' ');
-	out << "";
-
-	QString windowParams;
-	if (settings()->get("LaunchMaximized").toBool())
-	{
-		out << "Window size: max (if available)";
-	}
-	else
-	{
-		auto width = settings()->get("MinecraftWinWidth").toInt();
-		auto height = settings()->get("MinecraftWinHeight").toInt();
-		out << "Window size: " + QString::number(width) + " x " + QString::number(height);
-	}
-	out << "";
-	return out;
-}
-
-
-std::shared_ptr<LaunchStep> OneSixInstance::createMainLaunchStep(LaunchTask * parent, AuthSessionPtr session)
-{
-	auto method = launchMethod();
-	if(method == "LauncherPart")
-	{
-		auto step = std::make_shared<LauncherPartLaunch>(parent);
-		step->setAuthSession(session);
-		step->setWorkingDirectory(minecraftRoot());
-		return step;
-	}
-	else if (method == "DirectJava")
-	{
-		auto step = std::make_shared<DirectJavaLaunch>(parent);
-		step->setWorkingDirectory(minecraftRoot());
-		step->setAuthSession(session);
-		return step;
-	}
-	return nullptr;
-}
-
-class JarModTask : public Task
-{
-	Q_OBJECT
-public:
-	explicit JarModTask(std::shared_ptr<OneSixInstance> inst) : Task(nullptr), m_inst(inst)
-	{
-	}
-	virtual void executeTask()
-	{
-		auto profile = m_inst->getMinecraftProfile();
-		// nuke obsolete stripped jar(s) if needed
-		QString version_id = profile->getMinecraftVersion();
-		if(!FS::ensureFolderPathExists(m_inst->binRoot()))
-		{
-			emitFailed(tr("Couldn't create the bin folder for Minecraft.jar"));
-		}
-		auto finalJarPath = QDir(m_inst->binRoot()).absoluteFilePath("minecraft.jar");
-		QFile finalJar(finalJarPath);
-		if(finalJar.exists())
-		{
-			if(!finalJar.remove())
-			{
-				emitFailed(tr("Couldn't remove stale jar file: %1").arg(finalJarPath));
-				return;
-			}
-		}
-
-		// create temporary modded jar, if needed
-		auto jarMods = m_inst->getJarMods();
-		if(jarMods.size())
-		{
-			auto mainJar = profile->getMainJar();
-			QStringList jars, temp1, temp2, temp3, temp4;
-			mainJar->getApplicableFiles(currentSystem, jars, temp1, temp2, temp3, m_inst->getLocalLibraryPath());
-			auto sourceJarPath = jars[0];
-			if(!MMCZip::createModdedJar(sourceJarPath, finalJarPath, jarMods))
-			{
-				emitFailed(tr("Failed to create the custom Minecraft jar file."));
-				return;
-			}
-		}
-		emitSucceeded();
-	}
-	std::shared_ptr<OneSixInstance> m_inst;
-};
-
-std::shared_ptr<Task> OneSixInstance::createJarModdingTask()
-{
-	return std::make_shared<JarModTask>(std::dynamic_pointer_cast<OneSixInstance>(shared_from_this()));
-}
-
-std::shared_ptr<ModList> OneSixInstance::loaderModList() const
-{
-	if (!m_loader_mod_list)
-	{
-		m_loader_mod_list.reset(new ModList(loaderModsDir()));
-	}
-	m_loader_mod_list->update();
-	return m_loader_mod_list;
-}
-
-std::shared_ptr<ModList> OneSixInstance::coreModList() const
-{
-	if (!m_core_mod_list)
-	{
-		m_core_mod_list.reset(new ModList(coreModsDir()));
-	}
-	m_core_mod_list->update();
-	return m_core_mod_list;
-}
-
-std::shared_ptr<ModList> OneSixInstance::resourcePackList() const
-{
-	if (!m_resource_pack_list)
-	{
-		m_resource_pack_list.reset(new ModList(resourcePacksDir()));
-	}
-	m_resource_pack_list->update();
-	return m_resource_pack_list;
-}
-
-std::shared_ptr<ModList> OneSixInstance::texturePackList() const
-{
-	if (!m_texture_pack_list)
-	{
-		m_texture_pack_list.reset(new ModList(texturePacksDir()));
-	}
-	m_texture_pack_list->update();
-	return m_texture_pack_list;
-}
-
-std::shared_ptr<WorldList> OneSixInstance::worldList() const
-{
-	if (!m_world_list)
-	{
-		m_world_list.reset(new WorldList(worldDir()));
-	}
-	return m_world_list;
-}
-
-bool OneSixInstance::setIntendedVersionId(QString version)
-{
-	return setComponentVersion("net.minecraft", version);
-}
-
-QString OneSixInstance::intendedVersionId() const
-{
-	return getComponentVersion("net.minecraft");
-}
-
-bool OneSixInstance::setComponentVersion(const QString& uid, const QString& version)
-{
-	if(uid == "net.minecraft")
-	{
-		settings()->set("IntendedVersion", version);
-	}
-	else if (uid == "org.lwjgl")
-	{
-		settings()->set("LWJGLVersion", version);
-	}
-	else if (uid == "net.minecraftforge")
-	{
-		settings()->set("ForgeVersion", version);
-	}
-	else if (uid == "com.mumfrey.liteloader")
-	{
-		settings()->set("LiteloaderVersion", version);
-	}
-	if(getMinecraftProfile())
-	{
-		clearProfile();
-	}
-	emit propertiesChanged(this);
-	return true;
-}
-
-QString OneSixInstance::getComponentVersion(const QString& uid) const
-{
-	if(uid == "net.minecraft")
-	{
-		return settings()->get("IntendedVersion").toString();
-	}
-	else if(uid == "org.lwjgl")
-	{
-		return settings()->get("LWJGLVersion").toString();
-	}
-	else if(uid == "net.minecraftforge")
-	{
-		return settings()->get("ForgeVersion").toString();
-	}
-	else if(uid == "com.mumfrey.liteloader")
-	{
-		return settings()->get("LiteloaderVersion").toString();
-	}
-	return QString();
-}
-
-QList< Mod > OneSixInstance::getJarMods() const
-{
-	QList<Mod> mods;
-	for (auto jarmod : m_profile->getJarMods())
-	{
-		QStringList jar, temp1, temp2, temp3;
-		jarmod->getApplicableFiles(currentSystem, jar, temp1, temp2, temp3, jarmodsPath().absolutePath());
-		// QString filePath = jarmodsPath().absoluteFilePath(jarmod->filename(currentSystem));
-		mods.push_back(Mod(QFileInfo(jar[0])));
-	}
-	return mods;
-}
-
-void OneSixInstance::setShouldUpdate(bool)
-{
-}
-
-bool OneSixInstance::shouldUpdate() const
-{
-	return true;
-}
-
-QString OneSixInstance::currentVersionId() const
-{
-	return intendedVersionId();
-}
-
-void OneSixInstance::reloadProfile()
-{
-	m_profile->reload();
-	setVersionBroken(m_profile->getProblemSeverity() == ProblemSeverity::Error);
-	emit versionReloaded();
-}
-
-void OneSixInstance::clearProfile()
-{
-	m_profile->clear();
-	emit versionReloaded();
-}
-
-std::shared_ptr<MinecraftProfile> OneSixInstance::getMinecraftProfile() const
-{
-	return m_profile;
-}
-
-QDir OneSixInstance::librariesPath() const
-{
-	return QDir::current().absoluteFilePath("libraries");
-}
-
-QDir OneSixInstance::jarmodsPath() const
-{
-	return QDir(jarModsDir());
-}
-
-QDir OneSixInstance::versionsPath() const
-{
-	return QDir::current().absoluteFilePath("versions");
-}
-
-bool OneSixInstance::providesVersionFile() const
-{
-	return false;
-}
-
-bool OneSixInstance::reload()
-{
-	if (BaseInstance::reload())
-	{
-		try
-		{
-			reloadProfile();
-			return true;
-		}
-		catch (...)
-		{
-			return false;
-		}
-	}
-	return false;
-}
-
-QString OneSixInstance::loaderModsDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "mods");
-}
-
-QString OneSixInstance::coreModsDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "coremods");
-}
-
-QString OneSixInstance::resourcePacksDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "resourcepacks");
-}
-
-QString OneSixInstance::texturePacksDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "texturepacks");
-}
-
-QString OneSixInstance::instanceConfigFolder() const
-{
-	return FS::PathCombine(minecraftRoot(), "config");
-}
-
-QString OneSixInstance::jarModsDir() const
-{
-	return FS::PathCombine(instanceRoot(), "jarmods");
-}
-
-QString OneSixInstance::FMLlibDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "lib");
-}
-
-QString OneSixInstance::customLibrariesDir() const
-{
-	return FS::PathCombine(instanceRoot(), "libraries");
-}
-
-QString OneSixInstance::worldDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "saves");
-}
-
-QStringList OneSixInstance::extraArguments() const
-{
-	auto list = BaseInstance::extraArguments();
-	auto version = getMinecraftProfile();
-	if (!version)
-		return list;
-	auto jarMods = getJarMods();
-	if (!jarMods.isEmpty())
-	{
-		list.append({"-Dfml.ignoreInvalidMinecraftCertificates=true",
-					 "-Dfml.ignorePatchDiscrepancies=true"});
-	}
-	return list;
-}
-
-std::shared_ptr<OneSixInstance> OneSixInstance::getSharedPtr()
-{
-	return std::dynamic_pointer_cast<OneSixInstance>(BaseInstance::getSharedPtr());
-}
-
-QString OneSixInstance::typeName() const
-{
-	return tr("OneSix");
-}
-
-QStringList OneSixInstance::validLaunchMethods()
-{
-	return {"LauncherPart", "DirectJava"};
-}
-
-QStringList OneSixInstance::getClassPath() const
-{
-	QStringList jars, nativeJars;
-	auto javaArchitecture = settings()->get("JavaArchitecture").toString();
-	m_profile->getLibraryFiles(javaArchitecture, jars, nativeJars, getLocalLibraryPath(), binRoot());
-	return jars;
-}
-
-QString OneSixInstance::getMainClass() const
-{
-	return m_profile->getMainClass();
-}
-
-QStringList OneSixInstance::getNativeJars() const
-{
-	QStringList jars, nativeJars;
-	auto javaArchitecture = settings()->get("JavaArchitecture").toString();
-	m_profile->getLibraryFiles(javaArchitecture, jars, nativeJars, getLocalLibraryPath(), binRoot());
-	return nativeJars;
-}
-
-#include "OneSixInstance.moc"
diff --git a/api/logic/minecraft/onesix/OneSixInstance.h b/api/logic/minecraft/onesix/OneSixInstance.h
deleted file mode 100644
index 0cb4340b..00000000
--- a/api/logic/minecraft/onesix/OneSixInstance.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Copyright 2013-2017 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 "minecraft/MinecraftInstance.h"
-
-#include "minecraft/MinecraftProfile.h"
-#include "minecraft/ModList.h"
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT OneSixInstance : public MinecraftInstance
-{
-	Q_OBJECT
-public:
-	explicit OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
-	virtual ~OneSixInstance(){};
-
-	virtual void init() override;
-
-	//////  Mod Lists  //////
-	std::shared_ptr<ModList> loaderModList() const;
-	std::shared_ptr<ModList> coreModList() const;
-	std::shared_ptr<ModList> resourcePackList() const override;
-	std::shared_ptr<ModList> texturePackList() const override;
-	std::shared_ptr<WorldList> worldList() const override;
-	virtual QList<Mod> getJarMods() const override;
-	virtual void createProfile();
-
-	virtual QSet<QString> traits() override;
-
-	////// Directories and files //////
-	QString jarModsDir() const;
-	QString resourcePacksDir() const;
-	QString texturePacksDir() const;
-	QString loaderModsDir() const;
-	QString coreModsDir() const;
-	QString FMLlibDir() const;
-	QString customLibrariesDir() const;
-	QString worldDir() const;
-	virtual QString instanceConfigFolder() const override;
-
-	virtual shared_qobject_ptr<Task> createUpdateTask() override;
-	virtual std::shared_ptr<Task> createJarModdingTask() override;
-	virtual QString createLaunchScript(AuthSessionPtr session) override;
-	QStringList verboseDescription(AuthSessionPtr session) override;
-
-	virtual QString intendedVersionId() const override;
-	virtual bool setIntendedVersionId(QString version) override;
-	virtual QString currentVersionId() const override;
-
-	QString getComponentVersion(const QString &uid) const;
-	bool setComponentVersion(const QString &uid, const QString &version);
-
-	virtual bool shouldUpdate() const override;
-	virtual void setShouldUpdate(bool val) override;
-
-	/**
-	 * reload the profile, including version json files.
-	 *
-	 * throws various exceptions :3
-	 */
-	void reloadProfile();
-
-	/// clears all version information in preparation for an update
-	void clearProfile();
-
-	/// get the current full version info
-	std::shared_ptr<MinecraftProfile> getMinecraftProfile() const;
-
-	virtual QDir jarmodsPath() const;
-	virtual QDir librariesPath() const;
-	virtual QDir versionsPath() const;
-	virtual bool providesVersionFile() const;
-
-	bool reload() override;
-
-	virtual QStringList extraArguments() const override;
-
-	std::shared_ptr<OneSixInstance> getSharedPtr();
-
-	virtual QString typeName() const override;
-
-	bool canExport() const override
-	{
-		return true;
-	}
-
-	QStringList getClassPath() const override;
-	QString getMainClass() const override;
-
-	QStringList getNativeJars() const override;
-	QString getNativePath() const override;
-
-	QString getLocalLibraryPath() const override;
-
-	QStringList processMinecraftArgs(AuthSessionPtr account) const override;
-
-protected:
-	std::shared_ptr<LaunchStep> createMainLaunchStep(LaunchTask *parent, AuthSessionPtr session) override;
-	QStringList validLaunchMethods() override;
-
-signals:
-	void versionReloaded();
-
-protected:
-	std::shared_ptr<MinecraftProfile> m_profile;
-	mutable std::shared_ptr<ModList> m_loader_mod_list;
-	mutable std::shared_ptr<ModList> m_core_mod_list;
-	mutable std::shared_ptr<ModList> m_resource_pack_list;
-	mutable std::shared_ptr<ModList> m_texture_pack_list;
-	mutable std::shared_ptr<WorldList> m_world_list;
-};
-
-Q_DECLARE_METATYPE(std::shared_ptr<OneSixInstance>)
diff --git a/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp b/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
deleted file mode 100644
index 39dd8343..00000000
--- a/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
+++ /dev/null
@@ -1,471 +0,0 @@
-#include "OneSixProfileStrategy.h"
-#include "OneSixInstance.h"
-#include "OneSixVersionFormat.h"
-
-#include "Env.h"
-#include <FileSystem.h>
-
-#include <QDir>
-#include <QUuid>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QSaveFile>
-#include <QResource>
-#include <meta/Index.h>
-#include <meta/Version.h>
-
-#include <tuple>
-
-OneSixProfileStrategy::OneSixProfileStrategy(OneSixInstance* instance)
-{
-	m_instance = instance;
-}
-
-void OneSixProfileStrategy::upgradeDeprecatedFiles()
-{
-	auto versionJsonPath = FS::PathCombine(m_instance->instanceRoot(), "version.json");
-	auto customJsonPath = FS::PathCombine(m_instance->instanceRoot(), "custom.json");
-	auto mcJson = FS::PathCombine(m_instance->instanceRoot(), "patches" , "net.minecraft.json");
-
-	QString sourceFile;
-	QString renameFile;
-
-	// convert old crap.
-	if(QFile::exists(customJsonPath))
-	{
-		sourceFile = customJsonPath;
-		renameFile = versionJsonPath;
-	}
-	else if(QFile::exists(versionJsonPath))
-	{
-		sourceFile = versionJsonPath;
-	}
-	if(!sourceFile.isEmpty() && !QFile::exists(mcJson))
-	{
-		if(!FS::ensureFilePathExists(mcJson))
-		{
-			qWarning() << "Couldn't create patches folder for" << m_instance->name();
-			return;
-		}
-		if(!renameFile.isEmpty() && QFile::exists(renameFile))
-		{
-			if(!QFile::rename(renameFile, renameFile + ".old"))
-			{
-				qWarning() << "Couldn't rename" << renameFile << "to" << renameFile + ".old" << "in" << m_instance->name();
-				return;
-			}
-		}
-		auto file = ProfileUtils::parseJsonFile(QFileInfo(sourceFile), false);
-		ProfileUtils::removeLwjglFromPatch(file);
-		file->uid = "net.minecraft";
-		file->version = file->minecraftVersion;
-		file->name = "Minecraft";
-		auto data = OneSixVersionFormat::versionFileToJson(file, false).toJson();
-		QSaveFile newPatchFile(mcJson);
-		if(!newPatchFile.open(QIODevice::WriteOnly))
-		{
-			newPatchFile.cancelWriting();
-			qWarning() << "Couldn't open main patch for writing in" << m_instance->name();
-			return;
-		}
-		newPatchFile.write(data);
-		if(!newPatchFile.commit())
-		{
-			qWarning() << "Couldn't save main patch in" << m_instance->name();
-			return;
-		}
-		if(!QFile::rename(sourceFile, sourceFile + ".old"))
-		{
-			qWarning() << "Couldn't rename" << sourceFile << "to" << sourceFile + ".old" << "in" << m_instance->name();
-			return;
-		}
-	}
-}
-
-void OneSixProfileStrategy::loadDefaultBuiltinPatches()
-{
-	auto addBuiltinPatch = [&](const QString &uid, const QString intendedVersion, int order)
-	{
-		auto jsonFilePath = FS::PathCombine(m_instance->instanceRoot(), "patches" , uid + ".json");
-		// load up the base minecraft patch
-		ProfilePatchPtr profilePatch;
-		if(QFile::exists(jsonFilePath))
-		{
-			auto file = ProfileUtils::parseJsonFile(QFileInfo(jsonFilePath), false);
-			if(file->version.isEmpty())
-			{
-				file->version = intendedVersion;
-			}
-			profilePatch = std::make_shared<ProfilePatch>(file, jsonFilePath);
-			profilePatch->setVanilla(false);
-			profilePatch->setRevertible(true);
-		}
-		else
-		{
-			auto metaVersion = ENV.metadataIndex()->get(uid, intendedVersion);
-			profilePatch = std::make_shared<ProfilePatch>(metaVersion);
-			profilePatch->setVanilla(true);
-		}
-		profilePatch->setOrder(order);
-		profile->appendPatch(profilePatch);
-	};
-	addBuiltinPatch("net.minecraft", m_instance->getComponentVersion("net.minecraft"), -2);
-	addBuiltinPatch("org.lwjgl", m_instance->getComponentVersion("org.lwjgl"), -1);
-}
-
-void OneSixProfileStrategy::loadUserPatches()
-{
-	// first, collect all patches (that are not builtins of OneSix) and load them
-	QMap<QString, ProfilePatchPtr> loadedPatches;
-	QDir patchesDir(FS::PathCombine(m_instance->instanceRoot(),"patches"));
-	for (auto info : patchesDir.entryInfoList(QStringList() << "*.json", QDir::Files))
-	{
-		// parse the file
-		qDebug() << "Reading" << info.fileName();
-		auto file = ProfileUtils::parseJsonFile(info, true);
-		// ignore builtins
-		if (file->uid == "net.minecraft")
-			continue;
-		if (file->uid == "org.lwjgl")
-			continue;
-		auto patch = std::make_shared<ProfilePatch>(file, info.filePath());
-		patch->setRemovable(true);
-		patch->setMovable(true);
-		if(ENV.metadataIndex()->hasUid(file->uid))
-		{
-			// FIXME: requesting a uid/list creates it in the index... this allows reverting to possibly invalid versions...
-			patch->setRevertible(true);
-		}
-		loadedPatches[file->uid] = patch;
-	}
-	// these are 'special'... if not already loaded from instance files, grab them from the metadata repo.
-	auto loadSpecial = [&](const QString & uid, int order)
-	{
-		auto patchVersion = m_instance->getComponentVersion(uid);
-		if(!patchVersion.isEmpty() && !loadedPatches.contains(uid))
-		{
-			auto patch = std::make_shared<ProfilePatch>(ENV.metadataIndex()->get(uid, patchVersion));
-			patch->setOrder(order);
-			patch->setVanilla(true);
-			patch->setRemovable(true);
-			patch->setMovable(true);
-			loadedPatches[uid] = patch;
-		}
-	};
-	loadSpecial("net.minecraftforge", 5);
-	loadSpecial("com.mumfrey.liteloader", 10);
-
-	// now add all the patches by user sort order
-	ProfileUtils::PatchOrder userOrder;
-	ProfileUtils::readOverrideOrders(FS::PathCombine(m_instance->instanceRoot(), "order.json"), userOrder);
-	for (auto uid : userOrder)
-	{
-		// ignore builtins
-		if (uid == "net.minecraft")
-			continue;
-		if (uid == "org.lwjgl")
-			continue;
-		// ordering has a patch that is gone?
-		if(!loadedPatches.contains(uid))
-		{
-			continue;
-		}
-		profile->appendPatch(loadedPatches.take(uid));
-	}
-
-	// is there anything left to sort?
-	if(loadedPatches.isEmpty())
-	{
-		// TODO: save the order here?
-		return;
-	}
-
-	// inserting into multimap by order number as key sorts the patches and detects duplicates
-	QMultiMap<int, ProfilePatchPtr> files;
-	auto iter = loadedPatches.begin();
-	while(iter != loadedPatches.end())
-	{
-		files.insert((*iter)->getOrder(), *iter);
-		iter++;
-	}
-
-	// then just extract the patches and put them in the list
-	for (auto order : files.keys())
-	{
-		const auto &values = files.values(order);
-		for(auto &value: values)
-		{
-			// TODO: put back the insertion of problem messages here, so the user knows about the id duplication
-			profile->appendPatch(value);
-		}
-	}
-	// TODO: save the order here?
-}
-
-
-void OneSixProfileStrategy::load()
-{
-	profile->clearPatches();
-
-	upgradeDeprecatedFiles();
-	loadDefaultBuiltinPatches();
-	loadUserPatches();
-}
-
-bool OneSixProfileStrategy::saveOrder(ProfileUtils::PatchOrder order)
-{
-	return ProfileUtils::writeOverrideOrders(FS::PathCombine(m_instance->instanceRoot(), "order.json"), order);
-}
-
-bool OneSixProfileStrategy::resetOrder()
-{
-	return QDir(m_instance->instanceRoot()).remove("order.json");
-}
-
-bool OneSixProfileStrategy::removePatch(ProfilePatchPtr patch)
-{
-	bool ok = true;
-	// first, remove the patch file. this ensures it's not used anymore
-	auto fileName = patch->getFilename();
-	if(fileName.size())
-	{
-		QFile patchFile(fileName);
-		if(patchFile.exists() && !patchFile.remove())
-		{
-			qCritical() << "File" << fileName << "could not be removed because:" << patchFile.errorString();
-			return false;
-		}
-	}
-	if(!m_instance->getComponentVersion(patch->getID()).isEmpty())
-	{
-		m_instance->setComponentVersion(patch->getID(), QString());
-	}
-
-	// FIXME: we need a generic way of removing local resources, not just jar mods...
-	auto preRemoveJarMod = [&](LibraryPtr jarMod) -> bool
-	{
-		if (!jarMod->isLocal())
-		{
-			return true;
-		}
-		QStringList jar, temp1, temp2, temp3;
-		jarMod->getApplicableFiles(currentSystem, jar, temp1, temp2, temp3, m_instance->jarmodsPath().absolutePath());
-		QFileInfo finfo (jar[0]);
-		if(finfo.exists())
-		{
-			QFile jarModFile(jar[0]);
-			if(!jarModFile.remove())
-			{
-				qCritical() << "File" << jar[0] << "could not be removed because:" << jarModFile.errorString();
-				return false;
-			}
-			return true;
-		}
-		return true;
-	};
-
-	auto &jarMods = patch->getVersionFile()->jarMods;
-	for(auto &jarmod: jarMods)
-	{
-		ok &= preRemoveJarMod(jarmod);
-	}
-	return ok;
-}
-
-bool OneSixProfileStrategy::customizePatch(ProfilePatchPtr patch)
-{
-	if(patch->isCustom())
-	{
-		return false;
-	}
-
-	auto filename = FS::PathCombine(m_instance->instanceRoot(), "patches" , patch->getID() + ".json");
-	if(!FS::ensureFilePathExists(filename))
-	{
-		return false;
-	}
-	// FIXME: get rid of this try-catch.
-	try
-	{
-		QSaveFile jsonFile(filename);
-		if(!jsonFile.open(QIODevice::WriteOnly))
-		{
-			return false;
-		}
-		auto vfile = patch->getVersionFile();
-		if(!vfile)
-		{
-			return false;
-		}
-		auto document = OneSixVersionFormat::versionFileToJson(vfile, true);
-		jsonFile.write(document.toJson());
-		if(!jsonFile.commit())
-		{
-			return false;
-		}
-		load();
-	}
-	catch (Exception &error)
-	{
-		qWarning() << "Version could not be loaded:" << error.cause();
-	}
-	return true;
-}
-
-bool OneSixProfileStrategy::revertPatch(ProfilePatchPtr patch)
-{
-	if(!patch->isCustom())
-	{
-		// already not custom
-		return true;
-	}
-	auto filename = patch->getFilename();
-	if(!QFile::exists(filename))
-	{
-		// already gone / not custom
-		return true;
-	}
-	// just kill the file and reload
-	bool result = QFile::remove(filename);
-	// FIXME: get rid of this try-catch.
-	try
-	{
-		load();
-	}
-	catch (Exception &error)
-	{
-		qWarning() << "Version could not be loaded:" << error.cause();
-	}
-	return result;
-}
-
-bool OneSixProfileStrategy::installJarMods(QStringList filepaths)
-{
-	QString patchDir = FS::PathCombine(m_instance->instanceRoot(), "patches");
-	if(!FS::ensureFolderPathExists(patchDir))
-	{
-		return false;
-	}
-
-	if (!FS::ensureFolderPathExists(m_instance->jarModsDir()))
-	{
-		return false;
-	}
-
-	for(auto filepath:filepaths)
-	{
-		QFileInfo sourceInfo(filepath);
-		auto uuid = QUuid::createUuid();
-		QString id = uuid.toString().remove('{').remove('}');
-		QString target_filename = id + ".jar";
-		QString target_id = "org.multimc.jarmod." + id;
-		QString target_name = sourceInfo.completeBaseName() + " (jar mod)";
-		QString finalPath = FS::PathCombine(m_instance->jarModsDir(), target_filename);
-
-		QFileInfo targetInfo(finalPath);
-		if(targetInfo.exists())
-		{
-			return false;
-		}
-
-		if (!QFile::copy(sourceInfo.absoluteFilePath(),QFileInfo(finalPath).absoluteFilePath()))
-		{
-			return false;
-		}
-
-		auto f = std::make_shared<VersionFile>();
-		auto jarMod = std::make_shared<Library>();
-		jarMod->setRawName(GradleSpecifier("org.multimc.jarmods:" + id + ":1"));
-		jarMod->setFilename(target_filename);
-		jarMod->setDisplayName(sourceInfo.completeBaseName());
-		jarMod->setHint("local");
-		f->jarMods.append(jarMod);
-		f->name = target_name;
-		f->uid = target_id;
-		f->order = profile->getFreeOrderNumber();
-		QString patchFileName = FS::PathCombine(patchDir, target_id + ".json");
-
-		QFile file(patchFileName);
-		if (!file.open(QFile::WriteOnly))
-		{
-			qCritical() << "Error opening" << file.fileName()
-						<< "for reading:" << file.errorString();
-			return false;
-		}
-		file.write(OneSixVersionFormat::versionFileToJson(f, true).toJson());
-		file.close();
-
-		auto patch = std::make_shared<ProfilePatch>(f, patchFileName);
-		patch->setMovable(true);
-		patch->setRemovable(true);
-		profile->appendPatch(patch);
-	}
-	profile->saveCurrentOrder();
-	profile->reapplyPatches();
-	return true;
-}
-
-bool OneSixProfileStrategy::installCustomJar(QString filepath)
-{
-	QString patchDir = FS::PathCombine(m_instance->instanceRoot(), "patches");
-	if(!FS::ensureFolderPathExists(patchDir))
-	{
-		return false;
-	}
-
-	QString libDir = m_instance->customLibrariesDir();
-	if (!FS::ensureFolderPathExists(libDir))
-	{
-		return false;
-	}
-
-	auto specifier = GradleSpecifier("org.multimc:customjar:1");
-	QFileInfo sourceInfo(filepath);
-	QString target_filename = specifier.getFileName();
-	QString target_id = specifier.artifactId();
-	QString target_name = sourceInfo.completeBaseName() + " (custom jar)";
-	QString finalPath = FS::PathCombine(libDir, target_filename);
-
-	QFileInfo jarInfo(finalPath);
-	if (jarInfo.exists())
-	{
-		if(!QFile::remove(finalPath))
-		{
-			return false;
-		}
-	}
-	if (!QFile::copy(filepath, finalPath))
-	{
-		return false;
-	}
-
-	auto f = std::make_shared<VersionFile>();
-	auto jarMod = std::make_shared<Library>();
-	jarMod->setRawName(specifier);
-	jarMod->setDisplayName(sourceInfo.completeBaseName());
-	jarMod->setHint("local");
-	f->mainJar = jarMod;
-	f->name = target_name;
-	f->uid = target_id;
-	f->order = profile->getFreeOrderNumber();
-	QString patchFileName = FS::PathCombine(patchDir, target_id + ".json");
-
-	QFile file(patchFileName);
-	if (!file.open(QFile::WriteOnly))
-	{
-		qCritical() << "Error opening" << file.fileName()
-					<< "for reading:" << file.errorString();
-		return false;
-	}
-	file.write(OneSixVersionFormat::versionFileToJson(f, true).toJson());
-	file.close();
-
-	auto patch = std::make_shared<ProfilePatch>(f, patchFileName);
-	patch->setMovable(true);
-	patch->setRemovable(true);
-	profile->appendPatch(patch);
-
-	profile->saveCurrentOrder();
-	profile->reapplyPatches();
-	return true;
-}
diff --git a/api/logic/minecraft/onesix/OneSixProfileStrategy.h b/api/logic/minecraft/onesix/OneSixProfileStrategy.h
deleted file mode 100644
index e4eee4b2..00000000
--- a/api/logic/minecraft/onesix/OneSixProfileStrategy.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-#include "minecraft/ProfileStrategy.h"
-
-class OneSixInstance;
-
-class OneSixProfileStrategy : public ProfileStrategy
-{
-public:
-	OneSixProfileStrategy(OneSixInstance * instance);
-	virtual ~OneSixProfileStrategy() {};
-	void load() override;
-	bool resetOrder() override;
-	bool saveOrder(ProfileUtils::PatchOrder order) override;
-	bool installJarMods(QStringList filepaths) override;
-	bool installCustomJar(QString filepath) override;
-	bool removePatch(ProfilePatchPtr patch) override;
-	bool customizePatch(ProfilePatchPtr patch) override;
-	bool revertPatch(ProfilePatchPtr patch) override;
-
-protected:
-	virtual void loadDefaultBuiltinPatches();
-	virtual void loadUserPatches();
-	void upgradeDeprecatedFiles();
-
-protected:
-	OneSixInstance *m_instance;
-};
diff --git a/api/logic/minecraft/onesix/OneSixUpdate.cpp b/api/logic/minecraft/onesix/OneSixUpdate.cpp
deleted file mode 100644
index 230877ef..00000000
--- a/api/logic/minecraft/onesix/OneSixUpdate.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/* Copyright 2013-2017 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 "Env.h"
-#include <minecraft/forge/ForgeXzDownload.h>
-#include "OneSixUpdate.h"
-#include "OneSixInstance.h"
-
-#include <QFile>
-#include <QFileInfo>
-#include <QTextStream>
-#include <QDataStream>
-
-#include "BaseInstance.h"
-#include "minecraft/MinecraftProfile.h"
-#include "minecraft/Library.h"
-#include "net/URLConstants.h"
-#include <FileSystem.h>
-
-#include "update/FoldersTask.h"
-#include "update/LibrariesTask.h"
-#include "update/FMLLibrariesTask.h"
-#include "update/AssetUpdateTask.h"
-
-#include <meta/Index.h>
-#include <meta/Version.h>
-
-OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
-{
-	// create folders
-	{
-		m_tasks.append(std::make_shared<FoldersTask>(m_inst));
-	}
-
-	// add metadata update tasks, if necessary
-	{
-		/*
-		 * FIXME: there are some corner cases here that remain unhandled:
-		 * what if local load succeeds but remote fails? The version is still usable...
-		 * We should not rely on the remote to be there... and prefer local files if it does not respond.
-		 */
-		qDebug() << "Updating patches...";
-		auto profile = m_inst->getMinecraftProfile();
-		m_inst->reloadProfile();
-		for(int i = 0; i < profile->rowCount(); i++)
-		{
-			auto patch = profile->versionPatch(i);
-			auto id = patch->getID();
-			auto metadata = patch->getMeta();
-			if(metadata)
-			{
-				metadata->load();
-				auto task = metadata->getCurrentTask();
-				if(task)
-				{
-					qDebug() << "Loading remote meta patch" << id;
-					m_tasks.append(task.unwrap());
-				}
-			}
-			else
-			{
-				qDebug() << "Ignoring local patch" << id;
-			}
-		}
-	}
-
-	// libraries download
-	{
-		m_tasks.append(std::make_shared<LibrariesTask>(m_inst));
-	}
-
-	// FML libraries download and copy into the instance
-	{
-		m_tasks.append(std::make_shared<FMLLibrariesTask>(m_inst));
-	}
-
-	// assets update
-	{
-		m_tasks.append(std::make_shared<AssetUpdateTask>(m_inst));
-	}
-}
-
-void OneSixUpdate::executeTask()
-{
-	if(!m_preFailure.isEmpty())
-	{
-		emitFailed(m_preFailure);
-		return;
-	}
-	next();
-}
-
-void OneSixUpdate::next()
-{
-	if(m_abort)
-	{
-		emitFailed(tr("Aborted by user."));
-		return;
-	}
-	if(m_failed_out_of_order)
-	{
-		emitFailed(m_fail_reason);
-		return;
-	}
-	m_currentTask ++;
-	if(m_currentTask > 0)
-	{
-		auto task = m_tasks[m_currentTask - 1];
-		disconnect(task.get(), &Task::succeeded, this, &OneSixUpdate::subtaskSucceeded);
-		disconnect(task.get(), &Task::failed, this, &OneSixUpdate::subtaskFailed);
-		disconnect(task.get(), &Task::progress, this, &OneSixUpdate::progress);
-		disconnect(task.get(), &Task::status, this, &OneSixUpdate::setStatus);
-	}
-	if(m_currentTask == m_tasks.size())
-	{
-		emitSucceeded();
-		return;
-	}
-	auto task = m_tasks[m_currentTask];
-	// if the task is already finished by the time we look at it, skip it
-	if(task->isFinished())
-	{
-		qCritical() << "OneSixUpdate: Skipping finished subtask" << m_currentTask << ":" << task.get();
-		next();
-	}
-	connect(task.get(), &Task::succeeded, this, &OneSixUpdate::subtaskSucceeded);
-	connect(task.get(), &Task::failed, this, &OneSixUpdate::subtaskFailed);
-	connect(task.get(), &Task::progress, this, &OneSixUpdate::progress);
-	connect(task.get(), &Task::status, this, &OneSixUpdate::setStatus);
-	// if the task is already running, do not start it again
-	if(!task->isRunning())
-	{
-		task->start();
-	}
-}
-
-void OneSixUpdate::subtaskSucceeded()
-{
-	if(isFinished())
-	{
-		qCritical() << "OneSixUpdate: Subtask" << sender() << "succeeded, but work was already done!";
-		return;
-	}
-	auto senderTask = QObject::sender();
-	auto currentTask = m_tasks[m_currentTask].get();
-	if(senderTask != currentTask)
-	{
-		qDebug() << "OneSixUpdate: Subtask" << sender() << "succeeded out of order.";
-		return;
-	}
-	next();
-}
-
-void OneSixUpdate::subtaskFailed(QString error)
-{
-	if(isFinished())
-	{
-		qCritical() << "OneSixUpdate: Subtask" << sender() << "failed, but work was already done!";
-		return;
-	}
-	auto senderTask = QObject::sender();
-	auto currentTask = m_tasks[m_currentTask].get();
-	if(senderTask != currentTask)
-	{
-		qDebug() << "OneSixUpdate: Subtask" << sender() << "failed out of order.";
-		m_failed_out_of_order = true;
-		m_fail_reason = error;
-		return;
-	}
-	emitFailed(error);
-}
-
-
-bool OneSixUpdate::abort()
-{
-	if(!m_abort)
-	{
-		m_abort = true;
-		auto task = m_tasks[m_currentTask];
-		if(task->canAbort())
-		{
-			return task->abort();
-		}
-	}
-	return true;
-}
-
-bool OneSixUpdate::canAbort() const
-{
-	return true;
-}
diff --git a/api/logic/minecraft/onesix/OneSixUpdate.h b/api/logic/minecraft/onesix/OneSixUpdate.h
deleted file mode 100644
index f879f19e..00000000
--- a/api/logic/minecraft/onesix/OneSixUpdate.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2013-2017 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 <QObject>
-#include <QList>
-#include <QUrl>
-
-#include "net/NetJob.h"
-#include "tasks/Task.h"
-#include "minecraft/VersionFilterData.h"
-#include <quazip.h>
-
-class MinecraftVersion;
-class OneSixInstance;
-
-class OneSixUpdate : public Task
-{
-	Q_OBJECT
-public:
-	explicit OneSixUpdate(OneSixInstance *inst, QObject *parent = 0);
-	void executeTask() override;
-	bool canAbort() const override;
-
-private
-slots:
-	bool abort() override;
-	void subtaskSucceeded();
-	void subtaskFailed(QString error);
-
-private:
-	void next();
-
-private:
-	OneSixInstance *m_inst = nullptr;
-	QList<std::shared_ptr<Task>> m_tasks;
-	QString m_preFailure;
-	int m_currentTask = -1;
-	bool m_abort = false;
-	bool m_failed_out_of_order = false;
-	QString m_fail_reason;
-};
diff --git a/api/logic/minecraft/onesix/OneSixVersionFormat.cpp b/api/logic/minecraft/onesix/OneSixVersionFormat.cpp
deleted file mode 100644
index 7ebf514f..00000000
--- a/api/logic/minecraft/onesix/OneSixVersionFormat.cpp
+++ /dev/null
@@ -1,332 +0,0 @@
-#include "OneSixVersionFormat.h"
-#include <Json.h>
-#include "minecraft/ParseUtils.h"
-#include <minecraft/MojangVersionFormat.h>
-
-using namespace Json;
-
-static void readString(const QJsonObject &root, const QString &key, QString &variable)
-{
-	if (root.contains(key))
-	{
-		variable = requireString(root.value(key));
-	}
-}
-
-LibraryPtr OneSixVersionFormat::libraryFromJson(const QJsonObject &libObj, const QString &filename)
-{
-	LibraryPtr out = MojangVersionFormat::libraryFromJson(libObj, filename);
-	readString(libObj, "MMC-hint", out->m_hint);
-	readString(libObj, "MMC-absulute_url", out->m_absoluteURL);
-	readString(libObj, "MMC-absoluteUrl", out->m_absoluteURL);
-	readString(libObj, "MMC-filename", out->m_filename);
-	readString(libObj, "MMC-displayname", out->m_displayname);
-	return out;
-}
-
-QJsonObject OneSixVersionFormat::libraryToJson(Library *library)
-{
-	QJsonObject libRoot = MojangVersionFormat::libraryToJson(library);
-	if (library->m_absoluteURL.size())
-		libRoot.insert("MMC-absoluteUrl", library->m_absoluteURL);
-	if (library->m_hint.size())
-		libRoot.insert("MMC-hint", library->m_hint);
-	if (library->m_filename.size())
-		libRoot.insert("MMC-filename", library->m_filename);
-	if (library->m_displayname.size())
-		libRoot.insert("MMC-displayname", library->m_displayname);
-	return libRoot;
-}
-
-VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc, const QString &filename, const bool requireOrder)
-{
-	VersionFilePtr out(new VersionFile());
-	if (doc.isEmpty() || doc.isNull())
-	{
-		throw JSONValidationError(filename + " is empty or null");
-	}
-	if (!doc.isObject())
-	{
-		throw JSONValidationError(filename + " is not an object");
-	}
-
-	QJsonObject root = doc.object();
-
-	if (requireOrder)
-	{
-		if (root.contains("order"))
-		{
-			out->order = requireInteger(root.value("order"));
-		}
-		else
-		{
-			// FIXME: evaluate if we don't want to throw exceptions here instead
-			qCritical() << filename << "doesn't contain an order field";
-		}
-	}
-
-	out->name = root.value("name").toString();
-
-	if(root.contains("uid"))
-	{
-		out->uid = root.value("uid").toString();
-	}
-	else
-	{
-		out->uid = root.value("fileId").toString();
-	}
-
-	out->version = root.value("version").toString();
-	out->dependsOnMinecraftVersion = root.value("mcVersion").toString();
-	// out->filename = filename;
-
-	MojangVersionFormat::readVersionProperties(root, out.get());
-
-	// added for legacy Minecraft window embedding, TODO: remove
-	readString(root, "appletClass", out->appletClass);
-
-	if (root.contains("+tweakers"))
-	{
-		for (auto tweakerVal : requireArray(root.value("+tweakers")))
-		{
-			out->addTweakers.append(requireString(tweakerVal));
-		}
-	}
-
-	if (root.contains("+traits"))
-	{
-		for (auto tweakerVal : requireArray(root.value("+traits")))
-		{
-			out->traits.insert(requireString(tweakerVal));
-		}
-	}
-
-
-	if (root.contains("jarMods"))
-	{
-		for (auto libVal : requireArray(root.value("jarMods")))
-		{
-			QJsonObject libObj = requireObject(libVal);
-			// parse the jarmod
-			auto lib = OneSixVersionFormat::jarModFromJson(libObj, filename);
-			// and add to jar mods
-			out->jarMods.append(lib);
-		}
-	}
-	else if (root.contains("+jarMods")) // DEPRECATED: old style '+jarMods' are only here for backwards compatibility
-	{
-		for (auto libVal : requireArray(root.value("+jarMods")))
-		{
-			QJsonObject libObj = requireObject(libVal);
-			// parse the jarmod
-			auto lib = OneSixVersionFormat::plusJarModFromJson(libObj, filename, out->name);
-			// and add to jar mods
-			out->jarMods.append(lib);
-		}
-	}
-
-	if (root.contains("mods"))
-	{
-		for (auto libVal : requireArray(root.value("mods")))
-		{
-			QJsonObject libObj = requireObject(libVal);
-			// parse the jarmod
-			auto lib = OneSixVersionFormat::modFromJson(libObj, filename);
-			// and add to jar mods
-			out->mods.append(lib);
-		}
-	}
-
-	auto readLibs = [&](const char * which)
-	{
-		for (auto libVal : requireArray(root.value(which)))
-		{
-			QJsonObject libObj = requireObject(libVal);
-			// parse the library
-			auto lib = libraryFromJson(libObj, filename);
-			out->libraries.append(lib);
-		}
-	};
-	bool hasPlusLibs = root.contains("+libraries");
-	bool hasLibs = root.contains("libraries");
-	if (hasPlusLibs && hasLibs)
-	{
-		out->addProblem(ProblemSeverity::Warning,
-						QObject::tr("Version file has both '+libraries' and 'libraries'. This is no longer supported."));
-		readLibs("libraries");
-		readLibs("+libraries");
-	}
-	else if (hasLibs)
-	{
-		readLibs("libraries");
-	}
-	else if(hasPlusLibs)
-	{
-		readLibs("+libraries");
-	}
-
-	// if we have mainJar, just use it
-	if(root.contains("mainJar"))
-	{
-		QJsonObject libObj = requireObject(root, "mainJar");
-		out->mainJar = libraryFromJson(libObj, filename);
-	}
-	// else reconstruct it from downloads and id ... if that's available
-	else if(!out->minecraftVersion.isEmpty())
-	{
-		auto lib = std::make_shared<Library>();
-		lib->setRawName(GradleSpecifier(QString("com.mojang:minecraft:%1:client").arg(out->minecraftVersion)));
-		// we have a reliable client download, use it.
-		if(out->mojangDownloads.contains("client"))
-		{
-			auto LibDLInfo = std::make_shared<MojangLibraryDownloadInfo>();
-			LibDLInfo->artifact = out->mojangDownloads["client"];
-			lib->setMojangDownloadInfo(LibDLInfo);
-		}
-		// we got nothing... guess based on ancient hardcoded Mojang behaviour
-		// FIXME: this will eventually break...
-		else
-		{
-			lib->setAbsoluteUrl(URLConstants::getLegacyJarUrl(out->minecraftVersion));
-		}
-		out->mainJar = lib;
-	}
-
-	/* removed features that shouldn't be used */
-	if (root.contains("tweakers"))
-	{
-		out->addProblem(ProblemSeverity::Error, QObject::tr("Version file contains unsupported element 'tweakers'"));
-	}
-	if (root.contains("-libraries"))
-	{
-		out->addProblem(ProblemSeverity::Error, QObject::tr("Version file contains unsupported element '-libraries'"));
-	}
-	if (root.contains("-tweakers"))
-	{
-		out->addProblem(ProblemSeverity::Error, QObject::tr("Version file contains unsupported element '-tweakers'"));
-	}
-	if (root.contains("-minecraftArguments"))
-	{
-		out->addProblem(ProblemSeverity::Error, QObject::tr("Version file contains unsupported element '-minecraftArguments'"));
-	}
-	if (root.contains("+minecraftArguments"))
-	{
-		out->addProblem(ProblemSeverity::Error, QObject::tr("Version file contains unsupported element '+minecraftArguments'"));
-	}
-	return out;
-}
-
-QJsonDocument OneSixVersionFormat::versionFileToJson(const VersionFilePtr &patch, bool saveOrder)
-{
-	QJsonObject root;
-	if (saveOrder)
-	{
-		root.insert("order", patch->order);
-	}
-	writeString(root, "name", patch->name);
-
-	writeString(root, "uid", patch->uid);
-
-	writeString(root, "version", patch->version);
-	writeString(root, "mcVersion", patch->dependsOnMinecraftVersion);
-
-	MojangVersionFormat::writeVersionProperties(patch.get(), root);
-
-	if(patch->mainJar)
-	{
-		root.insert("mainJar", libraryToJson(patch->mainJar.get()));
-	}
-	writeString(root, "appletClass", patch->appletClass);
-	writeStringList(root, "+tweakers", patch->addTweakers);
-	writeStringList(root, "+traits", patch->traits.toList());
-	if (!patch->libraries.isEmpty())
-	{
-		QJsonArray array;
-		for (auto value: patch->libraries)
-		{
-			array.append(OneSixVersionFormat::libraryToJson(value.get()));
-		}
-		root.insert("libraries", array);
-	}
-	if (!patch->jarMods.isEmpty())
-	{
-		QJsonArray array;
-		for (auto value: patch->jarMods)
-		{
-			array.append(OneSixVersionFormat::jarModtoJson(value.get()));
-		}
-		root.insert("jarMods", array);
-	}
-	if (!patch->mods.isEmpty())
-	{
-		QJsonArray array;
-		for (auto value: patch->jarMods)
-		{
-			array.append(OneSixVersionFormat::modtoJson(value.get()));
-		}
-		root.insert("mods", array);
-	}
-	// write the contents to a json document.
-	{
-		QJsonDocument out;
-		out.setObject(root);
-		return out;
-	}
-}
-
-LibraryPtr OneSixVersionFormat::plusJarModFromJson(const QJsonObject &libObj, const QString &filename, const QString &originalName)
-{
-	LibraryPtr out(new Library());
-	if (!libObj.contains("name"))
-	{
-		throw JSONValidationError(filename +
-								  "contains a jarmod that doesn't have a 'name' field");
-	}
-
-	// just make up something unique on the spot for the library name.
-	auto uuid = QUuid::createUuid();
-	QString id = uuid.toString().remove('{').remove('}');
-	out->setRawName(GradleSpecifier("org.multimc.jarmods:" + id + ":1"));
-
-	// filename override is the old name
-	out->setFilename(libObj.value("name").toString());
-
-	// it needs to be local, it is stored in the instance jarmods folder
-	out->setHint("local");
-
-	// read the original name if present - some versions did not set it
-	// it is the original jar mod filename before it got renamed at the point of addition
-	auto displayName = libObj.value("originalName").toString();
-	if(displayName.isEmpty())
-	{
-		auto fixed = originalName;
-		fixed.remove(" (jar mod)");
-		out->setDisplayName(fixed);
-	}
-	else
-	{
-		out->setDisplayName(displayName);
-	}
-	return out;
-}
-
-LibraryPtr OneSixVersionFormat::jarModFromJson(const QJsonObject& libObj, const QString& filename)
-{
-	return libraryFromJson(libObj, filename);
-}
-
-
-QJsonObject OneSixVersionFormat::jarModtoJson(Library *jarmod)
-{
-	return libraryToJson(jarmod);
-}
-
-LibraryPtr OneSixVersionFormat::modFromJson(const QJsonObject& libObj, const QString& filename)
-{
-	return  libraryFromJson(libObj, filename);
-}
-
-QJsonObject OneSixVersionFormat::modtoJson(Library *jarmod)
-{
-	return libraryToJson(jarmod);
-}
diff --git a/api/logic/minecraft/onesix/OneSixVersionFormat.h b/api/logic/minecraft/onesix/OneSixVersionFormat.h
deleted file mode 100644
index 64f18da8..00000000
--- a/api/logic/minecraft/onesix/OneSixVersionFormat.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <minecraft/VersionFile.h>
-#include <minecraft/MinecraftProfile.h>
-#include <minecraft/Library.h>
-#include <QJsonDocument>
-
-class OneSixVersionFormat
-{
-public:
-	// version files / profile patches
-	static VersionFilePtr versionFileFromJson(const QJsonDocument &doc, const QString &filename, const bool requireOrder);
-	static QJsonDocument versionFileToJson(const VersionFilePtr &patch, bool saveOrder);
-
-	// libraries
-	static LibraryPtr libraryFromJson(const QJsonObject &libObj, const QString &filename);
-	static QJsonObject libraryToJson(Library *library);
-
-	// DEPRECATED: old 'plus' jar mods generated by the application
-	static LibraryPtr plusJarModFromJson(const QJsonObject &libObj, const QString &filename, const QString &originalName);
-
-	// new jar mods derived from libraries
-	static LibraryPtr jarModFromJson(const QJsonObject &libObj, const QString &filename);
-	static QJsonObject jarModtoJson(Library * jarmod);
-
-	// mods, also derived from libraries
-	static LibraryPtr modFromJson(const QJsonObject &libObj, const QString &filename);
-	static QJsonObject modtoJson(Library * jarmod);
-};
diff --git a/api/logic/minecraft/onesix/update/AssetUpdateTask.cpp b/api/logic/minecraft/onesix/update/AssetUpdateTask.cpp
deleted file mode 100644
index 21600ff0..00000000
--- a/api/logic/minecraft/onesix/update/AssetUpdateTask.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-#include "Env.h"
-#include "AssetUpdateTask.h"
-#include "minecraft/onesix/OneSixInstance.h"
-#include "net/ChecksumValidator.h"
-#include "minecraft/AssetsUtils.h"
-
-AssetUpdateTask::AssetUpdateTask(OneSixInstance * inst)
-{
-	m_inst = inst;
-}
-void AssetUpdateTask::executeTask()
-{
-	setStatus(tr("Updating assets index..."));
-	auto profile = m_inst->getMinecraftProfile();
-	auto assets = profile->getMinecraftAssets();
-	QUrl indexUrl = assets->url;
-	QString localPath = assets->id + ".json";
-	auto job = new NetJob(tr("Asset index for %1").arg(m_inst->name()));
-
-	auto metacache = ENV.metacache();
-	auto entry = metacache->resolveEntry("asset_indexes", localPath);
-	entry->setStale(true);
-	auto hexSha1 = assets->sha1.toLatin1();
-	qDebug() << "Asset index SHA1:" << hexSha1;
-	auto dl = Net::Download::makeCached(indexUrl, entry);
-	auto rawSha1 = QByteArray::fromHex(assets->sha1.toLatin1());
-	dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
-	job->addNetAction(dl);
-
-	downloadJob.reset(job);
-
-	connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::assetIndexFinished);
-	connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetIndexFailed);
-	connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
-
-	qDebug() << m_inst->name() << ": Starting asset index download";
-	downloadJob->start();
-}
-
-bool AssetUpdateTask::canAbort() const
-{
-	return true;
-}
-
-void AssetUpdateTask::assetIndexFinished()
-{
-	AssetsIndex index;
-	qDebug() << m_inst->name() << ": Finished asset index download";
-
-	auto profile = m_inst->getMinecraftProfile();
-	auto assets = profile->getMinecraftAssets();
-
-	QString asset_fname = "assets/indexes/" + assets->id + ".json";
-	// FIXME: this looks like a job for a generic validator based on json schema?
-	if (!AssetsUtils::loadAssetsIndexJson(assets->id, asset_fname, &index))
-	{
-		auto metacache = ENV.metacache();
-		auto entry = metacache->resolveEntry("asset_indexes", assets->id + ".json");
-		metacache->evictEntry(entry);
-		emitFailed(tr("Failed to read the assets index!"));
-	}
-
-	auto job = index.getDownloadJob();
-	if(job)
-	{
-		setStatus(tr("Getting the assets files from Mojang..."));
-		downloadJob = job;
-		connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::emitSucceeded);
-		connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetsFailed);
-		connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
-		downloadJob->start();
-		return;
-	}
-	emitSucceeded();
-}
-
-void AssetUpdateTask::assetIndexFailed(QString reason)
-{
-	qDebug() << m_inst->name() << ": Failed asset index download";
-	emitFailed(tr("Failed to download the assets index:\n%1").arg(reason));
-}
-
-void AssetUpdateTask::assetsFailed(QString reason)
-{
-	emitFailed(tr("Failed to download assets:\n%1").arg(reason));
-}
-
-bool AssetUpdateTask::abort()
-{
-	if(downloadJob)
-	{
-		return downloadJob->abort();
-	}
-	else
-	{
-		qWarning() << "Prematurely aborted FMLLibrariesTask";
-	}
-	return true;
-}
diff --git a/api/logic/minecraft/onesix/update/AssetUpdateTask.h b/api/logic/minecraft/onesix/update/AssetUpdateTask.h
deleted file mode 100644
index 3b500189..00000000
--- a/api/logic/minecraft/onesix/update/AssetUpdateTask.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-#include "tasks/Task.h"
-#include "net/NetJob.h"
-class OneSixInstance;
-
-class AssetUpdateTask : public Task
-{
-	Q_OBJECT
-public:
-	AssetUpdateTask(OneSixInstance * inst);
-	void executeTask() override;
-
-	bool canAbort() const override;
-
-private slots:
-	void assetIndexFinished();
-	void assetIndexFailed(QString reason);
-	void assetsFailed(QString reason);
-
-public slots:
-	bool abort() override;
-
-private:
-	OneSixInstance *m_inst;
-	NetJobPtr downloadJob;
-};
diff --git a/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp b/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp
deleted file mode 100644
index 13310e92..00000000
--- a/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-#include "Env.h"
-#include <FileSystem.h>
-#include <minecraft/VersionFilterData.h>
-#include "FMLLibrariesTask.h"
-#include "minecraft/onesix/OneSixInstance.h"
-
-
-FMLLibrariesTask::FMLLibrariesTask(OneSixInstance * inst)
-{
-	m_inst = inst;
-}
-void FMLLibrariesTask::executeTask()
-{
-	// Get the mod list
-	OneSixInstance *inst = (OneSixInstance *)m_inst;
-	std::shared_ptr<MinecraftProfile> profile = inst->getMinecraftProfile();
-	bool forge_present = false;
-
-	if (!profile->hasTrait("legacyFML"))
-	{
-		emitSucceeded();
-		return;
-	}
-
-	QString version = inst->intendedVersionId();
-	auto &fmlLibsMapping = g_VersionFilterData.fmlLibsMapping;
-	if (!fmlLibsMapping.contains(version))
-	{
-		emitSucceeded();
-		return;
-	}
-
-	auto &libList = fmlLibsMapping[version];
-
-	// determine if we need some libs for FML or forge
-	setStatus(tr("Checking for FML libraries..."));
-	forge_present = (profile->versionPatch("net.minecraftforge") != nullptr);
-	// we don't...
-	if (!forge_present)
-	{
-		emitSucceeded();
-		return;
-	}
-
-	// now check the lib folder inside the instance for files.
-	for (auto &lib : libList)
-	{
-		QFileInfo libInfo(FS::PathCombine(inst->FMLlibDir(), lib.filename));
-		if (libInfo.exists())
-			continue;
-		fmlLibsToProcess.append(lib);
-	}
-
-	// if everything is in place, there's nothing to do here...
-	if (fmlLibsToProcess.isEmpty())
-	{
-		emitSucceeded();
-		return;
-	}
-
-	// download missing libs to our place
-	setStatus(tr("Dowloading FML libraries..."));
-	auto dljob = new NetJob("FML libraries");
-	auto metacache = ENV.metacache();
-	for (auto &lib : fmlLibsToProcess)
-	{
-		auto entry = metacache->resolveEntry("fmllibs", lib.filename);
-		QString urlString = lib.ours ? URLConstants::FMLLIBS_OUR_BASE_URL + lib.filename
-									: URLConstants::FMLLIBS_FORGE_BASE_URL + lib.filename;
-		dljob->addNetAction(Net::Download::makeCached(QUrl(urlString), entry));
-	}
-
-	connect(dljob, &NetJob::succeeded, this, &FMLLibrariesTask::fmllibsFinished);
-	connect(dljob, &NetJob::failed, this, &FMLLibrariesTask::fmllibsFailed);
-	connect(dljob, &NetJob::progress, this, &FMLLibrariesTask::progress);
-	downloadJob.reset(dljob);
-	downloadJob->start();
-}
-
-bool FMLLibrariesTask::canAbort() const
-{
-	return true;
-}
-
-void FMLLibrariesTask::fmllibsFinished()
-{
-	downloadJob.reset();
-	if (!fmlLibsToProcess.isEmpty())
-	{
-		setStatus(tr("Copying FML libraries into the instance..."));
-		OneSixInstance *inst = (OneSixInstance *)m_inst;
-		auto metacache = ENV.metacache();
-		int index = 0;
-		for (auto &lib : fmlLibsToProcess)
-		{
-			progress(index, fmlLibsToProcess.size());
-			auto entry = metacache->resolveEntry("fmllibs", lib.filename);
-			auto path = FS::PathCombine(inst->FMLlibDir(), lib.filename);
-			if (!FS::ensureFilePathExists(path))
-			{
-				emitFailed(tr("Failed creating FML library folder inside the instance."));
-				return;
-			}
-			if (!QFile::copy(entry->getFullPath(), FS::PathCombine(inst->FMLlibDir(), lib.filename)))
-			{
-				emitFailed(tr("Failed copying Forge/FML library: %1.").arg(lib.filename));
-				return;
-			}
-			index++;
-		}
-		progress(index, fmlLibsToProcess.size());
-	}
-	emitSucceeded();
-}
-void FMLLibrariesTask::fmllibsFailed(QString reason)
-{
-	QStringList failed = downloadJob->getFailedFiles();
-	QString failed_all = failed.join("\n");
-	emitFailed(tr("Failed to download the following files:\n%1\n\nReason:%2\nPlease try again.").arg(failed_all, reason));
-}
-
-bool FMLLibrariesTask::abort()
-{
-	if(downloadJob)
-	{
-		return downloadJob->abort();
-	}
-	else
-	{
-		qWarning() << "Prematurely aborted FMLLibrariesTask";
-	}
-	return true;
-}
diff --git a/api/logic/minecraft/onesix/update/FMLLibrariesTask.h b/api/logic/minecraft/onesix/update/FMLLibrariesTask.h
deleted file mode 100644
index 616053d7..00000000
--- a/api/logic/minecraft/onesix/update/FMLLibrariesTask.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-#include "tasks/Task.h"
-#include "net/NetJob.h"
-class OneSixInstance;
-
-class FMLLibrariesTask : public Task
-{
-	Q_OBJECT
-public:
-	FMLLibrariesTask(OneSixInstance * inst);
-
-	void executeTask() override;
-
-	bool canAbort() const override;
-
-private slots:
-	void fmllibsFinished();
-	void fmllibsFailed(QString reason);
-
-public slots:
-	bool abort() override;
-
-private:
-	OneSixInstance *m_inst;
-	NetJobPtr downloadJob;
-	QList<FMLlib> fmlLibsToProcess;
-};
-
diff --git a/api/logic/minecraft/onesix/update/FoldersTask.cpp b/api/logic/minecraft/onesix/update/FoldersTask.cpp
deleted file mode 100644
index d478560c..00000000
--- a/api/logic/minecraft/onesix/update/FoldersTask.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "FoldersTask.h"
-#include "minecraft/onesix/OneSixInstance.h"
-#include <QDir>
-
-FoldersTask::FoldersTask(OneSixInstance * inst)
-	:Task()
-{
-	m_inst = inst;
-}
-
-void FoldersTask::executeTask()
-{
-	// Make directories
-	QDir mcDir(m_inst->minecraftRoot());
-	if (!mcDir.exists() && !mcDir.mkpath("."))
-	{
-		emitFailed(tr("Failed to create folder for minecraft binaries."));
-		return;
-	}
-	emitSucceeded();
-}
diff --git a/api/logic/minecraft/onesix/update/FoldersTask.h b/api/logic/minecraft/onesix/update/FoldersTask.h
deleted file mode 100644
index 7cdc5a93..00000000
--- a/api/logic/minecraft/onesix/update/FoldersTask.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "tasks/Task.h"
-
-class OneSixInstance;
-class FoldersTask : public Task
-{
-	Q_OBJECT
-public:
-	FoldersTask(OneSixInstance * inst);
-	void executeTask() override;
-private:
-	OneSixInstance *m_inst;
-};
-
diff --git a/api/logic/minecraft/onesix/update/LibrariesTask.cpp b/api/logic/minecraft/onesix/update/LibrariesTask.cpp
deleted file mode 100644
index 2cd41ded..00000000
--- a/api/logic/minecraft/onesix/update/LibrariesTask.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-#include "Env.h"
-#include "LibrariesTask.h"
-#include "minecraft/onesix/OneSixInstance.h"
-
-LibrariesTask::LibrariesTask(OneSixInstance * inst)
-{
-	m_inst = inst;
-}
-
-void LibrariesTask::executeTask()
-{
-	setStatus(tr("Getting the library files from Mojang..."));
-	qDebug() << m_inst->name() << ": downloading libraries";
-	OneSixInstance *inst = (OneSixInstance *)m_inst;
-	inst->reloadProfile();
-	if(inst->hasVersionBroken())
-	{
-		emitFailed(tr("Failed to load the version description files - check the instance for errors."));
-		return;
-	}
-
-	// Build a list of URLs that will need to be downloaded.
-	std::shared_ptr<MinecraftProfile> profile = inst->getMinecraftProfile();
-
-	auto job = new NetJob(tr("Libraries for instance %1").arg(inst->name()));
-	downloadJob.reset(job);
-
-	auto metacache = ENV.metacache();
-	QList<LibraryPtr> brokenLocalLibs;
-	QStringList failedFiles;
-	auto createJob = [&](const LibraryPtr & lib)
-	{
-		if(!lib)
-		{
-			emitFailed(tr("Null jar is specified in the metadata, aborting."));
-			return;
-		}
-		auto dls = lib->getDownloads(currentSystem, metacache.get(), failedFiles, inst->getLocalLibraryPath());
-		for(auto dl : dls)
-		{
-			downloadJob->addNetAction(dl);
-		}
-	};
-	auto createJobs = [&](const QList<LibraryPtr> & libs)
-	{
-		for (auto lib : libs)
-		{
-			createJob(lib);
-		}
-	};
-	createJobs(profile->getLibraries());
-	createJobs(profile->getNativeLibraries());
-	createJobs(profile->getJarMods());
-	createJob(profile->getMainJar());
-
-	// FIXME: this is never filled!!!!
-	if (!brokenLocalLibs.empty())
-	{
-		downloadJob.reset();
-		QString failed_all = failedFiles.join("\n");
-		emitFailed(tr("Some libraries marked as 'local' are missing their jar "
-					"files:\n%1\n\nYou'll have to correct this problem manually. If this is "
-					"an externally tracked instance, make sure to run it at least once "
-					"outside of MultiMC.").arg(failed_all));
-		return;
-	}
-	connect(downloadJob.get(), &NetJob::succeeded, this, &LibrariesTask::emitSucceeded);
-	connect(downloadJob.get(), &NetJob::failed, this, &LibrariesTask::jarlibFailed);
-	connect(downloadJob.get(), &NetJob::progress, this, &LibrariesTask::progress);
-	downloadJob->start();
-}
-
-bool LibrariesTask::canAbort() const
-{
-	return true;
-}
-
-void LibrariesTask::jarlibFailed(QString reason)
-{
-	emitFailed(tr("Game update failed: it was impossible to fetch the required libraries.\nReason:\n%1").arg(reason));
-}
-
-bool LibrariesTask::abort()
-{
-	if(downloadJob)
-	{
-		return downloadJob->abort();
-	}
-	else
-	{
-		qWarning() << "Prematurely aborted LibrariesTask";
-	}
-	return true;
-}
diff --git a/api/logic/minecraft/onesix/update/LibrariesTask.h b/api/logic/minecraft/onesix/update/LibrariesTask.h
deleted file mode 100644
index a84975e5..00000000
--- a/api/logic/minecraft/onesix/update/LibrariesTask.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-#include "tasks/Task.h"
-#include "net/NetJob.h"
-class OneSixInstance;
-
-class LibrariesTask : public Task
-{
-	Q_OBJECT
-public:
-	LibrariesTask(OneSixInstance * inst);
-
-	void executeTask() override;
-
-	bool canAbort() const override;
-
-private slots:
-	void jarlibFailed(QString reason);
-
-public slots:
-	bool abort() override;
-
-private:
-	OneSixInstance *m_inst;
-	NetJobPtr downloadJob;
-};