From 843c2d67eb04ecd215c9bc3de6f458c8d293b54f Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 13 Jul 2023 18:41:29 +0300
Subject: Added FTBAPP Import

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/import_ftb/PackHelpers.cpp    |  87 ++++++++++++++++++
 launcher/modplatform/import_ftb/PackHelpers.h      |  55 +++++++++++
 .../modplatform/import_ftb/PackInstallTask.cpp     | 102 +++++++++++++++++++++
 launcher/modplatform/import_ftb/PackInstallTask.h  |  49 ++++++++++
 4 files changed, 293 insertions(+)
 create mode 100644 launcher/modplatform/import_ftb/PackHelpers.cpp
 create mode 100644 launcher/modplatform/import_ftb/PackHelpers.h
 create mode 100644 launcher/modplatform/import_ftb/PackInstallTask.cpp
 create mode 100644 launcher/modplatform/import_ftb/PackInstallTask.h

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/import_ftb/PackHelpers.cpp b/launcher/modplatform/import_ftb/PackHelpers.cpp
new file mode 100644
index 00000000..26b6eafe
--- /dev/null
+++ b/launcher/modplatform/import_ftb/PackHelpers.cpp
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "modplatform/import_ftb/PackHelpers.h"
+
+#include <QIcon>
+#include <QString>
+#include <QVariant>
+
+#include "FileSystem.h"
+#include "Json.h"
+
+namespace FTBImportAPP {
+
+Modpack parseDirectory(QString path)
+{
+    Modpack modpack{ path };
+    auto instanceFile = QFileInfo(FS::PathCombine(path, "instance.json"));
+    if (!instanceFile.exists() || !instanceFile.isFile())
+        return {};
+    try {
+        auto doc = Json::requireDocument(instanceFile.absoluteFilePath(), "FTB_APP instance JSON file");
+        const auto root = doc.object();
+        modpack.uuid = Json::requireString(root, "uuid", "uuid");
+        modpack.id = Json::requireInteger(root, "id", "id");
+        modpack.versionId = Json::requireInteger(root, "versionId", "versionId");
+        modpack.name = Json::requireString(root, "name", "name");
+        modpack.version = Json::requireString(root, "version", "version");
+        modpack.mcVersion = Json::requireString(root, "mcVersion", "mcVersion");
+        modpack.jvmArgs = Json::requireVariant(root, "jvmArgs", "jvmArgs");
+    } catch (const Exception& e) {
+        qDebug() << "Couldn't load ftb instance json: " << e.cause();
+        return {};
+    }
+    auto versionsFile = QFileInfo(FS::PathCombine(path, "version.json"));
+    if (!versionsFile.exists() || !versionsFile.isFile())
+        return {};
+    try {
+        auto doc = Json::requireDocument(versionsFile.absoluteFilePath(), "FTB_APP version JSON file");
+        const auto root = doc.object();
+        auto targets = Json::requireArray(root, "targets", "targets");
+
+        for (auto target : targets) {
+            auto obj = Json::requireObject(target, "target");
+            auto name = Json::requireString(obj, "name", "name");
+            auto version = Json::requireString(obj, "version", "version");
+            if (name == "forge") {
+                modpack.loaderType = ResourceAPI::Forge;
+                modpack.version = version;
+                break;
+            } else if (name == "fabric") {
+                modpack.loaderType = ResourceAPI::Fabric;
+                modpack.version = version;
+                break;
+            } else if (name == "quilt") {
+                modpack.loaderType = ResourceAPI::Quilt;
+                modpack.version = version;
+                break;
+            }
+        }
+    } catch (const Exception& e) {
+        qDebug() << "Couldn't load ftb version json: " << e.cause();
+        return {};
+    }
+    auto iconFile = QFileInfo(FS::PathCombine(path, "folder.jpg"));
+    if (iconFile.exists() && iconFile.isFile()) {
+        modpack.icon = QIcon(iconFile.absoluteFilePath());
+    }
+    return modpack;
+}
+
+}  // namespace FTBImportAPP
diff --git a/launcher/modplatform/import_ftb/PackHelpers.h b/launcher/modplatform/import_ftb/PackHelpers.h
new file mode 100644
index 00000000..8ea4f3fa
--- /dev/null
+++ b/launcher/modplatform/import_ftb/PackHelpers.h
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <QIcon>
+#include <QList>
+#include <QMetaType>
+#include <QString>
+#include <QVariant>
+#include "modplatform/ResourceAPI.h"
+
+namespace FTBImportAPP {
+
+struct Modpack {
+    QString path;
+
+    // json data
+    QString uuid;
+    int id;
+    int versionId;
+    QString name;
+    QString version;
+    QString mcVersion;
+    // not needed for instance creation
+    QVariant jvmArgs;
+
+    std::optional<ResourceAPI::ModLoaderType> loaderType;
+    QString loaderVersion;
+
+    QIcon icon;
+};
+
+typedef QList<Modpack> ModpackList;
+
+Modpack parseDirectory(QString path);
+
+}  // namespace FTBImportAPP
+
+// We need it for the proxy model
+Q_DECLARE_METATYPE(FTBImportAPP::Modpack)
diff --git a/launcher/modplatform/import_ftb/PackInstallTask.cpp b/launcher/modplatform/import_ftb/PackInstallTask.cpp
new file mode 100644
index 00000000..7b01b66b
--- /dev/null
+++ b/launcher/modplatform/import_ftb/PackInstallTask.cpp
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "PackInstallTask.h"
+
+#include <QtConcurrent>
+
+#include "BaseInstance.h"
+#include "FileSystem.h"
+#include "minecraft/MinecraftInstance.h"
+#include "minecraft/PackProfile.h"
+#include "modplatform/ResourceAPI.h"
+#include "modplatform/import_ftb/PackHelpers.h"
+#include "settings/INISettingsObject.h"
+
+namespace FTBImportAPP {
+
+void PackInstallTask::executeTask()
+{
+    setStatus(tr("Copy files"));
+    setAbortable(false);
+    progress(1, 2);
+
+    m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), [this] {
+        FS::copy folderCopy(m_pack.path, FS::PathCombine(m_stagingPath, ".minecraft"));
+        folderCopy.followSymlinks(true);
+        return folderCopy();
+    });
+    connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::finished, this, &PackInstallTask::copySettings);
+    connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::canceled, this, &PackInstallTask::emitAborted);
+    m_copyFutureWatcher.setFuture(m_copyFuture);
+}
+
+void PackInstallTask::copySettings()
+{
+    setStatus(tr("Copy settings"));
+    progress(2, 2);
+    QString instanceConfigPath = FS::PathCombine(m_stagingPath, "instance.cfg");
+    auto instanceSettings = std::make_shared<INISettingsObject>(instanceConfigPath);
+    instanceSettings->suspendSave();
+    instanceSettings->registerSetting("InstanceType", "OneSix");
+    instanceSettings->set("InstanceType", "OneSix");
+
+    if (m_pack.jvmArgs.isValid() && !m_pack.jvmArgs.toString().isEmpty()) {
+        instanceSettings->registerSetting("OverrideJavaArgs", true);
+        instanceSettings->set("OverrideJavaArgs", true);
+        instanceSettings->registerSetting("JvmArgs", m_pack.jvmArgs.toString());
+        instanceSettings->set("JvmArgs", m_pack.jvmArgs.toString());
+    }
+
+    MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath);
+    auto components = instance.getPackProfile();
+    components->buildingFromScratch();
+    components->setComponentVersion("net.minecraft", m_pack.mcVersion, true);
+
+    auto modloader = m_pack.loaderType;
+    if (modloader.has_value())
+        switch (modloader.value()) {
+            case ResourceAPI::Forge: {
+                components->setComponentVersion("net.minecraftforge", m_pack.version, true);
+                break;
+            }
+            case ResourceAPI::Fabric: {
+                components->setComponentVersion("net.fabricmc.fabric-loader", m_pack.version, true);
+                break;
+            }
+            case ResourceAPI::Quilt: {
+                components->setComponentVersion("org.quiltmc.quilt-loader", m_pack.version, true);
+                break;
+            }
+            case ResourceAPI::Cauldron:
+                break;
+            case ResourceAPI::LiteLoader:
+                break;
+        }
+    components->saveNow();
+
+    instance.setName(name());
+    if (m_instIcon == "default")
+        m_instIcon = "ftb_logo";
+    instance.setIconKey(m_instIcon);
+    instanceSettings->resumeSave();
+
+    emitSucceeded();
+}
+
+}  // namespace FTBImportAPP
diff --git a/launcher/modplatform/import_ftb/PackInstallTask.h b/launcher/modplatform/import_ftb/PackInstallTask.h
new file mode 100644
index 00000000..4d453ee6
--- /dev/null
+++ b/launcher/modplatform/import_ftb/PackInstallTask.h
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QFuture>
+#include <QFutureWatcher>
+
+#include "InstanceTask.h"
+#include "PackHelpers.h"
+
+namespace FTBImportAPP {
+
+class PackInstallTask : public InstanceTask {
+    Q_OBJECT
+
+   public:
+    explicit PackInstallTask(Modpack pack) : m_pack(pack) {}
+    virtual ~PackInstallTask() = default;
+
+   protected:
+    virtual void executeTask() override;
+
+   private slots:
+    void copySettings();
+
+   private:
+    QFuture<bool> m_copyFuture;
+    QFutureWatcher<bool> m_copyFutureWatcher;
+
+    Modpack m_pack;
+};
+
+}  // namespace FTBImportAPP
-- 
cgit 


From bd6e8533adbce78d7cf791d323662af70d052fff Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 13 Jul 2023 19:58:08 +0300
Subject: send by reference

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/import_ftb/PackInstallTask.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/import_ftb/PackInstallTask.h b/launcher/modplatform/import_ftb/PackInstallTask.h
index 4d453ee6..842e4b35 100644
--- a/launcher/modplatform/import_ftb/PackInstallTask.h
+++ b/launcher/modplatform/import_ftb/PackInstallTask.h
@@ -30,7 +30,7 @@ class PackInstallTask : public InstanceTask {
     Q_OBJECT
 
    public:
-    explicit PackInstallTask(Modpack pack) : m_pack(pack) {}
+    explicit PackInstallTask(const Modpack& pack) : m_pack(pack) {}
     virtual ~PackInstallTask() = default;
 
    protected:
@@ -43,7 +43,7 @@ class PackInstallTask : public InstanceTask {
     QFuture<bool> m_copyFuture;
     QFutureWatcher<bool> m_copyFutureWatcher;
 
-    Modpack m_pack;
+    const Modpack m_pack;
 };
 
 }  // namespace FTBImportAPP
-- 
cgit 


From 0692cbe701723e203d16154fa97f67fc5c22198c Mon Sep 17 00:00:00 2001
From: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Sat, 15 Jul 2023 00:17:32 +0300
Subject: Update launcher/modplatform/import_ftb/PackInstallTask.cpp

Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/import_ftb/PackInstallTask.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/import_ftb/PackInstallTask.cpp b/launcher/modplatform/import_ftb/PackInstallTask.cpp
index 7b01b66b..1877afe9 100644
--- a/launcher/modplatform/import_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/import_ftb/PackInstallTask.cpp
@@ -32,7 +32,7 @@ namespace FTBImportAPP {
 
 void PackInstallTask::executeTask()
 {
-    setStatus(tr("Copy files"));
+    setStatus(tr("Copying files..."));
     setAbortable(false);
     progress(1, 2);
 
-- 
cgit 


From 2c2c39b42c61011698c14869dda71dc1fe3cda64 Mon Sep 17 00:00:00 2001
From: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Sat, 15 Jul 2023 00:17:48 +0300
Subject: Update launcher/modplatform/import_ftb/PackInstallTask.cpp

Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/import_ftb/PackInstallTask.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/import_ftb/PackInstallTask.cpp b/launcher/modplatform/import_ftb/PackInstallTask.cpp
index 1877afe9..e55f6ffa 100644
--- a/launcher/modplatform/import_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/import_ftb/PackInstallTask.cpp
@@ -48,7 +48,7 @@ void PackInstallTask::executeTask()
 
 void PackInstallTask::copySettings()
 {
-    setStatus(tr("Copy settings"));
+    setStatus(tr("Copying settings..."));
     progress(2, 2);
     QString instanceConfigPath = FS::PathCombine(m_stagingPath, "instance.cfg");
     auto instanceSettings = std::make_shared<INISettingsObject>(instanceConfigPath);
-- 
cgit 


From 7befd63ccedd96c52b94c1845fff36f24ee3f1d1 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 15 Jul 2023 00:28:58 +0300
Subject: fixed settings

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/import_ftb/PackInstallTask.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/import_ftb/PackInstallTask.cpp b/launcher/modplatform/import_ftb/PackInstallTask.cpp
index e55f6ffa..b5e424d1 100644
--- a/launcher/modplatform/import_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/import_ftb/PackInstallTask.cpp
@@ -53,17 +53,14 @@ void PackInstallTask::copySettings()
     QString instanceConfigPath = FS::PathCombine(m_stagingPath, "instance.cfg");
     auto instanceSettings = std::make_shared<INISettingsObject>(instanceConfigPath);
     instanceSettings->suspendSave();
-    instanceSettings->registerSetting("InstanceType", "OneSix");
-    instanceSettings->set("InstanceType", "OneSix");
+    MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath);
+    instance.settings()->set("InstanceType", "OneSix");
 
     if (m_pack.jvmArgs.isValid() && !m_pack.jvmArgs.toString().isEmpty()) {
-        instanceSettings->registerSetting("OverrideJavaArgs", true);
-        instanceSettings->set("OverrideJavaArgs", true);
-        instanceSettings->registerSetting("JvmArgs", m_pack.jvmArgs.toString());
-        instanceSettings->set("JvmArgs", m_pack.jvmArgs.toString());
+        instance.settings()->set("OverrideJavaArgs", true);
+        instance.settings()->set("JvmArgs", m_pack.jvmArgs.toString());
     }
 
-    MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath);
     auto components = instance.getPackProfile();
     components->buildingFromScratch();
     components->setComponentVersion("net.minecraft", m_pack.mcVersion, true);
-- 
cgit 


From 455c4953382b0548804ce45b5bb850641cff90f2 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon, 17 Jul 2023 16:25:51 +0300
Subject: simplify flame export

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

s
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 134 ++++++++-------------
 launcher/modplatform/flame/FlamePackExportTask.h   |   7 +-
 2 files changed, 49 insertions(+), 92 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index ac0da214..fc2cbc36 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -26,6 +26,7 @@
 #include <QMessageBox>
 #include <QtConcurrentRun>
 #include <algorithm>
+#include <iterator>
 #include <memory>
 #include "Json.h"
 #include "MMCZip.h"
@@ -64,20 +65,11 @@ void FlamePackExportTask::executeTask()
 
 bool FlamePackExportTask::abort()
 {
-    if (task != nullptr) {
+    if (task) {
         task->abort();
-        task = nullptr;
         emitAborted();
         return true;
     }
-
-    if (buildZipFuture.isRunning()) {
-        buildZipFuture.cancel();
-        // NOTE: Here we don't do `emitAborted()` because it will be done when `buildZipFuture` actually cancels, which may not occur
-        // immediately.
-        return true;
-    }
-
     return false;
 }
 
@@ -336,89 +328,44 @@ void FlamePackExportTask::buildZip()
     setStatus(tr("Adding files..."));
     setProgress(4, 5);
 
-    buildZipFuture = QtConcurrent::run(QThreadPool::globalInstance(), [this]() {
-        QuaZip zip(output);
-        if (!zip.open(QuaZip::mdCreate)) {
-            QFile::remove(output);
-            return BuildZipResult(tr("Could not create file"));
-        }
-
-        if (buildZipFuture.isCanceled())
-            return BuildZipResult();
+    auto zipTask = makeShared<MMCZip::ExportToZipTask>(output, gameRoot, files, "overrides/", true);
+    zipTask->addExtraFile("manifest.json", generateIndex());
+    zipTask->addExtraFile("modlist.html", generateHTML());
 
-        QuaZipFile indexFile(&zip);
-        if (!indexFile.open(QIODevice::WriteOnly, QuaZipNewInfo("manifest.json"))) {
-            QFile::remove(output);
-            return BuildZipResult(tr("Could not create index"));
-        }
-        indexFile.write(generateIndex());
+    QStringList exclude;
+    std::transform(resolvedFiles.keyBegin(), resolvedFiles.keyEnd(), std::back_insert_iterator(exclude),
+                   [this](QString file) { return gameRoot.relativeFilePath(file); });
+    zipTask->setExcludeFiles(exclude);
 
-        QuaZipFile modlist(&zip);
-        if (!modlist.open(QIODevice::WriteOnly, QuaZipNewInfo("modlist.html"))) {
-            QFile::remove(output);
-            return BuildZipResult(tr("Could not create index"));
-        }
-        QString content = "";
-        for (auto mod : resolvedFiles) {
-            if (mod.isMod) {
-                content += QString(TEMPLATE)
-                               .replace("{name}", mod.name.toHtmlEscaped())
-                               .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.addonId).toHtmlEscaped())
-                               .replace("{authors}", !mod.authors.isEmpty() ? QString(" (by %1)").arg(mod.authors).toHtmlEscaped() : "");
-            }
-        }
-        content = "<ul>" + content + "</ul>";
-        modlist.write(content.toUtf8());
-
-        auto progressStep = std::make_shared<TaskStepProgress>();
-
-        size_t progress = 0;
-        for (const QFileInfo& file : files) {
-            if (buildZipFuture.isCanceled()) {
-                QFile::remove(output);
-                progressStep->state = TaskStepState::Failed;
-                stepProgress(*progressStep);
-                return BuildZipResult();
-            }
-            progressStep->update(progress, files.length());
-            stepProgress(*progressStep);
-
-            const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
-            if (!resolvedFiles.contains(file.absoluteFilePath()) &&
-                !JlCompress::compressFile(&zip, file.absoluteFilePath(), "overrides/" + relative)) {
-                QFile::remove(output);
-                return BuildZipResult(tr("Could not read and compress %1").arg(relative));
-            }
-            progress++;
-        }
-
-        zip.close();
-
-        if (zip.getZipError() != 0) {
-            QFile::remove(output);
-            progressStep->state = TaskStepState::Failed;
-            stepProgress(*progressStep);
-            return BuildZipResult(tr("A zip error occurred"));
-        }
+    auto progressStep = std::make_shared<TaskStepProgress>();
+    connect(zipTask.get(), &Task::finished, this, [this, progressStep] {
         progressStep->state = TaskStepState::Succeeded;
         stepProgress(*progressStep);
-        return BuildZipResult();
     });
-    connect(&buildZipWatcher, &QFutureWatcher<BuildZipResult>::finished, this, &FlamePackExportTask::finish);
-    buildZipWatcher.setFuture(buildZipFuture);
-}
 
-void FlamePackExportTask::finish()
-{
-    if (buildZipFuture.isCanceled())
+    connect(zipTask.get(), &Task::succeeded, this, &FlamePackExportTask::emitSucceeded);
+    connect(zipTask.get(), &Task::aborted, this, [this]() {
+        QFile::remove(output);
         emitAborted();
-    else {
-        const BuildZipResult result = buildZipFuture.result();
-        if (result.has_value())
-            emitFailed(result.value());
-        else
-            emitSucceeded();
-    }
+    });
+    connect(zipTask.get(), &Task::failed, this, [this, progressStep](QString reason) {
+        progressStep->state = TaskStepState::Failed;
+        stepProgress(*progressStep);
+        QFile::remove(output);
+        emitFailed(reason);
+    });
+    connect(zipTask.get(), &Task::stepProgress, this, &FlamePackExportTask::propogateStepProgress);
+
+    connect(zipTask.get(), &Task::progress, this, [this, progressStep](qint64 current, qint64 total) {
+        progressStep->update(current, total);
+        stepProgress(*progressStep);
+    });
+    connect(zipTask.get(), &Task::status, this, [this, progressStep](QString status) {
+        progressStep->status = status;
+        stepProgress(*progressStep);
+    });
+    task.reset(zipTask);
+    zipTask->start();
 }
 
 QByteArray FlamePackExportTask::generateIndex()
@@ -471,3 +418,18 @@ QByteArray FlamePackExportTask::generateIndex()
 
     return QJsonDocument(obj).toJson(QJsonDocument::Compact);
 }
+
+QByteArray FlamePackExportTask::generateHTML()
+{
+    QString content = "";
+    for (auto mod : resolvedFiles) {
+        if (mod.isMod) {
+            content += QString(TEMPLATE)
+                           .replace("{name}", mod.name.toHtmlEscaped())
+                           .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.addonId).toHtmlEscaped())
+                           .replace("{authors}", !mod.authors.isEmpty() ? QString(" (by %1)").arg(mod.authors).toHtmlEscaped() : "");
+        }
+    }
+    content = "<ul>" + content + "</ul>";
+    return content.toUtf8();
+}
\ No newline at end of file
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index 3dee0a7e..d3dc6281 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <QFuture>
-#include <QFutureWatcher>
 #include "BaseInstance.h"
 #include "MMCZip.h"
 #include "minecraft/MinecraftInstance.h"
@@ -52,7 +50,6 @@ class FlamePackExportTask : public Task {
     const QString output;
     const MMCZip::FilterFunction filter;
 
-    typedef std::optional<QString> BuildZipResult;
     struct ResolvedFile {
         int addonId;
         int version;
@@ -76,15 +73,13 @@ class FlamePackExportTask : public Task {
     QMap<QString, HashInfo> pendingHashes{};
     QMap<QString, ResolvedFile> resolvedFiles{};
     Task::Ptr task;
-    QFuture<BuildZipResult> buildZipFuture;
-    QFutureWatcher<BuildZipResult> buildZipWatcher;
 
     void collectFiles();
     void collectHashes();
     void makeApiRequest();
     void getProjectsInfo();
     void buildZip();
-    void finish();
 
     QByteArray generateIndex();
+    QByteArray generateHTML();
 };
-- 
cgit 


From 78ee63af388ec53871cd3505a64a5d2059dbb922 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon, 17 Jul 2023 16:40:01 +0300
Subject: simplify modrinth export

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 .../modrinth/ModrinthPackExportTask.cpp            | 92 +++++++---------------
 .../modplatform/modrinth/ModrinthPackExportTask.h  |  5 --
 2 files changed, 30 insertions(+), 67 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
index 30fe566d..0470f831 100644
--- a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
@@ -55,20 +55,11 @@ void ModrinthPackExportTask::executeTask()
 
 bool ModrinthPackExportTask::abort()
 {
-    if (task != nullptr) {
+    if (task) {
         task->abort();
-        task = nullptr;
         emitAborted();
         return true;
     }
-
-    if (buildZipFuture.isRunning()) {
-        buildZipFuture.cancel();
-        // NOTE: Here we don't do `emitAborted()` because it will be done when `buildZipFuture` actually cancels, which may not occur
-        // immediately.
-        return true;
-    }
-
     return false;
 }
 
@@ -205,63 +196,40 @@ void ModrinthPackExportTask::buildZip()
 {
     setStatus(tr("Adding files..."));
 
-    buildZipFuture = QtConcurrent::run(QThreadPool::globalInstance(), [this]() {
-        QuaZip zip(output);
-        if (!zip.open(QuaZip::mdCreate)) {
-            QFile::remove(output);
-            return BuildZipResult(tr("Could not create file"));
-        }
-
-        if (buildZipFuture.isCanceled())
-            return BuildZipResult();
-
-        QuaZipFile indexFile(&zip);
-        if (!indexFile.open(QIODevice::WriteOnly, QuaZipNewInfo("modrinth.index.json"))) {
-            QFile::remove(output);
-            return BuildZipResult(tr("Could not create index"));
-        }
-        indexFile.write(generateIndex());
-
-        size_t progress = 0;
-        for (const QFileInfo& file : files) {
-            if (buildZipFuture.isCanceled()) {
-                QFile::remove(output);
-                return BuildZipResult();
-            }
-
-            setProgress(progress, files.length());
-            const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
-            if (!resolvedFiles.contains(relative) && !JlCompress::compressFile(&zip, file.absoluteFilePath(), "overrides/" + relative)) {
-                QFile::remove(output);
-                return BuildZipResult(tr("Could not read and compress %1").arg(relative));
-            }
-            progress++;
-        }
-
-        zip.close();
+    auto zipTask = makeShared<MMCZip::ExportToZipTask>(output, gameRoot, files, "overrides/", true);
+    zipTask->addExtraFile("modrinth.index.json", generateIndex());
 
-        if (zip.getZipError() != 0) {
-            QFile::remove(output);
-            return BuildZipResult(tr("A zip error occurred"));
-        }
+    zipTask->setExcludeFiles(resolvedFiles.keys());
 
-        return BuildZipResult();
+    auto progressStep = std::make_shared<TaskStepProgress>();
+    connect(zipTask.get(), &Task::finished, this, [this, progressStep] {
+        progressStep->state = TaskStepState::Succeeded;
+        stepProgress(*progressStep);
     });
-    connect(&buildZipWatcher, &QFutureWatcher<BuildZipResult>::finished, this, &ModrinthPackExportTask::finish);
-    buildZipWatcher.setFuture(buildZipFuture);
-}
 
-void ModrinthPackExportTask::finish()
-{
-    if (buildZipFuture.isCanceled())
+    connect(zipTask.get(), &Task::succeeded, this, &ModrinthPackExportTask::emitSucceeded);
+    connect(zipTask.get(), &Task::aborted, this, [this]() {
+        QFile::remove(output);
         emitAborted();
-    else {
-        const BuildZipResult result = buildZipFuture.result();
-        if (result.has_value())
-            emitFailed(result.value());
-        else
-            emitSucceeded();
-    }
+    });
+    connect(zipTask.get(), &Task::failed, this, [this, progressStep](QString reason) {
+        progressStep->state = TaskStepState::Failed;
+        stepProgress(*progressStep);
+        QFile::remove(output);
+        emitFailed(reason);
+    });
+    connect(zipTask.get(), &Task::stepProgress, this, &ModrinthPackExportTask::propogateStepProgress);
+
+    connect(zipTask.get(), &Task::progress, this, [this, progressStep](qint64 current, qint64 total) {
+        progressStep->update(current, total);
+        stepProgress(*progressStep);
+    });
+    connect(zipTask.get(), &Task::status, this, [this, progressStep](QString status) {
+        progressStep->status = status;
+        stepProgress(*progressStep);
+    });
+    task.reset(zipTask);
+    zipTask->start();
 }
 
 QByteArray ModrinthPackExportTask::generateIndex()
diff --git a/launcher/modplatform/modrinth/ModrinthPackExportTask.h b/launcher/modplatform/modrinth/ModrinthPackExportTask.h
index 96f292c1..1f9e0eb7 100644
--- a/launcher/modplatform/modrinth/ModrinthPackExportTask.h
+++ b/launcher/modplatform/modrinth/ModrinthPackExportTask.h
@@ -56,22 +56,17 @@ class ModrinthPackExportTask : public Task {
     const QString output;
     const MMCZip::FilterFunction filter;
 
-    typedef std::optional<QString> BuildZipResult;
-
     ModrinthAPI api;
     QFileInfoList files;
     QMap<QString, QString> pendingHashes;
     QMap<QString, ResolvedFile> resolvedFiles;
     Task::Ptr task;
-    QFuture<BuildZipResult> buildZipFuture;
-    QFutureWatcher<BuildZipResult> buildZipWatcher;
 
     void collectFiles();
     void collectHashes();
     void makeApiRequest();
     void parseApiResponse(const std::shared_ptr<QByteArray> response);
     void buildZip();
-    void finish();
 
     QByteArray generateIndex();
 };
-- 
cgit 


From 64041a84a2da2d0ba07d6eb663ff7cbc3b351b7b Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon, 17 Jul 2023 16:55:26 +0300
Subject: handle file removal in ExportToZipTask

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp       | 6 +-----
 launcher/modplatform/modrinth/ModrinthPackExportTask.cpp | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index fc2cbc36..a4efaf7c 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -344,14 +344,10 @@ void FlamePackExportTask::buildZip()
     });
 
     connect(zipTask.get(), &Task::succeeded, this, &FlamePackExportTask::emitSucceeded);
-    connect(zipTask.get(), &Task::aborted, this, [this]() {
-        QFile::remove(output);
-        emitAborted();
-    });
+    connect(zipTask.get(), &Task::aborted, this, &FlamePackExportTask::emitAborted);
     connect(zipTask.get(), &Task::failed, this, [this, progressStep](QString reason) {
         progressStep->state = TaskStepState::Failed;
         stepProgress(*progressStep);
-        QFile::remove(output);
         emitFailed(reason);
     });
     connect(zipTask.get(), &Task::stepProgress, this, &FlamePackExportTask::propogateStepProgress);
diff --git a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
index 0470f831..7290f454 100644
--- a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
@@ -208,14 +208,10 @@ void ModrinthPackExportTask::buildZip()
     });
 
     connect(zipTask.get(), &Task::succeeded, this, &ModrinthPackExportTask::emitSucceeded);
-    connect(zipTask.get(), &Task::aborted, this, [this]() {
-        QFile::remove(output);
-        emitAborted();
-    });
+    connect(zipTask.get(), &Task::aborted, this, &ModrinthPackExportTask::emitAborted);
     connect(zipTask.get(), &Task::failed, this, [this, progressStep](QString reason) {
         progressStep->state = TaskStepState::Failed;
         stepProgress(*progressStep);
-        QFile::remove(output);
         emitFailed(reason);
     });
     connect(zipTask.get(), &Task::stepProgress, this, &ModrinthPackExportTask::propogateStepProgress);
-- 
cgit 


From ef21879df4f7c2822381e1b6af4901e0e6b0d339 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 21 Jul 2023 19:30:00 +0300
Subject: replaced require with ensure for jvmArgs

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/import_ftb/PackHelpers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/import_ftb/PackHelpers.cpp b/launcher/modplatform/import_ftb/PackHelpers.cpp
index 26b6eafe..4a1bbef9 100644
--- a/launcher/modplatform/import_ftb/PackHelpers.cpp
+++ b/launcher/modplatform/import_ftb/PackHelpers.cpp
@@ -42,7 +42,7 @@ Modpack parseDirectory(QString path)
         modpack.name = Json::requireString(root, "name", "name");
         modpack.version = Json::requireString(root, "version", "version");
         modpack.mcVersion = Json::requireString(root, "mcVersion", "mcVersion");
-        modpack.jvmArgs = Json::requireVariant(root, "jvmArgs", "jvmArgs");
+        modpack.jvmArgs = Json::ensureVariant(root, "jvmArgs", {}, "jvmArgs");
     } catch (const Exception& e) {
         qDebug() << "Couldn't load ftb instance json: " << e.cause();
         return {};
-- 
cgit 


From 62aa7a52c4f10848b5645b57332afd26421a1f4e Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 27 Jul 2023 00:07:38 +0300
Subject: fiexed conflicts

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp       | 2 +-
 launcher/modplatform/modrinth/ModrinthPackExportTask.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 139c9d95..f5f3af37 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -350,7 +350,7 @@ void FlamePackExportTask::buildZip()
         stepProgress(*progressStep);
         emitFailed(reason);
     });
-    connect(zipTask.get(), &Task::stepProgress, this, &FlamePackExportTask::propogateStepProgress);
+    connect(zipTask.get(), &Task::stepProgress, this, &FlamePackExportTask::propagateStepProgress);
 
     connect(zipTask.get(), &Task::progress, this, [this, progressStep](qint64 current, qint64 total) {
         progressStep->update(current, total);
diff --git a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
index 7290f454..7bf29639 100644
--- a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
@@ -214,7 +214,7 @@ void ModrinthPackExportTask::buildZip()
         stepProgress(*progressStep);
         emitFailed(reason);
     });
-    connect(zipTask.get(), &Task::stepProgress, this, &ModrinthPackExportTask::propogateStepProgress);
+    connect(zipTask.get(), &Task::stepProgress, this, &ModrinthPackExportTask::propagateStepProgress);
 
     connect(zipTask.get(), &Task::progress, this, [this, progressStep](qint64 current, qint64 total) {
         progressStep->update(current, total);
-- 
cgit 


From 1d468ac35ad88d8c77cc83f25e3704d9bd7df01b Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 2 Aug 2023 18:35:35 +0200
Subject: chore: reformat

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 launcher/modplatform/CheckUpdateTask.h             |  17 +-
 launcher/modplatform/EnsureMetadataTask.h          |   5 +-
 launcher/modplatform/ModIndex.cpp                  |  30 +-
 launcher/modplatform/atlauncher/ATLPackIndex.cpp   |  11 +-
 launcher/modplatform/atlauncher/ATLPackIndex.h     |  15 +-
 .../modplatform/atlauncher/ATLPackInstallTask.cpp  | 349 +++++++++------------
 .../modplatform/atlauncher/ATLPackManifest.cpp     | 114 +++----
 launcher/modplatform/atlauncher/ATLPackManifest.h  |  48 +--
 launcher/modplatform/atlauncher/ATLShareCode.cpp   |   2 +-
 launcher/modplatform/atlauncher/ATLShareCode.h     |   4 +-
 launcher/modplatform/flame/FlameCheckUpdate.h      |   5 +-
 launcher/modplatform/flame/FlamePackIndex.cpp      |   9 +-
 launcher/modplatform/flame/PackManifest.cpp        |   7 +-
 launcher/modplatform/flame/PackManifest.h          |  34 +-
 launcher/modplatform/legacy_ftb/PackFetchTask.cpp  |   2 +-
 launcher/modplatform/legacy_ftb/PackHelpers.h      |  22 +-
 .../modplatform/legacy_ftb/PrivatePackManager.cpp  |  19 +-
 .../modplatform/legacy_ftb/PrivatePackManager.h    |  30 +-
 .../modplatform/modrinth/ModrinthCheckUpdate.h     |   5 +-
 .../modrinth/ModrinthInstanceCreationTask.cpp      |  24 +-
 .../modrinth/ModrinthInstanceCreationTask.h        |   5 +-
 .../modplatform/modrinth/ModrinthPackManifest.cpp  |  25 +-
 .../modplatform/modrinth/ModrinthPackManifest.h    |   9 +-
 launcher/modplatform/packwiz/Packwiz.h             |  54 ++--
 .../technic/SingleZipPackInstallTask.cpp           |  39 +--
 .../modplatform/technic/SingleZipPackInstallTask.h |  16 +-
 .../modplatform/technic/SolderPackInstallTask.cpp  |  36 +--
 .../modplatform/technic/SolderPackManifest.cpp     |   2 +-
 launcher/modplatform/technic/SolderPackManifest.h  |   4 +-
 .../modplatform/technic/TechnicPackProcessor.cpp   | 102 +++---
 .../modplatform/technic/TechnicPackProcessor.h     |  29 +-
 31 files changed, 454 insertions(+), 619 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/CheckUpdateTask.h b/launcher/modplatform/CheckUpdateTask.h
index f7582b8f..6d968ea4 100644
--- a/launcher/modplatform/CheckUpdateTask.h
+++ b/launcher/modplatform/CheckUpdateTask.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "minecraft/mod/Mod.h"
-#include "modplatform/ResourceAPI.h"
 #include "modplatform/ModIndex.h"
+#include "modplatform/ResourceAPI.h"
 #include "tasks/Task.h"
 
 class ResourceDownloadTask;
@@ -12,8 +12,11 @@ class CheckUpdateTask : public Task {
     Q_OBJECT
 
    public:
-    CheckUpdateTask(QList<Mod*>& mods, std::list<Version>& mcVersions, std::optional<ResourceAPI::ModLoaderTypes> loaders, std::shared_ptr<ModFolderModel> mods_folder)
-        : Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders(loaders), m_mods_folder(mods_folder) {};
+    CheckUpdateTask(QList<Mod*>& mods,
+                    std::list<Version>& mcVersions,
+                    std::optional<ResourceAPI::ModLoaderTypes> loaders,
+                    std::shared_ptr<ModFolderModel> mods_folder)
+        : Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders(loaders), m_mods_folder(mods_folder){};
 
     struct UpdatableMod {
         QString name;
@@ -25,7 +28,13 @@ class CheckUpdateTask : public Task {
         shared_qobject_ptr<ResourceDownloadTask> download;
 
        public:
-        UpdatableMod(QString name, QString old_h, QString old_v, QString new_v, QString changelog, ModPlatform::ResourceProvider p, shared_qobject_ptr<ResourceDownloadTask> t)
+        UpdatableMod(QString name,
+                     QString old_h,
+                     QString old_v,
+                     QString new_v,
+                     QString changelog,
+                     ModPlatform::ResourceProvider p,
+                     shared_qobject_ptr<ResourceDownloadTask> t)
             : name(name), old_hash(old_h), old_version(old_v), new_version(new_v), changelog(changelog), provider(p), download(t)
         {}
     };
diff --git a/launcher/modplatform/EnsureMetadataTask.h b/launcher/modplatform/EnsureMetadataTask.h
index 03cae4e4..2f276e5a 100644
--- a/launcher/modplatform/EnsureMetadataTask.h
+++ b/launcher/modplatform/EnsureMetadataTask.h
@@ -35,10 +35,7 @@ class EnsureMetadataTask : public Task {
     auto flameProjectsTask() -> Task::Ptr;
 
     // Helpers
-    enum class RemoveFromList {
-        Yes,
-        No
-    };
+    enum class RemoveFromList { Yes, No };
     void emitReady(Mod*, QString key = {}, RemoveFromList = RemoveFromList::Yes);
     void emitFail(Mod*, QString key = {}, RemoveFromList = RemoveFromList::Yes);
 
diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index a1c4d891..ecea0d8c 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -1,20 +1,20 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
-*  PolyMC - Minecraft Launcher
-*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
-*
-*  This program is free software: you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation, version 3.
-*
-*  This program is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
 #include "modplatform/ModIndex.h"
 
diff --git a/launcher/modplatform/atlauncher/ATLPackIndex.cpp b/launcher/modplatform/atlauncher/ATLPackIndex.cpp
index e649c43a..3be16973 100644
--- a/launcher/modplatform/atlauncher/ATLPackIndex.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackIndex.cpp
@@ -21,23 +21,20 @@
 
 #include "Json.h"
 
-static void loadIndexedVersion(ATLauncher::IndexedVersion & v, QJsonObject & obj)
+static void loadIndexedVersion(ATLauncher::IndexedVersion& v, QJsonObject& obj)
 {
     v.version = Json::requireString(obj, "version");
     v.minecraft = Json::requireString(obj, "minecraft");
 }
 
-void ATLauncher::loadIndexedPack(ATLauncher::IndexedPack & m, QJsonObject & obj)
+void ATLauncher::loadIndexedPack(ATLauncher::IndexedPack& m, QJsonObject& obj)
 {
     m.id = Json::requireInteger(obj, "id");
     m.position = Json::requireInteger(obj, "position");
     m.name = Json::requireString(obj, "name");
-    m.type = Json::requireString(obj, "type") == "private" ?
-            ATLauncher::PackType::Private :
-            ATLauncher::PackType::Public;
+    m.type = Json::requireString(obj, "type") == "private" ? ATLauncher::PackType::Private : ATLauncher::PackType::Public;
     auto versionsArr = Json::requireArray(obj, "versions");
-    for (const auto versionRaw : versionsArr)
-    {
+    for (const auto versionRaw : versionsArr) {
         auto versionObj = Json::requireObject(versionRaw);
         ATLauncher::IndexedVersion version;
         loadIndexedVersion(version, versionObj);
diff --git a/launcher/modplatform/atlauncher/ATLPackIndex.h b/launcher/modplatform/atlauncher/ATLPackIndex.h
index 337b80b8..8d18c671 100644
--- a/launcher/modplatform/atlauncher/ATLPackIndex.h
+++ b/launcher/modplatform/atlauncher/ATLPackIndex.h
@@ -18,21 +18,18 @@
 
 #include "ATLPackManifest.h"
 
+#include <QMetaType>
 #include <QString>
 #include <QVector>
-#include <QMetaType>
 
-namespace ATLauncher
-{
+namespace ATLauncher {
 
-struct IndexedVersion
-{
+struct IndexedVersion {
     QString version;
     QString minecraft;
 };
 
-struct IndexedPack
-{
+struct IndexedPack {
     int id;
     int position;
     QString name;
@@ -44,7 +41,7 @@ struct IndexedPack
     QString safeName;
 };
 
-void loadIndexedPack(IndexedPack & m, QJsonObject & obj);
-}
+void loadIndexedPack(IndexedPack& m, QJsonObject& obj);
+}  // namespace ATLauncher
 
 Q_DECLARE_METATYPE(ATLauncher::IndexedPack)
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index 82a51c27..1ac527bc 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -40,27 +40,27 @@
 
 #include <quazip/quazip.h>
 
-#include "MMCZip.h"
-#include "minecraft/OneSixVersionFormat.h"
-#include "Version.h"
-#include "net/ChecksumValidator.h"
 #include "FileSystem.h"
 #include "Json.h"
-#include "minecraft/MinecraftInstance.h"
-#include "minecraft/PackProfile.h"
-#include "settings/INISettingsObject.h"
+#include "MMCZip.h"
+#include "Version.h"
 #include "meta/Index.h"
 #include "meta/Version.h"
 #include "meta/VersionList.h"
+#include "minecraft/MinecraftInstance.h"
+#include "minecraft/OneSixVersionFormat.h"
+#include "minecraft/PackProfile.h"
+#include "net/ChecksumValidator.h"
+#include "settings/INISettingsObject.h"
 
-#include "BuildConfig.h"
 #include "Application.h"
+#include "BuildConfig.h"
 
 namespace ATLauncher {
 
 static Meta::Version::Ptr getComponentVersion(const QString& uid, const QString& version);
 
-PackInstallTask::PackInstallTask(UserInteractionSupport *support, QString packName, QString version, InstallMode installMode)
+PackInstallTask::PackInstallTask(UserInteractionSupport* support, QString packName, QString version, InstallMode installMode)
 {
     m_support = support;
     m_pack_name = packName;
@@ -71,8 +71,7 @@ PackInstallTask::PackInstallTask(UserInteractionSupport *support, QString packNa
 
 bool PackInstallTask::abort()
 {
-    if(abortable)
-    {
+    if (abortable) {
         return jobPtr->abort();
     }
     return false;
@@ -110,12 +109,9 @@ void PackInstallTask::onDownloadSucceeded()
     auto obj = doc.object();
 
     ATLauncher::PackVersion version;
-    try
-    {
+    try {
         ATLauncher::loadVersion(version, obj);
-    }
-    catch (const JSONValidationError &e)
-    {
+    } catch (const JSONValidationError& e) {
         emitFailed(tr("Could not understand pack manifest:\n") + e.cause());
         return;
     }
@@ -126,20 +122,20 @@ void PackInstallTask::onDownloadSucceeded()
     bool resetDirectory;
 
     switch (m_install_mode) {
-    case InstallMode::Reinstall:
-    case InstallMode::Update:
-        message = m_version.messages.update;
-        resetDirectory = true;
-        break;
-
-    case InstallMode::Install:
-        message = m_version.messages.install;
-        resetDirectory = false;
-        break;
-
-    default:
-        emitFailed(tr("Unsupported installation mode"));
-        return;
+        case InstallMode::Reinstall:
+        case InstallMode::Update:
+            message = m_version.messages.update;
+            resetDirectory = true;
+            break;
+
+        case InstallMode::Install:
+            message = m_version.messages.install;
+            resetDirectory = false;
+            break;
+
+        default:
+            emitFailed(tr("Unsupported installation mode"));
+            return;
     }
 
     // Display message if one exists
@@ -157,10 +153,9 @@ void PackInstallTask::onDownloadSucceeded()
         deleteExistingFiles();
     }
 
-    if(m_version.noConfigs) {
+    if (m_version.noConfigs) {
         downloadMods();
-    }
-    else {
+    } else {
         installConfigs();
     }
 }
@@ -212,11 +207,9 @@ void PackInstallTask::deleteExistingFiles()
 
         if (base == "root") {
             return minecraftPath;
-        }
-        else if (base == "config") {
+        } else if (base == "config") {
             return FS::PathCombine(minecraftPath, "config");
-        }
-        else {
+        } else {
             qWarning() << "Unrecognised base path" << base;
             return minecraftPath;
         }
@@ -338,19 +331,18 @@ QString PackInstallTask::getDirForModType(ModType type, QString raw)
 
 QString PackInstallTask::getVersionForLoader(QString uid)
 {
-    if(m_version.loader.recommended || m_version.loader.latest || m_version.loader.choose) {
+    if (m_version.loader.recommended || m_version.loader.latest || m_version.loader.choose) {
         auto vlist = APPLICATION->metadataIndex()->get(uid);
-        if(!vlist)
-        {
+        if (!vlist) {
             emitFailed(tr("Failed to get local metadata index for %1").arg(uid));
             return Q_NULLPTR;
         }
 
-        if(!vlist->isLoaded()) {
+        if (!vlist->isLoaded()) {
             vlist->load(Net::Mode::Online);
         }
 
-        if(m_version.loader.recommended || m_version.loader.latest) {
+        if (m_version.loader.recommended || m_version.loader.latest) {
             for (int i = 0; i < vlist->versions().size(); i++) {
                 auto version = vlist->versions().at(i);
                 auto reqs = version->requiredSet();
@@ -359,16 +351,17 @@ QString PackInstallTask::getVersionForLoader(QString uid)
                 // not all mod loaders depend on a given Minecraft version, so we won't do this
                 // filtering for those loaders.
                 if (m_version.loader.type != "fabric") {
-                    auto iter = std::find_if(reqs.begin(), reqs.end(), [](const Meta::Require &req) {
-                        return req.uid == "net.minecraft";
-                    });
-                    if (iter == reqs.end()) continue;
-                    if (iter->equalsVersion != m_version.minecraft) continue;
+                    auto iter = std::find_if(reqs.begin(), reqs.end(), [](const Meta::Require& req) { return req.uid == "net.minecraft"; });
+                    if (iter == reqs.end())
+                        continue;
+                    if (iter->equalsVersion != m_version.minecraft)
+                        continue;
                 }
 
                 if (m_version.loader.recommended) {
                     // first recommended build we find, we use.
-                    if (!version->isRecommended()) continue;
+                    if (!version->isRecommended())
+                        continue;
                 }
 
                 return version->descriptor();
@@ -376,8 +369,7 @@ QString PackInstallTask::getVersionForLoader(QString uid)
 
             emitFailed(tr("Failed to find version for %1 loader").arg(m_version.loader.type));
             return Q_NULLPTR;
-        }
-        else if(m_version.loader.choose) {
+        } else if (m_version.loader.choose) {
             // Fabric Loader doesn't depend on a given Minecraft version.
             if (m_version.loader.type == "fabric") {
                 return m_support->chooseVersion(vlist, Q_NULLPTR);
@@ -414,15 +406,14 @@ QString PackInstallTask::detectLibrary(VersionLibrary library)
         return group + ":" + artefact + ":" + version;
     }
 
-    if(library.file.contains("-")) {
+    if (library.file.contains("-")) {
         auto lastSlash = library.file.lastIndexOf("-");
         auto name = library.file.mid(0, lastSlash);
         auto version = library.file.mid(lastSlash + 1).remove(".jar");
 
-        if(name == QString("guava")) {
+        if (name == QString("guava")) {
             return "com.google.guava:guava:" + version;
-        }
-        else if(name == QString("commons-lang3")) {
+        } else if (name == QString("commons-lang3")) {
             return "org.apache.commons:commons-lang3:" + version;
         }
     }
@@ -432,22 +423,22 @@ QString PackInstallTask::detectLibrary(VersionLibrary library)
 
 bool PackInstallTask::createLibrariesComponent(QString instanceRoot, std::shared_ptr<PackProfile> profile)
 {
-    if(m_version.libraries.isEmpty()) {
+    if (m_version.libraries.isEmpty()) {
         return true;
     }
 
     QList<GradleSpecifier> exempt;
-    for(const auto & componentUid : componentsToInstall.keys()) {
+    for (const auto& componentUid : componentsToInstall.keys()) {
         auto componentVersion = componentsToInstall.value(componentUid);
 
-        for(const auto & library : componentVersion->data()->libraries) {
+        for (const auto& library : componentVersion->data()->libraries) {
             GradleSpecifier lib(library->rawName());
             exempt.append(lib);
         }
     }
 
     {
-        for(const auto & library : minecraftVersion->data()->libraries) {
+        for (const auto& library : minecraftVersion->data()->libraries) {
             GradleSpecifier lib(library->rawName());
             exempt.append(lib);
         }
@@ -458,8 +449,7 @@ bool PackInstallTask::createLibrariesComponent(QString instanceRoot, std::shared
     auto target_id = "org.multimc.atlauncher." + id;
 
     auto patchDir = FS::PathCombine(instanceRoot, "patches");
-    if(!FS::ensureFolderPathExists(patchDir))
-    {
+    if (!FS::ensureFolderPathExists(patchDir)) {
         return false;
     }
     auto patchFileName = FS::PathCombine(patchDir, target_id + ".json");
@@ -468,38 +458,24 @@ bool PackInstallTask::createLibrariesComponent(QString instanceRoot, std::shared
     f->name = m_pack_name + " " + m_version_name + " (libraries)";
 
     const static QMap<QString, QString> liteLoaderMap = {
-            { "61179803bcd5fb7790789b790908663d", "1.12-SNAPSHOT" },
-            { "1420785ecbfed5aff4a586c5c9dd97eb", "1.12.2-SNAPSHOT" },
-            { "073f68e2fcb518b91fd0d99462441714", "1.6.2_03" },
-            { "10a15b52fc59b1bfb9c05b56de1097d6", "1.6.2_02" },
-            { "b52f90f08303edd3d4c374e268a5acf1", "1.6.2_04" },
-            { "ea747e24e03e24b7cad5bc8a246e0319", "1.6.2_01" },
-            { "55785ccc82c07ff0ba038fe24be63ea2", "1.7.10_01" },
-            { "63ada46e033d0cb6782bada09ad5ca4e", "1.7.10_04" },
-            { "7983e4b28217c9ae8569074388409c86", "1.7.10_03" },
-            { "c09882458d74fe0697c7681b8993097e", "1.7.10_02" },
-            { "db7235aefd407ac1fde09a7baba50839", "1.7.10_00" },
-            { "6e9028816027f53957bd8fcdfabae064", "1.8" },
-            { "5e732dc446f9fe2abe5f9decaec40cde", "1.10-SNAPSHOT" },
-            { "3a98b5ed95810bf164e71c1a53be568d", "1.11.2-SNAPSHOT" },
-            { "ba8e6285966d7d988a96496f48cbddaa", "1.8.9-SNAPSHOT" },
-            { "8524af3ac3325a82444cc75ae6e9112f", "1.11-SNAPSHOT" },
-            { "53639d52340479ccf206a04f5e16606f", "1.5.2_01" },
-            { "1fcdcf66ce0a0806b7ad8686afdce3f7", "1.6.4_00" },
-            { "531c116f71ae2b11033f9a11a0f8e668", "1.6.4_01" },
-            { "4009eeb99c9068f608d3483a6439af88", "1.7.2_03" },
-            { "66f343354b8417abce1a10d557d2c6e9", "1.7.2_04" },
-            { "ab554c21f28fbc4ae9b098bcb5f4cceb", "1.7.2_05" },
-            { "e1d76a05a3723920e2f80a5e66c45f16", "1.7.2_02" },
-            { "00318cb0c787934d523f63cdfe8ddde4", "1.9-SNAPSHOT" },
-            { "986fd1ee9525cb0dcab7609401cef754", "1.9.4-SNAPSHOT" },
-            { "571ad5e6edd5ff40259570c9be588bb5", "1.9.4" },
-            { "1cdd72f7232e45551f16cc8ffd27ccf3", "1.10.2-SNAPSHOT" },
-            { "8a7c21f32d77ee08b393dd3921ced8eb", "1.10.2" },
-            { "b9bef8abc8dc309069aeba6fbbe58980", "1.12.1-SNAPSHOT" }
+        { "61179803bcd5fb7790789b790908663d", "1.12-SNAPSHOT" },   { "1420785ecbfed5aff4a586c5c9dd97eb", "1.12.2-SNAPSHOT" },
+        { "073f68e2fcb518b91fd0d99462441714", "1.6.2_03" },        { "10a15b52fc59b1bfb9c05b56de1097d6", "1.6.2_02" },
+        { "b52f90f08303edd3d4c374e268a5acf1", "1.6.2_04" },        { "ea747e24e03e24b7cad5bc8a246e0319", "1.6.2_01" },
+        { "55785ccc82c07ff0ba038fe24be63ea2", "1.7.10_01" },       { "63ada46e033d0cb6782bada09ad5ca4e", "1.7.10_04" },
+        { "7983e4b28217c9ae8569074388409c86", "1.7.10_03" },       { "c09882458d74fe0697c7681b8993097e", "1.7.10_02" },
+        { "db7235aefd407ac1fde09a7baba50839", "1.7.10_00" },       { "6e9028816027f53957bd8fcdfabae064", "1.8" },
+        { "5e732dc446f9fe2abe5f9decaec40cde", "1.10-SNAPSHOT" },   { "3a98b5ed95810bf164e71c1a53be568d", "1.11.2-SNAPSHOT" },
+        { "ba8e6285966d7d988a96496f48cbddaa", "1.8.9-SNAPSHOT" },  { "8524af3ac3325a82444cc75ae6e9112f", "1.11-SNAPSHOT" },
+        { "53639d52340479ccf206a04f5e16606f", "1.5.2_01" },        { "1fcdcf66ce0a0806b7ad8686afdce3f7", "1.6.4_00" },
+        { "531c116f71ae2b11033f9a11a0f8e668", "1.6.4_01" },        { "4009eeb99c9068f608d3483a6439af88", "1.7.2_03" },
+        { "66f343354b8417abce1a10d557d2c6e9", "1.7.2_04" },        { "ab554c21f28fbc4ae9b098bcb5f4cceb", "1.7.2_05" },
+        { "e1d76a05a3723920e2f80a5e66c45f16", "1.7.2_02" },        { "00318cb0c787934d523f63cdfe8ddde4", "1.9-SNAPSHOT" },
+        { "986fd1ee9525cb0dcab7609401cef754", "1.9.4-SNAPSHOT" },  { "571ad5e6edd5ff40259570c9be588bb5", "1.9.4" },
+        { "1cdd72f7232e45551f16cc8ffd27ccf3", "1.10.2-SNAPSHOT" }, { "8a7c21f32d77ee08b393dd3921ced8eb", "1.10.2" },
+        { "b9bef8abc8dc309069aeba6fbbe58980", "1.12.1-SNAPSHOT" }
     };
 
-    for(const auto & lib : m_version.libraries) {
+    for (const auto& lib : m_version.libraries) {
         // If the library is LiteLoader, we need to ignore it and handle it separately.
         if (liteLoaderMap.contains(lib.md5)) {
             auto ver = getComponentVersion("com.mumfrey.liteloader", liteLoaderMap.value(lib.md5));
@@ -513,18 +489,19 @@ bool PackInstallTask::createLibrariesComponent(QString instanceRoot, std::shared
         GradleSpecifier libSpecifier(libName);
 
         bool libExempt = false;
-        for(const auto & existingLib : exempt) {
-            if(libSpecifier.matchName(existingLib)) {
+        for (const auto& existingLib : exempt) {
+            if (libSpecifier.matchName(existingLib)) {
                 // If the pack specifies a newer version of the lib, use that!
                 libExempt = Version(libSpecifier.version()) >= Version(existingLib.version());
             }
         }
-        if(libExempt) continue;
+        if (libExempt)
+            continue;
 
         auto library = std::make_shared<Library>();
         library->setRawName(libName);
 
-        switch(lib.download) {
+        switch (lib.download) {
             case DownloadType::Server:
                 library->setAbsoluteUrl(BuildConfig.ATL_DOWNLOAD_SERVER_URL + lib.url);
                 break;
@@ -540,15 +517,13 @@ bool PackInstallTask::createLibrariesComponent(QString instanceRoot, std::shared
         f->libraries.append(library);
     }
 
-    if(f->libraries.isEmpty()) {
+    if (f->libraries.isEmpty()) {
         return true;
     }
 
     QFile file(patchFileName);
-    if (!file.open(QFile::WriteOnly))
-    {
-        qCritical() << "Error opening" << file.fileName()
-                    << "for reading:" << file.errorString();
+    if (!file.open(QFile::WriteOnly)) {
+        qCritical() << "Error opening" << file.fileName() << "for reading:" << file.errorString();
         return false;
     }
     file.write(OneSixVersionFormat::versionFileToJson(f).toJson());
@@ -593,18 +568,17 @@ bool PackInstallTask::createPackComponent(QString instanceRoot, std::shared_ptr<
     auto target_id = "org.multimc.atlauncher." + id;
 
     auto patchDir = FS::PathCombine(instanceRoot, "patches");
-    if(!FS::ensureFolderPathExists(patchDir))
-    {
+    if (!FS::ensureFolderPathExists(patchDir)) {
         return false;
     }
     auto patchFileName = FS::PathCombine(patchDir, target_id + ".json");
 
     QStringList mainClasses;
     QStringList tweakers;
-    for(const auto & componentUid : componentsToInstall.keys()) {
+    for (const auto& componentUid : componentsToInstall.keys()) {
         auto componentVersion = componentsToInstall.value(componentUid);
 
-        if(componentVersion->data()->mainClass != QString("")) {
+        if (componentVersion->data()->mainClass != QString("")) {
             mainClasses.append(componentVersion->data()->mainClass);
         }
         tweakers.append(componentVersion->data()->addTweakers);
@@ -619,25 +593,24 @@ bool PackInstallTask::createPackComponent(QString instanceRoot, std::shared_ptr<
     // Parse out tweakers
     auto args = extraArguments.split(" ");
     QString previous;
-    for(auto arg : args) {
-        if(arg.startsWith("--tweakClass=") || previous == "--tweakClass") {
+    for (auto arg : args) {
+        if (arg.startsWith("--tweakClass=") || previous == "--tweakClass") {
             auto tweakClass = arg.remove("--tweakClass=");
-            if(tweakers.contains(tweakClass)) continue;
+            if (tweakers.contains(tweakClass))
+                continue;
 
             f->addTweakers.append(tweakClass);
         }
         previous = arg;
     }
 
-    if(f->mainClass == QString() && f->addTweakers.isEmpty()) {
+    if (f->mainClass == QString() && f->addTweakers.isEmpty()) {
         return true;
     }
 
     QFile file(patchFileName);
-    if (!file.open(QFile::WriteOnly))
-    {
-        qCritical() << "Error opening" << file.fileName()
-                    << "for reading:" << file.errorString();
+    if (!file.open(QFile::WriteOnly)) {
+        qCritical() << "Error opening" << file.fileName() << "for reading:" << file.errorString();
         return false;
     }
     file.write(OneSixVersionFormat::versionFileToJson(f).toJson());
@@ -654,8 +627,7 @@ void PackInstallTask::installConfigs()
     jobPtr.reset(new NetJob(tr("Config download"), APPLICATION->network()));
 
     auto path = QString("Configs/%1/%2.zip").arg(m_pack_safe_name).arg(m_version_name);
-    auto url = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "packs/%1/versions/%2/Configs.zip")
-            .arg(m_pack_safe_name).arg(m_version_name);
+    auto url = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "packs/%1/versions/%2/Configs.zip").arg(m_pack_safe_name).arg(m_version_name);
     auto entry = APPLICATION->metacache()->resolveEntry("ATLauncherPacks", path);
     entry->setStale(true);
 
@@ -667,25 +639,22 @@ void PackInstallTask::installConfigs()
     jobPtr->addNetAction(dl);
     archivePath = entry->getFullPath();
 
-    connect(jobPtr.get(), &NetJob::succeeded, this, [&]()
-    {
+    connect(jobPtr.get(), &NetJob::succeeded, this, [&]() {
         abortable = false;
         jobPtr.reset();
         extractConfigs();
     });
-    connect(jobPtr.get(), &NetJob::failed, [&](QString reason)
-    {
+    connect(jobPtr.get(), &NetJob::failed, [&](QString reason) {
         abortable = false;
         jobPtr.reset();
         emitFailed(reason);
     });
-    connect(jobPtr.get(), &NetJob::progress, [&](qint64 current, qint64 total)
-    {
+    connect(jobPtr.get(), &NetJob::progress, [&](qint64 current, qint64 total) {
         abortable = true;
         setProgress(current, total);
     });
     connect(jobPtr.get(), &NetJob::stepProgress, this, &PackInstallTask::propagateStepProgress);
-    connect(jobPtr.get(), &NetJob::aborted, [&]{
+    connect(jobPtr.