1 files changed, 114 insertions, 200 deletions

diff --git a/api/logic/minecraft/legacy/LegacyInstance.cpp b/api/logic/minecraft/legacy/LegacyInstance.cpp
index 5338763c..b9d68a9c 100644
--- a/api/logic/minecraft/legacy/LegacyInstance.cpp
+++ b/api/logic/minecraft/legacy/LegacyInstance.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,322 +21,236 @@
 #include "LegacyInstance.h"
 
 #include "minecraft/legacy/LegacyModList.h"
-#include "minecraft/ModList.h"
 #include "minecraft/WorldList.h"
 #include <MMCZip.h>
 #include <FileSystem.h>
 
 LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
-	: BaseInstance(globalSettings, settings, rootDir)
+    : BaseInstance(globalSettings, settings, rootDir)
 {
-	settings->registerSetting("NeedsRebuild", true);
-	settings->registerSetting("ShouldUpdate", false);
-	settings->registerSetting("JarVersion", QString());
-	settings->registerSetting("IntendedJarVersion", QString());
-	/*
-	 * custom base jar has no default. it is determined in code... see the accessor methods for
-	 *it
-	 *
-	 * for instances that DO NOT have the CustomBaseJar setting (legacy instances),
-	 * [.]minecraft/bin/mcbackup.jar is the default base jar
-	 */
-	settings->registerSetting("UseCustomBaseJar", true);
-	settings->registerSetting("CustomBaseJar", "");
+    settings->registerSetting("NeedsRebuild", true);
+    settings->registerSetting("ShouldUpdate", false);
+    settings->registerSetting("JarVersion", QString());
+    settings->registerSetting("IntendedJarVersion", QString());
+    /*
+     * custom base jar has no default. it is determined in code... see the accessor methods for
+     *it
+     *
+     * for instances that DO NOT have the CustomBaseJar setting (legacy instances),
+     * [.]minecraft/bin/mcbackup.jar is the default base jar
+     */
+    settings->registerSetting("UseCustomBaseJar", true);
+    settings->registerSetting("CustomBaseJar", "");
 }
 
 QString LegacyInstance::mainJarToPreserve() const
 {
-	bool customJar = m_settings->get("UseCustomBaseJar").toBool();
-	if(customJar)
-	{
-		auto base = baseJar();
-		if(QFile::exists(base))
-		{
-			return base;
-		}
-	}
-	auto runnable = runnableJar();
-	if(QFile::exists(runnable))
-	{
-		return runnable;
-	}
-	return QString();
+    bool customJar = m_settings->get("UseCustomBaseJar").toBool();
+    if(customJar)
+    {
+        auto base = baseJar();
+        if(QFile::exists(base))
+        {
+            return base;
+        }
+    }
+    auto runnable = runnableJar();
+    if(QFile::exists(runnable))
+    {
+        return runnable;
+    }
+    return QString();
 }
 
 
 QString LegacyInstance::baseJar() const
 {
-	bool customJar = m_settings->get("UseCustomBaseJar").toBool();
-	if (customJar)
-	{
-		return customBaseJar();
-	}
-	else
-		return defaultBaseJar();
+    bool customJar = m_settings->get("UseCustomBaseJar").toBool();
+    if (customJar)
+    {
+        return customBaseJar();
+    }
+    else
+        return defaultBaseJar();
 }
 
 QString LegacyInstance::customBaseJar() const
 {
-	QString value = m_settings->get("CustomBaseJar").toString();
-	if (value.isNull() || value.isEmpty())
-	{
-		return defaultCustomBaseJar();
-	}
-	return value;
+    QString value = m_settings->get("CustomBaseJar").toString();
+    if (value.isNull() || value.isEmpty())
+    {
+        return defaultCustomBaseJar();
+    }
+    return value;
 }
 
 bool LegacyInstance::shouldUseCustomBaseJar() const
 {
-	return m_settings->get("UseCustomBaseJar").toBool();
+    return m_settings->get("UseCustomBaseJar").toBool();
 }
 
 
 shared_qobject_ptr<Task> LegacyInstance::createUpdateTask(Net::Mode)
 {
-	return nullptr;
+    return nullptr;
 }
 
-/*
-class LegacyJarModTask : public Task
-{
-	//Q_OBJECT
-public:
-	explicit LegacyJarModTask(std::shared_ptr<LegacyInstance> inst) : Task(nullptr), m_inst(inst)
-	{
-	}
-	virtual void executeTask()
-	{
-		if (!m_inst->shouldRebuild())
-		{
-			emitSucceeded();
-			return;
-		}
-
-		// Get the mod list
-		auto modList = m_inst->getJarMods();
-
-		QFileInfo runnableJar(m_inst->runnableJar());
-		QFileInfo baseJar(m_inst->baseJar());
-		bool base_is_custom = m_inst->shouldUseCustomBaseJar();
-
-		// Nothing to do if there are no jar mods to install, no backup and just the mc jar
-		if (base_is_custom)
-		{
-			// yes, this can happen if the instance only has the runnable jar and not the base jar
-			// it *could* be assumed that such an instance is vanilla, but that wouldn't be safe
-			// because that's not something mmc4 guarantees
-			if (runnableJar.isFile() && !baseJar.exists() && modList.empty())
-			{
-				m_inst->setShouldRebuild(false);
-				emitSucceeded();
-				return;
-			}
-
-			setStatus(tr("Installing mods: Backing up minecraft.jar ..."));
-			if (!baseJar.exists() && !QFile::copy(runnableJar.filePath(), baseJar.filePath()))
-			{
-				emitFailed("It seems both the active and base jar are gone. A fresh base jar will "
-						"be used on next run.");
-				m_inst->setShouldRebuild(true);
-				m_inst->setShouldUpdate(true);
-				m_inst->setShouldUseCustomBaseJar(false);
-				return;
-			}
-		}
-
-		if (!baseJar.exists())
-		{
-			emitFailed("The base jar " + baseJar.filePath() + " does not exist");
-			return;
-		}
-
-		if (runnableJar.exists() && !QFile::remove(runnableJar.filePath()))
-		{
-			emitFailed("Failed to delete old minecraft.jar");
-			return;
-		}
-
-		setStatus(tr("Installing mods: Opening minecraft.jar ..."));
-
-		QString outputJarPath = runnableJar.filePath();
-		QString inputJarPath = baseJar.filePath();
-
-		if(!MMCZip::createModdedJar(inputJarPath, outputJarPath, modList))
-		{
-			emitFailed(tr("Failed to create the custom Minecraft jar file."));
-			return;
-		}
-		m_inst->setShouldRebuild(false);
-		// inst->UpdateVersion(true);
-		emitSucceeded();
-		return;
-
-	}
-	std::shared_ptr<LegacyInstance> m_inst;
-};
-*/
-
 std::shared_ptr<LegacyModList> LegacyInstance::jarModList() const
 {
-	if (!jar_mod_list)
-	{
-		auto list = new LegacyModList(jarModsDir(), modListFile());
-		jar_mod_list.reset(list);
-	}
-	jar_mod_list->update();
-	return jar_mod_list;
-}
-
-QList<Mod> LegacyInstance::getJarMods() const
-{
-	return jarModList()->allMods();
+    if (!jar_mod_list)
+    {
+        auto list = new LegacyModList(jarModsDir(), modListFile());
+        jar_mod_list.reset(list);
+    }
+    jar_mod_list->update();
+    return jar_mod_list;
 }
 
-QString LegacyInstance::minecraftRoot() const
+QString LegacyInstance::gameRoot() const
 {
-	QFileInfo mcDir(FS::PathCombine(instanceRoot(), "minecraft"));
-	QFileInfo dotMCDir(FS::PathCombine(instanceRoot(), ".minecraft"));
+    QFileInfo mcDir(FS::PathCombine(instanceRoot(), "minecraft"));
+    QFileInfo dotMCDir(FS::PathCombine(instanceRoot(), ".minecraft"));
 
-	if (mcDir.exists() && !dotMCDir.exists())
-		return mcDir.filePath();
-	else
-		return dotMCDir.filePath();
+    if (mcDir.exists() && !dotMCDir.exists())
+        return mcDir.filePath();
+    else
+        return dotMCDir.filePath();
 }
 
 QString LegacyInstance::binRoot() const
 {
-	return FS::PathCombine(minecraftRoot(), "bin");
+    return FS::PathCombine(gameRoot(), "bin");
 }
 
 QString LegacyInstance::jarModsDir() const
 {
-	return FS::PathCombine(instanceRoot(), "instMods");
+    return FS::PathCombine(instanceRoot(), "instMods");
 }
 
 QString LegacyInstance::libDir() const
 {
-	return FS::PathCombine(minecraftRoot(), "lib");
+    return FS::PathCombine(gameRoot(), "lib");
 }
 
 QString LegacyInstance::savesDir() const
 {
-	return FS::PathCombine(minecraftRoot(), "saves");
+    return FS::PathCombine(gameRoot(), "saves");
 }
 
 QString LegacyInstance::loaderModsDir() const
 {
-	return FS::PathCombine(minecraftRoot(), "mods");
+    return FS::PathCombine(gameRoot(), "mods");
 }
 
 QString LegacyInstance::coreModsDir() const
 {
-	return FS::PathCombine(minecraftRoot(), "coremods");
+    return FS::PathCombine(gameRoot(), "coremods");
 }
 
 QString LegacyInstance::resourceDir() const
 {
-	return FS::PathCombine(minecraftRoot(), "resources");
+    return FS::PathCombine(gameRoot(), "resources");
 }
 QString LegacyInstance::texturePacksDir() const
 {
-	return FS::PathCombine(minecraftRoot(), "texturepacks");
+    return FS::PathCombine(gameRoot(), "texturepacks");
 }
 
 QString LegacyInstance::runnableJar() const
 {
-	return FS::PathCombine(binRoot(), "minecraft.jar");
+    return FS::PathCombine(binRoot(), "minecraft.jar");
 }
 
 QString LegacyInstance::modListFile() const
 {
-	return FS::PathCombine(instanceRoot(), "modlist");
+    return FS::PathCombine(instanceRoot(), "modlist");
 }
 
 QString LegacyInstance::instanceConfigFolder() const
 {
-	return FS::PathCombine(minecraftRoot(), "config");
+    return FS::PathCombine(gameRoot(), "config");
 }
 
 bool LegacyInstance::shouldRebuild() const
 {
-	return m_settings->get("NeedsRebuild").toBool();
+    return m_settings->get("NeedsRebuild").toBool();
 }
 
 QString LegacyInstance::currentVersionId() const
 {
-	return m_settings->get("JarVersion").toString();
+    return m_settings->get("JarVersion").toString();
 }
 
 QString LegacyInstance::intendedVersionId() const
 {
-	return m_settings->get("IntendedJarVersion").toString();
+    return m_settings->get("IntendedJarVersion").toString();
 }
 
 bool LegacyInstance::shouldUpdate() const
 {
-	QVariant var = settings()->get("ShouldUpdate");
-	if (!var.isValid() || var.toBool() == false)
-	{
-		return intendedVersionId() != currentVersionId();
-	}
-	return true;
+    QVariant var = settings()->get("ShouldUpdate");
+    if (!var.isValid() || var.toBool() == false)
+    {
+        return intendedVersionId() != currentVersionId();
+    }
+    return true;
 }
 
 QString LegacyInstance::defaultBaseJar() const
 {
-	return "versions/" + intendedVersionId() + "/" + intendedVersionId() + ".jar";
+    return "versions/" + intendedVersionId() + "/" + intendedVersionId() + ".jar";
 }
 
 QString LegacyInstance::defaultCustomBaseJar() const
 {
-	return FS::PathCombine(binRoot(), "mcbackup.jar");
+    return FS::PathCombine(binRoot(), "mcbackup.jar");
 }
 
 std::shared_ptr<WorldList> LegacyInstance::worldList() const
 {
-	if (!m_world_list)
-	{
-		m_world_list.reset(new WorldList(savesDir()));
-	}
-	return m_world_list;
+    if (!m_world_list)
+    {
+        m_world_list.reset(new WorldList(savesDir()));
+    }
+    return m_world_list;
 }
 
 QString LegacyInstance::typeName() const
 {
-	return tr("Legacy");
+    return tr("Legacy");
 }
 
 QString LegacyInstance::getStatusbarDescription()
 {
-	return tr("Instance from previous versions.");
+    return tr("Instance from previous versions.");
 }
 
 QStringList LegacyInstance::verboseDescription(AuthSessionPtr session)
 {
-	QStringList out;
-
-	auto alltraits = traits();
-	if(alltraits.size())
-	{
-		out << "Traits:";
-		for (auto trait : alltraits)
-		{
-			out << "  " + trait;
-		}
-		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;
+    QStringList out;
+
+    auto alltraits = traits();
+    if(alltraits.size())
+    {
+        out << "Traits:";
+        for (auto trait : alltraits)
+        {
+            out << "  " + trait;
+        }
+        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;
 }