Merge pull request #192 from Scrumplex/refactor-remove-legacy-instances

Drop legacy instances

10 files changed, 0 insertions, 1027 deletions

diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 7327f9d5..6db12c42 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -124,18 +124,7 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO
     m_settings->registerSetting("JoinServerOnLaunch", false);
     m_settings->registerSetting("JoinServerOnLaunchAddress", "");
 
-    // DEPRECATED: Read what versions the user configuration thinks should be used
-    m_settings->registerSetting({"IntendedVersion", "MinecraftVersion"}, "");
-    m_settings->registerSetting("LWJGLVersion", "");
-    m_settings->registerSetting("ForgeVersion", "");
-    m_settings->registerSetting("LiteloaderVersion", "");
-
     m_components.reset(new PackProfile(this));
-    m_components->setOldConfigVersion("net.minecraft", m_settings->get("IntendedVersion").toString());
-    auto setting = m_settings->getSetting("LWJGLVersion");
-    m_components->setOldConfigVersion("org.lwjgl", m_settings->get("LWJGLVersion").toString());
-    m_components->setOldConfigVersion("net.minecraftforge", m_settings->get("ForgeVersion").toString());
-    m_components->setOldConfigVersion("com.mumfrey.liteloader", m_settings->get("LiteloaderVersion").toString());
 }
 
 void MinecraftInstance::saveNow()
diff --git a/launcher/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp
index 59a8f133..d516e555 100644
--- a/launcher/minecraft/PackProfile.cpp
+++ b/launcher/minecraft/PackProfile.cpp
@@ -272,18 +272,6 @@ void PackProfile::save_internal()
 bool PackProfile::load()
 {
     auto filename = componentsFilePath();
-    QFile componentsFile(filename);
-
-    // migrate old config to new one, if needed
-    if(!componentsFile.exists())
-    {
-        if(!migratePreComponentConfig())
-        {
-            // FIXME: the user should be notified...
-            qCritical() << "Failed to convert old pre-component config for instance" << d->m_instance->name();
-            return false;
-        }
-    }
 
     // load the new component list and swap it with the current one...
     ComponentContainer newComponents;
@@ -369,239 +357,6 @@ void PackProfile::updateFailed(const QString& error)
     invalidateLaunchProfile();
 }
 
-// NOTE this is really old stuff, and only needs to be used when loading the old hardcoded component-unaware format (loadPreComponentConfig).
-static void upgradeDeprecatedFiles(QString root, QString instanceName)
-{
-    auto versionJsonPath = FS::PathCombine(root, "version.json");
-    auto customJsonPath = FS::PathCombine(root, "custom.json");
-    auto mcJson = FS::PathCombine(root, "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" << instanceName;
-            return;
-        }
-        if(!renameFile.isEmpty() && QFile::exists(renameFile))
-        {
-            if(!QFile::rename(renameFile, renameFile + ".old"))
-            {
-                qWarning() << "Couldn't rename" << renameFile << "to" << renameFile + ".old" << "in" << instanceName;
-                return;
-            }
-        }
-        auto file = ProfileUtils::parseJsonFile(QFileInfo(sourceFile), false);
-        ProfileUtils::removeLwjglFromPatch(file);
-        file->uid = "net.minecraft";
-        file->version = file->minecraftVersion;
-        file->name = "Minecraft";
-
-        Meta::Require needsLwjgl;
-        needsLwjgl.uid = "org.lwjgl";
-        file->requires.insert(needsLwjgl);
-
-        if(!ProfileUtils::saveJsonFile(OneSixVersionFormat::versionFileToJson(file), mcJson))
-        {
-            return;
-        }
-        if(!QFile::rename(sourceFile, sourceFile + ".old"))
-        {
-            qWarning() << "Couldn't rename" << sourceFile << "to" << sourceFile + ".old" << "in" << instanceName;
-            return;
-        }
-    }
-}
-
-/*
- * Migrate old layout to the component based one...
- * - Part of the version information is taken from `instance.cfg` (fed to this class from outside).
- * - Part is taken from the old order.json file.
- * - Part is loaded from loose json files in the instance's `patches` directory.
- */
-bool PackProfile::migratePreComponentConfig()
-{
-    // upgrade the very old files from the beginnings of MultiMC 5
-    upgradeDeprecatedFiles(d->m_instance->instanceRoot(), d->m_instance->name());
-
-    QList<ComponentPtr> components;
-    QSet<QString> loaded;
-
-    auto addBuiltinPatch = [&](const QString &uid, bool asDependency, const QString & emptyVersion, const Meta::Require & req, const Meta::Require & conflict)
-    {
-        auto jsonFilePath = FS::PathCombine(d->m_instance->instanceRoot(), "patches" , uid + ".json");
-        auto intendedVersion = d->getOldConfigVersion(uid);
-        // load up the base minecraft patch
-        ComponentPtr component;
-        if(QFile::exists(jsonFilePath))
-        {
-            if(intendedVersion.isEmpty())
-            {
-                intendedVersion = emptyVersion;
-            }
-            auto file = ProfileUtils::parseJsonFile(QFileInfo(jsonFilePath), false);
-            // fix uid
-            file->uid = uid;
-            // if version is missing, add it from the outside.
-            if(file->version.isEmpty())
-            {
-                file->version = intendedVersion;
-            }
-            // if this is a dependency (LWJGL), mark it also as volatile
-            if(asDependency)
-            {
-                file->m_volatile = true;
-            }
-            // insert requirements if needed
-            if(!req.uid.isEmpty())
-            {
-                file->requires.insert(req);
-            }
-            // insert conflicts if needed
-            if(!conflict.uid.isEmpty())
-            {
-                file->conflicts.insert(conflict);
-            }
-            // FIXME: @QUALITY do not ignore return value
-            ProfileUtils::saveJsonFile(OneSixVersionFormat::versionFileToJson(file), jsonFilePath);
-            component = new Component(this, uid, file);
-            component->m_version = intendedVersion;
-        }
-        else if(!intendedVersion.isEmpty())
-        {
-            auto metaVersion = APPLICATION->metadataIndex()->get(uid, intendedVersion);
-            component = new Component(this, metaVersion);
-        }
-        else
-        {
-            return;
-        }
-        component->m_dependencyOnly = asDependency;
-        component->m_important = !asDependency;
-        components.append(component);
-    };
-    // TODO: insert depends and conflicts here if these are customized files...
-    Meta::Require reqLwjgl;
-    reqLwjgl.uid = "org.lwjgl";
-    reqLwjgl.suggests = "2.9.1";
-    Meta::Require conflictLwjgl3;
-    conflictLwjgl3.uid = "org.lwjgl3";
-    Meta::Require nullReq;
-    addBuiltinPatch("org.lwjgl", true, "2.9.1", nullReq, conflictLwjgl3);
-    addBuiltinPatch("net.minecraft", false, QString(), reqLwjgl, nullReq);
-
-    // first, collect all other file-based patches and load them
-    QMap<QString, ComponentPtr> loadedComponents;
-    QDir patchesDir(FS::PathCombine(d->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);
-
-        // correct missing or wrong uid based on the file name
-        QString uid = info.completeBaseName();
-
-        // ignore builtins, they've been handled already
-        if (uid == "net.minecraft")
-            continue;
-        if (uid == "org.lwjgl")
-            continue;
-
-        // handle horrible corner cases
-        if(uid.isEmpty())
-        {
-            // if you have a file named '.json', make it just go away.
-            // FIXME: @QUALITY do not ignore return value
-            QFile::remove(info.absoluteFilePath());
-            continue;
-        }
-        file->uid = uid;
-        // FIXME: @QUALITY do not ignore return value
-        ProfileUtils::saveJsonFile(OneSixVersionFormat::versionFileToJson(file), info.absoluteFilePath());
-
-        auto component = new Component(this, file->uid, file);
-        auto version = d->getOldConfigVersion(file->uid);
-        if(!version.isEmpty())
-        {
-            component->m_version = version;
-        }
-        loadedComponents[file->uid] = component;
-    }
-    // try to load the other 'hardcoded' patches (forge, liteloader), if they weren't loaded from files
-    auto loadSpecial = [&](const QString & uid, int order)
-    {
-        auto patchVersion = d->getOldConfigVersion(uid);
-        if(!patchVersion.isEmpty() && !loadedComponents.contains(uid))
-        {
-            auto patch = new Component(this, APPLICATION->metadataIndex()->get(uid, patchVersion));
-            patch->setOrder(order);
-            loadedComponents[uid] = patch;
-        }
-    };
-    loadSpecial("net.minecraftforge", 5);
-    loadSpecial("com.mumfrey.liteloader", 10);
-
-    // load the old order.json file, if present
-    ProfileUtils::PatchOrder userOrder;
-    ProfileUtils::readOverrideOrders(FS::PathCombine(d->m_instance->instanceRoot(), "order.json"), userOrder);
-
-    // now add all the patches by user sort order
-    for (auto uid : userOrder)
-    {
-        // ignore builtins
-        if (uid == "net.minecraft")
-            continue;
-        if (uid == "org.lwjgl")
-            continue;
-        // ordering has a patch that is gone?
-        if(!loadedComponents.contains(uid))
-        {
-            continue;
-        }
-        components.append(loadedComponents.take(uid));
-    }
-
-    // is there anything left to sort? - this is used when there are leftover components that aren't part of the order.json
-    if(!loadedComponents.isEmpty())
-    {
-        // inserting into multimap by order number as key sorts the patches and detects duplicates
-        QMultiMap<int, ComponentPtr> files;
-        auto iter = loadedComponents.begin();
-        while(iter != loadedComponents.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
-                components.append(value);
-            }
-        }
-    }
-    // new we have a complete list of components...
-    return savePackProfile(componentsFilePath(), components);
-}
-
 // END: save/load
 
 void PackProfile::appendComponent(ComponentPtr component)
@@ -1169,15 +924,6 @@ std::shared_ptr<LaunchProfile> PackProfile::getProfile() const
     return d->m_profile;
 }
 
-void PackProfile::setOldConfigVersion(const QString& uid, const QString& version)
-{
-    if(version.isEmpty())
-    {
-        return;
-    }
-    d->m_oldConfigVersions[uid] = version;
-}
-
 bool PackProfile::setComponentVersion(const QString& uid, const QString& version, bool important)
 {
     auto iter = d->componentIndex.find(uid);
diff --git a/launcher/minecraft/PackProfile.h b/launcher/minecraft/PackProfile.h
index f30deb5a..989d1c6a 100644
--- a/launcher/minecraft/PackProfile.h
+++ b/launcher/minecraft/PackProfile.h
@@ -143,8 +143,6 @@ private:
     bool installCustomJar_internal(QString filepath);
     bool removeComponent_internal(ComponentPtr patch);
 
-    bool migratePreComponentConfig();
-
 private: /* data */
 
     std::unique_ptr<PackProfileData> d;
diff --git a/launcher/minecraft/PackProfile_p.h b/launcher/minecraft/PackProfile_p.h
index fce921bb..715e0460 100644
--- a/launcher/minecraft/PackProfile_p.h
+++ b/launcher/minecraft/PackProfile_p.h
@@ -18,18 +18,6 @@ struct PackProfileData
     // the launch profile (volatile, temporary thing created on demand)
     std::shared_ptr<LaunchProfile> m_profile;
 
-    // version information migrated from instance.cfg file. Single use on migration!
-    std::map<QString, QString> m_oldConfigVersions;
-    QString getOldConfigVersion(const QString& uid) const
-    {
-        const auto iter = m_oldConfigVersions.find(uid);
-        if(iter != m_oldConfigVersions.cend())
-        {
-            return (*iter).second;
-        }
-        return QString();
-    }
-
     // persistent list of components and related machinery
     ComponentContainer components;
     ComponentIndex componentIndex;
diff --git a/launcher/minecraft/legacy/LegacyInstance.cpp b/launcher/minecraft/legacy/LegacyInstance.cpp
deleted file mode 100644
index f467ec06..00000000
--- a/launcher/minecraft/legacy/LegacyInstance.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-/* Copyright 2013-2021 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 <QFileInfo>
-#include <minecraft/launch/LauncherPartLaunch.h>
-#include <QDir>
-#include <settings/Setting.h>
-
-#include "LegacyInstance.h"
-
-#include "minecraft/legacy/LegacyModList.h"
-#include "minecraft/WorldList.h"
-#include <MMCZip.h>
-#include <FileSystem.h>
-
-LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &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", "");
-}
-
-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();
-}
-
-
-QString LegacyInstance::baseJar() const
-{
-    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;
-}
-
-bool LegacyInstance::shouldUseCustomBaseJar() const
-{
-    return m_settings->get("UseCustomBaseJar").toBool();
-}
-
-
-Task::Ptr LegacyInstance::createUpdateTask(Net::Mode)
-{
-    return nullptr;
-}
-
-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;
-}
-
-QString LegacyInstance::gameRoot() const
-{
-    QFileInfo mcDir(FS::PathCombine(instanceRoot(), "minecraft"));
-    QFileInfo dotMCDir(FS::PathCombine(instanceRoot(), ".minecraft"));
-
-    if (mcDir.exists() && !dotMCDir.exists())
-        return mcDir.filePath();
-    else
-        return dotMCDir.filePath();
-}
-
-QString LegacyInstance::binRoot() const
-{
-    return FS::PathCombine(gameRoot(), "bin");
-}
-
-QString LegacyInstance::modsRoot() const {
-    return FS::PathCombine(gameRoot(), "mods");
-}
-
-
-QString LegacyInstance::jarModsDir() const
-{
-    return FS::PathCombine(instanceRoot(), "instMods");
-}
-
-QString LegacyInstance::libDir() const
-{
-    return FS::PathCombine(gameRoot(), "lib");
-}
-
-QString LegacyInstance::savesDir() const
-{
-    return FS::PathCombine(gameRoot(), "saves");
-}
-
-QString LegacyInstance::coreModsDir() const
-{
-    return FS::PathCombine(gameRoot(), "coremods");
-}
-
-QString LegacyInstance::resourceDir() const
-{
-    return FS::PathCombine(gameRoot(), "resources");
-}
-QString LegacyInstance::texturePacksDir() const
-{
-    return FS::PathCombine(gameRoot(), "texturepacks");
-}
-
-QString LegacyInstance::runnableJar() const
-{
-    return FS::PathCombine(binRoot(), "minecraft.jar");
-}
-
-QString LegacyInstance::modListFile() const
-{
-    return FS::PathCombine(instanceRoot(), "modlist");
-}
-
-QString LegacyInstance::instanceConfigFolder() const
-{
-    return FS::PathCombine(gameRoot(), "config");
-}
-
-bool LegacyInstance::shouldRebuild() const
-{
-    return m_settings->get("NeedsRebuild").toBool();
-}
-
-QString LegacyInstance::currentVersionId() const
-{
-    return m_settings->get("JarVersion").toString();
-}
-
-QString LegacyInstance::intendedVersionId() const
-{
-    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;
-}
-
-QString LegacyInstance::defaultBaseJar() const
-{
-    return "versions/" + intendedVersionId() + "/" + intendedVersionId() + ".jar";
-}
-
-QString LegacyInstance::defaultCustomBaseJar() const
-{
-    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;
-}
-
-QString LegacyInstance::typeName() const
-{
-    return tr("Legacy");
-}
-
-QString LegacyInstance::getStatusbarDescription()
-{
-    return tr("Instance from previous versions.");
-}
-
-QStringList LegacyInstance::verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin)
-{
-    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;
-}
diff --git a/launcher/minecraft/legacy/LegacyInstance.h b/launcher/minecraft/legacy/LegacyInstance.h
deleted file mode 100644
index 298543f7..00000000
--- a/launcher/minecraft/legacy/LegacyInstance.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright 2013-2021 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 "BaseInstance.h"
-#include "launch/LaunchTask.h"
-
-class ModFolderModel;
-class LegacyModList;
-class WorldList;
-class Task;
-/*
- * WHY: Legacy instances - from MultiMC 3 and 4 - are here only to provide a way to upgrade them to the current format.
- */
-class LegacyInstance : public BaseInstance
-{
-    Q_OBJECT
-public:
-
-    explicit LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
-
-    virtual void saveNow() override {}
-
-    /// Path to the instance's minecraft.jar
-    QString runnableJar() const;
-
-    //! Path to the instance's modlist file.
-    QString modListFile() const;
-
-    ////// Directories //////
-    QString libDir() const;
-    QString savesDir() const;
-    QString texturePacksDir() const;
-    QString jarModsDir() const;
-    QString coreModsDir() const;
-    QString resourceDir() const;
-
-    QString instanceConfigFolder() const override;
-
-    QString gameRoot() const override; // Path to the instance's minecraft directory.
-    QString modsRoot() const override; // Path to the instance's minecraft directory.
-    QString binRoot() const; // Path to the instance's minecraft bin directory.
-
-    /// Get the curent base jar of this instance. By default, it's the
-    /// versions/$version/$version.jar
-    QString baseJar() const;
-
-    /// the default base jar of this instance
-    QString defaultBaseJar() const;
-    /// the default custom base jar of this instance
-    QString defaultCustomBaseJar() const;
-
-    // the main jar that we actually want to keep when migrating the instance
-    QString mainJarToPreserve() const;
-
-    /*!
-     * Whether or not custom base jar is used
-     */
-    bool shouldUseCustomBaseJar() const;
-
-    /*!
-     * The value of the custom base jar
-     */
-    QString customBaseJar() const;
-
-    std::shared_ptr<LegacyModList> jarModList() const;
-    std::shared_ptr<WorldList> worldList() const;
-
-    /*!
-     * Whether or not the instance's minecraft.jar needs to be rebuilt.
-     * If this is true, when the instance launches, its jar mods will be
-     * re-added to a fresh minecraft.jar file.
-     */
-    bool shouldRebuild() const;
-
-    QString currentVersionId() const;
-    QString intendedVersionId() const;
-
-    QSet<QString> traits() const override
-    {
-        return {"legacy-instance", "texturepacks"};
-    };
-
-    virtual bool shouldUpdate() const;
-    virtual Task::Ptr createUpdateTask(Net::Mode mode) override;
-
-    virtual QString typeName() const override;
-
-    bool canLaunch() const override
-    {
-        return false;
-    }
-    bool canEdit() const override
-    {
-        return true;
-    }
-    bool canExport() const override
-    {
-        return false;
-    }
-    shared_qobject_ptr<LaunchTask> createLaunchTask(
-            AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) override
-    {
-        return nullptr;
-    }
-    IPathMatcher::Ptr getLogFileMatcher() override
-    {
-        return nullptr;
-    }
-    QString getLogFileRoot() override
-    {
-        return gameRoot();
-    }
-
-    QString getStatusbarDescription() override;
-    QStringList verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) override;
-
-    QProcessEnvironment createEnvironment() override
-    {
-        return QProcessEnvironment();
-    }
-    QMap<QString, QString> getVariables() const override
-    {
-        return {};
-    }
-protected:
-    mutable std::shared_ptr<LegacyModList> jar_mod_list;
-    mutable std::shared_ptr<WorldList> m_world_list;
-};
diff --git a/launcher/minecraft/legacy/LegacyModList.cpp b/launcher/minecraft/legacy/LegacyModList.cpp
deleted file mode 100644
index e9948ab1..00000000
--- a/launcher/minecraft/legacy/LegacyModList.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Copyright 2013-2021 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 "LegacyModList.h"
-#include <FileSystem.h>
-#include <QString>
-#include <QDebug>
-
-LegacyModList::LegacyModList(const QString &dir, const QString &list_file)
-    : m_dir(dir), m_list_file(list_file)
-{
-    FS::ensureFolderPathExists(m_dir.absolutePath());
-    m_dir.setFilter(QDir::Readable | QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs);
-    m_dir.setSorting(QDir::Name | QDir::IgnoreCase | QDir::LocaleAware);
-}
-
-    struct OrderItem
-    {
-        QString id;
-        bool enabled = false;
-    };
-    typedef QList<OrderItem> OrderList;
-
-static void internalSort(QList<LegacyModList::Mod> &what)
-{
-    auto predicate = [](const LegacyModList::Mod &left, const LegacyModList::Mod &right)
-    {
-        return left.fileName().localeAwareCompare(right.fileName()) < 0;
-    };
-    std::sort(what.begin(), what.end(), predicate);
-}
-
-static OrderList readListFile(const QString &m_list_file)
-{
-    OrderList itemList;
-    if (m_list_file.isNull() || m_list_file.isEmpty())
-        return itemList;
-
-    QFile textFile(m_list_file);
-    if (!textFile.open(QIODevice::ReadOnly | QIODevice::Text))
-        return OrderList();
-
-    QTextStream textStream;
-    textStream.setAutoDetectUnicode(true);
-    textStream.setDevice(&textFile);
-    while (true)
-    {
-        QString line = textStream.readLine();
-        if (line.isNull() || line.isEmpty())
-            break;
-        else
-        {
-            OrderItem it;
-            it.enabled = !line.endsWith(".disabled");
-            if (!it.enabled)
-            {
-                line.chop(9);
-            }
-            it.id = line;
-            itemList.append(it);
-        }
-    }
-    textFile.close();
-    return itemList;
-}
-
-bool LegacyModList::update()
-{
-    if (!m_dir.exists() || !m_dir.isReadable())
-        return false;
-
-    QList<Mod> orderedMods;
-    QList<Mod> newMods;
-    m_dir.refresh();
-    auto folderContents = m_dir.entryInfoList();
-
-    // first, process the ordered items (if any)
-    OrderList listOrder = readListFile(m_list_file);
-    for (auto item : listOrder)
-    {
-        QFileInfo infoEnabled(m_dir.filePath(item.id));
-        QFileInfo infoDisabled(m_dir.filePath(item.id + ".disabled"));
-        int idxEnabled = folderContents.indexOf(infoEnabled);
-        int idxDisabled = folderContents.indexOf(infoDisabled);
-        bool isEnabled;
-        // if both enabled and disabled versions are present, it's a special case...
-        if (idxEnabled >= 0 && idxDisabled >= 0)
-        {
-            // we only process the one we actually have in the order file.
-            // and exactly as we have it.
-            // THIS IS A CORNER CASE
-            isEnabled = item.enabled;
-        }
-        else
-        {
-            // only one is present.
-            // we pick the one that we found.
-            // we assume the mod was enabled/disabled by external means
-            isEnabled = idxEnabled >= 0;
-        }
-        int idx = isEnabled ? idxEnabled : idxDisabled;
-        QFileInfo &info = isEnabled ? infoEnabled : infoDisabled;
-        // if the file from the index file exists
-        if (idx != -1)
-        {
-            // remove from the actual folder contents list
-            folderContents.takeAt(idx);
-            // append the new mod
-            orderedMods.append(info);
-        }
-    }
-    // if there are any untracked files... append them sorted at the end
-    if (folderContents.size())
-    {
-        for (auto entry : folderContents)
-        {
-            newMods.append(entry);
-        }
-        internalSort(newMods);
-        orderedMods.append(newMods);
-    }
-    mods.swap(orderedMods);
-    return true;
-}
diff --git a/launcher/minecraft/legacy/LegacyModList.h b/launcher/minecraft/legacy/LegacyModList.h
deleted file mode 100644
index fade736e..00000000
--- a/launcher/minecraft/legacy/LegacyModList.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2013-2021 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 <QList>
-#include <QString>
-#include <QDir>
-
-class LegacyModList
-{
-public:
-
-    using Mod = QFileInfo;
-
-    LegacyModList(const QString &dir, const QString &list_file = QString());
-
-    /// Reloads the mod list and returns true if the list changed.
-    bool update();
-
-    QDir dir()
-    {
-        return m_dir;
-    }
-
-    const QList<Mod> & allMods()
-    {
-        return mods;
-    }
-
-protected:
-    QDir m_dir;
-    QString m_list_file;
-    QList<Mod> mods;
-};
diff --git a/launcher/minecraft/legacy/LegacyUpgradeTask.cpp b/launcher/minecraft/legacy/LegacyUpgradeTask.cpp
deleted file mode 100644
index a4ea60cd..00000000
--- a/launcher/minecraft/legacy/LegacyUpgradeTask.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#include "LegacyUpgradeTask.h"
-#include "settings/INISettingsObject.h"
-#include "FileSystem.h"
-#include "NullInstance.h"
-#include "pathmatcher/RegexpMatcher.h"
-#include <QtConcurrentRun>
-#include "LegacyInstance.h"
-#include "minecraft/MinecraftInstance.h"
-#include "minecraft