From 9ad356d66f4c7bf1ccbbe251df800ebb1c4b67d4 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 22 Jun 2023 16:00:45 +0300
Subject: Added ExportModsToStringTask

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'launcher/CMakeLists.txt')

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index ce2771a4..c7efdad8 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -487,6 +487,9 @@ set(API_SOURCES
     modplatform/helpers/HashUtils.cpp
     modplatform/helpers/OverrideUtils.h
     modplatform/helpers/OverrideUtils.cpp
+
+    modplatform/helpers/ExportModsToStringTask.h
+    modplatform/helpers/ExportModsToStringTask.cpp
 )
 
 set(FTB_SOURCES
-- 
cgit 


From 58321f34915bd22ab8a2c195b64af3006d962be9 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 22 Jun 2023 20:03:44 +0300
Subject: Added curseforge export

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/CMakeLists.txt                            |   2 +
 launcher/modplatform/flame/FlamePackExportTask.cpp | 223 +++++++++++++++++++++
 launcher/modplatform/flame/FlamePackExportTask.h   |  74 +++++++
 launcher/ui/MainWindow.cpp                         |   9 +
 launcher/ui/MainWindow.h                           |   1 +
 launcher/ui/MainWindow.ui                          |   8 +
 launcher/ui/dialogs/ExportMrPackDialog.cpp         |  30 ++-
 launcher/ui/dialogs/ExportMrPackDialog.h           |   6 +-
 8 files changed, 342 insertions(+), 11 deletions(-)
 create mode 100644 launcher/modplatform/flame/FlamePackExportTask.cpp
 create mode 100644 launcher/modplatform/flame/FlamePackExportTask.h

(limited to 'launcher/CMakeLists.txt')

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index c7efdad8..df6c9012 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -517,6 +517,8 @@ set(FLAME_SOURCES
     modplatform/flame/FlameCheckUpdate.h
     modplatform/flame/FlameInstanceCreationTask.h
     modplatform/flame/FlameInstanceCreationTask.cpp
+    modplatform/flame/FlamePackExportTask.h
+    modplatform/flame/FlamePackExportTask.cpp
 )
 
 set(MODRINTH_SOURCES
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
new file mode 100644
index 00000000..1ae13f72
--- /dev/null
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -0,0 +1,223 @@
+// 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 "FlamePackExportTask.h"
+#include <QJsonArray>
+#include <QJsonObject>
+
+#include <QCryptographicHash>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QtConcurrentRun>
+#include "Json.h"
+#include "MMCZip.h"
+#include "minecraft/PackProfile.h"
+#include "minecraft/mod/ModFolderModel.h"
+#include "modplatform/helpers/ExportModsToStringTask.h"
+
+const QStringList FlamePackExportTask::PREFIXES({ "mods/", "coremods/", "resourcepacks/", "texturepacks/", "shaderpacks/" });
+const QStringList FlamePackExportTask::FILE_EXTENSIONS({ "jar", "litemod", "zip" });
+const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}({authors})</a></li>";
+
+FlamePackExportTask::FlamePackExportTask(const QString& name,
+                                         const QString& version,
+                                         const QVariant& projectID,
+                                         InstancePtr instance,
+                                         const QString& output,
+                                         MMCZip::FilterFunction filter)
+    : name(name)
+    , version(version)
+    , projectID(projectID)
+    , instance(instance)
+    , mcInstance(dynamic_cast<MinecraftInstance*>(instance.get()))
+    , gameRoot(instance->gameRoot())
+    , output(output)
+    , filter(filter)
+{}
+
+void FlamePackExportTask::executeTask()
+{
+    setStatus(tr("Searching for files..."));
+    setProgress(0, 0);
+    collectFiles();
+}
+
+bool FlamePackExportTask::abort()
+{
+    if (task != nullptr) {
+        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;
+}
+
+void FlamePackExportTask::collectFiles()
+{
+    setAbortable(false);
+    QCoreApplication::processEvents();
+
+    files.clear();
+    if (!MMCZip::collectFileListRecursively(instance->gameRoot(), nullptr, &files, filter)) {
+        emitFailed(tr("Could not search for files"));
+        return;
+    }
+
+    resolvedFiles.clear();
+
+    mcInstance->loaderModList()->update();
+    connect(mcInstance->loaderModList().get(), &ModFolderModel::updateFinished, this, [this]() {
+        mods = mcInstance->loaderModList()->allMods();
+        buildZip();
+    });
+}
+
+void FlamePackExportTask::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("manifest.json"))) {
+            QFile::remove(output);
+            return BuildZipResult(tr("Could not create index"));
+        }
+        indexFile.write(generateIndex());
+
+        QuaZipFile modlist(&zip);
+        if (!modlist.open(QIODevice::WriteOnly, QuaZipNewInfo("modlist.html"))) {
+            QFile::remove(output);
+            return BuildZipResult(tr("Could not create index"));
+        }
+        QString content = ExportToString::ExportModsToStringTask(mods, TEMPLATE);
+        content = "<ul>" + content + "</ul>";
+        modlist.write(content.toUtf8());
+
+        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();
+
+        if (zip.getZipError() != 0) {
+            QFile::remove(output);
+            return BuildZipResult(tr("A zip error occurred"));
+        }
+
+        return BuildZipResult();
+    });
+    connect(&buildZipWatcher, &QFutureWatcher<BuildZipResult>::finished, this, &FlamePackExportTask::finish);
+    buildZipWatcher.setFuture(buildZipFuture);
+}
+
+void FlamePackExportTask::finish()
+{
+    if (buildZipFuture.isCanceled())
+        emitAborted();
+    else {
+        const BuildZipResult result = buildZipFuture.result();
+        if (result.has_value())
+            emitFailed(result.value());
+        else
+            emitSucceeded();
+    }
+}
+
+QByteArray FlamePackExportTask::generateIndex()
+{
+    QJsonObject obj;
+    obj["manifestType"] = "minecraftModpack";
+    obj["manifestVersion"] = 1;
+    obj["name"] = name;
+    obj["version"] = version;
+    obj["author"] = author;
+    obj["projectID"] = projectID.toInt();
+    obj["overrides"] = "overrides";
+    if (mcInstance) {
+        QJsonObject version;
+        auto profile = mcInstance->getPackProfile();
+        // collect all supported components
+        const ComponentPtr minecraft = profile->getComponent("net.minecraft");
+        const ComponentPtr quilt = profile->getComponent("org.quiltmc.quilt-loader");
+        const ComponentPtr fabric = profile->getComponent("net.fabricmc.fabric-loader");
+        const ComponentPtr forge = profile->getComponent("net.minecraftforge");
+
+        // convert all available components to mrpack dependencies
+        if (minecraft != nullptr)
+            version["version"] = minecraft->m_version;
+
+        QJsonObject loader;
+        if (quilt != nullptr)
+            loader["id"] = quilt->getName();
+        else if (fabric != nullptr)
+            loader["id"] = fabric->getName();
+        else if (forge != nullptr)
+            loader["id"] = forge->getName();
+        loader["primary"] = true;
+
+        version["modLoaders"] = QJsonArray({ loader });
+        obj["minecraft"] = version;
+    }
+
+    QJsonArray files;
+    QMapIterator<QString, ResolvedFile> iterator(resolvedFiles);
+    while (iterator.hasNext()) {
+        iterator.next();
+
+        const ResolvedFile& value = iterator.value();
+
+        QJsonObject file;
+        file["projectID"] = value.projectID.toInt();
+        file["fileID"] = value.fileID.toInt();
+        file["required"] = value.required;
+        files << file;
+    }
+    obj["files"] = files;
+
+    return QJsonDocument(obj).toJson(QJsonDocument::Compact);
+}
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
new file mode 100644
index 00000000..83927099
--- /dev/null
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -0,0 +1,74 @@
+// 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 "BaseInstance.h"
+#include "MMCZip.h"
+#include "minecraft/MinecraftInstance.h"
+#include "tasks/Task.h"
+
+class FlamePackExportTask : public Task {
+   public:
+    FlamePackExportTask(const QString& name,
+                        const QString& version,
+                        const QVariant& projectID,
+                        InstancePtr instance,
+                        const QString& output,
+                        MMCZip::FilterFunction filter);
+
+   protected:
+    void executeTask() override;
+    bool abort() override;
+
+   private:
+    struct ResolvedFile {
+        QVariant projectID, fileID;
+        bool required;
+    };
+
+    static const QStringList PREFIXES;
+    static const QStringList FILE_EXTENSIONS;
+    static const QString TEMPLATE;
+
+    // inputs
+    const QString name, version, author;
+    const QVariant projectID;
+    const InstancePtr instance;
+    MinecraftInstance* mcInstance;
+    const QDir gameRoot;
+    const QString output;
+    const MMCZip::FilterFunction filter;
+
+    typedef std::optional<QString> BuildZipResult;
+
+    QFileInfoList files;
+    QMap<QString, ResolvedFile> resolvedFiles;
+    Task::Ptr task;
+    QFuture<BuildZipResult> buildZipFuture;
+    QFutureWatcher<BuildZipResult> buildZipWatcher;
+    QList<Mod*> mods;
+
+    void collectFiles();
+    void buildZip();
+    void finish();
+
+    QByteArray generateIndex();
+};
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index e04011ca..0027d180 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -205,6 +205,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
         auto exportInstanceMenu = new QMenu(this);
         exportInstanceMenu->addAction(ui->actionExportInstanceZip);
         exportInstanceMenu->addAction(ui->actionExportInstanceMrPack);
+        exportInstanceMenu->addAction(ui->actionExportInstanceFlamePack);
         ui->actionExportInstance->setMenu(exportInstanceMenu);
     }
 
@@ -1416,6 +1417,14 @@ void MainWindow::on_actionExportInstanceMrPack_triggered()
     }
 }
 
+void MainWindow::on_actionExportInstanceFlamePack_triggered()
+{
+    if (m_selectedInstance) {
+        ExportMrPackDialog dlg(m_selectedInstance, this, ModPlatform::ResourceProvider::FLAME);
+        dlg.exec();
+    }
+}
+
 void MainWindow::on_actionRenameInstance_triggered()
 {
     if (m_selectedInstance)
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index 3bb20c4a..5f74b501 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -157,6 +157,7 @@ private slots:
     inline void on_actionExportInstance_triggered() { on_actionExportInstanceZip_triggered(); }
     void on_actionExportInstanceZip_triggered();
     void on_actionExportInstanceMrPack_triggered();
+    void on_actionExportInstanceFlamePack_triggered();
 
     void on_actionRenameInstance_triggered();
 
diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui
index f67fb185..f7e93f48 100644
--- a/launcher/ui/MainWindow.ui
+++ b/launcher/ui/MainWindow.ui
@@ -479,6 +479,14 @@
     <string>Modrinth (mrpack)</string>
    </property>
   </action>
+  <action name="actionExportInstanceFlamePack">
+   <property name="icon">
+    <iconset theme="flame"/>
+   </property>
+   <property name="text">
+    <string>Curseforge (zip)</string>
+   </property>
+  </action>
   <action name="actionCreateInstanceShortcut">
    <property name="icon">
     <iconset theme="shortcut">
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.cpp b/launcher/ui/dialogs/ExportMrPackDialog.cpp
index 561b92e4..16ef526a 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportMrPackDialog.cpp
@@ -18,6 +18,8 @@
 
 #include "ExportMrPackDialog.h"
 #include "minecraft/mod/ModFolderModel.h"
+#include "modplatform/ModIndex.h"
+#include "modplatform/flame/FlamePackExportTask.h"
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui/dialogs/ProgressDialog.h"
 #include "ui_ExportMrPackDialog.h"
@@ -32,12 +34,15 @@
 #include "MMCZip.h"
 #include "modplatform/modrinth/ModrinthPackExportTask.h"
 
-ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent)
-    : QDialog(parent), instance(instance), ui(new Ui::ExportMrPackDialog)
+ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent, ModPlatform::ResourceProvider provider)
+    : QDialog(parent), instance(instance), ui(new Ui::ExportMrPackDialog), m_provider(provider)
 {
     ui->setupUi(this);
     ui->name->setText(instance->name());
-    ui->summary->setText(instance->notes().split(QRegularExpression("\\r?\\n"))[0]);
+    if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
+        ui->summary->setText(instance->notes().split(QRegularExpression("\\r?\\n"))[0]);
+    else
+        ui->summaryLabel->setText("ProjectID");
 
     // ensure a valid pack is generated
     // the name and version fields mustn't be empty
@@ -97,20 +102,25 @@ void ExportMrPackDialog::done(int result)
 
         if (output.isEmpty())
             return;
-
-        ModrinthPackExportTask task(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
-                                    [this](const QString& path) { return proxy->blockedPaths().covers(path); });
-
-        connect(&task, &Task::failed,
+        Task* task;
+        if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
+            task = new ModrinthPackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
+                                              [this](const QString& path) { return proxy->blockedPaths().covers(path); });
+        else
+            task = new FlamePackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
+                                           [this](const QString& path) { return proxy->blockedPaths().covers(path); });
+
+        connect(task, &Task::failed,
                 [this](const QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show(); });
-        connect(&task, &Task::aborted, [this] {
+        connect(task, &Task::aborted, [this] {
             CustomMessageBox::selectable(this, tr("Task aborted"), tr("The task has been aborted by the user."), QMessageBox::Information)
                 ->show();
         });
+        connect(task, &Task::finished, [task] { task->deleteLater(); });
 
         ProgressDialog progress(this);
         progress.setSkipButton(true, tr("Abort"));
-        if (progress.execWithTask(&task) != QDialog::Accepted)
+        if (progress.execWithTask(task) != QDialog::Accepted)
             return;
     }
 
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.h b/launcher/ui/dialogs/ExportMrPackDialog.h
index 1c70c4ae..858a31bf 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.h
+++ b/launcher/ui/dialogs/ExportMrPackDialog.h
@@ -22,6 +22,7 @@
 #include "BaseInstance.h"
 #include "FastFileIconProvider.h"
 #include "FileIgnoreProxy.h"
+#include "modplatform/ModIndex.h"
 
 namespace Ui {
 class ExportMrPackDialog;
@@ -31,7 +32,9 @@ class ExportMrPackDialog : public QDialog {
     Q_OBJECT
 
    public:
-    explicit ExportMrPackDialog(InstancePtr instance, QWidget* parent = nullptr);
+    explicit ExportMrPackDialog(InstancePtr instance,
+                                QWidget* parent = nullptr,
+                                ModPlatform::ResourceProvider provider = ModPlatform::ResourceProvider::MODRINTH);
     ~ExportMrPackDialog();
 
     void done(int result) override;
@@ -42,4 +45,5 @@ class ExportMrPackDialog : public QDialog {
     Ui::ExportMrPackDialog* ui;
     FileIgnoreProxy* proxy;
     FastFileIconProvider icons;
+    const ModPlatform::ResourceProvider m_provider;
 };
-- 
cgit 


From 59e1e5190310626109018d5aeed4782b347176ec Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 14:51:12 +0300
Subject: Removed unused files

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/CMakeLists.txt                            |   3 -
 .../modplatform/helpers/ExportModsToStringTask.cpp | 100 ---------------------
 .../modplatform/helpers/ExportModsToStringTask.h   |  33 -------
 3 files changed, 136 deletions(-)
 delete mode 100644 launcher/modplatform/helpers/ExportModsToStringTask.cpp
 delete mode 100644 launcher/modplatform/helpers/ExportModsToStringTask.h

(limited to 'launcher/CMakeLists.txt')

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index df6c9012..8de616a6 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -487,9 +487,6 @@ set(API_SOURCES
     modplatform/helpers/HashUtils.cpp
     modplatform/helpers/OverrideUtils.h
     modplatform/helpers/OverrideUtils.cpp
-
-    modplatform/helpers/ExportModsToStringTask.h
-    modplatform/helpers/ExportModsToStringTask.cpp
 )
 
 set(FTB_SOURCES
diff --git a/launcher/modplatform/helpers/ExportModsToStringTask.cpp b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
deleted file mode 100644
index 03e1f4ba..00000000
--- a/launcher/modplatform/helpers/ExportModsToStringTask.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// 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 "ExportModsToStringTask.h"
-#include "modplatform/ModIndex.h"
-
-namespace ExportToString {
-
-QString ExportModsToStringTask(QList<Mod*> mods, Formats format, OptionalData extraData)
-{
-    switch (format) {
-        case HTML: {
-            QStringList lines;
-            for (auto mod : mods) {
-                auto meta = mod->metadata();
-                auto modName = mod->name();
-                if (extraData & Url) {
-                    auto url = mod->metaurl();
-                    if (!url.isEmpty())
-                        modName = QString("<a href=\"%1\">%2</a>").arg(url, modName);
-                }
-                auto line = modName;
-                if (extraData & Version) {
-                    auto ver = mod->version();
-                    if (ver.isEmpty() && meta != nullptr)
-                        ver = meta->version().toString();
-                    if (!ver.isEmpty())
-                        line += QString("[%1]").arg(ver);
-                }
-                if (extraData & Authors && !mod->authors().isEmpty())
-                    line += " by " + mod->authors().join(", ");
-                lines.append(QString("<ul>%1</ul>").arg(line));
-            }
-            return QString("<html><body>\n\t%1\n</body></html>").arg(lines.join("\n\t"));
-        }
-        case MARKDOWN: {
-            QStringList lines;
-            for (auto mod : mods) {
-                auto meta = mod->metadata();
-                auto modName = mod->name();
-                if (extraData & Url) {
-                    auto url = mod->metaurl();
-                    if (!url.isEmpty())
-                        modName = QString("[%1](%2)").arg(modName, url);
-                }
-                auto line = modName;
-                if (extraData & Version) {
-                    auto ver = mod->version();
-                    if (ver.isEmpty() && meta != nullptr)
-                        ver = meta->version().toString();
-                    if (!ver.isEmpty())
-                        line += QString("[%1]").arg(ver);
-                }
-                if (extraData & Authors && !mod->authors().isEmpty())
-                    line += " by " + mod->authors().join(", ");
-                lines << line;
-            }
-            return lines.join("\n");
-        }
-        default: {
-            return QString("unknown format:%1").arg(format);
-        }
-    }
-}
-
-QString ExportModsToStringTask(QList<Mod*> mods, QString lineTemplate)
-{
-    QStringList lines;
-    for (auto mod : mods) {
-        auto meta = mod->metadata();
-        auto modName = mod->name();
-
-        auto url = mod->metaurl();
-        auto ver = mod->version();
-        if (ver.isEmpty() && meta != nullptr)
-            ver = meta->version().toString();
-        auto authors = mod->authors().join(", ");
-        lines << QString(lineTemplate)
-                     .replace("{name}", modName)
-                     .replace("{url}", url)
-                     .replace("{version}", ver)
-                     .replace("{authors}", authors);
-    }
-    return lines.join("\n");
-}
-}  // namespace ExportToString
\ No newline at end of file
diff --git a/launcher/modplatform/helpers/ExportModsToStringTask.h b/launcher/modplatform/helpers/ExportModsToStringTask.h
deleted file mode 100644
index 756c69f7..00000000
--- a/launcher/modplatform/helpers/ExportModsToStringTask.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// 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 <qlist.h>
-#include <QString>
-#include "minecraft/mod/Mod.h"
-
-namespace ExportToString {
-
-enum Formats { HTML, MARKDOWN };
-enum OptionalData {
-    Authors = 1 << 0,
-    Url = 1 << 1,
-    Version = 1 << 2,
-};
-QString ExportModsToStringTask(QList<Mod*> mods, Formats format, OptionalData extraData);
-QString ExportModsToStringTask(QList<Mod*> mods, QString lineTemplate);
-}  // namespace ExportToString
-- 
cgit 


From 25579fbedcfac6b36c6b30ad2447d702b601e1d6 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 14:54:39 +0300
Subject: Renamed ExportMrPackDialog to ExportPackDialog

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/CMakeLists.txt                    |   6 +-
 launcher/ui/MainWindow.cpp                 |   6 +-
 launcher/ui/dialogs/ExportMrPackDialog.cpp | 145 ----------------------------
 launcher/ui/dialogs/ExportMrPackDialog.h   |  49 ----------
 launcher/ui/dialogs/ExportMrPackDialog.ui  | 146 -----------------------------
 launcher/ui/dialogs/ExportPackDialog.cpp   | 145 ++++++++++++++++++++++++++++
 launcher/ui/dialogs/ExportPackDialog.h     |  49 ++++++++++
 launcher/ui/dialogs/ExportPackDialog.ui    | 146 +++++++++++++++++++++++++++++
 8 files changed, 346 insertions(+), 346 deletions(-)
 delete mode 100644 launcher/ui/dialogs/ExportMrPackDialog.cpp
 delete mode 100644 launcher/ui/dialogs/ExportMrPackDialog.h
 delete mode 100644 launcher/ui/dialogs/ExportMrPackDialog.ui
 create mode 100644 launcher/ui/dialogs/ExportPackDialog.cpp
 create mode 100644 launcher/ui/dialogs/ExportPackDialog.h
 create mode 100644 launcher/ui/dialogs/ExportPackDialog.ui

(limited to 'launcher/CMakeLists.txt')

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 8de616a6..0dc2b80a 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -908,8 +908,8 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/EditAccountDialog.h
     ui/dialogs/ExportInstanceDialog.cpp
     ui/dialogs/ExportInstanceDialog.h
-    ui/dialogs/ExportMrPackDialog.cpp
-    ui/dialogs/ExportMrPackDialog.h
+    ui/dialogs/ExportPackDialog.cpp
+    ui/dialogs/ExportPackDialog.h
     ui/dialogs/IconPickerDialog.cpp
     ui/dialogs/IconPickerDialog.h
     ui/dialogs/ImportResourceDialog.cpp
@@ -1056,7 +1056,7 @@ qt_wrap_ui(LAUNCHER_UI
     ui/dialogs/ProfileSelectDialog.ui
     ui/dialogs/SkinUploadDialog.ui
     ui/dialogs/ExportInstanceDialog.ui
-    ui/dialogs/ExportMrPackDialog.ui
+    ui/dialogs/ExportPackDialog.ui
     ui/dialogs/IconPickerDialog.ui
     ui/dialogs/ImportResourceDialog.ui
     ui/dialogs/MSALoginDialog.ui
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 89c78539..91809c7b 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -107,7 +107,7 @@
 #include "ui/dialogs/CopyInstanceDialog.h"
 #include "ui/dialogs/EditAccountDialog.h"
 #include "ui/dialogs/ExportInstanceDialog.h"
-#include "ui/dialogs/ExportMrPackDialog.h"
+#include "ui/dialogs/ExportPackDialog.h"
 #include "ui/dialogs/ImportResourceDialog.h"
 #include "ui/themes/ITheme.h"
 #include "ui/themes/ThemeManager.h"
@@ -1412,7 +1412,7 @@ void MainWindow::on_actionExportInstanceMrPack_triggered()
 {
     if (m_selectedInstance)
     {
-        ExportMrPackDialog dlg(m_selectedInstance, this);
+        ExportPackDialog dlg(m_selectedInstance, this);
         dlg.exec();
     }
 }
@@ -1428,7 +1428,7 @@ void MainWindow::on_actionExportInstanceFlamePack_triggered()
                 msgBox.exec();
                 return;
             }
-            ExportMrPackDialog dlg(m_selectedInstance, this, ModPlatform::ResourceProvider::FLAME);
+            ExportPackDialog dlg(m_selectedInstance, this, ModPlatform::ResourceProvider::FLAME);
             dlg.exec();
         }
     }
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.cpp b/launcher/ui/dialogs/ExportMrPackDialog.cpp
deleted file mode 100644
index 94987c7e..00000000
--- a/launcher/ui/dialogs/ExportMrPackDialog.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
- *
- *  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 "ExportMrPackDialog.h"
-#include "minecraft/mod/ModFolderModel.h"
-#include "modplatform/ModIndex.h"
-#include "modplatform/flame/FlamePackExportTask.h"
-#include "ui/dialogs/CustomMessageBox.h"
-#include "ui/dialogs/ProgressDialog.h"
-#include "ui_ExportMrPackDialog.h"
-
-#include <QFileDialog>
-#include <QFileSystemModel>
-#include <QJsonDocument>
-#include <QMessageBox>
-#include <QPushButton>
-#include "FastFileIconProvider.h"
-#include "FileSystem.h"
-#include "MMCZip.h"
-#include "modplatform/modrinth/ModrinthPackExportTask.h"
-
-ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent, ModPlatform::ResourceProvider provider)
-    : QDialog(parent), instance(instance), ui(new Ui::ExportMrPackDialog), m_provider(provider)
-{
-    ui->setupUi(this);
-    ui->name->setText(instance->name());
-    if (m_provider == ModPlatform::ResourceProvider::MODRINTH) {
-        ui->summary->setText(instance->notes().split(QRegularExpression("\\r?\\n"))[0]);
-        ui->author->hide();
-        ui->authorLabel->hide();
-    } else {
-        setWindowTitle("Export CurseForge Pack");
-        ui->version->setText("");
-        ui->summaryLabel->setText("ProjectID");
-    }
-
-    // ensure a valid pack is generated
-    // the name and version fields mustn't be empty
-    connect(ui->name, &QLineEdit::textEdited, this, &ExportMrPackDialog::validate);
-    connect(ui->version, &QLineEdit::textEdited, this, &ExportMrPackDialog::validate);
-    // the instance name can technically be empty
-    validate();
-
-    QFileSystemModel* model = new QFileSystemModel(this);
-    model->setIconProvider(&icons);
-
-    // use the game root - everything outside cannot be exported
-    const QDir root(instance->gameRoot());
-    proxy = new FileIgnoreProxy(instance->gameRoot(), this);
-    proxy->setSourceModel(model);
-    proxy->setFilterRegularExpression("^(?!(\\.DS_Store)|([tT]humbs\\.db)).+$");
-
-    const QDir::Filters filter(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Hidden);
-
-    for (const QString& file : root.entryList(filter)) {
-        if (!(file == "mods" || file == "coremods" || file == "datapacks" || file == "config" || file == "options.txt" ||
-              file == "servers.dat"))
-            proxy->blockedPaths().insert(file);
-    }
-
-    MinecraftInstance* mcInstance = dynamic_cast<MinecraftInstance*>(instance.get());
-    if (mcInstance) {
-        const QDir index = mcInstance->loaderModList()->indexDir();
-        if (index.exists())
-            proxy->blockedPaths().insert(root.relativeFilePath(index.absolutePath()));
-    }
-
-    ui->treeView->setModel(proxy);
-    ui->treeView->setRootIndex(proxy->mapFromSource(model->index(instance->gameRoot())));
-    ui->treeView->sortByColumn(0, Qt::AscendingOrder);
-
-    model->setFilter(filter);
-    model->setRootPath(instance->gameRoot());
-
-    QHeaderView* headerView = ui->treeView->header();
-    headerView->setSectionResizeMode(QHeaderView::ResizeToContents);
-    headerView->setSectionResizeMode(0, QHeaderView::Stretch);
-}
-
-ExportMrPackDialog::~ExportMrPackDialog()
-{
-    delete ui;
-}
-
-void ExportMrPackDialog::done(int result)
-{
-    if (result == Accepted) {
-        const QString filename = FS::RemoveInvalidFilenameChars(ui->name->text());
-        QString output;
-        if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
-            output = QFileDialog::getSaveFileName(this, tr("Export %1").arg(ui->name->text()),
-                                                  FS::PathCombine(QDir::homePath(), filename + ".mrpack"), "Modrinth pack (*.mrpack *.zip)",
-                                                  nullptr);
-        else
-            output = QFileDialog::getSaveFileName(this, tr("Export %1").arg(ui->name->text()),
-                                                  FS::PathCombine(QDir::homePath(), filename + ".zip"), "CurseForge pack (*.zip)", nullptr);
-
-        if (output.isEmpty())
-            return;
-        Task* task;
-        if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
-            task = new ModrinthPackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
-                                              [this](const QString& path) { return proxy->blockedPaths().covers(path); });
-        else
-            task = new FlamePackExportTask(ui->name->text(), ui->version->text(), ui->author->text(), ui->summary->text(), instance, output,
-                                           [this](const QString& path) { return proxy->blockedPaths().covers(path); });
-
-        connect(task, &Task::failed,
-                [this](const QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show(); });
-        connect(task, &Task::aborted, [this] {
-            CustomMessageBox::selectable(this, tr("Task aborted"), tr("The task has been aborted by the user."), QMessageBox::Information)
-                ->show();
-        });
-        connect(task, &Task::finished, [task] { task->deleteLater(); });
-
-        ProgressDialog progress(this);
-        progress.setSkipButton(true, tr("Abort"));
-        if (progress.execWithTask(task) != QDialog::Accepted)
-            return;
-    }
-
-    QDialog::done(result);
-}
-
-void ExportMrPackDialog::validate()
-{
-    const bool invalid =
-        ui->name->text().isEmpty() || ((m_provider == ModPlatform::ResourceProvider::MODRINTH) && ui->version->text().isEmpty());
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setDisabled(invalid);
-}
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.h b/launcher/ui/dialogs/ExportMrPackDialog.h
deleted file mode 100644
index 858a31bf..00000000
--- a/launcher/ui/dialogs/ExportMrPackDialog.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
- *
- *  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 "BaseInstance.h"
-#include "FastFileIconProvider.h"
-#include "FileIgnoreProxy.h"
-#include "modplatform/ModIndex.h"
-
-namespace Ui {
-class ExportMrPackDialog;
-}
-
-class ExportMrPackDialog : public QDialog {
-    Q_OBJECT
-
-   public:
-    explicit ExportMrPackDialog(InstancePtr instance,
-                                QWidget* parent = nullptr,
-                                ModPlatform::ResourceProvider provider = ModPlatform::ResourceProvider::MODRINTH);
-    ~ExportMrPackDialog();
-
-    void done(int result) override;
-    void validate();
-
-   private:
-    const InstancePtr instance;
-    Ui::ExportMrPackDialog* ui;
-    FileIgnoreProxy* proxy;
-    FastFileIconProvider icons;
-    const ModPlatform::ResourceProvider m_provider;
-};
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.ui b/launcher/ui/dialogs/ExportMrPackDialog.ui
deleted file mode 100644
index 59ecb17c..00000000
--- a/launcher/ui/dialogs/ExportMrPackDialog.ui
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ExportMrPackDialog</class>
- <widget class="QDialog" name="ExportMrPackDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>650</width>
-    <height>413</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Export Modrinth Pack</string>
-  </property>
-  <property name="sizeGripEnabled">
-   <bool>true</bool>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <widget class="QGroupBox" name="information">
-     <property name="title">
-      <string>Information</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="3" column="0">
-       <widget class="QLabel" name="summaryLabel">
-        <property name="text">
-         <string>Summary</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QLineEdit" name="summary"/>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="nameLabel">
-        <property name="text">
-         <string>Name</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="versionLabel">
-        <property name="text">
-         <string>Version</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="name"/>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="version">
-        <property name="text">
-         <string>1.0.0</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="authorLabel">
-        <property name="text">
-         <string>Author</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QLineEdit" name="author"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="filesLabel">
-     <property name="text">
-      <string>Files</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTreeView" name="treeView">
-     <property name="alternatingRowColors">
-      <bool>true</bool>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::ExtendedSelection</enum>
-     </property>
-     <property name="sortingEnabled">
-      <bool>true</bool>
-     </property>
-     <attribute name="headerStretchLastSection">
-      <bool>false</bool>
-     </attribute>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>name</tabstop>
-  <tabstop>version</tabstop>
-  <tabstop>summary</tabstop>
-  <tabstop>treeView</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>ExportMrPackDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>324</x>
-     <y>390</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>324</x>
-     <y>206</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>ExportMrPackDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>324</x>
-     <y>390</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>324</x>
-     <y>206</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/launcher/ui/dialogs/ExportPackDialog.cpp b/launcher/ui/dialogs/ExportPackDialog.cpp
new file mode 100644
index 00000000..8e921f89
--- /dev/null
+++ b/launcher/ui/dialogs/ExportPackDialog.cpp
@@ -0,0 +1,145 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
+ *
+ *  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 "ExportPackDialog.h"
+#include "minecraft/mod/ModFolderModel.h"
+#include "modplatform/ModIndex.h"
+#include "modplatform/flame/FlamePackExportTask.h"
+#include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/ProgressDialog.h"
+#include "ui_ExportMrPackDialog.h"
+
+#include <QFileDialog>
+#include <QFileSystemModel>
+#include <QJsonDocument>
+#include <QMessageBox>
+#include <QPushButton>
+#include "FastFileIconProvider.h"
+#include "FileSystem.h"
+#include "MMCZip.h"
+#include "modplatform/modrinth/ModrinthPackExportTask.h"
+
+ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPlatform::ResourceProvider provider)
+    : QDialog(parent), instance(instance), ui(new Ui::ExportPackDialog), m_provider(provider)
+{
+    ui->setupUi(this);
+    ui->name->setText(instance->name());
+    if (m_provider == ModPlatform::ResourceProvider::MODRINTH) {
+        ui->summary->setText(instance->notes().split(QRegularExpression("\\r?\\n"))[0]);
+        ui->author->hide();
+        ui->authorLabel->hide();
+    } else {
+        setWindowTitle("Export CurseForge Pack");
+        ui->version->setText("");
+        ui->summaryLabel->setText("ProjectID");
+    }
+
+    // ensure a valid pack is generated
+    // the name and version fields mustn't be empty
+    connect(ui->name, &QLineEdit::textEdited, this, &ExportPackDialog::validate);
+    connect(ui->version, &QLineEdit::textEdited, this, &ExportPackDialog::validate);
+    // the instance name can technically be empty
+    validate();
+
+    QFileSystemModel* model = new QFileSystemModel(this);
+    model->setIconProvider(&icons);
+
+    // use the game root - everything outside cannot be exported
+    const QDir root(instance->gameRoot());
+    proxy = new FileIgnoreProxy(instance->gameRoot(), this);
+    proxy->setSourceModel(model);
+    proxy->setFilterRegularExpression("^(?!(\\.DS_Store)|([tT]humbs\\.db)).+$");
+
+    const QDir::Filters filter(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Hidden);
+
+    for (const QString& file : root.entryList(filter)) {
+        if (!(file == "mods" || file == "coremods" || file == "datapacks" || file == "config" || file == "options.txt" ||
+              file == "servers.dat"))
+            proxy->blockedPaths().insert(file);
+    }
+
+    MinecraftInstance* mcInstance = dynamic_cast<MinecraftInstance*>(instance.get());
+    if (mcInstance) {
+        const QDir index = mcInstance->loaderModList()->indexDir();
+        if (index.exists())
+            proxy->blockedPaths().insert(root.relativeFilePath(index.absolutePath()));
+    }
+
+    ui->treeView->setModel(proxy);
+    ui->treeView->setRootIndex(proxy->mapFromSource(model->index(instance->gameRoot())));
+    ui->treeView->sortByColumn(0, Qt::AscendingOrder);
+
+    model->setFilter(filter);
+    model->setRootPath(instance->gameRoot());
+
+    QHeaderView* headerView = ui->treeView->header();
+    headerView->setSectionResizeMode(QHeaderView::ResizeToContents);
+    headerView->setSectionResizeMode(0, QHeaderView::Stretch);
+}
+
+ExportPackDialog::~ExportPackDialog()
+{
+    delete ui;
+}
+
+void ExportPackDialog::done(int result)
+{
+    if (result == Accepted) {
+        const QString filename = FS::RemoveInvalidFilenameChars(ui->name->text());
+        QString output;
+        if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
+            output = QFileDialog::getSaveFileName(this, tr("Export %1").arg(ui->name->text()),
+                                                  FS::PathCombine(QDir::homePath(), filename + ".mrpack"), "Modrinth pack (*.mrpack *.zip)",
+                                                  nullptr);
+        else
+            output = QFileDialog::getSaveFileName(this, tr("Export %1").arg(ui->name->text()),
+                                                  FS::PathCombine(QDir::homePath(), filename + ".zip"), "CurseForge pack (*.zip)", nullptr);
+
+        if (output.isEmpty())
+            return;
+        Task* task;
+        if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
+            task = new ModrinthPackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
+                                              [this](const QString& path) { return proxy->blockedPaths().covers(path); });
+        else
+            task = new FlamePackExportTask(ui->name->text(), ui->version->text(), ui->author->text(), ui->summary->text(), instance, output,
+                                           [this](const QString& path) { return proxy->blockedPaths().covers(path); });
+
+        connect(task, &Task::failed,
+                [this](const QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show(); });
+        connect(task, &Task::aborted, [this] {
+            CustomMessageBox::selectable(this, tr("Task aborted"), tr("The task has been aborted by the user."), QMessageBox::Information)
+                ->show();
+        });
+        connect(task, &Task::finished, [task] { task->deleteLater(); });
+
+        ProgressDialog progress(this);
+        progress.setSkipButton(true, tr("Abort"));
+        if (progress.execWithTask(task) != QDialog::Accepted)
+            return;
+    }
+
+    QDialog::done(result);
+}
+
+void ExportPackDialog::validate()
+{
+    const bool invalid =
+        ui->name->text().isEmpty() || ((m_provider == ModPlatform::ResourceProvider::MODRINTH) && ui->version->text().isEmpty());
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setDisabled(invalid);
+}
diff --git a/launcher/ui/dialogs/ExportPackDialog.h b/launcher/ui/dialogs/ExportPackDialog.h
new file mode 100644
index 00000000..830c24d2
--- /dev/null
+++ b/launcher/ui/dialogs/ExportPackDialog.h
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
+ *
+ *  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 "BaseInstance.h"
+#include "FastFileIconProvider.h"
+#include "FileIgnoreProxy.h"
+#include "modplatform/ModIndex.h"
+
+namespace Ui {
+class ExportPackDialog;
+}
+
+class ExportPackDialog : public QDialog {
+    Q_OBJECT
+
+   public:
+    explicit ExportPackDialog(InstancePtr instance,
+                              QWidget* parent = nullptr,
+                              ModPlatform::ResourceProvider provider = ModPlatform::ResourceProvider::MODRINTH);
+    ~ExportPackDialog();
+
+    void done(int result) override;
+    void validate();
+
+   private:
+    const InstancePtr instance;
+    Ui::ExportPackDialog* ui;
+    FileIgnoreProxy* proxy;
+    FastFileIconProvider icons;
+    const ModPlatform::ResourceProvider m_provider;
+};
diff --git a/launcher/ui/dialogs/ExportPackDialog.ui b/launcher/ui/dialogs/ExportPackDialog.ui
new file mode 100644
index 00000000..5762508a
--- /dev/null
+++ b/launcher/ui/dialogs/ExportPackDialog.ui
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ExportPackDialog</class>
+ <widget class="QDialog" name="ExportPackDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>650</width>
+    <height>413</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Export Modrinth Pack</string>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QGroupBox" name="information">
+     <property name="title">
+      <string>Information</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="3" column="0">
+       <widget class="QLabel" name="summaryLabel">
+        <property name="text">
+         <string>Summary</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="summary"/>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="nameLabel">
+        <property name="text">
+         <string>Name</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="versionLabel">
+        <property name="text">
+         <string>Version</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="name"/>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="version">
+        <property name="text">
+         <string>1.0.0</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="authorLabel">
+        <property name="text">
+         <string>Author</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLineEdit" name="author"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="filesLabel">
+     <property name="text">
+      <string>Files</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTreeView" name="treeView">
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+     <attribute name="headerStretchLastSection">
+      <bool>false</bool>
+     </attribute>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>name</tabstop>
+  <tabstop>version</tabstop>
+  <tabstop>summary</tabstop>
+  <tabstop>treeView</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ExportPackDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>324</x>
+     <y>390</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>324</x>
+     <y>206</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ExportPackDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>324</x>
+     <y>390</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>324</x>
+     <y>206</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
-- 
cgit