From 9c10965997d873b0de56deef5d5ec5e768db1d8f Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Thu, 1 Jun 2023 16:39:04 -0700
Subject: refactor: split out setting api headers for downloads

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/CMakeLists.txt                            |  4 ++
 launcher/InstanceImportTask.cpp                    |  4 +-
 launcher/ResourceDownloadTask.cpp                  |  4 +-
 launcher/meta/BaseEntity.cpp                       |  4 +-
 launcher/minecraft/AssetsUtils.cpp                 |  4 +-
 launcher/minecraft/Library.cpp                     |  6 +--
 launcher/minecraft/update/AssetUpdateTask.cpp      |  4 +-
 launcher/minecraft/update/FMLLibrariesTask.cpp     |  4 +-
 .../modplatform/atlauncher/ATLPackInstallTask.cpp  | 12 ++---
 launcher/modplatform/flame/FileResolvingTask.cpp   |  5 ++-
 launcher/modplatform/flame/FlameAPI.cpp            |  7 +--
 launcher/modplatform/flame/FlameCheckUpdate.cpp    |  6 ++-
 .../flame/FlameInstanceCreationTask.cpp            |  4 +-
 .../modplatform/helpers/NetworkResourceAPI.cpp     |  8 ++--
 launcher/modplatform/legacy_ftb/PackFetchTask.cpp  |  8 ++--
 .../modplatform/legacy_ftb/PackInstallTask.cpp     |  4 +-
 launcher/modplatform/modrinth/ModrinthAPI.cpp      |  5 ++-
 .../modrinth/ModrinthInstanceCreationTask.cpp      |  5 ++-
 .../technic/SingleZipPackInstallTask.cpp           |  4 +-
 .../modplatform/technic/SolderPackInstallTask.cpp  |  5 ++-
 launcher/net/ApiDownload.h                         | 39 +++++++++++++++++
 launcher/net/ApiHeaderProxy.h                      | 51 ++++++++++++++++++++++
 launcher/net/Download.cpp                          | 12 ++---
 launcher/net/HeaderProxy.h                         | 49 +++++++++++++++++++++
 launcher/net/NetAction.h                           |  9 +++-
 launcher/net/RawHeaderProxy.h                      | 44 +++++++++++++++++++
 launcher/ui/pages/instance/ManagedPackPage.cpp     |  6 ++-
 launcher/ui/pages/modplatform/ResourceModel.cpp    |  4 +-
 .../pages/modplatform/atlauncher/AtlListModel.cpp  |  6 ++-
 .../atlauncher/AtlOptionalModDialog.cpp            |  4 +-
 launcher/ui/pages/modplatform/flame/FlameModel.cpp |  6 ++-
 launcher/ui/pages/modplatform/flame/FlamePage.cpp  |  4 +-
 .../ui/pages/modplatform/legacy_ftb/ListModel.cpp  |  3 +-
 .../pages/modplatform/modrinth/ModrinthModel.cpp   |  6 ++-
 .../ui/pages/modplatform/modrinth/ModrinthPage.cpp |  6 ++-
 .../ui/pages/modplatform/technic/TechnicModel.cpp  |  6 ++-
 .../ui/pages/modplatform/technic/TechnicPage.cpp   |  6 ++-
 launcher/ui/widgets/VariableSizedImageObject.cpp   |  3 +-
 38 files changed, 303 insertions(+), 68 deletions(-)
 create mode 100644 launcher/net/ApiDownload.h
 create mode 100644 launcher/net/ApiHeaderProxy.h
 create mode 100644 launcher/net/HeaderProxy.h
 create mode 100644 launcher/net/RawHeaderProxy.h

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index ce2771a4..63156471 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -136,6 +136,10 @@ set(NET_SOURCES
     net/Validator.h
     net/Upload.cpp
     net/Upload.h
+    net/HeaderProxy.h
+    net/RawHeaderProxy.h
+    net/ApiHeaderProxy.h
+    net/ApiDownload.h
 )
 
 # Game launch logic
diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index 352848f0..7332e917 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -51,6 +51,8 @@
 
 #include "settings/INISettingsObject.h"
 
+#include "net/ApiDownload.h"
+
 #include <QtConcurrentRun>
 #include <algorithm>
 
@@ -95,7 +97,7 @@ void InstanceImportTask::executeTask()
         m_archivePath = entry->getFullPath();
 
         m_filesNetJob.reset(new NetJob(tr("Modpack download"), APPLICATION->network()));
-        m_filesNetJob->addNetAction(Net::Download::makeCached(m_sourceUrl, entry));
+        m_filesNetJob->addNetAction(Net::ApiDownload::makeCached(m_sourceUrl, entry));
 
         connect(m_filesNetJob.get(), &NetJob::succeeded, this, &InstanceImportTask::downloadSucceeded);
         connect(m_filesNetJob.get(), &NetJob::progress, this, &InstanceImportTask::downloadProgressChanged);
diff --git a/launcher/ResourceDownloadTask.cpp b/launcher/ResourceDownloadTask.cpp
index 06c03c77..cd4c3fb4 100644
--- a/launcher/ResourceDownloadTask.cpp
+++ b/launcher/ResourceDownloadTask.cpp
@@ -24,6 +24,8 @@
 #include "minecraft/mod/ModFolderModel.h"
 #include "minecraft/mod/ResourceFolderModel.h"
 
+#include "net/ApiDownload.h"
+
 ResourceDownloadTask::ResourceDownloadTask(ModPlatform::IndexedPack::Ptr pack,
                                            ModPlatform::IndexedVersion version,
                                            const std::shared_ptr<ResourceFolderModel> packs,
@@ -51,7 +53,7 @@ ResourceDownloadTask::ResourceDownloadTask(ModPlatform::IndexedPack::Ptr pack,
         }
     }
 
-    m_filesNetJob->addNetAction(Net::Download::makeFile(m_pack_version.downloadUrl, dir.absoluteFilePath(getFilename())));
+    m_filesNetJob->addNetAction(Net::ApiDownload::makeFile(m_pack_version.downloadUrl, dir.absoluteFilePath(getFilename())));
     connect(m_filesNetJob.get(), &NetJob::succeeded, this, &ResourceDownloadTask::downloadSucceeded);
     connect(m_filesNetJob.get(), &NetJob::progress, this, &ResourceDownloadTask::downloadProgressChanged);
     connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &ResourceDownloadTask::propogateStepProgress);
diff --git a/launcher/meta/BaseEntity.cpp b/launcher/meta/BaseEntity.cpp
index 97815eba..fd810a91 100644
--- a/launcher/meta/BaseEntity.cpp
+++ b/launcher/meta/BaseEntity.cpp
@@ -15,7 +15,7 @@
 
 #include "BaseEntity.h"
 
-#include "net/Download.h"
+#include "net/ApiDownload.h"
 #include "net/HttpMetaCache.h"
 #include "net/NetJob.h"
 #include "Json.h"
@@ -130,7 +130,7 @@ void Meta::BaseEntity::load(Net::Mode loadType)
     auto url = this->url();
     auto entry = APPLICATION->metacache()->resolveEntry("meta", localFilename());
     entry->setStale(true);
-    auto dl = Net::Download::makeCached(url, entry);
+    auto dl = Net::ApiDownload::makeCached(url, entry);
     /*
      * The validator parses the file and loads it into the object.
      * If that fails, the file is not written to storage.
diff --git a/launcher/minecraft/AssetsUtils.cpp b/launcher/minecraft/AssetsUtils.cpp
index 16fdfdb1..65ad6da6 100644
--- a/launcher/minecraft/AssetsUtils.cpp
+++ b/launcher/minecraft/AssetsUtils.cpp
@@ -45,7 +45,7 @@
 
 #include "AssetsUtils.h"
 #include "FileSystem.h"
-#include "net/Download.h"
+#include "net/ApiDownload.h"
 #include "net/ChecksumValidator.h"
 #include "BuildConfig.h"
 
@@ -311,7 +311,7 @@ NetAction::Ptr AssetObject::getDownloadAction()
     QFileInfo objectFile(getLocalPath());
     if ((!objectFile.isFile()) || (objectFile.size() != size))
     {
-        auto objectDL = Net::Download::makeFile(getUrl(), objectFile.filePath());
+        auto objectDL = Net::ApiDownload::makeFile(getUrl(), objectFile.filePath());
         if(hash.size())
         {
             auto rawHash = QByteArray::fromHex(hash.toLatin1());
diff --git a/launcher/minecraft/Library.cpp b/launcher/minecraft/Library.cpp
index cb2b5254..e0318ef2 100644
--- a/launcher/minecraft/Library.cpp
+++ b/launcher/minecraft/Library.cpp
@@ -36,7 +36,7 @@
 #include "Library.h"
 #include "MinecraftInstance.h"
 
-#include <net/Download.h>
+#include <net/ApiDownload.h>
 #include <net/ChecksumValidator.h>
 #include <FileSystem.h>
 #include <BuildConfig.h>
@@ -129,14 +129,14 @@ QList<NetAction::Ptr> Library::getDownloads(
         if(sha1.size())
         {
             auto rawSha1 = QByteArray::fromHex(sha1.toLatin1());
-            auto dl = Net::Download::makeCached(url, entry, options);
+            auto dl = Net::ApiDownload::makeCached(url, entry, options);
             dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
             qDebug() << "Checksummed Download for:" << rawName().serialize() << "storage:" << storage << "url:" << url;
             out.append(dl);
         }
         else
         {
-            out.append(Net::Download::makeCached(url, entry, options));
+            out.append(Net::ApiDownload::makeCached(url, entry, options));
             qDebug() << "Download for:" << rawName().serialize() << "storage:" << storage << "url:" << url;
         }
         return true;
diff --git a/launcher/minecraft/update/AssetUpdateTask.cpp b/launcher/minecraft/update/AssetUpdateTask.cpp
index 31fd5eb1..bafbe75f 100644
--- a/launcher/minecraft/update/AssetUpdateTask.cpp
+++ b/launcher/minecraft/update/AssetUpdateTask.cpp
@@ -7,6 +7,8 @@
 
 #include "Application.h"
 
+#include "net/ApiDownload.h"
+
 AssetUpdateTask::AssetUpdateTask(MinecraftInstance * inst)
 {
     m_inst = inst;
@@ -34,7 +36,7 @@ void AssetUpdateTask::executeTask()
     entry->setStale(true);
     auto hexSha1 = assets->sha1.toLatin1();
     qDebug() << "Asset index SHA1:" << hexSha1;
-    auto dl = Net::Download::makeCached(indexUrl, entry);
+    auto dl = Net::ApiDownload::makeCached(indexUrl, entry);
     auto rawSha1 = QByteArray::fromHex(assets->sha1.toLatin1());
     dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
     job->addNetAction(dl);
diff --git a/launcher/minecraft/update/FMLLibrariesTask.cpp b/launcher/minecraft/update/FMLLibrariesTask.cpp
index 75e5c572..3651f4f4 100644
--- a/launcher/minecraft/update/FMLLibrariesTask.cpp
+++ b/launcher/minecraft/update/FMLLibrariesTask.cpp
@@ -8,6 +8,8 @@
 #include "BuildConfig.h"
 #include "Application.h"
 
+#include "net/ApiDownload.h"
+
 FMLLibrariesTask::FMLLibrariesTask(MinecraftInstance * inst)
 {
     m_inst = inst;
@@ -68,7 +70,7 @@ void FMLLibrariesTask::executeTask()
     {
         auto entry = metacache->resolveEntry("fmllibs", lib.filename);
         QString urlString = BuildConfig.FMLLIBS_BASE_URL + lib.filename;
-        dljob->addNetAction(Net::Download::makeCached(QUrl(urlString), entry, options));
+        dljob->addNetAction(Net::ApiDownload::makeCached(QUrl(urlString), entry, options));
     }
 
     connect(dljob.get(), &NetJob::succeeded, this, &FMLLibrariesTask::fmllibsFinished);
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index 07e0bf23..f763cc02 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -53,6 +53,8 @@
 #include "meta/Version.h"
 #include "meta/VersionList.h"
 
+#include "net/ApiDownload.h"
+
 #include "BuildConfig.h"
 #include "Application.h"
 
@@ -84,7 +86,7 @@ void PackInstallTask::executeTask()
     NetJob::Ptr netJob{ new NetJob("ATLauncher::VersionFetch", APPLICATION->network()) };
     auto searchUrl = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "packs/%1/versions/%2/Configs.json")
             .arg(m_pack_safe_name).arg(m_version_name);
-    netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl), &response));
 
     QObject::connect(netJob.get(), &NetJob::succeeded, this, &PackInstallTask::onDownloadSucceeded);
     QObject::connect(netJob.get(), &NetJob::failed, this, &PackInstallTask::onDownloadFailed);
@@ -658,7 +660,7 @@ void PackInstallTask::installConfigs()
     auto entry = APPLICATION->metacache()->resolveEntry("ATLauncherPacks", path);
     entry->setStale(true);
 
-    auto dl = Net::Download::makeCached(url, entry);
+    auto dl = Net::ApiDownload::makeCached(url, entry);
     if (!m_version.configs.sha1.isEmpty()) {
         auto rawSha1 = QByteArray::fromHex(m_version.configs.sha1.toLatin1());
         dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
@@ -781,7 +783,7 @@ void PackInstallTask::downloadMods()
             entry->setStale(true);
             modsToExtract.insert(entry->getFullPath(), mod);
 
-            auto dl = Net::Download::makeCached(url, entry);
+            auto dl = Net::ApiDownload::makeCached(url, entry);
             if (!mod.md5.isEmpty()) {
                 auto rawMd5 = QByteArray::fromHex(mod.md5.toLatin1());
                 dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, rawMd5));
@@ -793,7 +795,7 @@ void PackInstallTask::downloadMods()
             entry->setStale(true);
             modsToDecomp.insert(entry->getFullPath(), mod);
 
-            auto dl = Net::Download::makeCached(url, entry);
+            auto dl = Net::ApiDownload::makeCached(url, entry);
             if (!mod.md5.isEmpty()) {
                 auto rawMd5 = QByteArray::fromHex(mod.md5.toLatin1());
                 dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, rawMd5));
@@ -807,7 +809,7 @@ void PackInstallTask::downloadMods()
             auto entry = APPLICATION->metacache()->resolveEntry("ATLauncherPacks", cacheName);
             entry->setStale(true);
 
-            auto dl = Net::Download::makeCached(url, entry);
+            auto dl = Net::ApiDownload::makeCached(url, entry);
             if (!mod.md5.isEmpty()) {
                 auto rawMd5 = QByteArray::fromHex(mod.md5.toLatin1());
                 dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, rawMd5));
diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 83db642e..011c4cdf 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -2,6 +2,7 @@
 
 #include "Json.h"
 #include "net/Upload.h"
+#include "net/ApiDownload.h"
 
 #include "modplatform/modrinth/ModrinthPackIndex.h"
 
@@ -94,7 +95,7 @@ void Flame::FileResolvingTask::netJobFinished()
             if(!hash.isEmpty()) {
                 auto url = QString("https://api.modrinth.com/v2/version_file/%1?algorithm=sha1").arg(hash);
                 auto output = std::make_shared<QByteArray>();
-                auto dl = Net::Download::makeByteArray(QUrl(url), output.get());
+                auto dl = Net::ApiDownload::makeByteArray(QUrl(url), output.get());
                 QObject::connect(dl.get(), &Net::Download::succeeded, [&out]() {
                     out.resolved = true;
                 });
@@ -169,7 +170,7 @@ void Flame::FileResolvingTask::modrinthCheckFinished() {
             auto projectId = mod->projectId;
             auto output = std::make_shared<QByteArray>();
             auto url = QString("https://api.curseforge.com/v1/mods/%1").arg(projectId);
-            auto dl = Net::Download::makeByteArray(url, output.get());
+            auto dl = Net::ApiDownload::makeByteArray(url, output.get());
             qDebug() << "Fetching url slug for file:" << mod->fileName;
             QObject::connect(dl.get(), &Net::Download::succeeded, [block, index, output]() {
                 auto mod = block->at(index);  // use the shared_ptr so it is captured and only freed when we are done
diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index 92590a08..49ab06db 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -9,6 +9,7 @@
 #include "BuildConfig.h"
 #include "Json.h"
 #include "net/NetJob.h"
+#include "net/ApiDownload.h"
 #include "net/Upload.h"
 
 Task::Ptr FlameAPI::matchFingerprints(const QList<uint>& fingerprints, QByteArray* response)
@@ -40,7 +41,7 @@ auto FlameAPI::getModFileChangelog(int modId, int fileId) -> QString
 
     auto netJob = makeShared<NetJob>(QString("Flame::FileChangelog"), APPLICATION->network());
     auto response = std::make_shared<QByteArray>();
-    netJob->addNetAction(Net::Download::makeByteArray(
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(
         QString("https://api.curseforge.com/v1/mods/%1/files/%2/changelog")
             .arg(QString::fromStdString(std::to_string(modId)), QString::fromStdString(std::to_string(fileId))),
         response.get()));
@@ -75,7 +76,7 @@ auto FlameAPI::getModDescription(int modId) -> QString
 
     auto netJob = makeShared<NetJob>(QString("Flame::ModDescription"), APPLICATION->network());
     auto response = std::make_shared<QByteArray>();
-    netJob->addNetAction(Net::Download::makeByteArray(
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(
         QString("https://api.curseforge.com/v1/mods/%1/description").arg(QString::number(modId)), response.get()));
 
     QObject::connect(netJob.get(), &NetJob::succeeded, [&netJob, response, &description] {
@@ -115,7 +116,7 @@ auto FlameAPI::getLatestVersion(VersionSearchArgs&& args) -> ModPlatform::Indexe
     auto response = std::make_shared<QByteArray>();
     ModPlatform::IndexedVersion ver;
 
-    netJob->addNetAction(Net::Download::makeByteArray(versions_url, response.get()));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(versions_url, response.get()));
 
     QObject::connect(netJob.get(), &NetJob::succeeded, [response, args, &ver] {
         QJsonParseError parse_error{};
diff --git a/launcher/modplatform/flame/FlameCheckUpdate.cpp b/launcher/modplatform/flame/FlameCheckUpdate.cpp
index e09aeb3d..c81d1337 100644
--- a/launcher/modplatform/flame/FlameCheckUpdate.cpp
+++ b/launcher/modplatform/flame/FlameCheckUpdate.cpp
@@ -13,6 +13,8 @@
 #include "minecraft/mod/ModFolderModel.h"
 #include "minecraft/mod/ResourceFolderModel.h"
 
+#include "net/ApiDownload.h"
+
 static FlameAPI api;
 
 bool FlameCheckUpdate::abort()
@@ -33,7 +35,7 @@ ModPlatform::IndexedPack getProjectInfo(ModPlatform::IndexedVersion& ver_info)
 
     auto response = new QByteArray();
     auto url = QString("https://api.curseforge.com/v1/mods/%1").arg(ver_info.addonId.toString());
-    auto dl = Net::Download::makeByteArray(url, response);
+    auto dl = Net::ApiDownload::makeByteArray(url, response);
     get_project_job->addNetAction(dl);
 
     QObject::connect(get_project_job, &NetJob::succeeded, [response, &pack]() {
@@ -77,7 +79,7 @@ ModPlatform::IndexedVersion getFileInfo(int addonId, int fileId)
 
     auto response = new QByteArray();
     auto url = QString("https://api.curseforge.com/v1/mods/%1/files/%2").arg(QString::number(addonId), QString::number(fileId));
-    auto dl = Net::Download::makeByteArray(url, response);
+    auto dl = Net::ApiDownload::makeByteArray(url, response);
     get_file_info_job->addNetAction(dl);
 
     QObject::connect(get_file_info_job, &NetJob::succeeded, [response, &ver]() {
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index dae93d1c..099e3ae4 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -60,6 +60,8 @@
 #include "minecraft/World.h"
 #include "minecraft/mod/tasks/LocalResourceParse.h"
 
+#include "net/ApiDownload.h"
+
 
 const static QMap<QString, QString> forgemap = { { "1.2.5", "3.4.9.171" },
                                                  { "1.4.2", "6.0.1.355" },
@@ -473,7 +475,7 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
             case Flame::File::Type::Mod: {
                 if (!result.url.isEmpty()) {
                     qDebug() << "Will download" << result.url << "to" << path;
-                    auto dl = Net::Download::makeFile(result.url, path);
+                    auto dl = Net::ApiDownload::makeFile(result.url, path);
                     m_files_job->addNetAction(dl);
                 }
                 break;
diff --git a/launcher/modplatform/helpers/NetworkResourceAPI.cpp b/launcher/modplatform/helpers/NetworkResourceAPI.cpp
index a3c592fd..0ff8ac8a 100644
--- a/launcher/modplatform/helpers/NetworkResourceAPI.cpp
+++ b/launcher/modplatform/helpers/NetworkResourceAPI.cpp
@@ -9,6 +9,8 @@
 
 #include "modplatform/ModIndex.h"
 
+#include "net/ApiDownload.h"
+
 Task::Ptr NetworkResourceAPI::searchProjects(SearchArgs&& args, SearchCallbacks&& callbacks) const
 {
     auto search_url_optional = getSearchURL(args);
@@ -22,7 +24,7 @@ Task::Ptr NetworkResourceAPI::searchProjects(SearchArgs&& args, SearchCallbacks&
     auto response = new QByteArray();
     auto netJob = makeShared<NetJob>(QString("%1::Search").arg(debugName()), APPLICATION->network());
 
-    netJob->addNetAction(Net::Download::makeByteArray(QUrl(search_url), response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(search_url), response));
 
     QObject::connect(netJob.get(), &NetJob::succeeded, [this, response, callbacks]{
         QJsonParseError parse_error{};
@@ -90,7 +92,7 @@ Task::Ptr NetworkResourceAPI::getProjectVersions(VersionSearchArgs&& args, Versi
     auto netJob = makeShared<NetJob>(QString("%1::Versions").arg(args.pack.name), APPLICATION->network());
     auto response = new QByteArray();
 
-    netJob->addNetAction(Net::Download::makeByteArray(versions_url, response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(versions_url, response));
 
     QObject::connect(netJob.get(), &NetJob::succeeded, [response, callbacks, args] {
         QJsonParseError parse_error{};
@@ -122,7 +124,7 @@ Task::Ptr NetworkResourceAPI::getProject(QString addonId, QByteArray* response)
 
     auto netJob = makeShared<NetJob>(QString("%1::GetProject").arg(addonId), APPLICATION->network());
 
-    netJob->addNetAction(Net::Download::makeByteArray(QUrl(project_url), response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(project_url), response));
 
     QObject::connect(netJob.get(), &NetJob::finished, [response] {
         delete response;
diff --git a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
index e8768c5c..320ddd3e 100644
--- a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
@@ -40,6 +40,8 @@
 #include "BuildConfig.h"
 #include "Application.h"
 
+#include "net/ApiDownload.h"
+
 namespace LegacyFTB {
 
 void PackFetchTask::fetch()
@@ -51,11 +53,11 @@ void PackFetchTask::fetch()
 
     QUrl publicPacksUrl = QUrl(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/modpacks.xml");
     qDebug() << "Downloading public version info from" << publicPacksUrl.toString();
-    jobPtr->addNetAction(Net::Download::makeByteArray(publicPacksUrl, &publicModpacksXmlFileData));
+    jobPtr->addNetAction(Net::ApiDownload::makeByteArray(publicPacksUrl, &publicModpacksXmlFileData));
 
     QUrl thirdPartyUrl = QUrl(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/thirdparty.xml");
     qDebug() << "Downloading thirdparty version info from" << thirdPartyUrl.toString();
-    jobPtr->addNetAction(Net::Download::makeByteArray(thirdPartyUrl, &thirdPartyModpacksXmlFileData));
+    jobPtr->addNetAction(Net::ApiDownload::makeByteArray(thirdPartyUrl, &thirdPartyModpacksXmlFileData));
 
     QObject::connect(jobPtr.get(), &NetJob::succeeded, this, &PackFetchTask::fileDownloadFinished);
     QObject::connect(jobPtr.get(), &NetJob::failed, this, &PackFetchTask::fileDownloadFailed);
@@ -72,7 +74,7 @@ void PackFetchTask::fetchPrivate(const QStringList & toFetch)
     {
         QByteArray *data = new QByteArray();
         NetJob *job = new NetJob("Fetching private pack", m_network);
-        job->addNetAction(Net::Download::makeByteArray(privatePackBaseUrl.arg(packCode), data));
+        job->addNetAction(Net::ApiDownload::makeByteArray(privatePackBaseUrl.arg(packCode), data));
 
         QObject::connect(job, &NetJob::succeeded, this, [this, job, data, packCode]
         {
diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
index 36c142ac..6da8fc88 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
@@ -48,6 +48,8 @@
 #include "BuildConfig.h"
 #include "Application.h"
 
+#include "net/ApiDownload.h"
+
 namespace LegacyFTB {
 
 PackInstallTask::PackInstallTask(shared_qobject_ptr<QNetworkAccessManager> network, Modpack pack, QString version)
@@ -76,7 +78,7 @@ void PackInstallTask::downloadPack()
     } else {
         url = QString(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "modpacks/%1").arg(archivePath);
     }
-    netJobContainer->addNetAction(Net::Download::makeFile(url, archivePath));
+    netJobContainer->addNetAction(Net::ApiDownload::makeFile(url, archivePath));
 
     connect(netJobContainer.get(), &NetJob::succeeded, this, &PackInstallTask::onDownloadSucceeded);
     connect(netJobContainer.get(), &NetJob::failed, this, &PackInstallTask::onDownloadFailed);
diff --git a/launcher/modplatform/modrinth/ModrinthAPI.cpp b/launcher/modplatform/modrinth/ModrinthAPI.cpp
index 29e3d129..ab77ef11 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.cpp
+++ b/launcher/modplatform/modrinth/ModrinthAPI.cpp
@@ -8,12 +8,13 @@
 #include "Json.h"
 #include "net/NetJob.h"
 #include "net/Upload.h"
+#include "net/ApiDownload.h"
 
 Task::Ptr ModrinthAPI::currentVersion(QString hash, QString hash_format, QByteArray* response)
 {
     auto netJob = makeShared<NetJob>(QString("Modrinth::GetCurrentVersion"), APPLICATION->network());
 
-    netJob->addNetAction(Net::Download::makeByteArray(
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(
         QString(BuildConfig.MODRINTH_PROD_URL + "/version_file/%1?algorithm=%2").arg(hash, hash_format), response));
 
     QObject::connect(netJob.get(), &NetJob::finished, [response] { delete response; });
@@ -111,7 +112,7 @@ Task::Ptr ModrinthAPI::getProjects(QStringList addonIds, QByteArray* response) c
     auto netJob = makeShared<NetJob>(QString("Modrinth::GetProjects"), APPLICATION->network());
     auto searchUrl = getMultipleModInfoURL(addonIds);
 
-    netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl), response));
 
     QObject::connect(netJob.get(), &NetJob::finished, [response, netJob] {
         delete response;
diff --git a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
index bb8227aa..0edd696f 100644
--- a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
@@ -12,6 +12,7 @@
 #include "net/ChecksumValidator.h"
 
 #include "net/NetJob.h"
+#include "net/ApiDownload.h"
 #include "settings/INISettingsObject.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
@@ -238,7 +239,7 @@ bool ModrinthCreationTask::createInstance()
         }
 
         qDebug() << "Will try to download" << file.downloads.front() << "to" << file_path;
-        auto dl = Net::Download::makeFile(file.downloads.dequeue(), file_path);
+        auto dl = Net::ApiDownload::makeFile(file.downloads.dequeue(), file_path);
         dl->addValidator(new Net::ChecksumValidator(file.hashAlgorithm, file.hash));
         m_files_job->addNetAction(dl);
 
@@ -247,7 +248,7 @@ bool ModrinthCreationTask::createInstance()
             // MultipleOptionsTask's , once those exist :)
             auto param = dl.toWeakRef();
             connect(dl.get(), &NetAction::failed, [this, &file, file_path, param] {
-                auto ndl = Net::Download::makeFile(file.downloads.dequeue(), file_path);
+                auto ndl = Net::ApiDownload::makeFile(file.downloads.dequeue(), file_path);
                 ndl->addValidator(new Net::ChecksumValidator(file.hashAlgorithm, file.hash));
                 m_files_job->addNetAction(ndl);
                 if (auto shared = param.lock()) shared->succeeded();
diff --git a/launcher/modplatform/technic/SingleZipPackInstallTask.cpp b/launcher/modplatform/technic/SingleZipPackInstallTask.cpp
index f07ca24a..21b0defc 100644
--- a/launcher/modplatform/technic/SingleZipPackInstallTask.cpp
+++ b/launcher/modplatform/technic/SingleZipPackInstallTask.cpp
@@ -23,6 +23,8 @@
 
 #include "Application.h"
 
+#include "net/ApiDownload.h"
+
 Technic::SingleZipPackInstallTask::SingleZipPackInstallTask(const QUrl &sourceUrl, const QString &minecraftVersion)
 {
     m_sourceUrl = sourceUrl;
@@ -45,7 +47,7 @@ void Technic::SingleZipPackInstallTask::executeTask()
     auto entry = APPLICATION->metacache()->resolveEntry("general", path);
     entry->setStale(true);
     m_filesNetJob.reset(new NetJob(tr("Modpack download"), APPLICATION->network()));
-    m_filesNetJob->addNetAction(Net::Download::makeCached(m_sourceUrl, entry));
+    m_filesNetJob->addNetAction(Net::ApiDownload::makeCached(m_sourceUrl, entry));
     m_archivePath = entry->getFullPath();
     auto job = m_filesNetJob.get();
     connect(job, &NetJob::succeeded, this, &Technic::SingleZipPackInstallTask::downloadSucceeded);
diff --git a/launcher/modplatform/technic/SolderPackInstallTask.cpp b/launcher/modplatform/technic/SolderPackInstallTask.cpp
index c26d6a5a..0035c880 100644
--- a/launcher/modplatform/technic/SolderPackInstallTask.cpp
+++ b/launcher/modplatform/technic/SolderPackInstallTask.cpp
@@ -43,6 +43,7 @@
 #include "TechnicPackProcessor.h"
 #include "SolderPackManifest.h"
 #include "net/ChecksumValidator.h"
+#include "net/ApiDownload.h"
 
 Technic::SolderPackInstallTask::SolderPackInstallTask(
     shared_qobject_ptr<QNetworkAccessManager> network,
@@ -72,7 +73,7 @@ void Technic::SolderPackInstallTask::executeTask()
 
     m_filesNetJob.reset(new NetJob(tr("Resolving modpack files"), m_network));
     auto sourceUrl = QString("%1/modpack/%2/%3").arg(m_solderUrl.toString(), m_pack, m_version);
-    m_filesNetJob->addNetAction(Net::Download::makeByteArray(sourceUrl, &m_response));
+    m_filesNetJob->addNetAction(Net::ApiDownload::makeByteArray(sourceUrl, &m_response));
 
     auto job = m_filesNetJob.get();
     connect(job, &NetJob::succeeded, this, &Technic::SolderPackInstallTask::fileListSucceeded);
@@ -113,7 +114,7 @@ void Technic::SolderPackInstallTask::fileListSucceeded()
     for (const auto &mod : build.mods) {
         auto path = FS::PathCombine(m_outputDir.path(), QString("%1").arg(i));
 
-        auto dl = Net::Download::makeFile(mod.url, path);
+        auto dl = Net::ApiDownload::makeFile(mod.url, path);
         if (!mod.md5.isEmpty()) {
             auto rawMd5 = QByteArray::fromHex(mod.md5.toLatin1());
             dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, rawMd5));
diff --git a/launcher/net/ApiDownload.h b/launcher/net/ApiDownload.h
new file mode 100644
index 00000000..3ffda445
--- /dev/null
+++ b/launcher/net/ApiDownload.h
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.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 "ApiHeaderProxy.h"
+#include "Download.h"
+
+namespace Net {
+
+class ApiDownload : public Download {
+   public:
+    ApiDownload() : Download()
+    {
+        auto api_headers = new ApiHeaderProxy();
+        addHeaderProxy(api_headers);
+    }
+    virtual ~ApiDownload() = default;
+};
+
+}  // namespace Net
diff --git a/launcher/net/ApiHeaderProxy.h b/launcher/net/ApiHeaderProxy.h
new file mode 100644
index 00000000..0da92a74
--- /dev/null
+++ b/launcher/net/ApiHeaderProxy.h
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.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 "Application.h"
+#include "BuildConfig.h"
+#include "net/HeaderProxy.h"
+
+namespace Net {
+
+class ApiHeaderProxy : public HeaderProxy {
+   public:
+    ApiHeaderProxy() : HeaderProxy(){};
+    virtual ~ApiHeaderProxy() = default;
+
+   public:
+    virtual QList<HeaderPair> headers(const QNetworkRequest& request) const override
+    {
+        QList<HeaderPair> hdrs;
+        if (APPLICATION->capabilities() & Application::SupportsFlame && request.url().host() == QUrl(BuildConfig.FLAME_BASE_URL).host()) {
+            hdrs.append({ "x-api-key", APPLICATION->getFlameAPIKey().toUtf8() });
+        } else if (request.url().host() == QUrl(BuildConfig.MODRINTH_PROD_URL).host() ||
+                   request.url().host() == QUrl(BuildConfig.MODRINTH_STAGING_URL).host()) {
+            QString token = APPLICATION->getModrinthAPIToken();
+            if (!token.isNull())
+                hdrs.append({ "Authorization", token.toUtf8() });
+        }
+        return hdrs;
+    };
+};
+
+}  // namespace Net
diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index 7f8d3a06..6c217379 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -124,15 +124,11 @@ void Download::executeTask()
     }
 
     request.setHeader(QNetworkRequest::UserAgentHeader, APPLICATION->getUserAgent().toUtf8());
-    // TODO remove duplication
-    if (APPLICATION->capabilities() & Application::SupportsFlame && request.url().host() == QUrl(BuildConfig.FLAME_BASE_URL).host()) {
-        request.setRawHeader("x-api-key", APPLICATION->getFlameAPIKey().toUtf8());
-    } else if (request.url().host() == QUrl(BuildConfig.MODRINTH_PROD_URL).host() ||
-               request.url().host() == QUrl(BuildConfig.MODRINTH_STAGING_URL).host()) {
-        QString token = APPLICATION->getModrinthAPIToken();
-        if (!token.isNull())
-            request.setRawHeader("Authorization", token.toUtf8());
+    for ( auto header_proxy : m_headerProxies ) {
+        header_proxy->writeHeaders(request);
     }
+    // TODO remove duplication
+    
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
     request.setTransferTimeout();
diff --git a/launcher/net/HeaderProxy.h b/launcher/net/HeaderProxy.h
new file mode 100644
index 00000000..e94579e7
--- /dev/null
+++ b/launcher/net/HeaderProxy.h
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.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 <QNetworkRequest>
+
+namespace Net {
+
+struct HeaderPair {
+    QByteArray headerName;
+    QByteArray headerValue;
+};
+
+class HeaderProxy {
+   public:
+    HeaderProxy(){};
+    virtual ~HeaderProxy(){};
+
+   public:
+    virtual QList<HeaderPair> headers(const QNetworkRequest& request) const = 0;
+
+   public:
+    void writeHeaders(QNetworkRequest& request) {
+        for (auto header : headers(request)) {
+            request.setRawHeader(header.headerName, header.headerValue);
+        }
+    };
+};
+
+}  // namespace Net
diff --git a/launcher/net/NetAction.h b/launcher/net/NetAction.h
index ab9322c2..acb0672f 100644
--- a/launcher/net/NetAction.h
+++ b/launcher/net/NetAction.h
@@ -42,6 +42,8 @@
 #include "QObjectPtr.h"
 #include "tasks/Task.h"
 
+#include "HeaderProxy.h"
+
 class NetAction : public Task {
     Q_OBJECT
    protected:
@@ -56,13 +58,16 @@ class NetAction : public Task {
 
     void setNetwork(shared_qobject_ptr<QNetworkAccessManager> network) { m_network = network; }
 
+    void addHeaderProxy(Net::HeaderProxy* proxy) { m_headerProxies.push_back(std::shared_ptr<Net::HeaderProxy>(proxy)); }
+
    protected slots:
     virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) = 0;
     virtual void downloadError(QNetworkReply::NetworkError error) = 0;
     virtual void downloadFinished() = 0;
     virtual void downloadReadyRead() = 0;
 
-    virtual void sslErrors(const QList<QSslError>& errors) {
+    virtual void sslErrors(const QList<QSslError>& errors)
+    {
         int i = 1;
         for (auto error : errors) {
             qCritical() << "Network SSL Error #" << i << " : " << error.errorString();
@@ -70,7 +75,6 @@ class NetAction : public Task {
             qCritical() << "Certificate in question:\n" << cert.toText();
             i++;
         }
-
     };
 
    public slots:
@@ -91,4 +95,5 @@ class NetAction : public Task {
 
     /// source URL
     QUrl m_url;
+    std::vector<std::shared_ptr<Net::HeaderProxy>> m_headerProxies;
 };
diff --git a/launcher/net/RawHeaderProxy.h b/launcher/net/RawHeaderProxy.h
new file mode 100644
index 00000000..ffe6a81a
--- /dev/null
+++ b/launcher/net/RawHeaderProxy.h
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.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 "net/HeaderProxy.h"
+
+namespace Net {
+
+class ApiHeaderProxy : public HeaderProxy {
+   public:
+    ApiHeaderProxy() : HeaderProxy(){};
+    virtual ~ApiHeaderProxy() = default;
+
+   public:
+    virtual QList<HeaderPair> headers(const QNetworkRequest&) const override { return m_headers; };
+
+    void addHeader(const HeaderPair& header) { m_headers.append(header); }
+    void addHeader(const QByteArray& headerName, const QByteArray& headerValue) { m_headers.append({ headerName, headerValue }); }
+    void addHeaders(const QList<HeaderPair>& headers) { m_headers.append(headers); }
+
+   private:
+    QList<HeaderPair> m_headers;
+};
+
+}  // namespace Net
diff --git a/launcher/ui/pages/instance/ManagedPackPage.cpp b/launcher/ui/pages/instance/ManagedPackPage.cpp
index d0701a7a..68119f06 100644
--- a/launcher/ui/pages/instance/ManagedPackPage.cpp
+++ b/launcher/ui/pages/instance/ManagedPackPage.cpp
@@ -23,6 +23,8 @@
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui/dialogs/ProgressDialog.h"
 
+#include "net/ApiDownload.h"
+
 /** This is just to override the combo box popup behavior so that the combo box doesn't take the whole screen.
  *  ... thanks Qt.
  */
@@ -226,7 +228,7 @@ void ModrinthManagedPackPage::parseManagedPack()
 
     QString id = m_inst->getManagedPackID();
 
-    m_fetch_job->addNetAction(Net::Download::makeByteArray(QString("%1/project/%2/version").arg(BuildConfig.MODRINTH_PROD_URL, id), response.get()));
+    m_fetch_job->addNetAction(Net::ApiDownload::makeByteArray(QString("%1/project/%2/version").arg(BuildConfig.MODRINTH_PROD_URL, id), response.get()));
 
     QObject::connect(m_fetch_job.get(), &NetJob::succeeded, this, [this, response, id] {
         QJsonParseError parse_error{};
@@ -369,7 +371,7 @@ void FlameManagedPackPage::parseManagedPack()
 
     QString id = m_inst->getManagedPackID();
 
-    m_fetch_job->addNetAction(Net::Download::makeByteArray(QString("%1/mods/%2/files").arg(BuildConfig.FLAME_BASE_URL, id), response.get()));
+    m_fetch_job->addNetAction(Net::ApiDownload::makeByteArray(QString("%1/mods/%2/files").arg(BuildConfig.FLAME_BASE_URL, id), response.get()));
 
     QObject::connect(m_fetch_job.get(), &NetJob::succeeded, this, [this, response, id] {
         QJsonParseError parse_error{};
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
index 49405a02..3e0c0257 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -17,7 +17,7 @@
 #include "BuildConfig.h"
 #include "Json.h"
 
-#include "net/Download.h"
+#include "net/ApiDownload.h"
 #include "net/NetJob.h"
 
 #include "modplatform/ModIndex.h"
@@ -281,7 +281,7 @@ std::optional<QIcon> ResourceModel::getIcon(QModelIndex& index, const QUrl& url)
     auto cache_entry = APPLICATION->metacache()->resolveEntry(
         metaEntryBase(),
         QString("logos/%1").arg(QString(QCryptographicHash::hash(url.toEncoded(), QCryptographicHash::Algorithm::Sha1).toHex())));
-    auto icon_fetch_action = Net::Download::makeCached(url, cache_entry);
+    auto icon_fetch_action = Net::ApiDownload::makeCached(url, cache_entry);
 
     auto full_file_path = cache_entry->getFullPath();
     connect(icon_fetch_action.get(), &NetAction::succeeded, this, [=] {
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp
index 9ad26f47..e064919e 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp
@@ -20,6 +20,8 @@
 #include <Application.h>
 #include <Json.h>
 
+#include "net/ApiDownload.h"
+
 namespace Atl {
 
 ListModel::ListModel(QObject *parent) : QAbstractListModel(parent)
@@ -88,7 +90,7 @@ void ListModel::request()
 
     auto netJob = makeShared<NetJob>("Atl::Request", APPLICATION->network());
     auto url = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "launcher/json/packsnew.json");
-    netJob->addNetAction(Net::Download::makeByteArray(QUrl(url), &response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(url), &response));
     jobPtr = netJob;
     jobPtr->start();
 
@@ -184,7 +186,7 @@ void ListModel::requestLogo(QString file, QString url)
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("ATLauncherPacks", QString("logos/%1").arg(file.section(".", 0, 0)));
     NetJob *job = new NetJob(QString("ATLauncher Icon Download %1").arg(file), APPLICATION->network());
-    job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
+    job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
     QObject::connect(job, &NetJob::succeeded, this, [this, file, fullPath]
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
index cdb4532c..edc73345 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
@@ -43,6 +43,8 @@
 #include "modplatform/atlauncher/ATLShareCode.h"
 #include "Application.h"
 
+#include "net/ApiDownload.h"
+
 AtlOptionalModListModel::AtlOptionalModListModel(QWidget* parent, ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods)
     : QAbstractListModel(parent)
     , m_version(version)
@@ -152,7 +154,7 @@ Qt::ItemFlags AtlOptionalModListModel::flags(const QModelIndex &index) const {
 void AtlOptionalModListModel::useShareCode(const QString& code) {
     m_jobPtr.reset(new NetJob("Atl::Request", APPLICATION->network()));
     auto url = QString(BuildConfig.ATL_API_BASE_URL + "share-codes/" + code);
-    m_jobPtr->addNetAction(Net::Download::makeByteArray(QUrl(url), &m_response));
+    m_jobPtr->addNetAction(Net::ApiDownload::makeByteArray(QUrl(url), &m_response));
 
     connect(m_jobPtr.get(), &NetJob::succeeded,
             this, &AtlOptionalModListModel::shareCodeSuccess);
diff --git a/launcher/ui/pages/modplatform/flame/FlameModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
index d9d5ef5b..0a5fd9ce 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModel.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
@@ -3,6 +3,8 @@
 #include "Application.h"
 #include "ui/widgets/ProjectItem.h"
 
+#include "net/ApiDownload.h"
+
 #include <Version.h>
 
 #include <QtMath>
@@ -104,7 +106,7 @@ void ListModel::requestLogo(QString logo, QString url)
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("FlamePacks", QString("logos/%1").arg(logo.section(".", 0, 0)));
     auto job = new NetJob(QString("Flame Icon Download %1").arg(logo), APPLICATION->network());
-    job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
+    job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
     QObject::connect(job, &NetJob::succeeded, this, [this, logo, fullPath, job] {
@@ -171,7 +173,7 @@ void ListModel::performPaginatedSearch()
                          .arg(currentSearchTerm)
                          .arg(currentSort + 1);
 
-    netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl), &response));
     jobPtr = netJob;
     jobPtr->start();
     QObject::connect(netJob.get(), &NetJob::succeeded, this, &ListModel::searchRequestFinished);
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.cpp b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
index f9ac4a78..c98e4060 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
@@ -46,6 +46,8 @@
 #include "ui/widgets/ProjectItem.h"
 #include "modplatform/flame/FlameAPI.h"
 
+#include "net/ApiDownload.h"
+
 static FlameAPI api;
 
 FlamePage::FlamePage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), ui(new Ui::FlamePage), dialog(dialog)
@@ -132,7 +134,7 @@ void FlamePage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
         auto netJob = new NetJob(QString("Flame::PackVersions(%1)").arg(current.name), APPLICATION->network());
         auto response = new QByteArray();
         int addonId = current.addonId;
-        netJob->addNetAction(Net::Download::makeByteArray(QString("https://api.curseforge.com/v1/mods/%1/files").arg(addonId), response));
+        netJob->addNetAction(Net::ApiDownload::makeByteArray(QString("https://api.curseforge.com/v1/mods/%1/files").arg(addonId), response));
 
         QObject::connect(netJob, &NetJob::succeeded, this, [this, response, addonId, curr] {
             if (addonId != current.addonId) {
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
index 2343b79f..c391c128 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
@@ -37,6 +37,7 @@
 #include "Application.h"
 #include "net/HttpMetaCache.h"
 #include "net/NetJob.h"
+#include "net/ApiDownload.h"
 
 #include "StringUtils.h"
 #include <Version.h>
@@ -254,7 +255,7 @@ void ListModel::requestLogo(QString file)
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(file.section(".", 0, 0)));
     NetJob *job = new NetJob(QString("FTB Icon Download for %1").arg(file), APPLICATION->network());
-    job->addNetAction(Net::Download::makeCached(QUrl(QString(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/%1").arg(file)), entry));
+    job->addNetAction(Net::ApiDownload::makeCached(QUrl(QString(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/%1").arg(file)), entry));
 
     auto fullPath = entry->getFullPath();
     QObject::connect(job, &NetJob::finished, this, [this, file, fullPath]
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index 55d287b0..b28845fc 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -42,6 +42,8 @@
 #include "minecraft/PackProfile.h"
 #include "ui/widgets/ProjectItem.h"
 
+#include "net/ApiDownload.h"
+
 #include <QMessageBox>
 
 namespace Modrinth {
@@ -142,7 +144,7 @@ void ModpackListModel::performPaginatedSearch()
                             .arg(currentSearchTerm)
                             .arg(currentSort);
 
-    netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchAllUrl), &m_all_response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchAllUrl), &m_all_response));
 
     QObject::connect(netJob.get(), &NetJob::succeeded, this, [this] {
         QJsonParseError parse_error_all{};
@@ -235,7 +237,7 @@ void ModpackListModel::requestLogo(QString logo, QString url)
     MetaEntryPtr entry =
         APPLICATION->metacache()->resolveEntry(m_parent->metaEntryBase(), QString("logos/%1").arg(logo.section(".", 0, 0)));
     auto job = new NetJob(QString("%1 Icon Download %2").arg(m_parent->debugName()).arg(logo), APPLICATION->network());
-    job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
+    job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
     QObject::connect(job, &NetJob::succeeded, this, [this, logo, fullPath, job] {
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index 0bb11d83..c450395c 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -46,6 +46,8 @@
 
 #include "ui/widgets/ProjectItem.h"
 
+#include "net/ApiDownload.h"
+
 #include <QComboBox>
 #include <QKeyEvent>
 #include <QPushButton>
@@ -127,7 +129,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
 
         QString id = current.id;
 
-        netJob->addNetAction(Net::Download::makeByteArray(QString("%1/project/%2").arg(BuildConfig.MODRINTH_PROD_URL, id), response));
+        netJob->addNetAction(Net::ApiDownload::makeByteArray(QString("%1/project/%2").arg(BuildConfig.MODRINTH_PROD_URL, id), response));
 
         QObject::connect(netJob, &NetJob::succeeded, this, [this, response, id, curr] {
             if (id != current.id) {
@@ -179,7 +181,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
         QString id = current.id;
 
         netJob->addNetAction(
-            Net::Download::makeByteArray(QString("%1/project/%2/version").arg(BuildConfig.MODRINTH_PROD_URL, id), response));
+            Net::ApiDownload::makeByteArray(QString("%1/project/%2/version").arg(BuildConfig.MODRINTH_PROD_URL, id), response));
 
         QObject::connect(netJob, &NetJob::succeeded, this, [this, response, id, curr] {
             if (id != current.id) {
diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
index 50f0c72d..0790fb0b 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
@@ -38,6 +38,8 @@
 #include "BuildConfig.h"
 #include "Json.h"
 
+#include "net/ApiDownload.h"
+
 #include <QIcon>
 
 Technic::ListModel::ListModel(QObject *parent) : QAbstractListModel(parent)
@@ -134,7 +136,7 @@ void Technic::ListModel::performSearch()
         ).arg(BuildConfig.TECHNIC_API_BASE_URL, BuildConfig.TECHNIC_API_BUILD, currentSearchTerm);
         searchMode = List;
     }
-    netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl), &response));
     jobPtr = netJob;
     jobPtr->start();
     QObject::connect(netJob.get(), &NetJob::succeeded, this, &ListModel::searchRequestFinished);
@@ -286,7 +288,7 @@ void Technic::ListModel::requestLogo(QString logo, QString url)
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("TechnicPacks", QString("logos/%1").arg(logo));
     NetJob *job = new NetJob(QString("Technic Icon Download %1").arg(logo), APPLICATION->network());
-    job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
+    job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
 
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
index 859da97e..5aabcf34 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
@@ -49,6 +49,8 @@
 #include "Application.h"
 #include "modplatform/technic/SolderPackManifest.h"
 
+#include "net/ApiDownload.h"
+
 TechnicPage::TechnicPage(NewInstanceDialog* dialog, QWidget *parent)
     : QWidget(parent), ui(new Ui::TechnicPage), dialog(dialog)
 {
@@ -143,7 +145,7 @@ void TechnicPage::suggestCurrent()
 
     auto netJob = makeShared<NetJob>(QString("Technic::PackMeta(%1)").arg(current.name), APPLICATION->network());
     QString slug = current.slug;
-    netJob->addNetAction(Net::Download::makeByteArray(QString("%1modpack/%2?build=%3").arg(BuildConfig.TECHNIC_API_BASE_URL, slug, BuildConfig.TECHNIC_API_BUILD), &response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QString("%1modpack/%2?build=%3").arg(BuildConfig.TECHNIC_API_BASE_URL, slug, BuildConfig.TECHNIC_API_BUILD), &response));
     QObject::connect(netJob.get(), &NetJob::succeeded, this, [this, slug]
     {
         jobPtr.reset();
@@ -249,7 +251,7 @@ void TechnicPage::metadataLoaded()
 
         auto netJob = makeShared<NetJob>(QString("Technic::SolderMeta(%1)").arg(current.name), APPLICATION->network());
         auto url = QString("%1/modpack/%2").arg(current.url, current.slug);
-        netJob->addNetAction(Net::Download::makeByteArray(QUrl(url), &response));
+        netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(url), &response));
 
         QObject::connect(netJob.get(), &NetJob::succeeded, this, &TechnicPage::onSolderLoaded);
 
diff --git a/launcher/ui/widgets/VariableSizedImageObject.cpp b/launcher/ui/widgets/VariableSizedImageObject.cpp
index 991b4a04..3aa3343d 100644
--- a/launcher/ui/widgets/VariableSizedImageObject.cpp
+++ b/launcher/ui/widgets/VariableSizedImageObject.cpp
@@ -26,6 +26,7 @@
 #include "Application.h"
 
 #include "net/NetJob.h"
+#include "net/ApiDownload.h"
 
 enum FormatProperties { ImageData = QTextFormat::UserProperty + 1 };
 
@@ -97,7 +98,7 @@ void VariableSizedImageObject::loadImage(QTextDocument* doc, const QUrl& source,
         QString("images/%1").arg(QString(QCryptographicHash::hash(source.toEncoded(), QCryptographicHash::Algorithm::Sha1).toHex())));
 
     auto job = new NetJob(QString("Load Image: %1").arg(source.fileName()), APPLICATION->network());
-    job->addNetAction(Net::Download::makeCached(source, entry));
+    job->addNetAction(Net::ApiDownload::makeCached(source, entry));
 
     auto full_entry_path = entry->getFullPath();
     auto source_url = source;
-- 
cgit 


From 418677ef310ebde9e2ce6fa98e224b6d4d1aa9f4 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Thu, 1 Jun 2023 20:15:39 -0700
Subject: refactor: override / mask static `make` functions for ApiDownload

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/CMakeLists.txt                   |  1 +
 launcher/net/ApiDownload.cpp              | 67 +++++++++++++++++++++++++++++++
 launcher/net/ApiDownload.h                | 14 +++----
 launcher/net/ApiHeaderProxy.h             | 28 ++++++-------
 launcher/net/Download.cpp                 |  5 ++-
 launcher/net/Download.h                   |  4 +-
 launcher/net/HeaderProxy.h                |  3 +-
 launcher/net/NetAction.h                  |  1 +
 launcher/net/Upload.h                     |  1 +
 launcher/screenshots/ImgurAlbumCreation.h |  2 +
 launcher/screenshots/ImgurUpload.h        |  1 +
 11 files changed, 101 insertions(+), 26 deletions(-)
 create mode 100644 launcher/net/ApiDownload.cpp

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 63156471..1e28591e 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -140,6 +140,7 @@ set(NET_SOURCES
     net/RawHeaderProxy.h
     net/ApiHeaderProxy.h
     net/ApiDownload.h
+    net/ApiDownload.cpp
 )
 
 # Game launch logic
diff --git a/launcher/net/ApiDownload.cpp b/launcher/net/ApiDownload.cpp
new file mode 100644
index 00000000..69b39c4a
--- /dev/null
+++ b/launcher/net/ApiDownload.cpp
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.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 "ByteArraySink.h"
+#include "ChecksumValidator.h"
+#include "MetaCacheSink.h"
+#include "net/ApiDownload.h"
+#include "net/NetAction.h"
+
+namespace Net {
+
+auto ApiDownload::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> Download::Ptr
+{
+    auto dl = makeShared<ApiDownload>();
+    dl->m_url = url;
+    dl->setObjectName(QString("CACHE:") + url.toString());
+    dl->m_options = options;
+    auto md5Node = new ChecksumValidator(QCryptographicHash::Md5);
+    auto cachedNode = new MetaCacheSink(entry, md5Node, options.testFlag(Option::MakeEternal));
+    dl->m_sink.reset(cachedNode);
+    return dl;
+}
+
+auto ApiDownload::makeByteArray(QUrl url, QByteArray* output, Options options) -> Download::Ptr
+{
+    auto dl = makeShared<ApiDownload>();
+    dl->m_url = url;
+    dl->setObjectName(QString("BYTES:") + url.toString());
+    dl->m_options = options;
+    dl->m_sink.reset(new ByteArraySink(output));
+    return dl;
+}
+
+auto ApiDownload::makeFile(QUrl url, QString path, Options options) -> Download::Ptr
+{
+    auto dl = makeShared<ApiDownload>();
+    dl->m_url = url;
+    dl->setObjectName(QString("FILE:") + url.toString());
+    dl->m_options = options;
+    dl->m_sink.reset(new FileSink(path));
+    return dl;
+}
+
+
+void ApiDownload::init()
+{
+    qDebug() << "Setting up api download";
+    auto api_headers = new ApiHeaderProxy();
+    addHeaderProxy(api_headers);
+}
+}  // namespace Net
diff --git a/launcher/net/ApiDownload.h b/launcher/net/ApiDownload.h
index 3ffda445..7a1f2e92 100644
--- a/launcher/net/ApiDownload.h
+++ b/launcher/net/ApiDownload.h
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -28,12 +26,14 @@ namespace Net {
 
 class ApiDownload : public Download {
    public:
-    ApiDownload() : Download()
-    {
-        auto api_headers = new ApiHeaderProxy();
-        addHeaderProxy(api_headers);
-    }
     virtual ~ApiDownload() = default;
+
+    static auto makeCached(QUrl url, MetaEntryPtr entry, Options options = Option::NoOptions) -> Download::Ptr;
+    static auto makeByteArray(QUrl url, QByteArray* output, Options options = Option::NoOptions) -> Download::Ptr;
+    static auto makeFile(QUrl url, QString path, Options options = Option::NoOptions) -> Download::Ptr;
+
+    void init() override;
+    
 };
 
 }  // namespace Net
diff --git a/launcher/net/ApiHeaderProxy.h b/launcher/net/ApiHeaderProxy.h
index 0da92a74..5de503a6 100644
--- a/launcher/net/ApiHeaderProxy.h
+++ b/launcher/net/ApiHeaderProxy.h
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -21,9 +19,9 @@
 
 #pragma once
 
+#include "net/HeaderProxy.h"
 #include "Application.h"
 #include "BuildConfig.h"
-#include "net/HeaderProxy.h"
 
 namespace Net {
 
@@ -33,19 +31,19 @@ class ApiHeaderProxy : public HeaderProxy {
     virtual ~ApiHeaderProxy() = default;
 
    public:
-    virtual QList<HeaderPair> headers(const QNetworkRequest& request) const override
-    {
-        QList<HeaderPair> hdrs;
-        if (APPLICATION->capabilities() & Application::SupportsFlame && request.url().host() == QUrl(BuildConfig.FLAME_BASE_URL).host()) {
-            hdrs.append({ "x-api-key", APPLICATION->getFlameAPIKey().toUtf8() });
-        } else if (request.url().host() == QUrl(BuildConfig.MODRINTH_PROD_URL).host() ||
-                   request.url().host() == QUrl(BuildConfig.MODRINTH_STAGING_URL).host()) {
-            QString token = APPLICATION->getModrinthAPIToken();
-            if (!token.isNull())
-                hdrs.append({ "Authorization", token.toUtf8() });
-        }
-        return hdrs;
+    virtual QList<HeaderPair> headers(const QNetworkRequest& request) const override { 
+      QList<HeaderPair> hdrs;  
+      if (APPLICATION->capabilities() & Application::SupportsFlame && request.url().host() == QUrl(BuildConfig.FLAME_BASE_URL).host()) {
+          hdrs.append({ "x-api-key", APPLICATION->getFlameAPIKey().toUtf8() });
+      } else if (request.url().host() == QUrl(BuildConfig.MODRINTH_PROD_URL).host() ||
+               request.url().host() == QUrl(BuildConfig.MODRINTH_STAGING_URL).host()) {
+          QString token = APPLICATION->getModrinthAPIToken();
+          if (!token.isNull())
+              hdrs.append({ "Authorization", token.toUtf8() });
+      }
+    return hdrs; 
     };
+
 };
 
 }  // namespace Net
diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index 6c217379..071a9659 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -96,6 +96,8 @@ void Download::addValidator(Validator* v)
 
 void Download::executeTask()
 {
+    init();
+
     setStatus(tr("Downloading %1").arg(StringUtils::truncateUrlHumanFriendly(m_url, 80)));
 
     if (getState() == Task::State::AbortedByUser) {
@@ -124,7 +126,8 @@ void Download::executeTask()
     }
 
     request.setHeader(QNetworkRequest::UserAgentHeader, APPLICATION->getUserAgent().toUtf8());
-    for ( auto header_proxy : m_headerProxies ) {
+    for ( auto& header_proxy : m_headerProxies ) {
+
         header_proxy->writeHeaders(request);
     }
     // TODO remove duplication
diff --git a/launcher/net/Download.h b/launcher/net/Download.h
index 920164a3..fee04feb 100644
--- a/launcher/net/Download.h
+++ b/launcher/net/Download.h
@@ -63,6 +63,8 @@ class Download : public NetAction {
     static auto makeByteArray(QUrl url, QByteArray* output, Options options = Option::NoOptions) -> Download::Ptr;
     static auto makeFile(QUrl url, QString path, Options options = Option::NoOptions) -> Download::Ptr;
 
+    void init() override {};
+
    public:
     void addValidator(Validator* v);
     auto abort() -> bool override;
@@ -81,7 +83,7 @@ class Download : public NetAction {
    public slots:
     void executeTask() override;
 
-   private:
+   protected:
     std::unique_ptr<Sink> m_sink;
     Options m_options;
 
diff --git a/launcher/net/HeaderProxy.h b/launcher/net/HeaderProxy.h
index e94579e7..bb3c8b03 100644
--- a/launcher/net/HeaderProxy.h
+++ b/launcher/net/HeaderProxy.h
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -22,6 +20,7 @@
 #pragma once
 
 #include <QNetworkRequest>
+#include <QDebug>
 
 namespace Net {
 
diff --git a/launcher/net/NetAction.h b/launcher/net/NetAction.h
index acb0672f..93076abc 100644
--- a/launcher/net/NetAction.h
+++ b/launcher/net/NetAction.h
@@ -59,6 +59,7 @@ class NetAction : public Task {
     void setNetwork(shared_qobject_ptr<QNetworkAccessManager> network) { m_network = network; }
 
     void addHeaderProxy(Net::HeaderProxy* proxy) { m_headerProxies.push_back(std::shared_ptr<Net::HeaderProxy>(proxy)); }
+    virtual void init() = 0;
 
    protected slots:
     virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) = 0;
diff --git a/launcher/net/Upload.h b/launcher/net/Upload.h
index e8f0ea40..48442731 100644
--- a/launcher/net/Upload.h
+++ b/launcher/net/Upload.h
@@ -51,6 +51,7 @@ namespace Net {
         static Upload::Ptr makeByteArray(QUrl url, QByteArray *output, QByteArray m_post_data);
         auto abort() -> bool override;
         auto canAbort() const -> bool override { return true; };
+        virtual void init() override {};
 
     protected slots:
         void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
diff --git a/launcher/screenshots/ImgurAlbumCreation.h b/launcher/screenshots/ImgurAlbumCreation.h
index 0228b6e4..a2b70d8b 100644
--- a/launcher/screenshots/ImgurAlbumCreation.h
+++ b/launcher/screenshots/ImgurAlbumCreation.h
@@ -57,6 +57,8 @@ public:
         return m_id;
     }
 
+    void init() override {};
+
 protected
 slots:
     void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
diff --git a/launcher/screenshots/ImgurUpload.h b/launcher/screenshots/ImgurUpload.h
index 404dc876..e8a6d8d7 100644
--- a/launcher/screenshots/ImgurUpload.h
+++ b/launcher/screenshots/ImgurUpload.h
@@ -46,6 +46,7 @@ public:
     static Ptr make(ScreenShot::Ptr shot) {
         return Ptr(new ImgurUpload(shot));
     }
+    void init() override {};
 
 protected
 slots:
-- 
cgit 


From 6db906d62378a040e55c35f196d208bed7aebbef Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Thu, 1 Jun 2023 20:31:23 -0700
Subject: chore: format

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/net/ApiDownload.cpp  |  3 +--
 launcher/net/ApiDownload.h    |  1 -
 launcher/net/ApiHeaderProxy.h | 26 +++++++++++++-------------
 launcher/net/HeaderProxy.h    |  5 +++--
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/launcher/net/ApiDownload.cpp b/launcher/net/ApiDownload.cpp
index 69b39c4a..df476ce8 100644
--- a/launcher/net/ApiDownload.cpp
+++ b/launcher/net/ApiDownload.cpp
@@ -17,10 +17,10 @@
  *
  */
 
+#include "net/ApiDownload.h"
 #include "ByteArraySink.h"
 #include "ChecksumValidator.h"
 #include "MetaCacheSink.h"
-#include "net/ApiDownload.h"
 #include "net/NetAction.h"
 
 namespace Net {
@@ -57,7 +57,6 @@ auto ApiDownload::makeFile(QUrl url, QString path, Options options) -> Download:
     return dl;
 }
 
-
 void ApiDownload::init()
 {
     qDebug() << "Setting up api download";
diff --git a/launcher/net/ApiDownload.h b/launcher/net/ApiDownload.h
index 7a1f2e92..4d0a3292 100644
--- a/launcher/net/ApiDownload.h
+++ b/launcher/net/ApiDownload.h
@@ -33,7 +33,6 @@ class ApiDownload : public Download {
     static auto makeFile(QUrl url, QString path, Options options = Option::NoOptions) -> Download::Ptr;
 
     void init() override;
-    
 };
 
 }  // namespace Net
diff --git a/launcher/net/ApiHeaderProxy.h b/launcher/net/ApiHeaderProxy.h
index 5de503a6..6fd3e4c1 100644
--- a/launcher/net/ApiHeaderProxy.h
+++ b/launcher/net/ApiHeaderProxy.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include "net/HeaderProxy.h"
 #include "Application.h"
 #include "BuildConfig.h"
+#include "net/HeaderProxy.h"
 
 namespace Net {
 
@@ -31,19 +31,19 @@ class ApiHeaderProxy : public HeaderProxy {
     virtual ~ApiHeaderProxy() = default;
 
    public:
-    virtual QList<HeaderPair> headers(const QNetworkRequest& request) const override { 
-      QList<HeaderPair> hdrs;  
-      if (APPLICATION->capabilities() & Application::SupportsFlame && request.url().host() == QUrl(BuildConfig.FLAME_BASE_URL).host()) {
-          hdrs.append({ "x-api-key", APPLICATION->getFlameAPIKey().toUtf8() });
-      } else if (request.url().host() == QUrl(BuildConfig.MODRINTH_PROD_URL).host() ||
-               request.url().host() == QUrl(BuildConfig.MODRINTH_STAGING_URL).host()) {
-          QString token = APPLICATION->getModrinthAPIToken();
-          if (!token.isNull())
-              hdrs.append({ "Authorization", token.toUtf8() });
-      }
-    return hdrs; 
+    virtual QList<HeaderPair> headers(const QNetworkRequest& request) const override
+    {
+        QList<HeaderPair> hdrs;
+        if (APPLICATION->capabilities() & Application::SupportsFlame && request.url().host() == QUrl(BuildConfig.FLAME_BASE_URL).host()) {
+            hdrs.append({ "x-api-key", APPLICATION->getFlameAPIKey().toUtf8() });
+        } else if (request.url().host() == QUrl(BuildConfig.MODRINTH_PROD_URL).host() ||
+                   request.url().host() == QUrl(BuildConfig.MODRINTH_STAGING_URL).host()) {
+            QString token = APPLICATION->getModrinthAPIToken();
+            if (!token.isNull())
+                hdrs.append({ "Authorization", token.toUtf8() });
+        }
+        return hdrs;
     };
-
 };
 
 }  // namespace Net
diff --git a/launcher/net/HeaderProxy.h b/launcher/net/HeaderProxy.h
index bb3c8b03..308455e4 100644
--- a/launcher/net/HeaderProxy.h
+++ b/launcher/net/HeaderProxy.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <QNetworkRequest>
 #include <QDebug>
+#include <QNetworkRequest>
 
 namespace Net {
 
@@ -38,7 +38,8 @@ class HeaderProxy {
     virtual QList<HeaderPair> headers(const QNetworkRequest& request) const = 0;
 
    public:
-    void writeHeaders(QNetworkRequest& request) {
+    void writeHeaders(QNetworkRequest& request)
+    {
         for (auto header : headers(request)) {
             request.setRawHeader(header.headerName, header.headerValue);
         }
-- 
cgit 


From 3105f314cb5cbc6c1e040ceab0f776a0e39849d4 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Thu, 1 Jun 2023 20:47:03 -0700
Subject: fix: class rename (lsp acitons undid the first rename :P)

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/net/RawHeaderProxy.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/launcher/net/RawHeaderProxy.h b/launcher/net/RawHeaderProxy.h
index ffe6a81a..c1aea0a8 100644
--- a/launcher/net/RawHeaderProxy.h
+++ b/launcher/net/RawHeaderProxy.h
@@ -25,10 +25,10 @@
 
 namespace Net {
 
-class ApiHeaderProxy : public HeaderProxy {
+class RawHeaderProxy : public HeaderProxy {
    public:
-    ApiHeaderProxy() : HeaderProxy(){};
-    virtual ~ApiHeaderProxy() = default;
+    RawHeaderProxy() : HeaderProxy(){};
+    virtual ~RawHeaderProxy() = default;
 
    public:
     virtual QList<HeaderPair> headers(const QNetworkRequest&) const override { return m_headers; };
-- 
cgit 


From c8ff812ab89044890d88779e33f3c6f86c4b8f74 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun, 25 Jun 2023 12:02:46 -0700
Subject: feat(net): ApiUpload ^& fix unfired `finished` signals

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/modplatform/flame/FileResolvingTask.cpp |   3 +-
 launcher/modplatform/flame/FlameAPI.cpp          |   7 +-
 launcher/modplatform/modrinth/ModrinthAPI.cpp    |  14 +-
 launcher/net/ApiUpload.cpp                       |  43 +++
 launcher/net/ApiUpload.h                         |  36 +++
 launcher/net/Download.cpp                        |  29 +-
 launcher/net/Upload.cpp                          | 367 ++++++++++++-----------
 launcher/net/Upload.h                            |  44 +--
 8 files changed, 323 insertions(+), 220 deletions(-)
 create mode 100644 launcher/net/ApiUpload.cpp
 create mode 100644 launcher/net/ApiUpload.h

diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 011c4cdf..09f0588f 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -1,6 +1,7 @@
 #include "FileResolvingTask.h"
 
 #include "Json.h"
+#include "net/ApiUpload.h"
 #include "net/Upload.h"
 #include "net/ApiDownload.h"
 
@@ -34,7 +35,7 @@ void Flame::FileResolvingTask::executeTask()
         return l;
     }));
     QByteArray data = Json::toText(object);
-    auto dl = Net::Upload::makeByteArray(QUrl("https://api.curseforge.com/v1/mods/files"), result.get(), data);
+    auto dl = Net::ApiUpload::makeByteArray(QUrl("https://api.curseforge.com/v1/mods/files"), result.get(), data);
     m_dljob->addNetAction(dl);
 
     auto step_progress = std::make_shared<TaskStepProgress>();
diff --git a/launcher/modplatform/flame/FlameAPI.cpp b/launcher/modplatform/flame/FlameAPI.cpp
index 49ab06db..5a8286d4 100644
--- a/launcher/modplatform/flame/FlameAPI.cpp
+++ b/launcher/modplatform/flame/FlameAPI.cpp
@@ -8,6 +8,7 @@
 #include "Application.h"
 #include "BuildConfig.h"
 #include "Json.h"
+#include "net/ApiUpload.h"
 #include "net/NetJob.h"
 #include "net/ApiDownload.h"
 #include "net/Upload.h"
@@ -27,7 +28,7 @@ Task::Ptr FlameAPI::matchFingerprints(const QList<uint>& fingerprints, QByteArra
     QJsonDocument body(body_obj);
     auto body_raw = body.toJson();
 
-    netJob->addNetAction(Net::Upload::makeByteArray(QString("https://api.curseforge.com/v1/fingerprints"), response, body_raw));
+    netJob->addNetAction(Net::ApiUpload::makeByteArray(QString("https://api.curseforge.com/v1/fingerprints"), response, body_raw));
 
     QObject::connect(netJob.get(), &NetJob::finished, [response] { delete response; });
 
@@ -176,7 +177,7 @@ Task::Ptr FlameAPI::getProjects(QStringList addonIds, QByteArray* response) cons
     QJsonDocument body(body_obj);
     auto body_raw = body.toJson();
 
-    netJob->addNetAction(Net::Upload::makeByteArray(QString("https://api.curseforge.com/v1/mods"), response, body_raw));
+    netJob->addNetAction(Net::ApiUpload::makeByteArray(QString("https://api.curseforge.com/v1/mods"), response, body_raw));
 
     QObject::connect(netJob.get(), &NetJob::finished, [response] { delete response; });
     QObject::connect(netJob.get(), &NetJob::failed, [body_raw] { qDebug() << body_raw; });
@@ -199,7 +200,7 @@ Task::Ptr FlameAPI::getFiles(const QStringList& fileIds, QByteArray* response) c
     QJsonDocument body(body_obj);
     auto body_raw = body.toJson();
 
-    netJob->addNetAction(Net::Upload::makeByteArray(QString("https://api.curseforge.com/v1/mods/files"), response, body_raw));
+    netJob->addNetAction(Net::ApiUpload::makeByteArray(QString("https://api.curseforge.com/v1/mods/files"), response, body_raw));
 
     QObject::connect(netJob.get(), &NetJob::finished, [response] { delete response; });
     QObject::connect(netJob.get(), &NetJob::failed, [body_raw] { qDebug() << body_raw; });
diff --git a/launcher/modplatform/modrinth/ModrinthAPI.cpp b/launcher/modplatform/modrinth/ModrinthAPI.cpp
index ab77ef11..4089c366 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.cpp
+++ b/launcher/modplatform/modrinth/ModrinthAPI.cpp
@@ -6,9 +6,10 @@
 
 #include "Application.h"
 #include "Json.h"
+#include "net/ApiDownload.h"
+#include "net/ApiUpload.h"
 #include "net/NetJob.h"
 #include "net/Upload.h"
-#include "net/ApiDownload.h"
 
 Task::Ptr ModrinthAPI::currentVersion(QString hash, QString hash_format, QByteArray* response)
 {
@@ -34,7 +35,7 @@ Task::Ptr ModrinthAPI::currentVersions(const QStringList& hashes, QString hash_f
     QJsonDocument body(body_obj);
     auto body_raw = body.toJson();
 
-    netJob->addNetAction(Net::Upload::makeByteArray(QString(BuildConfig.MODRINTH_PROD_URL + "/version_files"), response, body_raw));
+    netJob->addNetAction(Net::ApiUpload::makeByteArray(QString(BuildConfig.MODRINTH_PROD_URL + "/version_files"), response, body_raw));
 
     QObject::connect(netJob.get(), &NetJob::finished, [response] { delete response; });
 
@@ -65,7 +66,7 @@ Task::Ptr ModrinthAPI::latestVersion(QString hash,
     QJsonDocument body(body_obj);
     auto body_raw = body.toJson();
 
-    netJob->addNetAction(Net::Upload::makeByteArray(
+    netJob->addNetAction(Net::ApiUpload::makeByteArray(
         QString(BuildConfig.MODRINTH_PROD_URL + "/version_file/%1/update?algorithm=%2").arg(hash, hash_format), response, body_raw));
 
     QObject::connect(netJob.get(), &NetJob::finished, [response] { delete response; });
@@ -100,7 +101,8 @@ Task::Ptr ModrinthAPI::latestVersions(const QStringList& hashes,
     QJsonDocument body(body_obj);
     auto body_raw = body.toJson();
 
-    netJob->addNetAction(Net::Upload::makeByteArray(QString(BuildConfig.MODRINTH_PROD_URL + "/version_files/update"), response, body_raw));
+    netJob->addNetAction(
+        Net::ApiUpload::makeByteArray(QString(BuildConfig.MODRINTH_PROD_URL + "/version_files/update"), response, body_raw));
 
     QObject::connect(netJob.get(), &NetJob::finished, [response] { delete response; });
 
@@ -114,9 +116,7 @@ Task::Ptr ModrinthAPI::getProjects(QStringList addonIds, QByteArray* response) c
 
     netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl), response));
 
-    QObject::connect(netJob.get(), &NetJob::finished, [response, netJob] {
-        delete response;
-    });
+    QObject::connect(netJob.get(), &NetJob::finished, [response, netJob] { delete response; });
 
     return netJob;
 }
diff --git a/launcher/net/ApiUpload.cpp b/launcher/net/ApiUpload.cpp
new file mode 100644
index 00000000..497573b2
--- /dev/null
+++ b/launcher/net/ApiUpload.cpp
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.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 "net/ApiUpload.h"
+#include "ByteArraySink.h"
+#include "ChecksumValidator.h"
+#include "MetaCacheSink.h"
+#include "net/NetAction.h"
+
+namespace Net {
+
+Upload::Ptr ApiUpload::makeByteArray(QUrl url, QByteArray* output, QByteArray m_post_data)
+{
+      auto up = makeShared<ApiUpload>();
+      up->m_url = std::move(url);
+      up->m_sink.reset(new ByteArraySink(output));
+      up->m_post_data = std::move(m_post_data);
+      return up;
+}
+
+void ApiUpload::init()
+{
+    qDebug() << "Setting up api upload";
+    auto api_headers = new ApiHeaderProxy();
+    addHeaderProxy(api_headers);
+}
+}  // namespace Net
diff --git a/launcher/net/ApiUpload.h b/launcher/net/ApiUpload.h
new file mode 100644
index 00000000..3aeac99d
--- /dev/null
+++ b/launcher/net/ApiUpload.h
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.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 "ApiHeaderProxy.h"
+#include "Upload.h"
+
+namespace Net {
+
+class ApiUpload : public Upload {
+   public:
+    virtual ~ApiUpload() = default;
+
+    static Upload::Ptr makeByteArray(QUrl url, QByteArray* output, QByteArray m_post_data);
+
+    void init() override;
+};
+
+}  // namespace Net
diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index 071a9659..47966da5 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -46,7 +46,10 @@
 #include "ChecksumValidator.h"
 #include "MetaCacheSink.h"
 
+#if defined(LAUNCHER_APPLICATION)
 #include "Application.h"
+#endif
+
 #include "BuildConfig.h"
 
 #include "net/Logging.h"
@@ -57,6 +60,7 @@
 
 namespace Net {
 
+#if defined(LAUNCHER_APPLICATION)
 auto Download::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> Download::Ptr
 {
     auto dl = makeShared<Download>();
@@ -68,6 +72,7 @@ auto Download::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> Down
     dl->m_sink.reset(cachedNode);
     return dl;
 }
+#endif
 
 auto Download::makeByteArray(QUrl url, QByteArray* output, Options options) -> Download::Ptr
 {
@@ -110,8 +115,8 @@ void Download::executeTask()
     m_state = m_sink->init(request);
     switch (m_state) {
         case State::Succeeded:
-            emit succeeded();
             qCDebug(taskDownloadLogC) << getUid().toString() << "Download cache hit " << m_url.toString();
+            emitSucceeded();
             return;
         case State::Running:
             qCDebug(taskDownloadLogC) << getUid().toString() << "Downloading " << m_url.toString();
@@ -125,7 +130,13 @@ void Download::executeTask()
             return;
     }
 
-    request.setHeader(QNetworkRequest::UserAgentHeader, APPLICATION->getUserAgent().toUtf8());
+#if defined (LAUNCHER_APPLICATION)
+    auto user_agent = APPLICATION->getUserAgent();
+#else
+    auto user_agent = BuildConfig.USER_AGENT;
+#endif
+    
+    request.setHeader(QNetworkRequest::UserAgentHeader, user_agent.toUtf8());
     for ( auto& header_proxy : m_headerProxies ) {
 
         header_proxy->writeHeaders(request);
@@ -162,7 +173,7 @@ void Download::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
     auto elapsed_ms = std::chrono::duration_cast<std::chrono::milliseconds>(elapsed);
     auto bytes_received_since = bytesReceived - m_last_progress_bytes;
     auto dl_speed_bps = (double)bytes_received_since / elapsed_ms.count() * 1000;
-    auto remaing_time_s = (bytesTotal - bytesReceived) / dl_speed_bps;
+    auto remaining_time_s = (bytesTotal - bytesReceived) / dl_speed_bps;
 
     //: Current amount of bytes downloaded, out of the total amount of bytes in the download
     QString dl_progress =
@@ -170,7 +181,7 @@ void Download::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
 
     QString dl_speed_str;
     if (elapsed_ms.count() > 0) {
-        auto str_eta = bytesTotal > 0 ? Time::humanReadableDuration(remaing_time_s) : tr("unknown");
+        auto str_eta = bytesTotal > 0 ? Time::humanReadableDuration(remaining_time_s) : tr("unknown");
         //: Download speed, in bytes per second (remaining download time in parenthesis)
         dl_speed_str =
             tr("%1 /s (%2)").arg(StringUtils::humanReadableFileSize(dl_speed_bps)).arg(str_eta);
@@ -282,19 +293,19 @@ void Download::downloadFinished()
         qCDebug(taskDownloadLogC) << getUid().toString() << "Download failed but we are allowed to proceed:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emit succeeded();
+        emitSucceeded();
         return;
     } else if (m_state == State::Failed) {
         qCDebug(taskDownloadLogC) << getUid().toString() << "Download failed in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emit failed("");
+        emitFailed("");
         return;
     } else if (m_state == State::AbortedByUser) {
         qCDebug(taskDownloadLogC) << getUid().toString() << "Download aborted in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emit aborted();
+        emitAborted();
         return;
     }
 
@@ -311,13 +322,13 @@ void Download::downloadFinished()
         qCDebug(taskDownloadLogC) << getUid().toString() << "Download failed to finalize:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emit failed("");
+        emitFailed("");
         return;
     }
 
     m_reply.reset();
     qCDebug(taskDownloadLogC) << getUid().toString() << "Download succeeded:" << m_url.toString();
-    emit succeeded();
+    emitSucceeded();
 }
 
 void Download::downloadReadyRead()
diff --git a/launcher/net/Upload.cpp b/launcher/net/Upload.cpp
index 4f9553ed..27759f53 100644
--- a/launcher/net/Upload.cpp
+++ b/launcher/net/Upload.cpp
@@ -39,218 +39,229 @@
 #include "Upload.h"
 
 #include <utility>
-#include "ByteArraySink.h"
 #include "BuildConfig.h"
+#include "ByteArraySink.h"
+
+#if defined(LAUNCHER_APPLICATION)
 #include "Application.h"
+#endif
 
 #include "net/Logging.h"
 
 namespace Net {
 
-    bool Upload::abort()
-    {
-        if (m_reply) {
-            m_reply->abort();
-        } else {
-            m_state = State::AbortedByUser;
-        }
-        return true;
+bool Upload::abort()
+{
+    if (m_reply) {
+        m_reply->abort();
+    } else {
+        m_state = State::AbortedByUser;
     }
+    return true;
+}
 
-    void Upload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) {
-        setProgress(bytesReceived, bytesTotal);
-    }
+void Upload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
+{
+    setProgress(bytesReceived, bytesTotal);
+}
 
-    void Upload::downloadError(QNetworkReply::NetworkError error) {
-        if (error == QNetworkReply::OperationCanceledError) {
-            qCCritical(taskUploadLogC) << getUid().toString() << "Aborted " << m_url.toString();
-            m_state = State::AbortedByUser;
-        } else {
-            // error happened during download.
-            qCCritical(taskUploadLogC) << getUid().toString() << "Failed " << m_url.toString() << " with reason " << error;
-            m_state = State::Failed;
-        }
+void Upload::downloadError(QNetworkReply::NetworkError error)
+{
+    if (error == QNetworkReply::OperationCanceledError) {
+        qCCritical(taskUploadLogC) << getUid().toString() << "Aborted " << m_url.toString();
+        m_state = State::AbortedByUser;
+    } else {
+        // error happened during download.
+        qCCritical(taskUploadLogC) << getUid().toString() << "Failed " << m_url.toString() << " with reason " << error;
+        m_state = State::Failed;
     }
+}
 
-    void Upload::sslErrors(const QList<QSslError> &errors) {
-        int i = 1;
-        for (const auto& error : errors) {
-            qCCritical(taskUploadLogC) << getUid().toString() << "Upload" << m_url.toString() << "SSL Error #" << i << " : " << error.errorString();
-            auto cert = error.certificate();
-            qCCritical(taskUploadLogC) << getUid().toString() << "Certificate in question:\n" << cert.toText();
-            i++;
-        }
+void Upload::sslErrors(const QList<QSslError>& errors)
+{
+    int i = 1;
+    for (const auto& error : errors) {
+        qCCritical(taskUploadLogC) << getUid().toString() << "Upload" << m_url.toString() << "SSL Error #" << i << " : "
+                                   << error.errorString();
+        auto cert = error.certificate();
+        qCCritical(taskUploadLogC) << getUid().toString() << "Certificate in question:\n" << cert.toText();
+        i++;
     }
+}
 
-    bool Upload::handleRedirect()
-    {
-        QUrl redirect = m_reply->header(QNetworkRequest::LocationHeader).toUrl();
-        if (!redirect.isValid()) {
-            if (!m_reply->hasRawHeader("Location")) {
-                // no redirect -> it's fine to continue
-                return false;
-            }
-            // there is a Location header, but it's not correct. we need to apply some workarounds...
-            QByteArray redirectBA = m_reply->rawHeader("Location");
-            if (redirectBA.size() == 0) {
-                // empty, yet present redirect header? WTF?
-                return false;
-            }
-            QString redirectStr = QString::fromUtf8(redirectBA);
-
-            if (redirectStr.startsWith("//")) {
-                /*
-                 * IF the URL begins with //, we need to insert the URL scheme.
-                 * See: https://bugreports.qt.io/browse/QTBUG-41061
-                 * See: http://tools.ietf.org/html/rfc3986#section-4.2
-                 */
-                redirectStr = m_reply->url().scheme() + ":" + redirectStr;
-            } else if (redirectStr.startsWith("/")) {
-                /*
-                 * IF the URL begins with /, we need to process it as a relative URL
-                 */
-                auto url = m_reply->url();
-                url.setPath(redirectStr, QUrl::TolerantMode);
-                redirectStr = url.toString();
-            }
+bool Upload::handleRedirect()
+{
+    QUrl redirect = m_reply->header(QNetworkRequest::LocationHeader).toUrl();
+    if (!redirect.isValid()) {
+        if (!m_reply->hasRawHeader("Location")) {
+            // no redirect -> it's fine to continue
+            return false;
+        }
+        // there is a Location header, but it's not correct. we need to apply some workarounds...
+        QByteArray redirectBA = m_reply->rawHeader("Location");
+        if (redirectBA.size() == 0) {
+            // empty, yet present redirect header? WTF?
+            return false;
+        }
+        QString redirectStr = QString::fromUtf8(redirectBA);
 
+        if (redirectStr.startsWith("//")) {
             /*
-             * Next, make sure the URL is parsed in tolerant mode. Qt doesn't parse the location header in tolerant mode, which causes issues.
-             * FIXME: report Qt bug for this
+             * IF the URL begins with //, we need to insert the URL scheme.
+             * See: https://bugreports.qt.io/browse/QTBUG-41061
+             * See: http://tools.ietf.org/html/rfc3986#section-4.2
              */
-            redirect = QUrl(redirectStr, QUrl::TolerantMode);
-            if (!redirect.isValid()) {
-                qCWarning(taskUploadLogC) << getUid().toString() << "Failed to parse redirect URL:" << redirectStr;
-                downloadError(QNetworkReply::ProtocolFailure);
-                return false;
-            }
-            qCDebug(taskUploadLogC) << getUid().toString() << "Fixed location header:" << redirect;
-        } else {
-            qCDebug(taskUploadLogC) << getUid().toString() << "Location header:" << redirect;
+            redirectStr = m_reply->url().scheme() + ":" + redirectStr;
+        } else if (redirectStr.startsWith("/")) {
+            /*
+             * IF the URL begins with /, we need to process it as a relative URL
+             */
+            auto url = m_reply->url();
+            url.setPath(redirectStr, QUrl::TolerantMode);
+            redirectStr = url.toString();
         }
 
-        m_url = QUrl(redirect.toString());
-        qCDebug(taskUploadLogC) << getUid().toString() << "Following redirect to " << m_url.toString();
-        startAction(m_network);
-        return true;
+        /*
+         * Next, make sure the URL is parsed in tolerant mode. Qt doesn't parse the location header in tolerant mode, which causes issues.
+         * FIXME: report Qt bug for this
+         */
+        redirect = QUrl(redirectStr, QUrl::TolerantMode);
+        if (!redirect.isValid()) {
+            qCWarning(taskUploadLogC) << getUid().toString() << "Failed to parse redirect URL:" << redirectStr;
+            downloadError(QNetworkReply::ProtocolFailure);
+            return false;
+        }
+        qCDebug(taskUploadLogC) << getUid().toString() << "Fixed location header:" << redirect;
+    } else {
+        qCDebug(taskUploadLogC) << getUid().toString() << "Location header:" << redirect;
     }
 
-    void Upload::downloadFinished() {
-        // handle HTTP redirection first
-        // very unlikely for post requests, still can happen
-        if (handleRedirect()) {
-            qCDebug(taskUploadLogC) << getUid().toString() << "Upload redirected:" << m_url.toString();
-            return;
-        }
+    m_url = QUrl(redirect.toString());
+    qCDebug(taskUploadLogC) << getUid().toString() << "Following redirect to " << m_url.toString();
+    startAction(m_network);
+    return true;
+}
 
-        // if the download failed before this point ...
-        if (m_state == State::Succeeded) {
-            qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed but we are allowed to proceed:" << m_url.toString();
-            m_sink->abort();
-            m_reply.reset();
-            emit succeeded();
-            return;
-        } else if (m_state == State::Failed) {
-            qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed in previous step:" << m_url.toString();
-            m_sink->abort();
-            m_reply.reset();
-            emit failed("");
-            return;
-        } else if (m_state == State::AbortedByUser) {
-            qCDebug(taskUploadLogC) << getUid().toString() << "Upload aborted in previous step:" << m_url.toString();
-            m_sink->abort();
-            m_reply.reset();
-            emit aborted();
-            return;
-        }
+void Upload::downloadFinished()
+{
+    // handle HTTP redirection first
+    // very unlikely for post requests, still can happen
+    if (handleRedirect()) {
+        qCDebug(taskUploadLogC) << getUid().toString() << "Upload redirected:" << m_url.toString();
+        return;
+    }
 
-        // make sure we got all the remaining data, if any
-        auto data = m_reply->readAll();
-        if (data.size()) {
-            qCDebug(taskUploadLogC) << getUid().toString() << "Writing extra" << data.size() << "bytes";
-            m_state = m_sink->write(data);
-        }
+    // if the download failed before this point ...
+    if (m_state == State::Succeeded) {
+        qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed but we are allowed to proceed:" << m_url.toString();
+        m_sink->abort();
+        m_reply.reset();
+        emitSucceeded();
+        return;
+    } else if (m_state == State::Failed) {
+        qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed in previous step:" << m_url.toString();
+        m_sink->abort();
+        m_reply.reset();
+        emitFailed("");
+        return;
+    } else if (m_state == State::AbortedByUser) {
+        qCDebug(taskUploadLogC) << getUid().toString() << "Upload aborted in previous step:" << m_url.toString();
+        m_sink->abort();
+        m_reply.reset();
+        emitAborted();
+        return;
+    }
 
-        // otherwise, finalize the whole graph
-        m_state = m_sink->finalize(*m_reply.get());
-        if (m_state != State::Succeeded) {
-            qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed to finalize:" << m_url.toString();
-            m_sink->abort();
-            m_reply.reset();
-            emit failed("");
-            return;
-        }
+    // make sure we got all the remaining data, if any
+    auto data = m_reply->readAll();
+    if (data.size()) {
+        qCDebug(taskUploadLogC) << getUid().toString() << "Writing extra" << data.size() << "bytes";
+        m_state = m_sink->write(data);
+    }
+
+    // otherwise, finalize the whole graph
+    m_state = m_sink->finalize(*m_reply.get());
+    if (m_state != State::Succeeded) {
+        qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed to finalize:" << m_url.toString();
+        m_sink->abort();
         m_reply.reset();
-        qCDebug(taskUploadLogC) << getUid().toString() << "Upload succeeded:" << m_url.toString();
-        emit succeeded();
+        emitFailed("");
+        return;
     }
+    m_reply.reset();
+    qCDebug(taskUploadLogC) << getUid().toString() << "Upload succeeded:" << m_url.toString();
+    emitSucceeded();
+}
 
-    void Upload::downloadReadyRead() {
-        if (m_state == State::Running) {
-            auto data = m_reply->readAll();
-            m_state = m_sink->write(data);
-        }
+void Upload::downloadReadyRead()
+{
+    if (m_state == State::Running) {
+        auto data = m_reply->readAll();
+        m_state = m_sink->write(data);
     }
+}
 
-    void Upload::executeTask() {
-        setStatus(tr("Uploading %1").arg(m_url.toString()));
+void Upload::executeTask()
+{
+    setStatus(tr("Uploading %1").arg(m_url.toString()));
 
-        if (m_state == State::AbortedByUser) {
-            qCWarning(taskUploadLogC) << getUid().toString() << "Attempt to start an aborted Upload:" << m_url.toString();
-            emit aborted();
+    if (m_state == State::AbortedByUser) {
+        qCWarning(taskUploadLogC) << getUid().toString() << "Attempt to start an aborted Upload:" << m_url.toString();
+        emitAborted();
+        return;
+    }
+    QNetworkRequest request(m_url);
+    m_state = m_sink->init(request);
+    switch (m_state) {
+        case State::Succeeded:
+            emitSucceeded();
+            qCDebug(taskUploadLogC) << getUid().toString() << "Upload cache hit " << m_url.toString();
             return;
-        }
-        QNetworkRequest request(m_url);
-        m_state = m_sink->init(request);
-        switch (m_state) {
-            case State::Succeeded:
-                emitSucceeded();
-                qCDebug(taskUploadLogC) << getUid().toString() << "Upload cache hit " << m_url.toString();
-                return;
-            case State::Running:
-                qCDebug(taskUploadLogC) << getUid().toString() << "Uploading " << m_url.toString();
-                break;
-            case State::Inactive:
-            case State::Failed:
-                emitFailed("");
-                return;
-            case State::AbortedByUser:
-                emitAborted();
-                return;
-        }
+        case State::Running:
+            qCDebug(taskUploadLogC) << getUid().toString() << "Uploading " << m_url.toString();
+            break;
+        case State::Inactive:
+        case State::Failed:
+            emitFailed("");
+            return;
+        case State::AbortedByUser:
+            emitAborted();
+            return;
+    }
 
-        request.setHeader(QNetworkRequest::UserAgentHeader, APPLICATION->getUserAgent().toUtf8());
-        // TODO remove duplication
-        if (APPLICATION->capabilities() & Application::SupportsFlame && request.url().host() == QUrl(BuildConfig.FLAME_BASE_URL).host()) {
-            request.setRawHeader("x-api-key", APPLICATION->getFlameAPIKey().toUtf8());
-        } else if (request.url().host() == QUrl(BuildConfig.MODRINTH_PROD_URL).host() ||
-                   request.url().host() == QUrl(BuildConfig.MODRINTH_STAGING_URL).host()) {
-            QString token = APPLICATION->getModrinthAPIToken();
-            if (!token.isNull())
-                request.setRawHeader("Authorization", token.toUtf8());
-        }
+#if defined(LAUNCHER_APPLICATION)
+    auto user_agent = APPLICATION->getUserAgent();
+#else
+    auto user_agent = BuildConfig.USER_AGENT;
+#endif
+    request.setHeader(QNetworkRequest::UserAgentHeader, user_agent.toUtf8());
+
+    for (auto& header_proxy : m_headerProxies) {
+        header_proxy->writeHeaders(request);
+    }
 
-        //TODO other types of post requests ?
-        request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-        QNetworkReply* rep = m_network->post(request, m_post_data);
+    // TODO other types of post requests ?
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    QNetworkReply* rep = m_network->post(request, m_post_data);
 
-        m_reply.reset(rep);
-        connect(rep, &QNetworkReply::downloadProgress, this,  &Upload::downloadProgress);
-        connect(rep, &QNetworkReply::finished, this, &Upload::downloadFinished);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
-        connect(rep, &QNetworkReply::errorOccurred, this, &Upload::downloadError);
+    m_reply.reset(rep);
+    connect(rep, &QNetworkReply::downloadProgress, this, &Upload::downloadProgress);
+    connect(rep, &QNetworkReply::finished, this, &Upload::downloadFinished);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
+    connect(rep, &QNetworkReply::errorOccurred, this, &Upload::downloadError);
 #else
-        connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &Upload::downloadError);
+    connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &Upload::downloadError);
 #endif
-        connect(rep, &QNetworkReply::sslErrors, this, &Upload::sslErrors);
-        connect(rep, &QNetworkReply::readyRead, this, &Upload::downloadReadyRead);
-    }
+    connect(rep, &QNetworkReply::sslErrors, this, &Upload::sslErrors);
+    connect(rep, &QNetworkReply::readyRead, this, &Upload::downloadReadyRead);
+}
 
-    Upload::Ptr Upload::makeByteArray(QUrl url, QByteArray *output, QByteArray m_post_data) {
-        auto up = makeShared<Upload>();
-        up->m_url = std::move(url);
-        up->m_sink.reset(new ByteArraySink(output));
-        up->m_post_data = std::move(m_post_data);
-        return up;
-    }
-} // Net
+Upload::Ptr Upload::makeByteArray(QUrl url, QByteArray* output, QByteArray m_post_data)
+{
+    auto up = makeShared<Upload>();
+    up->m_url = std::move(url);
+    up->m_sink.reset(new ByteArraySink(output));
+    up->m_post_data = std::move(m_post_data);
+    return up;
+}
+}  // namespace Net
diff --git a/launcher/net/Upload.h b/launcher/net/Upload.h
index 48442731..2220c035 100644
--- a/launcher/net/Upload.h
+++ b/launcher/net/Upload.h
@@ -42,32 +42,32 @@
 
 namespace Net {
 
-    class Upload : public NetAction {
-        Q_OBJECT
+class Upload : public NetAction {
+    Q_OBJECT
 
-    public:
-        using Ptr = shared_qobject_ptr<Upload>;
+   public:
+    using Ptr = shared_qobject_ptr<Upload>;
 
-        static Upload::Ptr makeByteArray(QUrl url, QByteArray *output, QByteArray m_post_data);
-        auto abort() -> bool override;
-        auto canAbort() const -> bool override { return true; };
-        virtual void init() override {};
+    static Upload::Ptr makeByteArray(QUrl url, QByteArray* output, QByteArray m_post_data);
+    auto abort() -> bool override;
+    auto canAbort() const -> bool override { return true; };
+    virtual void init() override{};
 
-    protected slots:
-        void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
-        void downloadError(QNetworkReply::NetworkError error) override;
-        void sslErrors(const QList<QSslError> & errors) override;
-        void downloadFinished() override;
-        void downloadReadyRead() override;
+   protected slots:
+    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
+    void downloadError(QNetworkReply::NetworkError error) override;
+    void sslErrors(const QList<QSslError>& errors) override;
+    void downloadFinished() override;
+    void downloadReadyRead() override;
 
-    public slots:
-        void executeTask() override;
-    private:
-        std::unique_ptr<Sink> m_sink;
-        QByteArray m_post_data;
+   public slots:
+    void executeTask() override;
 
-        bool handleRedirect();
-    };
+   protected:
+    std::unique_ptr<Sink> m_sink;
+    QByteArray m_post_data;
 
-} // Net
+    bool handleRedirect();
+};
 
+}  // namespace Net
-- 
cgit 


From 013a26aafecdd8a9944ad1ec94893d7efe7874ea Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun, 25 Jun 2023 13:23:43 -0700
Subject: fix: add `ApiUpload` to CMakeLists.txt

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index f4308caa..20372dbc 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -141,6 +141,8 @@ set(NET_SOURCES
     net/ApiHeaderProxy.h
     net/ApiDownload.h
     net/ApiDownload.cpp
+    net/ApiUpload.cpp
+    net/ApiUpload.h
 )
 
 # Game launch logic
-- 
cgit 


From 1ba08f4641f32d39efc509247807eca035be62f5 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun, 25 Jun 2023 14:25:07 -0700
Subject: fixup! Merge remote-tracking branch 'upstream/develop' into
 refactor/net-split-headers-to-proxy-class

---
 launcher/net/Download.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/launcher/net/Download.h b/launcher/net/Download.h
index 19f675ad..2fa318ef 100644
--- a/launcher/net/Download.h
+++ b/launcher/net/Download.h
@@ -59,7 +59,10 @@ class Download : public NetAction {
    public:
     ~Download() override = default;
 
+#if defined(LAUNCHER_APPLICATION)
     static auto makeCached(QUrl url, MetaEntryPtr entry, Options options = Option::NoOptions) -> Download::Ptr;
+#endif
+
     static auto makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Options options = Option::NoOptions) -> Download::Ptr;
     static auto makeFile(QUrl url, QString path, Options options = Option::NoOptions) -> Download::Ptr;
 
-- 
cgit 

-- 
cgit 


From c49ee8785792142b67d6c431d1913a4d7d2fa936 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 25 Jun 2023 18:49:50 -0400
Subject: fix(net): fix emit signals in download & upload task

Signed-off-by: seth <getchoo@tuta.io>
---
 launcher/net/Download.cpp | 12 ++++++------
 launcher/net/Upload.cpp   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index c8645213..40d8a5bb 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -117,7 +117,7 @@ void Download::executeTask()
     switch (m_state) {
         case State::Succeeded:
             qCDebug(taskDownloadLogC) << getUid().toString() << "Download cache hit " << m_url.toString();
-            emitSucceeded();
+            emit succeeded();
             return;
         case State::Running:
             qCDebug(taskDownloadLogC) << getUid().toString() << "Downloading " << m_url.toString();
@@ -294,19 +294,19 @@ void Download::downloadFinished()
         qCDebug(taskDownloadLogC) << getUid().toString() << "Download failed but we are allowed to proceed:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitSucceeded();
+        emit succeeded();
         return;
     } else if (m_state == State::Failed) {
         qCDebug(taskDownloadLogC) << getUid().toString() << "Download failed in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitFailed("");
+        emit failed("");
         return;
     } else if (m_state == State::AbortedByUser) {
         qCDebug(taskDownloadLogC) << getUid().toString() << "Download aborted in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitAborted();
+        emit aborted();
         return;
     }
 
@@ -323,13 +323,13 @@ void Download::downloadFinished()
         qCDebug(taskDownloadLogC) << getUid().toString() << "Download failed to finalize:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitFailed("");
+        emit failed("");
         return;
     }
 
     m_reply.reset();
     qCDebug(taskDownloadLogC) << getUid().toString() << "Download succeeded:" << m_url.toString();
-    emitSucceeded();
+    emit succeeded();
 }
 
 void Download::downloadReadyRead()
diff --git a/launcher/net/Upload.cpp b/launcher/net/Upload.cpp
index 8881b16a..0688c5a8 100644
--- a/launcher/net/Upload.cpp
+++ b/launcher/net/Upload.cpp
@@ -157,19 +157,19 @@ void Upload::downloadFinished()
         qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed but we are allowed to proceed:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitSucceeded();
+        emit succeeded();
         return;
     } else if (m_state == State::Failed) {
         qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitFailed("");
+        emit failed("");
         return;
     } else if (m_state == State::AbortedByUser) {
         qCDebug(taskUploadLogC) << getUid().toString() << "Upload aborted in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitAborted();
+        emit aborted();
         return;
     }
 
@@ -186,12 +186,12 @@ void Upload::downloadFinished()
         qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed to finalize:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitFailed("");
+        emit failed("");
         return;
     }
     m_reply.reset();
     qCDebug(taskUploadLogC) << getUid().toString() << "Upload succeeded:" << m_url.toString();
-    emitSucceeded();
+    emit succeeded();
 }
 
 void Upload::downloadReadyRead()
@@ -208,7 +208,7 @@ void Upload::executeTask()
 
     if (m_state == State::AbortedByUser) {
         qCWarning(taskUploadLogC) << getUid().toString() << "Attempt to start an aborted Upload:" << m_url.toString();
-        emitAborted();
+        emit aborted();
         return;
     }
     QNetworkRequest request(m_url);
-- 
cgit 


From b142407b218383992f854486cabebb766e83fa93 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun, 25 Jun 2023 16:13:26 -0700
Subject: fix: ensure `finished` signal is emited

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/net/Download.cpp | 6 ++++++
 launcher/net/Upload.cpp   | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index 40d8a5bb..c0828185 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -118,6 +118,7 @@ void Download::executeTask()
         case State::Succeeded:
             qCDebug(taskDownloadLogC) << getUid().toString() << "Download cache hit " << m_url.toString();
             emit succeeded();
+            emit finished();
             return;
         case State::Running:
             qCDebug(taskDownloadLogC) << getUid().toString() << "Downloading " << m_url.toString();
@@ -295,18 +296,21 @@ void Download::downloadFinished()
         m_sink->abort();
         m_reply.reset();
         emit succeeded();
+        emit finished();
         return;
     } else if (m_state == State::Failed) {
         qCDebug(taskDownloadLogC) << getUid().toString() << "Download failed in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
         emit failed("");
+        emit finished();
         return;
     } else if (m_state == State::AbortedByUser) {
         qCDebug(taskDownloadLogC) << getUid().toString() << "Download aborted in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
         emit aborted();
+        emit finished();
         return;
     }
 
@@ -324,12 +328,14 @@ void Download::downloadFinished()
         m_sink->abort();
         m_reply.reset();
         emit failed("");
+        emit finished();
         return;
     }
 
     m_reply.reset();
     qCDebug(taskDownloadLogC) << getUid().toString() << "Download succeeded:" << m_url.toString();
     emit succeeded();
+    emit finished();
 }
 
 void Download::downloadReadyRead()
diff --git a/launcher/net/Upload.cpp b/launcher/net/Upload.cpp
index 0688c5a8..d9115ede 100644
--- a/launcher/net/Upload.cpp
+++ b/launcher/net/Upload.cpp
@@ -158,18 +158,21 @@ void Upload::downloadFinished()
         m_sink->abort();
         m_reply.reset();
         emit succeeded();
+        emit finished();
         return;
     } else if (m_state == State::Failed) {
         qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
         emit failed("");
+        emit finished();
         return;
     } else if (m_state == State::AbortedByUser) {
         qCDebug(taskUploadLogC) << getUid().toString() << "Upload aborted in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
         emit aborted();
+        emit finished();
         return;
     }
 
@@ -187,11 +190,13 @@ void Upload::downloadFinished()
         m_sink->abort();
         m_reply.reset();
         emit failed("");
+        emit finished();
         return;
     }
     m_reply.reset();
     qCDebug(taskUploadLogC) << getUid().toString() << "Upload succeeded:" << m_url.toString();
     emit succeeded();
+    emit finished();
 }
 
 void Upload::downloadReadyRead()
@@ -209,6 +214,7 @@ void Upload::executeTask()
     if (m_state == State::AbortedByUser) {
         qCWarning(taskUploadLogC) << getUid().toString() << "Attempt to start an aborted Upload:" << m_url.toString();
         emit aborted();
+        emit finished();
         return;
     }
     QNetworkRequest request(m_url);
-- 
cgit 


From 385babb4583a10a6c669c80b0f1b75799fa85049 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 27 Jun 2023 01:01:02 +0300
Subject: Simplify Upload and Download

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/CMakeLists.txt      |   2 +
 launcher/net/ApiDownload.cpp |   3 +
 launcher/net/ApiUpload.cpp   |  11 +-
 launcher/net/Download.cpp    | 272 +----------------------------------
 launcher/net/Download.h      |  34 +----
 launcher/net/NetRequest.cpp  | 327 +++++++++++++++++++++++++++++++++++++++++++
 launcher/net/NetRequest.h    |  97 +++++++++++++
 launcher/net/Upload.cpp      | 216 +---------------------------
 launcher/net/Upload.h        |  22 +--
 9 files changed, 451 insertions(+), 533 deletions(-)
 create mode 100644 launcher/net/NetRequest.cpp
 create mode 100644 launcher/net/NetRequest.h

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 20372dbc..df8489e5 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -143,6 +143,8 @@ set(NET_SOURCES
     net/ApiDownload.cpp
     net/ApiUpload.cpp
     net/ApiUpload.h
+    net/NetRequest.cpp
+    net/NetRequest.h
 )
 
 # Game launch logic
diff --git a/launcher/net/ApiDownload.cpp b/launcher/net/ApiDownload.cpp
index aaa8ff65..5dfaa51d 100644
--- a/launcher/net/ApiDownload.cpp
+++ b/launcher/net/ApiDownload.cpp
@@ -28,6 +28,7 @@ namespace Net {
 auto ApiDownload::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> Download::Ptr
 {
     auto dl = makeShared<ApiDownload>();
+    dl->logCat = taskDownloadLogC;
     dl->m_url = url;
     dl->setObjectName(QString("CACHE:") + url.toString());
     dl->m_options = options;
@@ -40,6 +41,7 @@ auto ApiDownload::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> D
 auto ApiDownload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Options options) -> Download::Ptr
 {
     auto dl = makeShared<ApiDownload>();
+    dl->logCat = taskDownloadLogC;
     dl->m_url = url;
     dl->setObjectName(QString("BYTES:") + url.toString());
     dl->m_options = options;
@@ -50,6 +52,7 @@ auto ApiDownload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Op
 auto ApiDownload::makeFile(QUrl url, QString path, Options options) -> Download::Ptr
 {
     auto dl = makeShared<ApiDownload>();
+    dl->logCat = taskDownloadLogC;
     dl->m_url = url;
     dl->setObjectName(QString("FILE:") + url.toString());
     dl->m_options = options;
diff --git a/launcher/net/ApiUpload.cpp b/launcher/net/ApiUpload.cpp
index 96ebc49c..ec4f14af 100644
--- a/launcher/net/ApiUpload.cpp
+++ b/launcher/net/ApiUpload.cpp
@@ -27,11 +27,12 @@ namespace Net {
 
 Upload::Ptr ApiUpload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, QByteArray m_post_data)
 {
-      auto up = makeShared<ApiUpload>();
-      up->m_url = std::move(url);
-      up->m_sink.reset(new ByteArraySink(output));
-      up->m_post_data = std::move(m_post_data);
-      return up;
+    auto up = makeShared<ApiUpload>();
+    up->logCat = taskUploadLogC;
+    up->m_url = std::move(url);
+    up->m_sink.reset(new ByteArraySink(output));
+    up->m_post_data = std::move(m_post_data);
+    return up;
 }
 
 void ApiUpload::init()
diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index c0828185..dc316878 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -65,6 +65,7 @@ namespace Net {
 auto Download::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> Download::Ptr
 {
     auto dl = makeShared<Download>();
+    dl->logCat = taskDownloadLogC;
     dl->m_url = url;
     dl->setObjectName(QString("CACHE:") + url.toString());
     dl->m_options = options;
@@ -78,6 +79,7 @@ auto Download::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> Down
 auto Download::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Options options) -> Download::Ptr
 {
     auto dl = makeShared<Download>();
+    dl->logCat = taskDownloadLogC;
     dl->m_url = url;
     dl->setObjectName(QString("BYTES:") + url.toString());
     dl->m_options = options;
@@ -88,6 +90,7 @@ auto Download::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Optio
 auto Download::makeFile(QUrl url, QString path, Options options) -> Download::Ptr
 {
     auto dl = makeShared<Download>();
+    dl->logCat = taskDownloadLogC;
     dl->m_url = url;
     dl->setObjectName(QString("FILE:") + url.toString());
     dl->m_options = options;
@@ -95,271 +98,8 @@ auto Download::makeFile(QUrl url, QString path, Options options) -> Download::Pt
     return dl;
 }
 
-void Download::addValidator(Validator* v)
+QNetworkReply* Download::getReply(QNetworkRequest& request)
 {
-    m_sink->addValidator(v);
-}
-
-void Download::executeTask()
-{
-    init();
-
-    setStatus(tr("Downloading %1").arg(StringUtils::truncateUrlHumanFriendly(m_url, 80)));
-
-    if (getState() == Task::State::AbortedByUser) {
-        qCWarning(taskDownloadLogC) << getUid().toString() << "Attempt to start an aborted Download:" << m_url.toString();
-        emitAborted();
-        return;
-    }
-
-    QNetworkRequest request(m_url);
-    m_state = m_sink->init(request);
-    switch (m_state) {
-        case State::Succeeded:
-            qCDebug(taskDownloadLogC) << getUid().toString() << "Download cache hit " << m_url.toString();
-            emit succeeded();
-            emit finished();
-            return;
-        case State::Running:
-            qCDebug(taskDownloadLogC) << getUid().toString() << "Downloading " << m_url.toString();
-            break;
-        case State::Inactive:
-        case State::Failed:
-            emitFailed();
-            return;
-        case State::AbortedByUser:
-            emitAborted();
-            return;
-    }
-
-#if defined (LAUNCHER_APPLICATION)
-    auto user_agent = APPLICATION->getUserAgent();
-#else
-    auto user_agent = BuildConfig.USER_AGENT;
-#endif
-    
-    request.setHeader(QNetworkRequest::UserAgentHeader, user_agent.toUtf8());
-    for ( auto& header_proxy : m_headerProxies ) {
-
-        header_proxy->writeHeaders(request);
-    }
-    // TODO remove duplication
-    
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-    request.setTransferTimeout();
-#endif
-
-    m_last_progress_time = m_clock.now();
-    m_last_progress_bytes = 0;
-
-    QNetworkReply* rep = m_network->get(request);
-    m_reply.reset(rep);
-    connect(rep, &QNetworkReply::downloadProgress, this, &Download::downloadProgress);
-    connect(rep, &QNetworkReply::finished, this, &Download::downloadFinished);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
-    connect(rep, &QNetworkReply::errorOccurred, this, &Download::downloadError);
-#else
-    connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &Download::downloadError);
-#endif
-    connect(rep, &QNetworkReply::sslErrors, this, &Download::sslErrors);
-    connect(rep, &QNetworkReply::readyRead, this, &Download::downloadReadyRead);
-}
-
-void Download::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
-{
-    auto now = m_clock.now();
-    auto elapsed = now - m_last_progress_time;
-
-    // use milliseconds for speed precision
-    auto elapsed_ms = std::chrono::duration_cast<std::chrono::milliseconds>(elapsed);
-    auto bytes_received_since = bytesReceived - m_last_progress_bytes;
-    auto dl_speed_bps = (double)bytes_received_since / elapsed_ms.count() * 1000;
-    auto remaining_time_s = (bytesTotal - bytesReceived) / dl_speed_bps;
-
-    //: Current amount of bytes downloaded, out of the total amount of bytes in the download
-    QString dl_progress =
-        tr("%1 / %2").arg(StringUtils::humanReadableFileSize(bytesReceived)).arg(StringUtils::humanReadableFileSize(bytesTotal));
-
-    QString dl_speed_str;
-    if (elapsed_ms.count() > 0) {
-        auto str_eta = bytesTotal > 0 ? Time::humanReadableDuration(remaining_time_s) : tr("unknown");
-        //: Download speed, in bytes per second (remaining download time in parenthesis)
-        dl_speed_str =
-            tr("%1 /s (%2)").arg(StringUtils::humanReadableFileSize(dl_speed_bps)).arg(str_eta);
-    } else {
-        //: Download speed at 0 bytes per second
-        dl_speed_str = tr("0 B/s");
-    }
-
-    setDetails(dl_progress + "\n" + dl_speed_str);
-
-    setProgress(bytesReceived, bytesTotal);
-}
-
-void Download::downloadError(QNetworkReply::NetworkError error)
-{
-    if (error == QNetworkReply::OperationCanceledError) {
-        qCCritical(taskDownloadLogC) << getUid().toString() << "Aborted " << m_url.toString();
-        m_state = State::AbortedByUser;
-    } else {
-        if (m_options & Option::AcceptLocalFiles) {
-            if (m_sink->hasLocalData()) {
-                m_state = State::Succeeded;
-                return;
-            }
-        }
-        // error happened during download.
-        qCCritical(taskDownloadLogC) << getUid().toString() << "Failed " << m_url.toString() << " with reason " << error;
-        m_state = State::Failed;
-    }
-}
-
-void Download::sslErrors(const QList<QSslError>& errors)
-{
-    int i = 1;
-    for (auto error : errors) {
-        qCCritical(taskDownloadLogC) << getUid().toString() << "Download" << m_url.toString() << "SSL Error #" << i << " : "
-                                     << error.errorString();
-        auto cert = error.certificate();
-        qCCritical(taskDownloadLogC) << getUid().toString() << "Certificate in question:\n" << cert.toText();
-        i++;
-    }
-}
-
-auto Download::handleRedirect() -> bool
-{
-    QUrl redirect = m_reply->header(QNetworkRequest::LocationHeader).toUrl();
-    if (!redirect.isValid()) {
-        if (!m_reply->hasRawHeader("Location")) {
-            // no redirect -> it's fine to continue
-            return false;
-        }
-        // there is a Location header, but it's not correct. we need to apply some workarounds...
-        QByteArray redirectBA = m_reply->rawHeader("Location");
-        if (redirectBA.size() == 0) {
-            // empty, yet present redirect header? WTF?
-            return false;
-        }
-        QString redirectStr = QString::fromUtf8(redirectBA);
-
-        if (redirectStr.startsWith("//")) {
-            /*
-             * IF the URL begins with //, we need to insert the URL scheme.
-             * See: https://bugreports.qt.io/browse/QTBUG-41061
-             * See: http://tools.ietf.org/html/rfc3986#section-4.2
-             */
-            redirectStr = m_reply->url().scheme() + ":" + redirectStr;
-        } else if (redirectStr.startsWith("/")) {
-            /*
-             * IF the URL begins with /, we need to process it as a relative URL
-             */
-            auto url = m_reply->url();
-            url.setPath(redirectStr, QUrl::TolerantMode);
-            redirectStr = url.toString();
-        }
-
-        /*
-         * Next, make sure the URL is parsed in tolerant mode. Qt doesn't parse the location header in tolerant mode, which causes issues.
-         * FIXME: report Qt bug for this
-         */
-        redirect = QUrl(redirectStr, QUrl::TolerantMode);
-        if (!redirect.isValid()) {
-            qCWarning(taskDownloadLogC) << getUid().toString() << "Failed to parse redirect URL:" << redirectStr;
-            downloadError(QNetworkReply::ProtocolFailure);
-            return false;
-        }
-        qCDebug(taskDownloadLogC) << getUid().toString() << "Fixed location header:" << redirect;
-    } else {
-        qCDebug(taskDownloadLogC) << getUid().toString() << "Location header:" << redirect;
-    }
-
-    m_url = QUrl(redirect.toString());
-    qCDebug(taskDownloadLogC) << getUid().toString() << "Following redirect to " << m_url.toString();
-    startAction(m_network);
-
-    return true;
-}
-
-void Download::downloadFinished()
-{
-    // handle HTTP redirection first
-    if (handleRedirect()) {
-        qCDebug(taskDownloadLogC) << getUid().toString() << "Download redirected:" << m_url.toString();
-        return;
-    }
-
-    // if the download failed before this point ...
-    if (m_state == State::Succeeded)  // pretend to succeed so we continue processing :)
-    {
-        qCDebug(taskDownloadLogC) << getUid().toString() << "Download failed but we are allowed to proceed:" << m_url.toString();
-        m_sink->abort();
-        m_reply.reset();
-        emit succeeded();
-        emit finished();
-        return;
-    } else if (m_state == State::Failed) {
-        qCDebug(taskDownloadLogC) << getUid().toString() << "Download failed in previous step:" << m_url.toString();
-        m_sink->abort();
-        m_reply.reset();
-        emit failed("");
-        emit finished();
-        return;
-    } else if (m_state == State::AbortedByUser) {
-        qCDebug(taskDownloadLogC) << getUid().toString() << "Download aborted in previous step:" << m_url.toString();
-        m_sink->abort();
-        m_reply.reset();
-        emit aborted();
-        emit finished();
-        return;
-    }
-
-    // make sure we got all the remaining data, if any
-    auto data = m_reply->readAll();
-    if (data.size()) {
-        qCDebug(taskDownloadLogC) << getUid().toString() << "Writing extra" << data.size() << "bytes";
-        m_state = m_sink->write(data);
-    }
-
-    // otherwise, finalize the whole graph
-    m_state = m_sink->finalize(*m_reply.get());
-    if (m_state != State::Succeeded) {
-        qCDebug(taskDownloadLogC) << getUid().toString() << "Download failed to finalize:" << m_url.toString();
-        m_sink->abort();
-        m_reply.reset();
-        emit failed("");
-        emit finished();
-        return;
-    }
-
-    m_reply.reset();
-    qCDebug(taskDownloadLogC) << getUid().toString() << "Download succeeded:" << m_url.toString();
-    emit succeeded();
-    emit finished();
-}
-
-void Download::downloadReadyRead()
-{
-    if (m_state == State::Running) {
-        auto data = m_reply->readAll();
-        m_state = m_sink->write(data);
-        if (m_state == State::Failed) {
-            qCCritical(taskDownloadLogC) << getUid().toString() << "Failed to process response chunk";
-        }
-        // qDebug() << "Download" << m_url.toString() << "gained" << data.size() << "bytes";
-    } else {
-        qCCritical(taskDownloadLogC) << getUid().toString() << "Cannot write download data! illegal status " << m_status;
-    }
-}
-
-}  // namespace Net
-
-auto Net::Download::abort() -> bool
-{
-    if (m_reply) {
-        m_reply->abort();
-    } else {
-        m_state = State::AbortedByUser;
-    }
-    return true;
+    return m_network->get(request);
 }
+}  // namespace Net
\ No newline at end of file
diff --git a/launcher/net/Download.h b/launcher/net/Download.h
index 2fa318ef..113875ee 100644
--- a/launcher/net/Download.h
+++ b/launcher/net/Download.h
@@ -46,15 +46,14 @@
 #include "Validator.h"
 
 #include "QObjectPtr.h"
+#include "net/NetRequest.h"
 
 namespace Net {
-class Download : public NetAction {
+class Download : public NetRequest {
     Q_OBJECT
 
    public:
     using Ptr = shared_qobject_ptr<class Download>;
-    enum class Option { NoOptions = 0, AcceptLocalFiles = 1, MakeEternal = 2 };
-    Q_DECLARE_FLAGS(Options, Option)
 
    public:
     ~Download() override = default;
@@ -66,34 +65,9 @@ class Download : public NetAction {
     static auto makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Options options = Option::NoOptions) -> Download::Ptr;
     static auto makeFile(QUrl url, QString path, Options options = Option::NoOptions) -> Download::Ptr;
 
-    void init() override {};
-
-   public:
-    void addValidator(Validator* v);
-    auto abort() -> bool override;
-    auto canAbort() const -> bool override { return true; };
-
-   private:
-    auto handleRedirect() -> bool;
-
-   protected slots:
-    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
-    void downloadError(QNetworkReply::NetworkError error) override;
-    void sslErrors(const QList<QSslError>& errors) override;
-    void downloadFinished() override;
-    void downloadReadyRead() override;
-
-   public slots:
-    void executeTask() override;
+    void init() override{};
 
    protected:
-    std::unique_ptr<Sink> m_sink;
-    Options m_options;
-
-    std::chrono::steady_clock m_clock;
-    std::chrono::time_point<std::chrono::steady_clock> m_last_progress_time;
-    qint64 m_last_progress_bytes;
+    virtual QNetworkReply* getReply(QNetworkRequest&) override;
 };
 }  // namespace Net
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(Net::Download::Options)
diff --git a/launcher/net/NetRequest.cpp b/launcher/net/NetRequest.cpp
new file mode 100644
index 00000000..3f7cdbaa
--- /dev/null
+++ b/launcher/net/NetRequest.cpp
@@ -0,0 +1,327 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.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/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      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 "NetRequest.h"
+#include <QUrl>
+
+#include <QDateTime>
+#include <QFileInfo>
+#include <memory>
+
+#include "ByteArraySink.h"
+#include "ChecksumValidator.h"
+#include "MetaCacheSink.h"
+
+#if defined(LAUNCHER_APPLICATION)
+#include "Application.h"
+#endif
+
+#include "BuildConfig.h"
+
+#include "net/Logging.h"
+#include "net/NetAction.h"
+
+#include "MMCTime.h"
+#include "StringUtils.h"
+
+namespace Net {
+
+void NetRequest::addValidator(Validator* v)
+{
+    m_sink->addValidator(v);
+}
+
+void NetRequest::executeTask()
+{
+    init();
+
+    setStatus(tr("Downloading %1").arg(StringUtils::truncateUrlHumanFriendly(m_url, 80)));
+
+    if (getState() == Task::State::AbortedByUser) {
+        qCWarning(logCat) << getUid().toString() << "Attempt to start an aborted Request:" << m_url.toString();
+        emitAborted();
+        return;
+    }
+
+    QNetworkRequest request(m_url);
+    m_state = m_sink->init(request);
+    switch (m_state) {
+        case State::Succeeded:
+            qCDebug(logCat) << getUid().toString() << "Request cache hit " << m_url.toString();
+            emit succeeded();
+            emit finished();
+            return;
+        case State::Running:
+            qCDebug(logCat) << getUid().toString() << "Runninng " << m_url.toString();
+            break;
+        case State::Inactive:
+        case State::Failed:
+            emitFailed();
+            return;
+        case State::AbortedByUser:
+            emitAborted();
+            return;
+    }
+
+#if defined(LAUNCHER_APPLICATION)
+    auto user_agent = APPLICATION->getUserAgent();
+#else
+    auto user_agent = BuildConfig.USER_AGENT;
+#endif
+
+    request.setHeader(QNetworkRequest::UserAgentHeader, user_agent.toUtf8());
+    for (auto& header_proxy : m_headerProxies) {
+        header_proxy->writeHeaders(request);
+    }
+    // TODO remove duplication
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+    request.setTransferTimeout();
+#endif
+
+    m_last_progress_time = m_clock.now();
+    m_last_progress_bytes = 0;
+
+    QNetworkReply* rep = getReply(request);
+    m_reply.reset(rep);
+    connect(rep, &QNetworkReply::downloadProgress, this, &NetRequest::downloadProgress);
+    connect(rep, &QNetworkReply::finished, this, &NetRequest::downloadFinished);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
+    connect(rep, &QNetworkReply::errorOccurred, this, &NetRequest::downloadError);
+#else
+    connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &NetRequest::downloadError);
+#endif
+    connect(rep, &QNetworkReply::sslErrors, this, &NetRequest::sslErrors);
+    connect(rep, &QNetworkReply::readyRead, this, &NetRequest::downloadReadyRead);
+}
+
+void NetRequest::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
+{
+    auto now = m_clock.now();
+    auto elapsed = now - m_last_progress_time;
+
+    // use milliseconds for speed precision
+    auto elapsed_ms = std::chrono::duration_cast<std::chrono::milliseconds>(elapsed);
+    auto bytes_received_since = bytesReceived - m_last_progress_bytes;
+    auto dl_speed_bps = (double)bytes_received_since / elapsed_ms.count() * 1000;
+    auto remaining_time_s = (bytesTotal - bytesReceived) / dl_speed_bps;
+
+    //: Current amount of bytes downloaded, out of the total amount of bytes in the download
+    QString dl_progress =
+        tr("%1 / %2").arg(StringUtils::humanReadableFileSize(bytesReceived)).arg(StringUtils::humanReadableFileSize(bytesTotal));
+
+    QString dl_speed_str;
+    if (elapsed_ms.count() > 0) {
+        auto str_eta = bytesTotal > 0 ? Time::humanReadableDuration(remaining_time_s) : tr("unknown");
+        //: Download speed, in bytes per second (remaining download time in parenthesis)
+        dl_speed_str = tr("%1 /s (%2)").arg(StringUtils::humanReadableFileSize(dl_speed_bps)).arg(str_eta);
+    } else {
+        //: Download speed at 0 bytes per second
+        dl_speed_str = tr("0 B/s");
+    }
+
+    setDetails(dl_progress + "\n" + dl_speed_str);
+
+    setProgress(bytesReceived, bytesTotal);
+}
+
+void NetRequest::downloadError(QNetworkReply::NetworkError error)
+{
+    if (error == QNetworkReply::OperationCanceledError) {
+        qCCritical(logCat) << getUid().toString() << "Aborted " << m_url.toString();
+        m_state = State::AbortedByUser;
+    } else {
+        if (m_options & Option::AcceptLocalFiles) {
+            if (m_sink->hasLocalData()) {
+                m_state = State::Succeeded;
+                return;
+            }
+        }
+        // error happened during download.
+        qCCritical(logCat) << getUid().toString() << "Failed " << m_url.toString() << " with reason " << error;
+        m_state = State::Failed;
+    }
+}
+
+void NetRequest::sslErrors(const QList<QSslError>& errors)
+{
+    int i = 1;
+    for (auto error : errors) {
+        qCCritical(logCat) << getUid().toString() << "Request" << m_url.toString() << "SSL Error #" << i << " : " << error.errorString();
+        auto cert = error.certificate();
+        qCCritical(logCat) << getUid().toString() << "Certificate in question:\n" << cert.toText();
+        i++;
+    }
+}
+
+auto NetRequest::handleRedirect() -> bool
+{
+    QUrl redirect = m_reply->header(QNetworkRequest::LocationHeader).toUrl();
+    if (!redirect.isValid()) {
+        if (!m_reply->hasRawHeader("Location")) {
+            // no redirect -> it's fine to continue
+            return false;
+        }
+        // there is a Location header, but it's not correct. we need to apply some workarounds...
+        QByteArray redirectBA = m_reply->rawHeader("Location");
+        if (redirectBA.size() == 0) {
+            // empty, yet present redirect header? WTF?
+            return false;
+        }
+        QString redirectStr = QString::fromUtf8(redirectBA);
+
+        if (redirectStr.startsWith("//")) {
+            /*
+             * IF the URL begins with //, we need to insert the URL scheme.
+             * See: https://bugreports.qt.io/browse/QTBUG-41061
+             * See: http://tools.ietf.org/html/rfc3986#section-4.2
+             */
+            redirectStr = m_reply->url().scheme() + ":" + redirectStr;
+        } else if (redirectStr.startsWith("/")) {
+            /*
+             * IF the URL begins with /, we need to process it as a relative URL
+             */
+            auto url = m_reply->url();
+            url.setPath(redirectStr, QUrl::TolerantMode);
+            redirectStr = url.toString();
+        }
+
+        /*
+         * Next, make sure the URL is parsed in tolerant mode. Qt doesn't parse the location header in tolerant mode, which causes issues.
+         * FIXME: report Qt bug for this
+         */
+        redirect = QUrl(redirectStr, QUrl::TolerantMode);
+        if (!redirect.isValid()) {
+            qCWarning(logCat) << getUid().toString() << "Failed to parse redirect URL:" << redirectStr;
+            downloadError(QNetworkReply::ProtocolFailure);
+            return false;
+        }
+        qCDebug(logCat) << getUid().toString() << "Fixed location header:" << redirect;
+    } else {
+        qCDebug(logCat) << getUid().toString() << "Location header:" << redirect;
+    }
+
+    m_url = QUrl(redirect.toString());
+    qCDebug(logCat) << getUid().toString() << "Following redirect to " << m_url.toString();
+    startAction(m_network);
+
+    return true;
+}
+
+void NetRequest::downloadFinished()
+{
+    // handle HTTP redirection first
+    if (handleRedirect()) {
+        qCDebug(logCat) << getUid().toString() << "Request redirected:" << m_url.toString();
+        return;
+    }
+
+    // if the download failed before this point ...
+    if (m_state == State::Succeeded)  // pretend to succeed so we continue processing :)
+    {
+        qCDebug(logCat) << getUid().toString() << "Request failed but we are allowed to proceed:" << m_url.toString();
+        m_sink->abort();
+        m_reply.reset();
+        emit succeeded();
+        emit finished();
+        return;
+    } else if (m_state == State::Failed) {
+        qCDebug(logCat) << getUid().toString() << "Request failed in previous step:" << m_url.toString();
+        m_sink->abort();
+        m_reply.reset();
+        emit failed("");
+        emit finished();
+        return;
+    } else if (m_state == State::AbortedByUser) {
+        qCDebug(logCat) << getUid().toString() << "Request aborted in previous step:" << m_url.toString();
+        m_sink->abort();
+        m_reply.reset();
+        emit aborted();
+        emit finished();
+        return;
+    }
+
+    // make sure we got all the remaining data, if any
+    auto data = m_reply->readAll();
+    if (data.size()) {
+        qCDebug(logCat) << getUid().toString() << "Writing extra" << data.size() << "bytes";
+        m_state = m_sink->write(data);
+    }
+
+    // otherwise, finalize the whole graph
+    m_state = m_sink->finalize(*m_reply.get());
+    if (m_state != State::Succeeded) {
+        qCDebug(logCat) << getUid().toString() << "Request failed to finalize:" << m_url.toString();
+        m_sink->abort();
+        m_reply.reset();
+        emit failed("");
+        emit finished();
+        return;
+    }
+
+    m_reply.reset();
+    qCDebug(logCat) << getUid().toString() << "Request succeeded:" << m_url.toString();
+    emit succeeded();
+    emit finished();
+}
+
+void NetRequest::downloadReadyRead()
+{
+    if (m_state == State::Running) {
+        auto data = m_reply->readAll();
+        m_state = m_sink->write(data);
+        if (m_state == State::Failed) {
+            qCCritical(logCat) << getUid().toString() << "Failed to process response chunk";
+        }
+        // qDebug() << "Request" << m_url.toString() << "gained" << data.size() << "bytes";
+    } else {
+        qCCritical(logCat) << getUid().toString() << "Cannot write download data! illegal status " << m_status;
+    }
+}
+
+}  // namespace Net
+
+auto Net::NetRequest::abort() -> bool
+{
+    if (m_reply) {
+        m_reply->abort();
+    } else {
+        m_state = State::AbortedByUser;
+    }
+    return true;
+}
diff --git a/launcher/net/NetRequest.h b/launcher/net/NetRequest.h
new file mode 100644
index 00000000..0105a60c
--- /dev/null
+++ b/launcher/net/NetRequest.h
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.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/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      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 <qloggingcategory.h>
+#include <chrono>
+
+#include "NetAction.h"
+#include "Sink.h"
+#include "Validator.h"
+
+#include "QObjectPtr.h"
+#include "net/Logging.h"
+
+namespace Net {
+class NetRequest : public NetAction {
+    Q_OBJECT
+
+   public:
+    using Ptr = shared_qobject_ptr<class NetRequest>;
+    enum class Option { NoOptions = 0, AcceptLocalFiles = 1, MakeEternal = 2 };
+    Q_DECLARE_FLAGS(Options, Option)
+
+   public:
+    ~NetRequest() override = default;
+
+    void init() override{};
+
+   public:
+    void addValidator(Validator* v);
+    auto abort() -> bool override;
+    auto canAbort() const -> bool override { return true; };
+
+   private:
+    auto handleRedirect() -> bool;
+    virtual QNetworkReply* getReply(QNetworkRequest&) = 0;
+
+   protected slots:
+    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
+    void downloadError(QNetworkReply::NetworkError error) override;
+    void sslErrors(const QList<QSslError>& errors) override;
+    void downloadFinished() override;
+    void downloadReadyRead() override;
+
+   public slots:
+    void executeTask() override;
+
+   protected:
+    std::unique_ptr<Sink> m_sink;
+    Options m_options;
+
+    typedef const QLoggingCategory& (*logCatFunc)();
+    logCatFunc logCat = taskUploadLogC;
+
+    std::chrono::steady_clock m_clock;
+    std::chrono::time_point<std::chrono::steady_clock> m_last_progress_time;
+    qint64 m_last_progress_bytes;
+};
+}  // namespace Net
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(Net::NetRequest::Options)
diff --git a/launcher/net/Upload.cpp b/launcher/net/Upload.cpp
index d9115ede..245a52ae 100644
--- a/launcher/net/Upload.cpp
+++ b/launcher/net/Upload.cpp
@@ -40,232 +40,22 @@
 
 #include <memory>
 #include <utility>
-#include "BuildConfig.h"
 #include "ByteArraySink.h"
 
-#if defined(LAUNCHER_APPLICATION)
-#include "Application.h"
-#endif
-
 #include "net/Logging.h"
 
 namespace Net {
 
-bool Upload::abort()
+QNetworkReply* Upload::getReply(QNetworkRequest& request)
 {
-    if (m_reply) {
-        m_reply->abort();
-    } else {
-        m_state = State::AbortedByUser;
-    }
-    return true;
-}
-
-void Upload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
-{
-    setProgress(bytesReceived, bytesTotal);
-}
-
-void Upload::downloadError(QNetworkReply::NetworkError error)
-{
-    if (error == QNetworkReply::OperationCanceledError) {
-        qCCritical(taskUploadLogC) << getUid().toString() << "Aborted " << m_url.toString();
-        m_state = State::AbortedByUser;
-    } else {
-        // error happened during download.
-        qCCritical(taskUploadLogC) << getUid().toString() << "Failed " << m_url.toString() << " with reason " << error;
-        m_state = State::Failed;
-    }
-}
-
-void Upload::sslErrors(const QList<QSslError>& errors)
-{
-    int i = 1;
-    for (const auto& error : errors) {
-        qCCritical(taskUploadLogC) << getUid().toString() << "Upload" << m_url.toString() << "SSL Error #" << i << " : "
-                                   << error.errorString();
-        auto cert = error.certificate();
-        qCCritical(taskUploadLogC) << getUid().toString() << "Certificate in question:\n" << cert.toText();
-        i++;
-    }
-}
-
-bool Upload::handleRedirect()
-{
-    QUrl redirect = m_reply->header(QNetworkRequest::LocationHeader).toUrl();
-    if (!redirect.isValid()) {
-        if (!m_reply->hasRawHeader("Location")) {
-            // no redirect -> it's fine to continue
-            return false;
-        }
-        // there is a Location header, but it's not correct. we need to apply some workarounds...
-        QByteArray redirectBA = m_reply->rawHeader("Location");
-        if (redirectBA.size() == 0) {
-            // empty, yet present redirect header? WTF?
-            return false;
-        }
-        QString redirectStr = QString::fromUtf8(redirectBA);
-
-        if (redirectStr.startsWith("//")) {
-            /*
-             * IF the URL begins with //, we need to insert the URL scheme.
-             * See: https://bugreports.qt.io/browse/QTBUG-41061
-             * See: http://tools.ietf.org/html/rfc3986#section-4.2
-             */
-            redirectStr = m_reply->url().scheme() + ":" + redirectStr;
-        } else if (redirectStr.startsWith("/")) {
-            /*
-             * IF the URL begins with /, we need to process it as a relative URL
-             */
-            auto url = m_reply->url();
-            url.setPath(redirectStr, QUrl::TolerantMode);
-            redirectStr = url.toString();
-        }
-
-        /*
-         * Next, make sure the URL is parsed in tolerant mode. Qt doesn't parse the location header in tolerant mode, which causes issues.
-         * FIXME: report Qt bug for this
-         */
-        redirect = QUrl(redirectStr, QUrl::TolerantMode);
-        if (!redirect.isValid()) {
-            qCWarning(taskUploadLogC) << getUid().toString() << "Failed to parse redirect URL:" << redirectStr;
-            downloadError(QNetworkReply::ProtocolFailure);
-            return false;
-        }
-        qCDebug(taskUploadLogC) << getUid().toString() << "Fixed location header:" << redirect;
-    } else {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Location header:" << redirect;
-    }
-
-    m_url = QUrl(redirect.toString());
-    qCDebug(taskUploadLogC) << getUid().toString() << "Following redirect to " << m_url.toString();
-    startAction(m_network);
-    return true;
-}
-
-void Upload::downloadFinished()
-{
-    // handle HTTP redirection first
-    // very unlikely for post requests, still can happen
-    if (handleRedirect()) {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Upload redirected:" << m_url.toString();
-        return;
-    }
-
-    // if the download failed before this point ...
-    if (m_state == State::Succeeded) {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed but we are allowed to proceed:" << m_url.toString();
-        m_sink->abort();
-        m_reply.reset();
-        emit succeeded();
-        emit finished();
-        return;
-    } else if (m_state == State::Failed) {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed in previous step:" << m_url.toString();
-        m_sink->abort();
-        m_reply.reset();
-        emit failed("");
-        emit finished();
-        return;
-    } else if (m_state == State::AbortedByUser) {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Upload aborted in previous step:" << m_url.toString();
-        m_sink->abort();
-        m_reply.reset();
-        emit aborted();
-        emit finished();
-        return;
-    }
-
-    // make sure we got all the remaining data, if any
-    auto data = m_reply->readAll();
-    if (data.size()) {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Writing extra" << data.size() << "bytes";
-        m_state = m_sink->write(data);
-    }
-
-    // otherwise, finalize the whole graph
-    m_state = m_sink->finalize(*m_reply.get());
-    if (m_state != State::Succeeded) {
-        qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed to finalize:" << m_url.toString();
-        m_sink->abort();
-        m_reply.reset();
-        emit failed("");
-        emit finished();
-        return;
-    }
-    m_reply.reset();
-    qCDebug(taskUploadLogC) << getUid().toString() << "Upload succeeded:" << m_url.toString();
-    emit succeeded();
-    emit finished();
-}
-
-void Upload::downloadReadyRead()
-{
-    if (m_state == State::Running) {
-        auto data = m_reply->readAll();
-        m_state = m_sink->write(data);
-    }
-}
-
-void Upload::executeTask()
-{
-    setStatus(tr("Uploading %1").arg(m_url.toString()));
-
-    if (m_state == State::AbortedByUser) {
-        qCWarning(taskUploadLogC) << getUid().toString() << "Attempt to start an aborted Upload:" << m_url.toString();
-        emit aborted();
-        emit finished();
-        return;
-    }
-    QNetworkRequest request(m_url);
-    m_state = m_sink->init(request);
-    switch (m_state) {
-        case State::Succeeded:
-            emitSucceeded();
-            qCDebug(taskUploadLogC) << getUid().toString() << "Upload cache hit " << m_url.toString();
-            return;
-        case State::Running:
-            qCDebug(taskUploadLogC) << getUid().toString() << "Uploading " << m_url.toString();
-            break;
-        case State::Inactive:
-        case State::Failed:
-            emitFailed("");
-            return;
-        case State::AbortedByUser:
-            emitAborted();
-            return;
-    }
-
-#if defined(LAUNCHER_APPLICATION)
-    auto user_agent = APPLICATION->getUserAgent();
-#else
-    auto user_agent = BuildConfig.USER_AGENT;
-#endif
-    request.setHeader(QNetworkRequest::UserAgentHeader, user_agent.toUtf8());
-
-    for (auto& header_proxy : m_headerProxies) {
-        header_proxy->writeHeaders(request);
-    }
-
-    // TODO other types of post requests ?
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    QNetworkReply* rep = m_network->post(request, m_post_data);
-
-    m_reply.reset(rep);
-    connect(rep, &QNetworkReply::downloadProgress, this, &Upload::downloadProgress);
-    connect(rep, &QNetworkReply::finished, this, &Upload::downloadFinished);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
-    connect(rep, &QNetworkReply::errorOccurred, this, &Upload::downloadError);
-#else
-    connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &Upload::downloadError);
-#endif
-    connect(rep, &QNetworkReply::sslErrors, this, &Upload::sslErrors);
-    connect(rep, &QNetworkReply::readyRead, this, &Upload::downloadReadyRead);
+    return m_network->post(request, m_post_data);
 }
 
 Upload::Ptr Upload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, QByteArray m_post_data)
 {
     auto up = makeShared<Upload>();
+    up->logCat = taskUploadLogC;
     up->m_url = std::move(url);
     up->m_sink.reset(new ByteArraySink(output));
     up->m_post_data = std::move(m_post_data);
diff --git a/launcher/net/Upload.h b/launcher/net/Upload.h
index 8be3f2c1..51ce410b 100644
--- a/launcher/net/Upload.h
+++ b/launcher/net/Upload.h
@@ -37,37 +37,21 @@
 
 #pragma once
 
-#include "NetAction.h"
-#include "Sink.h"
+#include "net/NetRequest.h"
 
 namespace Net {
 
-class Upload : public NetAction {
+class Upload : public NetRequest {
     Q_OBJECT
 
    public:
     using Ptr = shared_qobject_ptr<Upload>;
 
     static Upload::Ptr makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, QByteArray m_post_data);
-    auto abort() -> bool override;
-    auto canAbort() const -> bool override { return true; };
-    virtual void init() override{};
-
-   protected slots:
-    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
-    void downloadError(QNetworkReply::NetworkError error) override;
-    void sslErrors(const QList<QSslError>& errors) override;
-    void downloadFinished() override;
-    void downloadReadyRead() override;
-
-   public slots:
-    void executeTask() override;
 
    protected:
-    std::unique_ptr<Sink> m_sink;
+    virtual QNetworkReply* getReply(QNetworkRequest&) override;
     QByteArray m_post_data;
-
-    bool handleRedirect();
 };
 
 }  // namespace Net
-- 
cgit 


From 45c39d078ff4675a87f97bc2e5cc5f072e591856 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 27 Jun 2023 09:23:24 +0300
Subject: More clenup

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/net/ApiDownload.cpp |  3 ---
 launcher/net/ApiUpload.cpp   |  1 -
 launcher/net/Download.cpp    | 13 -------------
 launcher/net/Download.h      | 12 +-----------
 launcher/net/NetRequest.cpp  | 15 ++++-----------
 launcher/net/NetRequest.h    |  2 ++
 launcher/net/Upload.cpp      |  3 ---
 launcher/net/Upload.h        |  2 +-
 8 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/launcher/net/ApiDownload.cpp b/launcher/net/ApiDownload.cpp
index 5dfaa51d..aaa8ff65 100644
--- a/launcher/net/ApiDownload.cpp
+++ b/launcher/net/ApiDownload.cpp
@@ -28,7 +28,6 @@ namespace Net {
 auto ApiDownload::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> Download::Ptr
 {
     auto dl = makeShared<ApiDownload>();
-    dl->logCat = taskDownloadLogC;
     dl->m_url = url;
     dl->setObjectName(QString("CACHE:") + url.toString());
     dl->m_options = options;
@@ -41,7 +40,6 @@ auto ApiDownload::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> D
 auto ApiDownload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Options options) -> Download::Ptr
 {
     auto dl = makeShared<ApiDownload>();
-    dl->logCat = taskDownloadLogC;
     dl->m_url = url;
     dl->setObjectName(QString("BYTES:") + url.toString());
     dl->m_options = options;
@@ -52,7 +50,6 @@ auto ApiDownload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Op
 auto ApiDownload::makeFile(QUrl url, QString path, Options options) -> Download::Ptr
 {
     auto dl = makeShared<ApiDownload>();
-    dl->logCat = taskDownloadLogC;
     dl->m_url = url;
     dl->setObjectName(QString("FILE:") + url.toString());
     dl->m_options = options;
diff --git a/launcher/net/ApiUpload.cpp b/launcher/net/ApiUpload.cpp
index ec4f14af..c1221b76 100644
--- a/launcher/net/ApiUpload.cpp
+++ b/launcher/net/ApiUpload.cpp
@@ -28,7 +28,6 @@ namespace Net {
 Upload::Ptr ApiUpload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, QByteArray m_post_data)
 {
     auto up = makeShared<ApiUpload>();
-    up->logCat = taskUploadLogC;
     up->m_url = std::move(url);
     up->m_sink.reset(new ByteArraySink(output));
     up->m_post_data = std::move(m_post_data);
diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index dc316878..d25447b2 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -47,25 +47,14 @@
 #include "ChecksumValidator.h"
 #include "MetaCacheSink.h"
 
-#if defined(LAUNCHER_APPLICATION)
-#include "Application.h"
-#endif
-
-#include "BuildConfig.h"
-
-#include "net/Logging.h"
 #include "net/NetAction.h"
 
-#include "MMCTime.h"
-#include "StringUtils.h"
-
 namespace Net {
 
 #if defined(LAUNCHER_APPLICATION)
 auto Download::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> Download::Ptr
 {
     auto dl = makeShared<Download>();
-    dl->logCat = taskDownloadLogC;
     dl->m_url = url;
     dl->setObjectName(QString("CACHE:") + url.toString());
     dl->m_options = options;
@@ -79,7 +68,6 @@ auto Download::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> Down
 auto Download::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Options options) -> Download::Ptr
 {
     auto dl = makeShared<Download>();
-    dl->logCat = taskDownloadLogC;
     dl->m_url = url;
     dl->setObjectName(QString("BYTES:") + url.toString());
     dl->m_options = options;
@@ -90,7 +78,6 @@ auto Download::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Optio
 auto Download::makeFile(QUrl url, QString path, Options options) -> Download::Ptr
 {
     auto dl = makeShared<Download>();
-    dl->logCat = taskDownloadLogC;
     dl->m_url = url;
     dl->setObjectName(QString("FILE:") + url.toString());
     dl->m_options = options;
diff --git a/launcher/net/Download.h b/launcher/net/Download.h
index 113875ee..dc3ccacf 100644
--- a/launcher/net/Download.h
+++ b/launcher/net/Download.h
@@ -38,12 +38,7 @@
 
 #pragma once
 
-#include <chrono>
-
 #include "HttpMetaCache.h"
-#include "NetAction.h"
-#include "Sink.h"
-#include "Validator.h"
 
 #include "QObjectPtr.h"
 #include "net/NetRequest.h"
@@ -51,12 +46,9 @@
 namespace Net {
 class Download : public NetRequest {
     Q_OBJECT
-
    public:
     using Ptr = shared_qobject_ptr<class Download>;
-
-   public:
-    ~Download() override = default;
+    explicit Download() : NetRequest() { logCat = taskDownloadLogC; };
 
 #if defined(LAUNCHER_APPLICATION)
     static auto makeCached(QUrl url, MetaEntryPtr entry, Options options = Option::NoOptions) -> Download::Ptr;
@@ -65,8 +57,6 @@ class Download : public NetRequest {
     static auto makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Options options = Option::NoOptions) -> Download::Ptr;
     static auto makeFile(QUrl url, QString path, Options options = Option::NoOptions) -> Download::Ptr;
 
-    void init() override{};
-
    protected:
     virtual QNetworkReply* getReply(QNetworkRequest&) override;
 };
diff --git a/launcher/net/NetRequest.cpp b/launcher/net/NetRequest.cpp
index 3f7cdbaa..30457712 100644
--- a/launcher/net/NetRequest.cpp
+++ b/launcher/net/NetRequest.cpp
@@ -43,17 +43,10 @@
 #include <QFileInfo>
 #include <memory>
 
-#include "ByteArraySink.h"
-#include "ChecksumValidator.h"
-#include "MetaCacheSink.h"
-
 #if defined(LAUNCHER_APPLICATION)
 #include "Application.h"
 #endif
 
-#include "BuildConfig.h"
-
-#include "net/Logging.h"
 #include "net/NetAction.h"
 
 #include "MMCTime.h"
@@ -70,7 +63,7 @@ void NetRequest::executeTask()
 {
     init();
 
-    setStatus(tr("Downloading %1").arg(StringUtils::truncateUrlHumanFriendly(m_url, 80)));
+    setStatus(tr("Requesting %1").arg(StringUtils::truncateUrlHumanFriendly(m_url, 80)));
 
     if (getState() == Task::State::AbortedByUser) {
         qCWarning(logCat) << getUid().toString() << "Attempt to start an aborted Request:" << m_url.toString();
@@ -314,9 +307,7 @@ void NetRequest::downloadReadyRead()
     }
 }
 
-}  // namespace Net
-
-auto Net::NetRequest::abort() -> bool
+auto NetRequest::abort() -> bool
 {
     if (m_reply) {
         m_reply->abort();
@@ -325,3 +316,5 @@ auto Net::NetRequest::abort() -> bool
     }
     return true;
 }
+
+}  // namespace Net
diff --git a/launcher/net/NetRequest.h b/launcher/net/NetRequest.h
index 0105a60c..6ebdcab0 100644
--- a/launcher/net/NetRequest.h
+++ b/launcher/net/NetRequest.h
@@ -51,6 +51,8 @@
 namespace Net {
 class NetRequest : public NetAction {
     Q_OBJECT
+   protected:
+    explicit NetRequest() : NetAction(){};
 
    public:
     using Ptr = shared_qobject_ptr<class NetRequest>;
diff --git a/launcher/net/Upload.cpp b/launcher/net/Upload.cpp
index 245a52ae..726572e5 100644
--- a/launcher/net/Upload.cpp
+++ b/launcher/net/Upload.cpp
@@ -42,8 +42,6 @@
 #include <utility>
 #include "ByteArraySink.h"
 
-#include "net/Logging.h"
-
 namespace Net {
 
 QNetworkReply* Upload::getReply(QNetworkRequest& request)
@@ -55,7 +53,6 @@ QNetworkReply* Upload::getReply(QNetworkRequest& request)
 Upload::Ptr Upload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, QByteArray m_post_data)
 {
     auto up = makeShared<Upload>();
-    up->logCat = taskUploadLogC;
     up->m_url = std::move(url);
     up->m_sink.reset(new ByteArraySink(output));
     up->m_post_data = std::move(m_post_data);
diff --git a/launcher/net/Upload.h b/launcher/net/Upload.h
index 51ce410b..f920e556 100644
--- a/launcher/net/Upload.h
+++ b/launcher/net/Upload.h
@@ -43,9 +43,9 @@ namespace Net {
 
 class Upload : public NetRequest {
     Q_OBJECT
-
    public:
     using Ptr = shared_qobject_ptr<Upload>;
+    explicit Upload() : NetRequest() { logCat = taskUploadLogC; };
 
     static Upload::Ptr makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, QByteArray m_post_data);
 
-- 
cgit 


From 6c374f5f08ad873ae23aab057751d9defc95d12b Mon Sep 17 00:00:00 2001
From: ashuntu <101582426+ashuntu@users.noreply.github.com>
Date: Thu, 29 Jun 2023 21:09:31 -0500
Subject: Add snapcraft.yaml

Signed-off-by: ashuntu <101582426+ashuntu@users.noreply.github.com>
---
 snap/snapcraft.yaml | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 snap/snapcraft.yaml

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
new file mode 100644
index 00000000..41c0ce07
--- /dev/null
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,64 @@
+name: prismlauncher
+license: GPL-3.0-only
+base: core22
+website: https://prismlauncher.org/
+source-code: https://github.com/PrismLauncher/PrismLauncher
+issues: https://github.com/PrismLauncher/PrismLauncher/issues
+donation: https://opencollective.com/prismlauncher
+contact: https://discord.gg/prismlauncher
+summary: A custom Minecraft launcher with modpack support
+adopt-info: prismlauncher
+
+grade: devel
+confinement: strict
+
+architectures:
+  - build-on: amd64
+  - build-on: arm64
+
+parts:
+  prismlauncher:
+    parse-info:
+      - usr/share/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml
+    plugin: cmake
+    build-packages:
+      - zlib1g-dev
+      - openjdk-17-jdk
+      - scdoc
+      - libgl1-mesa-dev
+      - extra-cmake-modules
+    build-snaps:
+      - kf5-5-106-qt-5-15-9-core22
+      - kf5-5-106-qt-5-15-9-core22-sdk
+    stage-packages:
+      - openjdk-17-jre
+      - openjdk-8-jre
+    source: .
+    override-pull: |
+      craftctl default
+      # Fix the icon reference in the desktop file
+      sed -i.bak -e 's|Icon=org.prismlauncher.PrismLauncher|Icon=/usr/share/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg|g' program_info/org.prismlauncher.PrismLauncher.desktop.in
+      # Remove the build directory so that local development doesn't interfere with Snap compilation
+      rm -rf build
+      git submodule update --init --recursive
+    cmake-generator: Ninja
+    cmake-parameters:
+      - "-DCMAKE_INSTALL_PREFIX=/usr"
+      - "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+      - "-DENABLE_LTO=ON"
+      - "-DLauncher_BUILD_PLATFORM=snap"
+      - "-DLauncher_QT_VERSION_MAJOR='5'"
+
+apps:
+  prismlauncher:
+    common-id: org.prismlauncher.PrismLauncher
+    desktop: usr/share/applications/org.prismlauncher.PrismLauncher.desktop
+    command: usr/bin/prismlauncher
+    extensions:
+      - kde-neon
+    plugs:
+      - home
+      - opengl
+      - network
+      - network-bind
+      - audio-playback
-- 
cgit 


From b6e9a5495162c0ffedf99b0d96d1c4daf08c51e9 Mon Sep 17 00:00:00 2001
From: ashuntu <101582426+ashuntu@users.noreply.github.com>
Date: Thu, 29 Jun 2023 21:15:07 -0500
Subject: Add snap github action

Signed-off-by: ashuntu <101582426+ashuntu@users.noreply.github.com>
---
 .github/workflows/build.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c2966abe..696acdba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -569,6 +569,31 @@ jobs:
         run: |
           ccache -s
 
+  snap:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        if: inputs.build_type == 'Debug'
+        uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+      - name: Set short version
+        shell: bash
+        if: inputs.build_type == 'Debug'
+        run: |
+          ver_short=`git rev-parse --short HEAD`
+          echo "VERSION=$ver_short" >> $GITHUB_ENV
+      - name: Package Snap (Linux)
+        id: snapcraft
+        if: inputs.build_type == 'Debug'
+        uses: snapcore/action-build@v1
+      - name: Upload Snap (Linux)
+        if: inputs.build_type == 'Debug'
+        uses: actions/upload-artifact@v3
+        with:
+          name: prismlauncher_${{ env.VERSION }}_amd64.snap
+          path: ${{ steps.snapcraft.outputs.snap }}
+
   flatpak:
     runs-on: ubuntu-latest
     container:
-- 
cgit 


From f1bd9700f71341ed726e205f04633bb0cb44e6fb Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 2 Jul 2023 22:43:30 +0300
Subject: Fail NetRequest on connection close from QT

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/net/NetRequest.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/launcher/net/NetRequest.cpp b/launcher/net/NetRequest.cpp
index 30457712..ff59da18 100644
--- a/launcher/net/NetRequest.cpp
+++ b/launcher/net/NetRequest.cpp
@@ -157,7 +157,7 @@ void NetRequest::downloadError(QNetworkReply::NetworkError error)
 {
     if (error == QNetworkReply::OperationCanceledError) {
         qCCritical(logCat) << getUid().toString() << "Aborted " << m_url.toString();
-        m_state = State::AbortedByUser;
+        m_state = State::Failed;
     } else {
         if (m_options & Option::AcceptLocalFiles) {
             if (m_sink->hasLocalData()) {
@@ -274,6 +274,13 @@ void NetRequest::downloadFinished()
     if (data.size()) {
         qCDebug(logCat) << getUid().toString() << "Writing extra" << data.size() << "bytes";
         m_state = m_sink->write(data);
+        if (m_state != State::Succeeded) {
+            qCDebug(logCat) << getUid().toString() << "Request failed to write:" << m_url.toString();
+            m_sink->abort();
+            emit failed("");
+            emit finished();
+            return;
+        }
     }
 
     // otherwise, finalize the whole graph
@@ -309,10 +316,14 @@ void NetRequest::downloadReadyRead()
 
 auto NetRequest::abort() -> bool
 {
+    m_state = State::AbortedByUser;
     if (m_reply) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)  // QNetworkReply::errorOccurred added in 5.15
+        disconnect(m_reply.get(), &QNetworkReply::errorOccurred, nullptr, nullptr);
+#else
+        disconnect(m_reply.get(), QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), nullptr, nullptr);
+#endif
         m_reply->abort();
-    } else {
-        m_state = State::AbortedByUser;
     }
     return true;
 }
-- 
cgit 


From 10678096e57eb5b344f0dd39ad178403640b722a Mon Sep 17 00:00:00 2001
From: ashuntu <101582426+ashuntu@users.noreply.github.com>
Date: Fri, 7 Jul 2023 13:20:15 -0500
Subject: Persist app data between install versions

---
 launcher/Application.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 1d97a5f2..b91b3157 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -280,7 +280,16 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     }
     else
     {
-        QDir foo(FS::PathCombine(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation), ".."));
+        QDir foo;
+        if (DesktopServices::isSnap())
+        {
+            foo = QDir(getenv("SNAP_USER_COMMON"));
+        }
+        else
+        {
+            foo = QDir(FS::PathCombine(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation), ".."));
+        }
+        
         dataPath = foo.absolutePath();
         adjustedBy = "Persistent data path";
 
-- 
cgit 


From 51d7a6289e1cf2df463ae8d7c0b08b4a61faea3c Mon Sep 17 00:00:00 2001
From: ashuntu <101582426+ashuntu@users.noreply.github.com>
Date: Fri, 7 Jul 2023 13:23:05 -0500
Subject: Fix URL open crash (#596)

---
 launcher/DesktopServices.cpp | 24 +++++++++++++++++++-----
 launcher/DesktopServices.h   | 13 +++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/launcher/DesktopServices.cpp b/launcher/DesktopServices.cpp
index 2984a1b4..81362f09 100644
--- a/launcher/DesktopServices.cpp
+++ b/launcher/DesktopServices.cpp
@@ -118,7 +118,7 @@ bool openDirectory(const QString &path, bool ensureExists)
         return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath()));
     };
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-    if(!isFlatpak())
+    if(!isSandbox())
     {
         return IndirectOpen(f);
     }
@@ -139,7 +139,7 @@ bool openFile(const QString &path)
         return QDesktopServices::openUrl(QUrl::fromLocalFile(path));
     };
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-    if(!isFlatpak())
+    if(!isSandbox())
     {
         return IndirectOpen(f);
     }
@@ -157,7 +157,7 @@ bool openFile(const QString &application, const QString &path, const QString &wo
     qDebug() << "Opening file" << path << "using" << application;
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave
-    if(!isFlatpak())
+    if(!isSandbox())
     {
         return IndirectOpen([&]()
         {
@@ -177,7 +177,7 @@ bool run(const QString &application, const QStringList &args, const QString &wor
 {
     qDebug() << "Running" << application << "with args" << args.join(' ');
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-    if(!isFlatpak())
+    if(!isSandbox())
     {
     // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave
     return IndirectOpen([&]()
@@ -202,7 +202,7 @@ bool openUrl(const QUrl &url)
         return QDesktopServices::openUrl(url);
     };
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
-    if(!isFlatpak())
+    if(!isSandbox())
     {
         return IndirectOpen(f);
     }
@@ -224,4 +224,18 @@ bool isFlatpak()
 #endif
 }
 
+bool isSnap()
+{
+#ifdef Q_OS_LINUX
+    return getenv("SNAP");
+#else
+    return false;
+#endif
+}
+
+bool isSandbox()
+{
+    return isSnap() || isFlatpak();
+}
+
 }
diff --git a/launcher/DesktopServices.h b/launcher/DesktopServices.h
index 21c9cae0..b1948cc2 100644
--- a/launcher/DesktopServices.h
+++ b/launcher/DesktopServices.h
@@ -34,5 +34,18 @@ namespace DesktopServices
      */
     bool openUrl(const QUrl &url);
 
+    /**
+     * Determine whether the launcher is running in a Flatpak environment
+    */
     bool isFlatpak();
+
+    /**
+     * Determine whether the launcher is running in a Snap environment
+    */
+    bool isSnap();
+
+    /**
+     * Determine whether the launcher is running in a sandboxed (Flatpak or Snap) environment
+    */
+    bool isSandbox();
 }
-- 
cgit 


From e21756ea8c35d04d78046fea44ac5e52f069f699 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Mon, 10 Jul 2023 16:10:58 +0100
Subject: Remove direct launch

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/Application.cpp                       |   3 -
 launcher/CMakeLists.txt                        |   2 -
 launcher/minecraft/MinecraftInstance.cpp       |  41 +-----
 launcher/minecraft/MinecraftInstance.h         |   2 -
 launcher/minecraft/launch/DirectJavaLaunch.cpp | 166 -------------------------
 launcher/minecraft/launch/DirectJavaLaunch.h   |  58 ---------
 6 files changed, 5 insertions(+), 267 deletions(-)
 delete mode 100644 launcher/minecraft/launch/DirectJavaLaunch.cpp
 delete mode 100644 launcher/minecraft/launch/DirectJavaLaunch.h

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 7858d713..aa0eeb8e 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -618,9 +618,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_settings->registerSetting("ShowGlobalGameTime", true);
         m_settings->registerSetting("RecordGameTime", true);
 
-        // Minecraft launch method
-        m_settings->registerSetting("MCLaunchMethod", "LauncherPart");
-
         // Minecraft mods
         m_settings->registerSetting("ModMetadataDisabled", false);
 
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index af3bc28e..0bf60dc7 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -262,8 +262,6 @@ set(MINECRAFT_SOURCES
     minecraft/launch/CreateGameFolders.h
     minecraft/launch/ModMinecraftJar.cpp
     minecraft/launch/ModMinecraftJar.h
-    minecraft/launch/DirectJavaLaunch.cpp
-    minecraft/launch/DirectJavaLaunch.h
     minecraft/launch/ExtractNatives.cpp
     minecraft/launch/ExtractNatives.h
     minecraft/launch/LauncherPartLaunch.cpp
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 4867cc7a..2796872a 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -60,7 +60,6 @@
 #include "launch/steps/QuitAfterGameStop.h"
 
 #include "minecraft/launch/LauncherPartLaunch.h"
-#include "minecraft/launch/DirectJavaLaunch.h"
 #include "minecraft/launch/ModMinecraftJar.h"
 #include "minecraft/launch/ClaimAccount.h"
 #include "minecraft/launch/ReconstructAssets.h"
@@ -166,10 +165,6 @@ void MinecraftInstance::loadSpecificSettings()
         m_settings->registerOverride(global_settings->getSetting("MaxMemAlloc"), memorySetting);
         m_settings->registerOverride(global_settings->getSetting("PermGen"), memorySetting);
 
-        // Minecraft launch method
-        auto launchMethodOverride = m_settings->registerSetting("OverrideMCLaunchMethod", false);
-        m_settings->registerOverride(global_settings->getSetting("MCLaunchMethod"), launchMethodOverride);
-
         // Native library workarounds
         auto nativeLibraryWorkaroundsOverride = m_settings->registerSetting("OverrideNativeWorkarounds", false);
         m_settings->registerOverride(global_settings->getSetting("UseNativeOpenAL"), nativeLibraryWorkaroundsOverride);
@@ -979,15 +974,6 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         process->appendStep(makeShared<CheckJava>(pptr));
     }
 
-    // check launch method
-    QStringList validMethods = {"LauncherPart", "DirectJava"};
-    QString method = launchMethod();
-    if(!validMethods.contains(method))
-    {
-        process->appendStep(makeShared<TextPrint>(pptr, "Selected launch method \"" + method + "\" is not valid.\n", MessageLevel::Fatal));
-        return process;
-    }
-
     // create the .minecraft folder and server-resource-packs (workaround for Minecraft bug MCL-3732)
     {
         process->appendStep(makeShared<CreateGameFolders>(pptr));
@@ -1061,23 +1047,11 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
 
     {
         // actually launch the game
-        auto method = launchMethod();
-        if(method == "LauncherPart")
-        {
-            auto step = makeShared<LauncherPartLaunch>(pptr);
-            step->setWorkingDirectory(gameRoot());
-            step->setAuthSession(session);
-            step->setServerToJoin(serverToJoin);
-            process->appendStep(step);
-        }
-        else if (method == "DirectJava")
-        {
-            auto step = makeShared<DirectJavaLaunch>(pptr);
-            step->setWorkingDirectory(gameRoot());
-            step->setAuthSession(session);
-            step->setServerToJoin(serverToJoin);
-            process->appendStep(step);
-        }
+        auto step = makeShared<LauncherPartLaunch>(pptr);
+        step->setWorkingDirectory(gameRoot());
+        step->setAuthSession(session);
+        step->setServerToJoin(serverToJoin);
+        process->appendStep(step);
     }
 
     // run post-exit command if that's needed
@@ -1100,11 +1074,6 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     return m_launchProcess;
 }
 
-QString MinecraftInstance::launchMethod()
-{
-    return settings()->get("MCLaunchMethod").toString();
-}
-
 JavaVersion MinecraftInstance::getJavaVersion()
 {
     return JavaVersion(settings()->get("JavaVersion").toString());
diff --git a/launcher/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h
index 068b3008..4afcf04b 100644
--- a/launcher/minecraft/MinecraftInstance.h
+++ b/launcher/minecraft/MinecraftInstance.h
@@ -165,8 +165,6 @@ public:
 
 protected:
     QMap<QString, QString> createCensorFilterFromSession(AuthSessionPtr session);
-    QStringList validLaunchMethods();
-    QString launchMethod();
 
 protected: // data
     std::shared_ptr<PackProfile> m_components;
diff --git a/launcher/minecraft/launch/DirectJavaLaunch.cpp b/launcher/minecraft/launch/DirectJavaLaunch.cpp
deleted file mode 100644
index ca55cd2e..00000000
--- a/launcher/minecraft/launch/DirectJavaLaunch.cpp
+++ /dev/null
@@ -1,166 +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 "DirectJavaLaunch.h"
-
-#include <QStandardPaths>
-
-#include <launch/LaunchTask.h>
-#include <minecraft/MinecraftInstance.h>
-#include <FileSystem.h>
-#include <Commandline.h>
-
-#include "Application.h"
-
-#ifdef Q_OS_LINUX
-#include "gamemode_client.h"
-#endif
-
-DirectJavaLaunch::DirectJavaLaunch(LaunchTask *parent) : LaunchStep(parent)
-{
-    connect(&m_process, &LoggedProcess::log, this, &DirectJavaLaunch::logLines);
-    connect(&m_process, &LoggedProcess::stateChanged, this, &DirectJavaLaunch::on_state);
-}
-
-void DirectJavaLaunch::executeTask()
-{
-    auto instance = m_parent->instance();
-    std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
-    QStringList args = minecraftInstance->javaArguments();
-
-    args.append("-Djava.library.path=" + minecraftInstance->getNativePath());
-
-    auto classPathEntries = minecraftInstance->getClassPath();
-    args.append("-cp");
-    QString classpath;
-#ifdef Q_OS_WIN32
-    classpath = classPathEntries.join(';');
-#else
-    classpath = classPathEntries.join(':');
-#endif
-    args.append(classpath);
-    args.append(minecraftInstance->getMainClass());
-
-    QString allArgs = args.join(", ");
-    emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::Launcher);
-
-    auto javaPath = FS::ResolveExecutable(instance->settings()->get("JavaPath").toString());
-
-    m_process.setProcessEnvironment(instance->createLaunchEnvironment());
-
-    // make detachable - this will keep the process running even if the object is destroyed
-    m_process.setDetachable(true);
-
-    auto mcArgs = minecraftInstance->processMinecraftArgs(m_session, m_serverToJoin);
-    args.append(mcArgs);
-
-    QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
-    if(!wrapperCommandStr.isEmpty())
-    {
-        auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
-        auto wrapperCommand = wrapperArgs.takeFirst();
-        auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
-        if (realWrapperCommand.isEmpty())
-        {
-            const char *reason = QT_TR_NOOP("The wrapper command \"%1\" couldn't be found.");
-            emit logLine(QString(reason).arg(wrapperCommand), MessageLevel::Fatal);
-            emitFailed(tr(reason).arg(wrapperCommand));
-            return;
-        }
-        emit logLine("Wrapper command is:\n" + wrapperCommandStr + "\n\n", MessageLevel::Launcher);
-        args.prepend(javaPath);
-        m_process.start(wrapperCommand, wrapperArgs + args);
-    }
-    else
-    {
-        m_process.start(javaPath, args);
-    }
-
-#ifdef Q_OS_LINUX
-    if (instance->settings()->get("EnableFeralGamemode").toBool() && APPLICATION->capabilities() & Application::SupportsGameMode)
-    {
-        auto pid = m_process.processId();
-        if (pid)
-        {
-            gamemode_request_start_for(pid);
-        }
-    }
-#endif
-}
-
-void DirectJavaLaunch::on_state(LoggedProcess::State state)
-{
-    switch(state)
-    {
-        case LoggedProcess::FailedToStart:
-        {
-            //: Error message displayed if instance can't start
-            const char *reason = QT_TR_NOOP("Could not launch Minecraft!");
-            emit logLine(reason, MessageLevel::Fatal);
-            emitFailed(tr(reason));
-            return;
-        }
-        case LoggedProcess::Aborted:
-        case LoggedProcess::Crashed:
-        {
-            m_parent->setPid(-1);
-            emitFailed(tr("Game crashed."));
-            return;
-        }
-        case LoggedProcess::Finished:
-        {
-            m_parent->setPid(-1);
-            // if the exit code wasn't 0, report this as a crash
-            auto exitCode = m_process.exitCode();
-            if(exitCode != 0)
-            {
-                emitFailed(tr("Game crashed."));
-                return;
-            }
-            //FIXME: make this work again
-            // m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode));
-            // run post-exit
-            emitSucceeded();
-            break;
-        }
-        case LoggedProcess::Running:
-            emit logLine(QString("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::Launcher);
-            m_parent->setPid(m_process.processId());
-            m_parent->instance()->setLastLaunch();
-            break;
-        default:
-            break;
-    }
-}
-
-void DirectJavaLaunch::setWorkingDirectory(const QString &wd)
-{
-    m_process.setWorkingDirectory(wd);
-}
-
-void DirectJavaLaunch::proceed()
-{
-    // nil
-}
-
-bool DirectJavaLaunch::abort()
-{
-    auto state = m_process.state();
-    if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
-    {
-        m_process.kill();
-    }
-    return true;
-}
-
diff --git a/launcher/minecraft/launch/DirectJavaLaunch.h b/launcher/minecraft/launch/DirectJavaLaunch.h
deleted file mode 100644
index 58b119b8..00000000
--- a/launcher/minecraft/launch/DirectJavaLaunch.h
+++ /dev/null
@@ -1,58 +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 <launch/LaunchStep.h>
-#include <LoggedProcess.h>
-#include <minecraft/auth/AuthSession.h>
-
-#include "MinecraftServerTarget.h"
-
-class DirectJavaLaunch: public LaunchStep
-{
-    Q_OBJECT
-public:
-    explicit DirectJavaLaunch(LaunchTask *parent);
-    virtual ~DirectJavaLaunch() {};
-
-    virtual void executeTask();
-    virtual bool abort();
-    virtual void proceed();
-    virtual bool canAbort() const
-    {
-        return true;
-    }
-    void setWorkingDirectory(const QString &wd);
-    void setAuthSession(AuthSessionPtr session)
-    {
-        m_session = session;
-    }
-
-    void setServerToJoin(MinecraftServerTargetPtr serverToJoin)
-    {
-        m_serverToJoin = std::move(serverToJoin);
-    }
-
-private slots:
-    void on_state(LoggedProcess::State state);
-
-private:
-    LoggedProcess m_process;
-    QString m_command;
-    AuthSessionPtr m_session;
-    MinecraftServerTargetPtr m_serverToJoin;
-};
-
-- 
cgit 


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/CMakeLists.txt                            |  11 +++
 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 ++++++++++
 launcher/ui/dialogs/NewInstanceDialog.cpp          |  24 ++---
 .../pages/modplatform/import_ftb/ImportFTBPage.cpp | 104 +++++++++++++++++++++
 .../pages/modplatform/import_ftb/ImportFTBPage.h   |  67 +++++++++++++
 .../pages/modplatform/import_ftb/ImportFTBPage.ui  |  28 ++++++
 .../ui/pages/modplatform/import_ftb/ListModel.cpp  |  89 ++++++++++++++++++
 .../ui/pages/modplatform/import_ftb/ListModel.h    |  46 +++++++++
 11 files changed, 650 insertions(+), 12 deletions(-)
 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
 create mode 100644 launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
 create mode 100644 launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
 create mode 100644 launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.ui
 create mode 100644 launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
 create mode 100644 launcher/ui/pages/modplatform/import_ftb/ListModel.h

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index af3bc28e..6544e65b 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -498,6 +498,11 @@ set(FTB_SOURCES
     modplatform/legacy_ftb/PrivatePackManager.cpp
 
     modplatform/legacy_ftb/PackHelpers.h
+
+    modplatform/import_ftb/PackInstallTask.h
+    modplatform/import_ftb/PackInstallTask.cpp
+    modplatform/import_ftb/PackHelpers.h
+    modplatform/import_ftb/PackHelpers.cpp
 )
 
 set(FLAME_SOURCES
@@ -867,6 +872,11 @@ SET(LAUNCHER_SOURCES
     ui/pages/modplatform/legacy_ftb/ListModel.h
     ui/pages/modplatform/legacy_ftb/ListModel.cpp
 
+    ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
+    ui/pages/modplatform/import_ftb/ImportFTBPage.h
+    ui/pages/modplatform/import_ftb/ListModel.h
+    ui/pages/modplatform/import_ftb/ListModel.cpp
+
     ui/pages/modplatform/flame/FlameModel.cpp
     ui/pages/modplatform/flame/FlameModel.h
     ui/pages/modplatform/flame/FlamePage.cpp
@@ -1039,6 +1049,7 @@ qt_wrap_ui(LAUNCHER_UI
     ui/pages/modplatform/ResourcePage.ui
     ui/pages/modplatform/flame/FlamePage.ui
     ui/pages/modplatform/legacy_ftb/Page.ui
+    ui/pages/modplatform/import_ftb/ImportFTBPage.ui
     ui/pages/modplatform/ImportPage.ui
     ui/pages/modplatform/modrinth/ModrinthPage.ui
     ui/pages/modplatform/technic/TechnicPage.ui
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
diff --git a/launcher/ui/dialogs/NewInstanceDialog.cpp b/launcher/ui/dialogs/NewInstanceDialog.cpp
index 7b9bb944..76b139fc 100644
--- a/launcher/ui/dialogs/NewInstanceDialog.cpp
+++ b/launcher/ui/dialogs/NewInstanceDialog.cpp
@@ -33,38 +33,37 @@
  *      limitations under the License.
  */
 
-#include "Application.h"
 #include "NewInstanceDialog.h"
+#include "Application.h"
+#include "ui/pages/modplatform/import_ftb/ImportFTBPage.h"
 #include "ui_NewInstanceDialog.h"
 
 #include <BaseVersion.h>
+#include <InstanceList.h>
 #include <icons/IconList.h>
 #include <tasks/Task.h>
-#include <InstanceList.h>
 
-#include "VersionSelectDialog.h"
-#include "ProgressDialog.h"
 #include "IconPickerDialog.h"
+#include "ProgressDialog.h"
+#include "VersionSelectDialog.h"
 
+#include <QDialogButtonBox>
+#include <QFileDialog>
 #include <QLayout>
 #include <QPushButton>
-#include <QFileDialog>
 #include <QValidator>
-#include <QDialogButtonBox>
 #include <utility>
 
-#include "ui/widgets/PageContainer.h"
 #include "ui/pages/modplatform/CustomPage.h"
+#include "ui/pages/modplatform/ImportPage.h"
 #include "ui/pages/modplatform/atlauncher/AtlPage.h"
-#include "ui/pages/modplatform/legacy_ftb/Page.h"
 #include "ui/pages/modplatform/flame/FlamePage.h"
-#include "ui/pages/modplatform/ImportPage.h"
+#include "ui/pages/modplatform/legacy_ftb/Page.h"
 #include "ui/pages/modplatform/modrinth/ModrinthPage.h"
 #include "ui/pages/modplatform/technic/TechnicPage.h"
+#include "ui/widgets/PageContainer.h"
 
-
-
-NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString & url, QWidget *parent)
+NewInstanceDialog::NewInstanceDialog(const QString& initialGroup, const QString& url, QWidget* parent)
     : QDialog(parent), ui(new Ui::NewInstanceDialog)
 {
     ui->setupUi(this);
@@ -168,6 +167,7 @@ QList<BasePage *> NewInstanceDialog::getPages()
     if (APPLICATION->capabilities() & Application::SupportsFlame)
         pages.append(new FlamePage(this));
     pages.append(new LegacyFTB::Page(this));
+    pages.append(new FTBImportAPP::ImportFTBPage(this));
     pages.append(new ModrinthPage(this));
     pages.append(new TechnicPage(this));
 
diff --git a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
new file mode 100644
index 00000000..5c9ff63b
--- /dev/null
+++ b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
@@ -0,0 +1,104 @@
+// 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 "ImportFTBPage.h"
+#include "ui_ImportFTBPage.h"
+
+#include <QWidget>
+#include "FileSystem.h"
+#include "ListModel.h"
+#include "modplatform/import_ftb/PackInstallTask.h"
+#include "ui/dialogs/NewInstanceDialog.h"
+
+namespace FTBImportAPP {
+
+ImportFTBPage::ImportFTBPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), dialog(dialog), ui(new Ui::ImportFTBPage)
+{
+    ui->setupUi(this);
+
+    {
+        listModel = new ListModel(this);
+
+        ui->modpackList->setModel(listModel);
+        ui->modpackList->setSortingEnabled(true);
+        ui->modpackList->header()->hide();
+        ui->modpackList->setIndentation(0);
+        ui->modpackList->setIconSize(QSize(42, 42));
+    }
+
+    connect(ui->modpackList->selectionModel(), &QItemSelectionModel::currentChanged, this, &ImportFTBPage::onPublicPackSelectionChanged);
+
+    ui->modpackList->selectionModel()->reset();
+}
+
+ImportFTBPage::~ImportFTBPage()
+{
+    delete ui;
+}
+
+void ImportFTBPage::openedImpl()
+{
+    if (!initialized) {
+        listModel->update();
+        initialized = true;
+    }
+    suggestCurrent();
+}
+
+void ImportFTBPage::retranslate()
+{
+    ui->retranslateUi(this);
+}
+
+void ImportFTBPage::suggestCurrent()
+{
+    if (!isOpened)
+        return;
+
+    if (selected.path.isEmpty()) {
+        dialog->setSuggestedPack();
+        return;
+    }
+
+    dialog->setSuggestedPack(selected.name, new PackInstallTask(selected));
+    QString editedLogoName = QString("ftb_%1").arg(selected.id);
+    dialog->setSuggestedIconFromFile(FS::PathCombine(selected.path, "folder.jpg"), editedLogoName);
+}
+
+void ImportFTBPage::onPublicPackSelectionChanged(QModelIndex now, QModelIndex prev)
+{
+    if (!now.isValid()) {
+        onPackSelectionChanged();
+        return;
+    }
+    Modpack selectedPack = listModel->data(now, Qt::UserRole).value<Modpack>();
+    onPackSelectionChanged(&selectedPack);
+}
+
+void ImportFTBPage::onPackSelectionChanged(Modpack* pack)
+{
+    if (pack) {
+        selected = *pack;
+        suggestCurrent();
+        return;
+    }
+    if (isOpened)
+        dialog->setSuggestedPack();
+}
+
+}  // namespace FTBImportAPP
diff --git a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
new file mode 100644
index 00000000..437fb62a
--- /dev/null
+++ b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
@@ -0,0 +1,67 @@
+// 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 <QDialog>
+#include <QTextBrowser>
+#include <QTreeView>
+#include <QWidget>
+
+#include <Application.h>
+#include "modplatform/import_ftb/PackHelpers.h"
+#include "ui/pages/BasePage.h"
+#include "ui/pages/modplatform/import_ftb/ListModel.h"
+
+class NewInstanceDialog;
+
+namespace FTBImportAPP {
+namespace Ui {
+class ImportFTBPage;
+}
+
+class ImportFTBPage : public QWidget, public BasePage {
+    Q_OBJECT
+
+   public:
+    explicit ImportFTBPage(NewInstanceDialog* dialog, QWidget* parent = 0);
+    virtual ~ImportFTBPage();
+    QString displayName() const override { return "FTB App Import"; }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("ftb_logo"); }
+    QString id() const override { return "import_ftb"; }
+    QString helpPage() const override { return "FTB-platform"; }
+    bool shouldDisplay() const override { return true; }
+    void openedImpl() override;
+    void retranslate() override;
+
+   private:
+    void suggestCurrent();
+    void onPackSelectionChanged(Modpack* pack = nullptr);
+   private slots:
+    void onPublicPackSelectionChanged(QModelIndex first, QModelIndex second);
+
+   private:
+    bool initialized = false;
+    Modpack selected;
+    ListModel* listModel = nullptr;
+
+    NewInstanceDialog* dialog = nullptr;
+    Ui::ImportFTBPage* ui = nullptr;
+};
+
+}  // namespace FTBImportAPP
diff --git a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.ui b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.ui
new file mode 100644
index 00000000..32d548b0
--- /dev/null
+++ b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.ui
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>FTBImportAPP::ImportFTBPage</class>
+ <widget class="QWidget" name="FTBImportAPP::ImportFTBPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1461</width>
+    <height>1011</height>
+   </rect>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QTreeView" name="modpackList">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>16777215</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
new file mode 100644
index 00000000..35d0334b
--- /dev/null
+++ b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
@@ -0,0 +1,89 @@
+// 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 "ListModel.h"
+#include <qnamespace.h>
+#include <QDir>
+#include <QDirIterator>
+#include <QFileInfo>
+#include <QIcon>
+#include <QProcessEnvironment>
+#include "FileSystem.h"
+#include "modplatform/import_ftb/PackHelpers.h"
+
+namespace FTBImportAPP {
+
+QString getPath()
+{
+    QString partialPath;
+#if defined(Q_OS_OSX)
+    partialPath = FS::PathCombine(QDir::homePath(), "Library/Application Support");
+#elif defined(Q_OS_WIN32)
+    partialPath = QProcessEnvironment::systemEnvironment().value("LOCALAPPDATA", "");
+#else
+    partialPath = QDir::homePath();
+#endif
+    return FS::PathCombine(partialPath, ".ftba");
+}
+
+const QString ListModel::FTB_APP_PATH = getPath();
+
+void ListModel::update()
+{
+    beginResetModel();
+    modpacks.clear();
+
+    QString instancesPath = FS::PathCombine(FTB_APP_PATH, "instances");
+    if (auto instancesInfo = QFileInfo(instancesPath); instancesInfo.exists() && instancesInfo.isDir()) {
+        QDirIterator directoryIterator(instancesPath, QDir::Dirs | QDir::NoDotAndDotDot | QDir::Readable | QDir::Hidden,
+                                       QDirIterator::FollowSymlinks);
+        while (directoryIterator.hasNext()) {
+            auto modpack = parseDirectory(directoryIterator.next());
+            if (!modpack.path.isEmpty())
+                modpacks.append(modpack);
+        }
+    } else {
+        qDebug() << "Couldn't find ftb instances folder: " << instancesPath;
+    }
+
+    endResetModel();
+}
+
+QVariant ListModel::data(const QModelIndex& index, int role) const
+{
+    int pos = index.row();
+    if (pos >= modpacks.size() || pos < 0 || !index.isValid()) {
+        return QVariant();
+    }
+
+    auto pack = modpacks.at(pos);
+    if (role == Qt::DisplayRole) {
+        return pack.name;
+    } else if (role == Qt::DecorationRole) {
+        return pack.icon;
+    } else if (role == Qt::UserRole) {
+        QVariant v;
+        v.setValue(pack);
+        return v;
+    } else if (role == Qt::ToolTipRole) {
+        return tr("Minecraft %1").arg(pack.mcVersion);
+    }
+
+    return QVariant();
+}
+}  // namespace FTBImportAPP
\ No newline at end of file
diff --git a/launcher/ui/pages/modplatform/import_ftb/ListModel.h b/launcher/ui/pages/modplatform/import_ftb/ListModel.h
new file mode 100644
index 00000000..c67aa896
--- /dev/null
+++ b/launcher/ui/pages/modplatform/import_ftb/ListModel.h
@@ -0,0 +1,46 @@
+// 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 <QAbstractListModel>
+#include <QIcon>
+#include <QVariant>
+#include "modplatform/import_ftb/PackHelpers.h"
+
+namespace FTBImportAPP {
+
+class ListModel : public QAbstractListModel {
+    Q_OBJECT
+
+   public:
+    ListModel(QObject* parent) : QAbstractListModel(parent) {}
+    virtual ~ListModel() = default;
+
+    int rowCount(const QModelIndex& parent) const { return modpacks.size(); }
+    int columnCount(const QModelIndex& parent) const { return 1; }
+    QVariant data(const QModelIndex& index, int role) const;
+
+    void update();
+
+    static const QString FTB_APP_PATH;
+
+   private:
+    ModpackList modpacks;
+};
+}  // namespace FTBImportAPP
\ No newline at end of file
-- 
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(-)

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(-)

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(-)

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 ++++-------
 launcher/ui/pages/modplatform/import_ftb/ListModel.cpp |  1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

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);
diff --git a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
index 35d0334b..dc78f451 100644
--- a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "ListModel.h"
-#include <qnamespace.h>
 #include <QDir>
 #include <QDirIterator>
 #include <QFileInfo>
-- 
cgit 


From 002430db4668df1816feba550f5c2f432683996c Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 16 Jul 2023 15:43:47 +0300
Subject: added path to flatpack

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 flatpak/org.prismlauncher.PrismLauncher.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/flatpak/org.prismlauncher.PrismLauncher.yml b/flatpak/org.prismlauncher.PrismLauncher.yml
index 0524946f..725e54da 100644
--- a/flatpak/org.prismlauncher.PrismLauncher.yml
+++ b/flatpak/org.prismlauncher.PrismLauncher.yml
@@ -25,6 +25,8 @@ finish-args:
   - --filesystem=xdg-run/app/com.discordapp.Discord:create
     # Mod drag&drop
   - --filesystem=xdg-download:ro
+    # FTBApp import
+  - --filesystem=~/.ftba:ro
 
 modules:
   - name: prismlauncher
@@ -38,8 +40,8 @@ modules:
         JAVA_HOME: /usr/lib/sdk/openjdk17/jvm/openjdk-17
         JAVA_COMPILER: /usr/lib/sdk/openjdk17/jvm/openjdk-17/bin/javac
     sources:
-        - type: dir
-          path: ../
+      - type: dir
+        path: ../
     builddir: true
   - name: openjdk
     buildsystem: simple
-- 
cgit 


From 0bf70d677e5cc2e72907d7df5dbb54020a1e32a9 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon, 17 Jul 2023 16:24:43 +0300
Subject: Upgraded ExportToZipTask

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/MMCZip.cpp | 77 ++++++++++++++++++++++++++++++++---------------------
 launcher/MMCZip.h   | 23 +++++++++-------
 2 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/launcher/MMCZip.cpp b/launcher/MMCZip.cpp
index 0a334a83..cc749197 100644
--- a/launcher/MMCZip.cpp
+++ b/launcher/MMCZip.cpp
@@ -424,45 +424,60 @@ bool collectFileListRecursively(const QString& rootDir, const QString& subDir, Q
 
 void ExportToZipTask::executeTask()
 {
-    (void)QtConcurrent::run(QThreadPool::globalInstance(), [this]() {
-        setStatus("Adding files...");
-        setProgress(0, m_files.length());
-        if (!m_dir.exists()) {
-            emitFailed(tr("Folder doesn't exist"));
+    (void)QtConcurrent::run(QThreadPool::globalInstance(), [this]() { exportZip(); });
+}
+
+void ExportToZipTask::exportZip()
+{
+    setStatus("Adding files...");
+    setProgress(0, m_files.length());
+    if (!m_dir.exists()) {
+        emitFailed(tr("Folder doesn't exist"));
+        return;
+    }
+    if (!m_output.isOpen() && !m_output.open(QuaZip::mdCreate)) {
+        emitFailed(tr("Could not create file"));
+        return;
+    }
+
+    for (auto fileName : m_extra_files.keys()) {
+        if (!isRunning())
             return;
-        }
-        if (!m_output->isOpen() && !m_output->open(QuaZip::mdCreate)) {
-            emitFailed(tr("Could not create file"));
+        QuaZipFile indexFile(&m_output);
+        if (!indexFile.open(QIODevice::WriteOnly, QuaZipNewInfo(fileName))) {
+            emitFailed(tr("Could not create:") + fileName);
             return;
         }
+        indexFile.write(m_extra_files[fileName]);
+    }
 
-        for (const QFileInfo& file : m_files) {
-            if (!isRunning())
-                return;
-
-            auto absolute = file.absoluteFilePath();
-            auto relative = m_dir.relativeFilePath(absolute);
-            setStatus("Compresing: " + relative);
-            setProgress(m_progress + 1, m_progressTotal);
-            if (m_followSymlinks) {
-                if (file.isSymLink())
-                    absolute = file.symLinkTarget();
-                else
-                    absolute = file.canonicalFilePath();
-            }
+    for (const QFileInfo& file : m_files) {
+        if (!isRunning())
+            return;
 
-            if (!JlCompress::compressFile(m_output.get(), absolute, m_destinationPrefix + relative)) {
-                emitFailed(tr("Could not read and compress %1").arg(relative));
-                return;
-            }
+        auto absolute = file.absoluteFilePath();
+        auto relative = m_dir.relativeFilePath(absolute);
+        setStatus("Compresing: " + relative);
+        setProgress(m_progress + 1, m_progressTotal);
+        if (m_follow_symlinks) {
+            if (file.isSymLink())
+                absolute = file.symLinkTarget();
+            else
+                absolute = file.canonicalFilePath();
         }
 
-        m_output->close();
-        if (m_output->getZipError() != 0) {
-            emitFailed(tr("A zip error occurred"));
+        if (!m_exclude_files.contains(relative) && !JlCompress::compressFile(&m_output, absolute, m_destination_prefix + relative)) {
+            emitFailed(tr("Could not read and compress %1").arg(relative));
             return;
         }
-        emitSucceeded();
-    });
+    }
+
+    m_output.close();
+    if (m_output.getZipError() != 0) {
+        emitFailed(tr("A zip error occurred"));
+        return;
+    }
+    emitSucceeded();
 }
+
 }  // namespace MMCZip
\ No newline at end of file
diff --git a/launcher/MMCZip.h b/launcher/MMCZip.h
index 531f4a38..60b3490f 100644
--- a/launcher/MMCZip.h
+++ b/launcher/MMCZip.h
@@ -40,6 +40,7 @@
 #include <quazip/JlCompress.h>
 #include <QDir>
 #include <QFileInfo>
+#include <QHash>
 #include <QSet>
 #include <QString>
 #include <functional>
@@ -146,28 +147,30 @@ bool collectFileListRecursively(const QString& rootDir, const QString& subDir, Q
 
 class ExportToZipTask : public Task {
    public:
-    ExportToZipTask(std::shared_ptr<QuaZip> output,
-                    QDir dir,
-                    QFileInfoList files,
-                    QString destinationPrefix = "",
-                    bool followSymlinks = false)
-        : m_output(output), m_dir(dir), m_files(files), m_destinationPrefix(destinationPrefix), m_followSymlinks(followSymlinks)
+    ExportToZipTask(QString outputPath, QDir dir, QFileInfoList files, QString destinationPrefix = "", bool followSymlinks = false)
+        : m_output(outputPath), m_dir(dir), m_files(files), m_destination_prefix(destinationPrefix), m_follow_symlinks(followSymlinks)
     {
         setAbortable(true);
     };
     ExportToZipTask(QString outputPath, QString dir, QFileInfoList files, QString destinationPrefix = "", bool followSymlinks = false)
-        : ExportToZipTask(std::make_shared<QuaZip>(outputPath), QDir(dir), files, destinationPrefix, followSymlinks){};
+        : ExportToZipTask(outputPath, QDir(dir), files, destinationPrefix, followSymlinks){};
 
     virtual ~ExportToZipTask() = default;
 
+    void setExcludeFiles(QStringList excludeFiles) { m_exclude_files = excludeFiles; }
+    void addExtraFile(QString fileName, QByteArray data) { m_extra_files.emplace(fileName, data); }
+
    protected:
     virtual void executeTask() override;
+    void exportZip();
 
    private:
-    std::shared_ptr<QuaZip> m_output;
+    QuaZip m_output;
     QDir m_dir;
     QFileInfoList m_files;
-    QString m_destinationPrefix;
-    bool m_followSymlinks;
+    QString m_destination_prefix;
+    bool m_follow_symlinks;
+    QStringList m_exclude_files;
+    QHash<QString, QByteArray> m_extra_files;
 };
 }  // namespace MMCZip
-- 
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(-)

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(-)

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/MMCZip.cpp                                      | 11 +++++++++++
 launcher/MMCZip.h                                        | 12 +++++++++++-
 launcher/modplatform/flame/FlamePackExportTask.cpp       |  6 +-----
 launcher/modplatform/modrinth/ModrinthPackExportTask.cpp |  6 +-----
 launcher/ui/dialogs/ExportInstanceDialog.cpp             |  7 ++-----
 5 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/launcher/MMCZip.cpp b/launcher/MMCZip.cpp
index cc749197..84d35787 100644
--- a/launcher/MMCZip.cpp
+++ b/launcher/MMCZip.cpp
@@ -480,4 +480,15 @@ void ExportToZipTask::exportZip()
     emitSucceeded();
 }
 
+void ExportToZipTask::emitAborted()
+{
+    QFile::remove(m_output_path);
+    Task::emitAborted();
+}
+void ExportToZipTask::emitFailed(QString reason)
+{
+    QFile::remove(m_output_path);
+    Task::emitFailed(reason);
+}
+
 }  // namespace MMCZip
\ No newline at end of file
diff --git a/launcher/MMCZip.h b/launcher/MMCZip.h
index 60b3490f..cb49e0c0 100644
--- a/launcher/MMCZip.h
+++ b/launcher/MMCZip.h
@@ -148,7 +148,12 @@ bool collectFileListRecursively(const QString& rootDir, const QString& subDir, Q
 class ExportToZipTask : public Task {
    public:
     ExportToZipTask(QString outputPath, QDir dir, QFileInfoList files, QString destinationPrefix = "", bool followSymlinks = false)
-        : m_output(outputPath), m_dir(dir), m_files(files), m_destination_prefix(destinationPrefix), m_follow_symlinks(followSymlinks)
+        : m_output_path(outputPath)
+        , m_output(outputPath)
+        , m_dir(dir)
+        , m_files(files)
+        , m_destination_prefix(destinationPrefix)
+        , m_follow_symlinks(followSymlinks)
     {
         setAbortable(true);
     };
@@ -164,7 +169,12 @@ class ExportToZipTask : public Task {
     virtual void executeTask() override;
     void exportZip();
 
+   protected slots:
+    virtual void emitAborted() override;
+    virtual void emitFailed(QString reason = "") override;
+
    private:
+    QString m_output_path;
     QuaZip m_output;
     QDir m_dir;
     QFileInfoList m_files;
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);
diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp
index 1a3f8cd4..d1a69b93 100644
--- a/launcher/ui/dialogs/ExportInstanceDialog.cpp
+++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp
@@ -146,11 +146,8 @@ void ExportInstanceDialog::doExport()
 
     auto task = makeShared<MMCZip::ExportToZipTask>(output, m_instance->instanceRoot(), files, "", true);
 
-    connect(task.get(), &Task::failed, this, [this, output](QString reason) {
-        CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
-        QFile::remove(output);
-    });
-    connect(task.get(), &Task::aborted, this, [output] { QFile::remove(output); });
+    connect(task.get(), &Task::failed, this,
+            [this, output](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show(); });
     connect(task.get(), &Task::finished, this, [task] { task->deleteLater(); });
 
     ProgressDialog progress(this);
-- 
cgit 


From cd9310afedace04a887a82ea1856672a26647935 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon, 17 Jul 2023 16:57:52 +0300
Subject: replace emplace with insert

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

diff --git a/launcher/MMCZip.h b/launcher/MMCZip.h
index cb49e0c0..465550d5 100644
--- a/launcher/MMCZip.h
+++ b/launcher/MMCZip.h
@@ -163,7 +163,7 @@ class ExportToZipTask : public Task {
     virtual ~ExportToZipTask() = default;
 
     void setExcludeFiles(QStringList excludeFiles) { m_exclude_files = excludeFiles; }
-    void addExtraFile(QString fileName, QByteArray data) { m_extra_files.emplace(fileName, data); }
+    void addExtraFile(QString fileName, QByteArray data) { m_extra_files.insert(fileName, data); }
 
    protected:
     virtual void executeTask() override;
-- 
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(-)

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 361583edfcf7e647b7bdf6ba9b82dd810a50b845 Mon Sep 17 00:00:00 2001
From: LostLuma <lilly@lostluma.net>
Date: Wed, 26 Jul 2023 03:08:38 +0200
Subject: Ignore cache files when exporting instances

Signed-off-by: LostLuma <lilly@lostluma.net>
---
 launcher/ui/dialogs/ExportInstanceDialog.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp
index d1a69b93..f17a5779 100644
--- a/launcher/ui/dialogs/ExportInstanceDialog.cpp
+++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp
@@ -70,6 +70,7 @@ ExportInstanceDialog::ExportInstanceDialog(InstancePtr instance, QWidget* parent
     auto prefix = QDir(instance->instanceRoot()).relativeFilePath(instance->gameRoot());
     proxyModel->ignoreFilesWithPath().insert({ FS::PathCombine(prefix, "logs"), FS::PathCombine(prefix, "crash-reports") });
     proxyModel->ignoreFilesWithName().append({ ".DS_Store", "thumbs.db", "Thumbs.db" });
+    proxyModel->blockedPaths().insert({ FS::PathCombine(prefix, ".cache"), FS::PathCombine(prefix, ".fabric") });
     loadPackIgnore();
 
     ui->treeView->setModel(proxyModel);
-- 
cgit 


From a9fefb2eebf8ded7322b778d9a3f36bfc65cf113 Mon Sep 17 00:00:00 2001
From: LostLuma <lilly@lostluma.net>
Date: Wed, 26 Jul 2023 15:22:22 +0200
Subject: Address review comments

Signed-off-by: LostLuma <lilly@lostluma.net>
---
 launcher/ui/dialogs/ExportInstanceDialog.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp
index f17a5779..7b64467a 100644
--- a/launcher/ui/dialogs/ExportInstanceDialog.cpp
+++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp
@@ -70,7 +70,8 @@ ExportInstanceDialog::ExportInstanceDialog(InstancePtr instance, QWidget* parent
     auto prefix = QDir(instance->instanceRoot()).relativeFilePath(instance->gameRoot());
     proxyModel->ignoreFilesWithPath().insert({ FS::PathCombine(prefix, "logs"), FS::PathCombine(prefix, "crash-reports") });
     proxyModel->ignoreFilesWithName().append({ ".DS_Store", "thumbs.db", "Thumbs.db" });
-    proxyModel->blockedPaths().insert({ FS::PathCombine(prefix, ".cache"), FS::PathCombine(prefix, ".fabric") });
+    proxyModel->blockedPaths().insert(
+        { FS::PathCombine(prefix, ".cache"), FS::PathCombine(prefix, ".fabric"), FS::PathCombine(prefix, ".quilt") });
     loadPackIgnore();
 
     ui->treeView->setModel(proxyModel);
-- 
cgit 


From e6b4fc918250b415762b525ebce763b81f7d5cf9 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 26 Jul 2023 21:36:40 +0300
Subject: removed quilt warning

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/MainWindow.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index da572fc3..c8373bab 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1342,16 +1342,10 @@ void MainWindow::on_actionExportInstanceFlamePack_triggered()
     if (m_selectedInstance) {
         auto instance = dynamic_cast<MinecraftInstance*>(m_selectedInstance.get());
         if (instance) {
-            QString errorMsg;
-            if (instance->getPackProfile()->getComponent("org.quiltmc.quilt-loader")) {
-                errorMsg = tr("Quilt is currently not supported by CurseForge modpacks.");
-            } else if (auto cmp = instance->getPackProfile()->getComponent("net.minecraft");
-                       cmp && cmp->getVersionFile() && cmp->getVersionFile()->type == "snapshot") {
-                errorMsg = tr("Snapshots are currently not supported by CurseForge modpacks.");
-            }
-            if (!errorMsg.isEmpty()) {
+            if (auto cmp = instance->getPackProfile()->getComponent("net.minecraft");
+                cmp && cmp->getVersionFile() && cmp->getVersionFile()->type == "snapshot") {
                 QMessageBox msgBox;
-                msgBox.setText(errorMsg);
+                msgBox.setText("Snapshots are currently not supported by CurseForge modpacks.");
                 msgBox.exec();
                 return;
             }
-- 
cgit 


From 1974bb7e59803fc9fc219a8d7f59896320bd58ea Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 26 Jul 2023 14:34:11 -0400
Subject: chore(ci): cleanup garnix.yaml

Signed-off-by: seth <getchoo@tuta.io>
---
 garnix.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/garnix.yaml b/garnix.yaml
index 755396f7..3bf14524 100644
--- a/garnix.yaml
+++ b/garnix.yaml
@@ -1,5 +1,6 @@
 builds:
   exclude: []
   include:
-    - "devShells.*-linux.*"
-    - "packages.*-linux.*"
+    - "checks.x86_64-linux.*"
+    - "devShells.*.*"
+    - "packages.*.*"
-- 
cgit 


From 342a0d0091fafece11f2b18e38c3786f112ac20b Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 26 Jul 2023 14:47:47 -0400
Subject: fix(nix): disable x86_64-darwin

Signed-off-by: seth <getchoo@tuta.io>
---
 nix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nix/default.nix b/nix/default.nix
index 7bad1440..47172927 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -24,9 +24,9 @@
   # Supported systems.
   systems = [
     "x86_64-linux"
-    "x86_64-darwin"
     "aarch64-linux"
-    # Disabled due to qtbase being currently broken for "aarch64-darwin."
+    # Disabled due to our packages not supporting darwin yet.
+    # "x86_64-darwin"
     # "aarch64-darwin"
   ];
 }
-- 
cgit 


From f7ffbcca6c5490e24ee74486cfc6698a38512561 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 26 Jul 2023 14:45:30 -0400
Subject: chore(docs): correct markdownlint warnings

Signed-off-by: seth <getchoo@tuta.io>
---
 CONTRIBUTING.md     |  5 ++---
 libraries/README.md |  2 +-
 nix/NIX.md          | 10 ++++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b2795ce4..07291677 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ In an effort to ensure that the code you contribute is actually compatible with
 
 This can be done by appending `-s` to your `git commit` call, or by manually appending the following text to your commit message:
 
-```
+```text
 <commit message>
 
 Signed-off-by: Author name <Author email>
@@ -27,7 +27,7 @@ Signed-off-by: Author name <Author email>
 
 By signing off your work, you agree to the terms below:
 
-```
+```text
 Developer's Certificate of Origin 1.1
 
 By making a contribution to this project, I certify that:
@@ -62,7 +62,6 @@ As a bonus, you can also [cryptographically sign your commits][gh-signing-commit
 [gh-signing-commits]: https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits
 [gh-vigilant-mode]: https://docs.github.com/en/authentication/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits
 
-
 ## Backporting to Release Branches
 
 We use [automated backports](https://github.com/PrismLauncher/PrismLauncher/blob/develop/.github/workflows/backport.yml) to merge specific contributions from develop into `release` branches.
diff --git a/libraries/README.md b/libraries/README.md
index 4da11314..e75a381e 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -61,7 +61,7 @@ The `standard` and `legacy` launchers are available.
 
 Example (some parts have been censored):
 
-```
+```text
 mod legacyjavafixer-1.0
 mainClass net.minecraft.launchwrapper.Launch
 param --username
diff --git a/nix/NIX.md b/nix/NIX.md
index 980d20e8..aa945acc 100644
--- a/nix/NIX.md
+++ b/nix/NIX.md
@@ -53,7 +53,8 @@ home.packages = [ pkgs.prismlauncher ];
 
 ### Without flakes-enabled nix
 
-#### Using channels
+<details>
+<summary>Using channels</summary>
 
 ```sh
 nix-channel --add https://github.com/PrismLauncher/PrismLauncher/archive/master.tar.gz prismlauncher
@@ -61,7 +62,10 @@ nix-channel --update prismlauncher
 nix-env -iA prismlauncher
 ```
 
-#### Using the overlay
+</details>
+
+<details>
+<summary>Using the overlay</summary>
 
 ```nix
 # In your configuration.nix:
@@ -74,6 +78,8 @@ nix-env -iA prismlauncher
 }
 ```
 
+</details>
+
 ## Running ad-hoc
 
 If you're on a flakes-enabled nix you can run the launcher in one-line
-- 
cgit 


From 31b62203a77c9e480e8ea51b9c8ff366211f5b58 Mon Sep 17 00:00:00 2001
From: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Wed, 26 Jul 2023 23:44:35 +0300
Subject: Update launcher/ui/MainWindow.cpp

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

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index c8373bab..e342e833 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1344,7 +1344,7 @@ void MainWindow::on_actionExportInstanceFlamePack_triggered()
         if (instance) {
             if (auto cmp = instance->getPackProfile()->getComponent("net.minecraft");
                 cmp && cmp->getVersionFile() && cmp->getVersionFile()->type == "snapshot") {
-                QMessageBox msgBox;
+                QMessageBox msgBox(this);
                 msgBox.setText("Snapshots are currently not supported by CurseForge modpacks.");
                 msgBox.exec();
                 return;
-- 
cgit 


From 1e82cb6a7c9c7e8d0a9bfa3d2505b4b8eb132944 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 26 Jul 2023 23:56:01 +0300
Subject: fix: add support for QByteArray inifile

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/minecraft/mod/tasks/LocalModParseTask.cpp |  9 ++++-----
 launcher/settings/INIFile.cpp                      | 21 ++++++++++++++++++---
 launcher/settings/INIFile.h                        |  1 +
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
index 264019f8..60389753 100644
--- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
@@ -1,9 +1,9 @@
 #include "LocalModParseTask.h"
 
+#include <qdcss.h>
 #include <quazip/quazip.h>
 #include <quazip/quazipfile.h>
 #include <toml++/toml.h>
-#include <qdcss.h>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -369,12 +369,11 @@ ModDetails ReadQuiltModInfo(QByteArray contents)
                 details.icon_file = icon.toString();
             }
         }
-
     }
     return details;
 }
 
-ModDetails ReadForgeInfo(QString fileName)
+ModDetails ReadForgeInfo(QByteArray contents)
 {
     ModDetails details;
     // Read the data
@@ -382,7 +381,7 @@ ModDetails ReadForgeInfo(QString fileName)
     details.mod_id = "Forge";
     details.homeurl = "http://www.minecraftforge.net/forum/";
     INIFile ini;
-    if (!ini.loadFile(fileName))
+    if (!ini.loadFile(contents))
         return details;
 
     QString major = ini.get("forge.major.number", "0").toString();
@@ -554,7 +553,7 @@ bool processZIP(Mod& mod, ProcessingLevel level)
             return false;
         }
 
-        details = ReadForgeInfo(file.getFileName());
+        details = ReadForgeInfo(file.readAll());
         file.close();
         zip.close();
 
diff --git a/launcher/settings/INIFile.cpp b/launcher/settings/INIFile.cpp
index d16256b9..4fb11ed3 100644
--- a/launcher/settings/INIFile.cpp
+++ b/launcher/settings/INIFile.cpp
@@ -37,11 +37,12 @@
 #include "settings/INIFile.h"
 #include <FileSystem.h>
 
+#include <QDebug>
 #include <QFile>
-#include <QTextStream>
-#include <QStringList>
 #include <QSaveFile>
-#include <QDebug>
+#include <QStringList>
+#include <QTemporaryFile>
+#include <QTextStream>
 
 #include <QSettings>
 
@@ -71,6 +72,7 @@ bool INIFile::saveFile(QString fileName)
 
     return true;
 }
+
 QString unescape(QString orig)
 {
     QString out;
@@ -185,6 +187,19 @@ bool INIFile::loadFile(QString fileName)
     return true;
 }
 
+bool INIFile::loadFile(QByteArray data)
+{
+    QTemporaryFile file;
+    if (!file.open())
+        return false;
+    file.write(data);
+    file.flush();
+    file.close();
+    auto loaded = loadFile(file.fileName());
+    file.remove();
+    return loaded;
+}
+
 QVariant INIFile::get(QString key, QVariant def) const
 {
     if (!this->contains(key))
diff --git a/launcher/settings/INIFile.h b/launcher/settings/INIFile.h
index 0d5c05eb..4ee543cf 100644
--- a/launcher/settings/INIFile.h
+++ b/launcher/settings/INIFile.h
@@ -50,6 +50,7 @@ public:
     explicit INIFile();
 
     bool loadFile(QString fileName);
+    bool loadFile(QByteArray data);
     bool saveFile(QString fileName);
 
     QVariant get(QString key, QVariant def) const;
-- 
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(-)

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 48e50401968a72846350c6fbd76cc957b64a6b5a Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 26 Jul 2023 17:27:52 -0400
Subject: feat: disable sparkle when update url is empty

Signed-off-by: seth <getchoo@tuta.io>
---
 CMakeLists.txt          |  4 ++--
 launcher/CMakeLists.txt | 17 +++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41634f68..e0c84093 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -343,8 +343,8 @@ if(UNIX AND APPLE)
     set(MACOSX_BUNDLE_LONG_VERSION_STRING "${Launcher_VERSION_NAME}")
     set(MACOSX_BUNDLE_ICON_FILE ${Launcher_Name}.icns)
     set(MACOSX_BUNDLE_COPYRIGHT "© 2022 ${Launcher_Copyright_Mac}")
-    set(MACOSX_SPARKLE_UPDATE_PUBLIC_KEY "v55ZWWD6QlPoXGV6VLzOTZxZUggWeE51X8cRQyQh6vA=")
-    set(MACOSX_SPARKLE_UPDATE_FEED_URL "https://prismlauncher.org/feed/appcast.xml")
+    set(MACOSX_SPARKLE_UPDATE_PUBLIC_KEY "v55ZWWD6QlPoXGV6VLzOTZxZUggWeE51X8cRQyQh6vA=" CACHE STRING "Public key for Sparkle update feed")
+    set(MACOSX_SPARKLE_UPDATE_FEED_URL "https://prismlauncher.org/feed/appcast.xml" CACHE STRING "URL for Sparkle update feed")
 
     set(MACOSX_SPARKLE_DOWNLOAD_URL "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz" CACHE STRING "URL to Sparkle release archive")
     set(MACOSX_SPARKLE_SHA256 "bf6ac1caa9f8d321d5784859c88da874f28412f37fb327bc21b7b14c5d61ef94" CACHE STRING "SHA256 checksum for Sparkle release archive")
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 2d06dbf4..af82464a 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -668,7 +668,7 @@ set(LOGIC_SOURCES
     ${ATLAUNCHER_SOURCES}
 )
 
-if(APPLE)
+if(APPLE AND NOT "${MACOSX_SPARKLE_UPDATE_FEED_URL}" STREQUAL "")
     set (LOGIC_SOURCES ${LOGIC_SOURCES} ${MAC_UPDATE_SOURCES})
 endif()
 
@@ -1141,17 +1141,22 @@ if(APPLE)
     set(CMAKE_MACOSX_RPATH 1)
     set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks/")
 
-    file(DOWNLOAD ${MACOSX_SPARKLE_DOWNLOAD_URL} ${CMAKE_BINARY_DIR}/Sparkle.tar.xz EXPECTED_HASH SHA256=${MACOSX_SPARKLE_SHA256})
-    file(ARCHIVE_EXTRACT INPUT ${CMAKE_BINARY_DIR}/Sparkle.tar.xz DESTINATION ${CMAKE_BINARY_DIR}/frameworks/Sparkle)
+    if(NOT "${MACOSX_SPARKLE_UPDATE_FEED_URL}" STREQUAL "")
+      file(DOWNLOAD ${MACOSX_SPARKLE_DOWNLOAD_URL} ${CMAKE_BINARY_DIR}/Sparkle.tar.xz EXPECTED_HASH SHA256=${MACOSX_SPARKLE_SHA256})
+      file(ARCHIVE_EXTRACT INPUT ${CMAKE_BINARY_DIR}/Sparkle.tar.xz DESTINATION ${CMAKE_BINARY_DIR}/frameworks/Sparkle)
+
+      find_library(SPARKLE_FRAMEWORK Sparkle "${CMAKE_BINARY_DIR}/frameworks/Sparkle")
+    endif()
 
-    find_library(SPARKLE_FRAMEWORK Sparkle "${CMAKE_BINARY_DIR}/frameworks/Sparkle")
     target_link_libraries(Launcher_logic
         "-framework AppKit"
         "-framework Carbon"
         "-framework Foundation"
         "-framework ApplicationServices"
     )
-    target_link_libraries(Launcher_logic ${SPARKLE_FRAMEWORK})
+    if(NOT "${MACOSX_SPARKLE_UPDATE_FEED_URL}" STREQUAL "")
+      target_link_libraries(Launcher_logic ${SPARKLE_FRAMEWORK})
+    endif()
 endif()
 
 target_link_libraries(Launcher_logic)
@@ -1213,7 +1218,7 @@ if(WIN32)
     )
 endif()
 
-if (UNIX AND APPLE)
+if (UNIX AND APPLE AND NOT "${MACOSX_SPARKLE_UPDATE_FEED_URL}" STREQUAL "")
     # Add Sparkle updater
     # It has to be copied here instead of just allowing fixup_bundle to install it, otherwise essential parts of
     # the framework aren't installed
-- 
cgit 


From a8498b0dab94d0ab6c9e5cf395e5003db541b749 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 26 Jul 2023 19:03:14 -0400
Subject: chore: make INSTALL_BUNDLE a cached variable

Signed-off-by: seth <getchoo@tuta.io>
---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0c84093..b4910d1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -354,7 +354,7 @@ if(UNIX AND APPLE)
     set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${MACOSX_SPARKLE_DIR})
 
     # install as bundle
-    set(INSTALL_BUNDLE "full")
+    set(INSTALL_BUNDLE "full" CACHE STRING "Use fixup_bundle to bundle dependencies")
 
     # Add the icon
     install(FILES ${Launcher_Branding_ICNS} DESTINATION ${RESOURCES_DEST_DIR} RENAME ${Launcher_Name}.icns)
@@ -367,7 +367,7 @@ elseif(UNIX)
     set(JARS_DEST_DIR "share/${Launcher_Name}")
 
     # install as bundle with no dependencies included
-    set(INSTALL_BUNDLE "nodeps")
+    set(INSTALL_BUNDLE "nodeps" CACHE STRING "Use fixup_bundle to bundle dependencies")
 
     # Set RPATH
     SET(Launcher_BINARY_RPATH "$ORIGIN/")
@@ -401,7 +401,7 @@ elseif(WIN32)
     set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 
     # install as bundle
-    set(INSTALL_BUNDLE "full")
+    set(INSTALL_BUNDLE "full" CACHE STRING "Use fixup_bundle to bundle dependencies")
 else()
     message(FATAL_ERROR "Platform not supported")
 endif()
-- 
cgit 


From 4a9ea832ff63a3f1f6f779b35b8a7a3e705fc6a3 Mon Sep 17 00:00:00 2001
From: LostLuma <lilly@lostluma.net>
Date: Thu, 27 Jul 2023 01:42:14 +0200
Subject: Ignore cache files entirely, also apply to modpack export

Signed-off-by: LostLuma <lilly@lostluma.net>
---
 launcher/ui/dialogs/ExportInstanceDialog.cpp | 2 +-
 launcher/ui/dialogs/ExportPackDialog.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp
index 7b64467a..d6a503cc 100644
--- a/launcher/ui/dialogs/ExportInstanceDialog.cpp
+++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp
@@ -70,7 +70,7 @@ ExportInstanceDialog::ExportInstanceDialog(InstancePtr instance, QWidget* parent
     auto prefix = QDir(instance->instanceRoot()).relativeFilePath(instance->gameRoot());
     proxyModel->ignoreFilesWithPath().insert({ FS::PathCombine(prefix, "logs"), FS::PathCombine(prefix, "crash-reports") });
     proxyModel->ignoreFilesWithName().append({ ".DS_Store", "thumbs.db", "Thumbs.db" });
-    proxyModel->blockedPaths().insert(
+    proxyModel->ignoreFilesWithPath().insert(
         { FS::PathCombine(prefix, ".cache"), FS::PathCombine(prefix, ".fabric"), FS::PathCombine(prefix, ".quilt") });
     loadPackIgnore();
 
diff --git a/launcher/ui/dialogs/ExportPackDialog.cpp b/launcher/ui/dialogs/ExportPackDialog.cpp
index 2abe2805..ad8db5ff 100644
--- a/launcher/ui/dialogs/ExportPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportPackDialog.cpp
@@ -61,7 +61,7 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla
     // use the game root - everything outside cannot be exported
     const QDir root(instance->gameRoot());
     proxy = new FileIgnoreProxy(instance->gameRoot(), this);
-    proxy->ignoreFilesWithPath().insert({ "logs", "crash-reports" });
+    proxy->ignoreFilesWithPath().insert({ "logs", "crash-reports", ".cache", ".fabric", ".quilt" });
     proxy->ignoreFilesWithName().append({ ".DS_Store", "thumbs.db", "Thumbs.db" });
     proxy->setSourceModel(model);
 
-- 
cgit 


From 51bfda937d47837ed426150ed6f43a60b4ca0ce1 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 27 Jul 2023 00:59:01 -0400
Subject: chore: don't include sparkle when not enabled

Signed-off-by: seth <getchoo@tuta.io>
---
 launcher/Application.cpp | 4 ++--
 launcher/CMakeLists.txt  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index aeea90f1..27a8756d 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -131,7 +131,7 @@
 #include "MangoHud.h"
 #endif
 
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC) && defined(SPARKLE_ENABLED)
 #include "updater/MacSparkleUpdater.h"
 #endif
 
@@ -776,7 +776,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     if(BuildConfig.UPDATER_ENABLED)
     {
         qDebug() << "Initializing updater";
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC) && defined(SPARKLE_ENABLED)
         m_updater.reset(new MacSparkleUpdater());
 #endif
         qDebug() << "<> Updater started.";
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index af82464a..74a93909 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -1146,6 +1146,7 @@ if(APPLE)
       file(ARCHIVE_EXTRACT INPUT ${CMAKE_BINARY_DIR}/Sparkle.tar.xz DESTINATION ${CMAKE_BINARY_DIR}/frameworks/Sparkle)
 
       find_library(SPARKLE_FRAMEWORK Sparkle "${CMAKE_BINARY_DIR}/frameworks/Sparkle")
+      add_compile_definitions(SPARKLE_ENABLED)
     endif()
 
     target_link_libraries(Launcher_logic
-- 
cgit 


From b1aa9e584624a0732dd55fc6c459524a8abfe6ba Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Thu, 27 Jul 2023 09:37:56 +0200
Subject: refactor: introduce internal Launcher_ENABLE_UPDATER variable

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 CMakeLists.txt          | 6 ++++++
 launcher/CMakeLists.txt | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4910d1b..05ada3b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -318,6 +318,8 @@ add_subdirectory(program_info)
 
 ####################################### Install layout #######################################
 
+set(Launcher_ENABLE_UPDATER NO)
+
 if(NOT (UNIX AND APPLE))
     # Install "portable.txt" if selected component is "portable"
     install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_Portable_File}" DESTINATION "." COMPONENT portable EXCLUDE_FROM_ALL)
@@ -353,6 +355,10 @@ if(UNIX AND APPLE)
     # directories to look for dependencies
     set(DIRS ${QT_LIBS_DIR} ${QT_LIBEXECS_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${MACOSX_SPARKLE_DIR})
 
+    if(NOT MACOSX_SPARKLE_UPDATE_PUBLIC_KEY STREQUAL "" AND NOT MACOSX_SPARKLE_UPDATE_FEED_URL STREQUAL "")
+        set(Launcher_ENABLE_UPDATER YES)
+    endif()
+
     # install as bundle
     set(INSTALL_BUNDLE "full" CACHE STRING "Use fixup_bundle to bundle dependencies")
 
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 74a93909..490dccf0 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -668,7 +668,7 @@ set(LOGIC_SOURCES
     ${ATLAUNCHER_SOURCES}
 )
 
-if(APPLE AND NOT "${MACOSX_SPARKLE_UPDATE_FEED_URL}" STREQUAL "")
+if(APPLE AND Launcher_ENABLE_UPDATER)
     set (LOGIC_SOURCES ${LOGIC_SOURCES} ${MAC_UPDATE_SOURCES})
 endif()
 
@@ -1141,7 +1141,7 @@ if(APPLE)
     set(CMAKE_MACOSX_RPATH 1)
     set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks/")
 
-    if(NOT "${MACOSX_SPARKLE_UPDATE_FEED_URL}" STREQUAL "")
+    if(Launcher_ENABLE_UPDATER)
       file(DOWNLOAD ${MACOSX_SPARKLE_DOWNLOAD_URL} ${CMAKE_BINARY_DIR}/Sparkle.tar.xz EXPECTED_HASH SHA256=${MACOSX_SPARKLE_SHA256})
       file(ARCHIVE_EXTRACT INPUT ${CMAKE_BINARY_DIR}/Sparkle.tar.xz DESTINATION ${CMAKE_BINARY_DIR}/frameworks/Sparkle)
 
@@ -1155,7 +1155,7 @@ if(APPLE)
         "-framework Foundation"
         "-framework ApplicationServices"
     )
-    if(NOT "${MACOSX_SPARKLE_UPDATE_FEED_URL}" STREQUAL "")
+    if(Launcher_ENABLE_UPDATER)
       target_link_libraries(Launcher_logic ${SPARKLE_FRAMEWORK})
     endif()
 endif()
@@ -1219,7 +1219,7 @@ if(WIN32)
     )
 endif()
 
-if (UNIX AND APPLE AND NOT "${MACOSX_SPARKLE_UPDATE_FEED_URL}" STREQUAL "")
+if (UNIX AND APPLE AND Launcher_ENABLE_UPDATER)
     # Add Sparkle updater
     # It has to be copied here instead of just allowing fixup_bundle to install it, otherwise essential parts of
     # the framework aren't installed
-- 
cgit 


From 1467072f3dcd6ea5d2e3375ad5d69f3ee6d58af2 Mon Sep 17 00:00:00 2001
From: ashuntu <101582426+ashuntu@users.noreply.github.com>
Date: Fri, 28 Jul 2023 16:25:32 -0500
Subject: Removed snapcraft.yaml in favor of dedicated repo:
 https://github.com/ashuntu/prismlauncher-snap

---
 .github/workflows/build.yml | 25 ------------------
 snap/snapcraft.yaml         | 64 ---------------------------------------------
 2 files changed, 89 deletions(-)
 delete mode 100644 snap/snapcraft.yaml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a234cd29..c710d54b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -569,31 +569,6 @@ jobs:
         run: |
           ccache -s
 
-  snap:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        if: inputs.build_type == 'Debug'
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-      - name: Set short version
-        shell: bash
-        if: inputs.build_type == 'Debug'
-        run: |
-          ver_short=`git rev-parse --short HEAD`
-          echo "VERSION=$ver_short" >> $GITHUB_ENV
-      - name: Package Snap (Linux)
-        id: snapcraft
-        if: inputs.build_type == 'Debug'
-        uses: snapcore/action-build@v1
-      - name: Upload Snap (Linux)
-        if: inputs.build_type == 'Debug'
-        uses: actions/upload-artifact@v3
-        with:
-          name: prismlauncher_${{ env.VERSION }}_amd64.snap
-          path: ${{ steps.snapcraft.outputs.snap }}
-
   flatpak:
     runs-on: ubuntu-latest
     container:
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
deleted file mode 100644
index 41c0ce07..00000000
--- a/snap/snapcraft.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: prismlauncher
-license: GPL-3.0-only
-base: core22
-website: https://prismlauncher.org/
-source-code: https://github.com/PrismLauncher/PrismLauncher
-issues: https://github.com/PrismLauncher/PrismLauncher/issues
-donation: https://opencollective.com/prismlauncher
-contact: https://discord.gg/prismlauncher
-summary: A custom Minecraft launcher with modpack support
-adopt-info: prismlauncher
-
-grade: devel
-confinement: strict
-
-architectures:
-  - build-on: amd64
-  - build-on: arm64
-
-parts:
-  prismlauncher:
-    parse-info:
-      - usr/share/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml
-    plugin: cmake
-    build-packages:
-      - zlib1g-dev
-      - openjdk-17-jdk
-      - scdoc
-      - libgl1-mesa-dev
-      - extra-cmake-modules
-    build-snaps:
-      - kf5-5-106-qt-5-15-9-core22
-      - kf5-5-106-qt-5-15-9-core22-sdk
-    stage-packages:
-      - openjdk-17-jre
-      - openjdk-8-jre
-    source: .
-    override-pull: |
-      craftctl default
-      # Fix the icon reference in the desktop file
-      sed -i.bak -e 's|Icon=org.prismlauncher.PrismLauncher|Icon=/usr/share/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg|g' program_info/org.prismlauncher.PrismLauncher.desktop.in
-      # Remove the build directory so that local development doesn't interfere with Snap compilation
-      rm -rf build
-      git submodule update --init --recursive
-    cmake-generator: Ninja
-    cmake-parameters:
-      - "-DCMAKE_INSTALL_PREFIX=/usr"
-      - "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-      - "-DENABLE_LTO=ON"
-      - "-DLauncher_BUILD_PLATFORM=snap"
-      - "-DLauncher_QT_VERSION_MAJOR='5'"
-
-apps:
-  prismlauncher:
-    common-id: org.prismlauncher.PrismLauncher
-    desktop: usr/share/applications/org.prismlauncher.PrismLauncher.desktop
-    command: usr/bin/prismlauncher
-    extensions:
-      - kde-neon
-    plugs:
-      - home
-      - opengl
-      - network
-      - network-bind
-      - audio-playback
-- 
cgit 


From d1513732be63a0aed8f97c5bcf1bd5ecd94a423c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 30 Jul 2023 00:20:33 +0000
Subject: chore(nix): update lockfile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22)
  → 'github:nixos/nixpkgs/d2b52322f35597c62abf56de91b0236746b2a03d' (2023-07-29)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18)
  → 'github:cachix/pre-commit-hooks.nix/1e2443dd3f669eb65433b2fc26a3065e05a7dc9c' (2023-07-29)
---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 13a3e0a4..af7ecae7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,11 +91,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1690026219,
-        "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=",
+        "lastModified": 1690630721,
+        "narHash": "sha256-Y04onHyBQT4Erfr2fc82dbJTfXGYrf4V0ysLUYnPOP8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73",
+        "rev": "d2b52322f35597c62abf56de91b0236746b2a03d",
         "type": "github"
       },
       "original": {
@@ -138,11 +138,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689668210,
-        "narHash": "sha256-XAATwDkaUxH958yXLs1lcEOmU6pSEIkatY3qjqk8X0E=",
+        "lastModified": 1690628027,
+        "narHash": "sha256-OTSbA2hM6VmxyZ/4siYPANffMBzIsKu04GLjXcv8ST0=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "eb433bff05b285258be76513add6f6c57b441775",
+        "rev": "1e2443dd3f669eb65433b2fc26a3065e05a7dc9c",
         "type": "github"
       },
       "original": {
-- 
cgit 


From 5a9f780cf842a8def9bccf60e84ce405dc9acc32 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Mon, 31 Jul 2023 22:36:13 -0700
Subject: fix(FlameInstanceCreationTask): include Net::Apidownload

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index c2c7080f..c170a4f5 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -61,6 +61,7 @@
 #include "meta/VersionList.h"
 #include "minecraft/World.h"
 #include "minecraft/mod/tasks/LocalResourceParse.h"
+#include "net/ApiDownload.h"
 
 static const FlameAPI api;
 
-- 
cgit 


From f19e8dd086cd046c694a4a9a02d83827b08952b0 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Tue, 1 Aug 2023 18:53:51 -0700
Subject: Apply suggestions from code review

Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/net/ApiHeaderProxy.h | 2 +-
 launcher/net/Download.h       | 2 +-
 launcher/net/HeaderProxy.h    | 2 +-
 launcher/net/NetRequest.h     | 2 +-
 launcher/net/RawHeaderProxy.h | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/launcher/net/ApiHeaderProxy.h b/launcher/net/ApiHeaderProxy.h
index 6fd3e4c1..789a6fad 100644
--- a/launcher/net/ApiHeaderProxy.h
+++ b/launcher/net/ApiHeaderProxy.h
@@ -27,7 +27,7 @@ namespace Net {
 
 class ApiHeaderProxy : public HeaderProxy {
    public:
-    ApiHeaderProxy() : HeaderProxy(){};
+    ApiHeaderProxy() : HeaderProxy() {}
     virtual ~ApiHeaderProxy() = default;
 
    public:
diff --git a/launcher/net/Download.h b/launcher/net/Download.h
index dc3ccacf..5f6a5caf 100644
--- a/launcher/net/Download.h
+++ b/launcher/net/Download.h
@@ -48,7 +48,7 @@ class Download : public NetRequest {
     Q_OBJECT
    public:
     using Ptr = shared_qobject_ptr<class Download>;
-    explicit Download() : NetRequest() { logCat = taskDownloadLogC; };
+    explicit Download() : NetRequest() { logCat = taskDownloadLogC; }
 
 #if defined(LAUNCHER_APPLICATION)
     static auto makeCached(QUrl url, MetaEntryPtr entry, Options options = Option::NoOptions) -> Download::Ptr;
diff --git a/launcher/net/HeaderProxy.h b/launcher/net/HeaderProxy.h
index 308455e4..f41c5875 100644
--- a/launcher/net/HeaderProxy.h
+++ b/launcher/net/HeaderProxy.h
@@ -43,7 +43,7 @@ class HeaderProxy {
         for (auto header : headers(request)) {
             request.setRawHeader(header.headerName, header.headerValue);
         }
-    };
+    }
 };
 
 }  // namespace Net
diff --git a/launcher/net/NetRequest.h b/launcher/net/NetRequest.h
index 6ebdcab0..9a602162 100644
--- a/launcher/net/NetRequest.h
+++ b/launcher/net/NetRequest.h
@@ -67,7 +67,7 @@ class NetRequest : public NetAction {
    public:
     void addValidator(Validator* v);
     auto abort() -> bool override;
-    auto canAbort() const -> bool override { return true; };
+    auto canAbort() const -> bool override { return true; }
 
    private:
     auto handleRedirect() -> bool;
diff --git a/launcher/net/RawHeaderProxy.h b/launcher/net/RawHeaderProxy.h
index c1aea0a8..09b3d4d0 100644
--- a/launcher/net/RawHeaderProxy.h
+++ b/launcher/net/RawHeaderProxy.h
@@ -27,7 +27,7 @@ namespace Net {
 
 class RawHeaderProxy : public HeaderProxy {
    public:
-    RawHeaderProxy() : HeaderProxy(){};
+    RawHeaderProxy() : HeaderProxy() {}
     virtual ~RawHeaderProxy() = default;
 
    public:
-- 
cgit 


From 16e6a01881815e7cc1db4a8d9746f1eaa5daaa15 Mon Sep 17 00:00:00 2001
From: Apix <apix0n@outlook.com>
Date: Wed, 2 Aug 2023 11:35:54 +0200
Subject: fix: fix copyright year

Signed-off-by: Apix <apix0n@outlook.com>
---
 CMakeLists.txt                      | 2 +-
 launcher/ui/dialogs/AboutDialog.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41634f68..af49f665 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -342,7 +342,7 @@ if(UNIX AND APPLE)
     set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${Launcher_VERSION_NAME}")
     set(MACOSX_BUNDLE_LONG_VERSION_STRING "${Launcher_VERSION_NAME}")
     set(MACOSX_BUNDLE_ICON_FILE ${Launcher_Name}.icns)
-    set(MACOSX_BUNDLE_COPYRIGHT "© 2022 ${Launcher_Copyright_Mac}")
+    set(MACOSX_BUNDLE_COPYRIGHT "© 2022-2023 ${Launcher_Copyright_Mac}")
     set(MACOSX_SPARKLE_UPDATE_PUBLIC_KEY "v55ZWWD6QlPoXGV6VLzOTZxZUggWeE51X8cRQyQh6vA=")
     set(MACOSX_SPARKLE_UPDATE_FEED_URL "https://prismlauncher.org/feed/appcast.xml")
 
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index 88739463..b1734eff 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -170,7 +170,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
     QString urlText("<html><head/><body><p><a href=\"%1\">%1</a></p></body></html>");
     ui->urlLabel->setText(urlText.arg(BuildConfig.LAUNCHER_GIT));
 
-    QString copyText("© 2022 %1");
+    QString copyText("© 2022-2023 %1");
     ui->copyLabel->setText(copyText.arg(BuildConfig.LAUNCHER_COPYRIGHT));
 
     connect(ui->closeButton, SIGNAL(clicked()), SLOT(close()));
-- 
cgit 

-- 
cgit 


From f13eccb03d053453fd063850a35d7d17d76f9ce3 Mon Sep 17 00:00:00 2001
From: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Wed, 2 Aug 2023 19:24:58 +0300
Subject: Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
---
 launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
index 437fb62a..54c49f7b 100644
--- a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
+++ b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
@@ -41,7 +41,7 @@ class ImportFTBPage : public QWidget, public BasePage {
    public:
     explicit ImportFTBPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~ImportFTBPage();
-    QString displayName() const override { return "FTB App Import"; }
+    QString displayName() const override { return tr("FTB App Import"); }
     QIcon icon() const override { return APPLICATION->getThemedIcon("ftb_logo"); }
     QString id() const override { return "import_ftb"; }
     QString helpPage() const override { return "FTB-platform"; }
-- 
cgit 


From 39d4f0df66c2981c20e897416db2e8b551c52f03 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 2 Aug 2023 18:54:52 +0200
Subject: fix: don't reset meta url on launch

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 launcher/Application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index fd253dab..3a09ae28 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -713,7 +713,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
             QUrl metaUrl(m_settings->get("MetaURLOverride").toString());
 
             // get rid of invalid meta urls
-            if (!metaUrl.isValid() || metaUrl.scheme() != "http" || metaUrl.scheme() != "https")
+            if (!metaUrl.isValid() || (metaUrl.scheme() != "http" && metaUrl.scheme() != "https"))
                 m_settings->reset("MetaURLOverride");
         }
 
-- 
cgit 


From b013133cc1a66d777c0c16969302e23fb8cd2e16 Mon Sep 17 00:00:00 2001
From: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Date: Thu, 3 Aug 2023 09:24:47 +0200
Subject: chore: update to qt 6.5.2

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c710d54b..a7b8f652 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -68,7 +68,7 @@ jobs:
             qt_ver: 6
             qt_host: windows
             qt_arch: ''
-            qt_version: '6.5.1'
+            qt_version: '6.5.2'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
 
@@ -80,7 +80,7 @@ jobs:
             qt_ver: 6
             qt_host: windows
             qt_arch: 'win64_msvc2019_arm64'
-            qt_version: '6.5.1'
+            qt_version: '6.5.2'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
 
@@ -90,7 +90,7 @@ jobs:
             qt_ver: 6
             qt_host: mac
             qt_arch: ''
-            qt_version: '6.5.0'
+            qt_version: '6.5.2'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
 
-- 
cgit