From 318d11481d719cf537ecdc00f8d676494bab22b6 Mon Sep 17 00:00:00 2001
From: PandaNinjas <admin@malwarefight.wip.la>
Date: Wed, 7 Jun 2023 19:37:54 -0400
Subject: Resolve other switch fallthrough issues

---
 launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index dae93d1c..11365a21 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -467,8 +467,9 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
         switch (result.type) {
             case Flame::File::Type::Folder: {
                 logWarning(tr("This 'Folder' may need extracting: %1").arg(relpath));
-                // fall-through intentional, we treat these as plain old mods and dump them wherever.
+                // fallthrough intentional, we treat these as plain old mods and dump them wherever.
             }
+            /* fallthrough */
             case Flame::File::Type::SingleFile:
             case Flame::File::Type::Mod: {
                 if (!result.url.isEmpty()) {
-- 
cgit 


From 9d2516a199ae4c33f773ab00ce59ecb2a6dfd0a5 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 +
 .../modplatform/helpers/ExportModsToStringTask.cpp | 114 +++++++++++++++++++++
 .../modplatform/helpers/ExportModsToStringTask.h   |  33 ++++++
 3 files changed, 150 insertions(+)
 create mode 100644 launcher/modplatform/helpers/ExportModsToStringTask.cpp
 create mode 100644 launcher/modplatform/helpers/ExportModsToStringTask.h

(limited to 'launcher/modplatform')

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
diff --git a/launcher/modplatform/helpers/ExportModsToStringTask.cpp b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
new file mode 100644
index 00000000..a105fc35
--- /dev/null
+++ b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
@@ -0,0 +1,114 @@
+// 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->homeurl();
+                    if (meta != nullptr) {
+                        url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
+                                                                                      : "https://modrinth.com/mod/") +
+                              meta->project_id.toString();
+                    }
+                    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->homeurl();
+                    if (meta != nullptr) {
+                        url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
+                                                                                      : "https://modrinth.com/mod/") +
+                              meta->project_id.toString();
+                    }
+                    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->homeurl();
+        if (meta != nullptr) {
+            url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
+                                                                          : "https://modrinth.com/mod/") +
+                  meta->project_id.toString();
+        }
+        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
new file mode 100644
index 00000000..756c69f7
--- /dev/null
+++ b/launcher/modplatform/helpers/ExportModsToStringTask.h
@@ -0,0 +1,33 @@
+// 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 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 +
 .../modplatform/helpers/ExportModsToStringTask.cpp | 114 +++++++++++++++++++++
 .../modplatform/helpers/ExportModsToStringTask.h   |  33 ++++++
 3 files changed, 150 insertions(+)
 create mode 100644 launcher/modplatform/helpers/ExportModsToStringTask.cpp
 create mode 100644 launcher/modplatform/helpers/ExportModsToStringTask.h

(limited to 'launcher/modplatform')

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
diff --git a/launcher/modplatform/helpers/ExportModsToStringTask.cpp b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
new file mode 100644
index 00000000..a105fc35
--- /dev/null
+++ b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
@@ -0,0 +1,114 @@
+// 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->homeurl();
+                    if (meta != nullptr) {
+                        url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
+                                                                                      : "https://modrinth.com/mod/") +
+                              meta->project_id.toString();
+                    }
+                    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->homeurl();
+                    if (meta != nullptr) {
+                        url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
+                                                                                      : "https://modrinth.com/mod/") +
+                              meta->project_id.toString();
+                    }
+                    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->homeurl();
+        if (meta != nullptr) {
+            url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
+                                                                          : "https://modrinth.com/mod/") +
+                  meta->project_id.toString();
+        }
+        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
new file mode 100644
index 00000000..756c69f7
--- /dev/null
+++ b/launcher/modplatform/helpers/ExportModsToStringTask.h
@@ -0,0 +1,33 @@
+// 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 da6f846a496f70dd5339ed1bdba35842feaa1286 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 22 Jun 2023 18:11:03 +0300
Subject: Use slug for url

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/helpers/ExportModsToStringTask.cpp b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
index a105fc35..c10560c1 100644
--- a/launcher/modplatform/helpers/ExportModsToStringTask.cpp
+++ b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
@@ -32,7 +32,7 @@ QString ExportModsToStringTask(QList<Mod*> mods, Formats format, OptionalData ex
                     if (meta != nullptr) {
                         url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
                                                                                       : "https://modrinth.com/mod/") +
-                              meta->project_id.toString();
+                              meta->slug.remove(".pw.toml");
                     }
                     if (!url.isEmpty())
                         modName = QString("<a href=\"%1\">%2</a>").arg(url, modName);
@@ -61,7 +61,7 @@ QString ExportModsToStringTask(QList<Mod*> mods, Formats format, OptionalData ex
                     if (meta != nullptr) {
                         url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
                                                                                       : "https://modrinth.com/mod/") +
-                              meta->project_id.toString();
+                              meta->slug.remove(".pw.toml");
                     }
                     if (!url.isEmpty())
                         modName = QString("[%1](%2)").arg(modName, url);
-- 
cgit 


From 4e07f9574af10943577726f795fc8fad249e90e4 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 22 Jun 2023 18:11:03 +0300
Subject: Use slug for url

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/helpers/ExportModsToStringTask.cpp b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
index a105fc35..c10560c1 100644
--- a/launcher/modplatform/helpers/ExportModsToStringTask.cpp
+++ b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
@@ -32,7 +32,7 @@ QString ExportModsToStringTask(QList<Mod*> mods, Formats format, OptionalData ex
                     if (meta != nullptr) {
                         url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
                                                                                       : "https://modrinth.com/mod/") +
-                              meta->project_id.toString();
+                              meta->slug.remove(".pw.toml");
                     }
                     if (!url.isEmpty())
                         modName = QString("<a href=\"%1\">%2</a>").arg(url, modName);
@@ -61,7 +61,7 @@ QString ExportModsToStringTask(QList<Mod*> mods, Formats format, OptionalData ex
                     if (meta != nullptr) {
                         url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
                                                                                       : "https://modrinth.com/mod/") +
-                              meta->project_id.toString();
+                              meta->slug.remove(".pw.toml");
                     }
                     if (!url.isEmpty())
                         modName = QString("[%1](%2)").arg(modName, url);
-- 
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/modplatform')

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 377f27b16fbd8adb21d4907101d195ef6f3a9e88 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 22 Jun 2023 20:04:06 +0300
Subject: Updated slug for url

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/helpers/ExportModsToStringTask.cpp b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
index c10560c1..e7be5ce1 100644
--- a/launcher/modplatform/helpers/ExportModsToStringTask.cpp
+++ b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
@@ -97,7 +97,7 @@ QString ExportModsToStringTask(QList<Mod*> mods, QString lineTemplate)
         if (meta != nullptr) {
             url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
                                                                           : "https://modrinth.com/mod/") +
-                  meta->project_id.toString();
+                  meta->slug.remove(".pw.toml");
         }
         auto ver = mod->version();
         if (ver.isEmpty() && meta != nullptr)
-- 
cgit 


From 3c9c39cb890252f94d0c50caa00de5439881d7f6 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 22 Jun 2023 20:04:06 +0300
Subject: Updated slug for url

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/helpers/ExportModsToStringTask.cpp b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
index c10560c1..e7be5ce1 100644
--- a/launcher/modplatform/helpers/ExportModsToStringTask.cpp
+++ b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
@@ -97,7 +97,7 @@ QString ExportModsToStringTask(QList<Mod*> mods, QString lineTemplate)
         if (meta != nullptr) {
             url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
                                                                           : "https://modrinth.com/mod/") +
-                  meta->project_id.toString();
+                  meta->slug.remove(".pw.toml");
         }
         auto ver = mod->version();
         if (ver.isEmpty() && meta != nullptr)
-- 
cgit 


From 049b02cee46358a3d1dd13769e2c6f4ba27bc55e Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 22 Jun 2023 21:06:01 +0300
Subject: finished up the curesforge export

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 28 +++++++++++-----------
 launcher/modplatform/flame/FlamePackExportTask.h   | 10 ++------
 launcher/ui/dialogs/ExportMrPackDialog.cpp         | 20 +++++++++++-----
 launcher/ui/dialogs/ExportMrPackDialog.ui          | 14 +++++++++--
 4 files changed, 42 insertions(+), 30 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 1ae13f72..4ac2c8ab 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -28,20 +28,21 @@
 #include "MMCZip.h"
 #include "minecraft/PackProfile.h"
 #include "minecraft/mod/ModFolderModel.h"
+#include "modplatform/ModIndex.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 QString& author,
                                          const QVariant& projectID,
                                          InstancePtr instance,
                                          const QString& output,
                                          MMCZip::FilterFunction filter)
     : name(name)
     , version(version)
+    , author(author)
     , projectID(projectID)
     , instance(instance)
     , mcInstance(dynamic_cast<MinecraftInstance*>(instance.get()))
@@ -193,28 +194,27 @@ QByteArray FlamePackExportTask::generateIndex()
 
         QJsonObject loader;
         if (quilt != nullptr)
-            loader["id"] = quilt->getName();
+            loader["id"] = "quilt-" + quilt->getVersion();
         else if (fabric != nullptr)
-            loader["id"] = fabric->getName();
+            loader["id"] = "fabric-" + fabric->getVersion();
         else if (forge != nullptr)
-            loader["id"] = forge->getName();
+            loader["id"] = "forge-" + forge->getVersion();
         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();
+    for (auto mod : mods) {
+        auto meta = mod->metadata();
+        if (meta == nullptr || meta->provider != ModPlatform::ResourceProvider::FLAME)
+            continue;
+        resolvedFiles[gameRoot.relativeFilePath(mod->fileinfo().absoluteFilePath())] = {};
 
         QJsonObject file;
-        file["projectID"] = value.projectID.toInt();
-        file["fileID"] = value.fileID.toInt();
-        file["required"] = value.required;
+        file["projectID"] = meta->project_id.toInt();
+        file["fileID"] = meta->file_id.toInt();
+        file["required"] = true;
         files << file;
     }
     obj["files"] = files;
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index 83927099..c3cda926 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -29,6 +29,7 @@ class FlamePackExportTask : public Task {
    public:
     FlamePackExportTask(const QString& name,
                         const QString& version,
+                        const QString& author,
                         const QVariant& projectID,
                         InstancePtr instance,
                         const QString& output,
@@ -39,13 +40,6 @@ class FlamePackExportTask : public Task {
     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
@@ -60,7 +54,7 @@ class FlamePackExportTask : public Task {
     typedef std::optional<QString> BuildZipResult;
 
     QFileInfoList files;
-    QMap<QString, ResolvedFile> resolvedFiles;
+    QMap<QString, QString> resolvedFiles;
     Task::Ptr task;
     QFuture<BuildZipResult> buildZipFuture;
     QFutureWatcher<BuildZipResult> buildZipWatcher;
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.cpp b/launcher/ui/dialogs/ExportMrPackDialog.cpp
index 16ef526a..aaa528aa 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportMrPackDialog.cpp
@@ -39,10 +39,13 @@ ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent, Mo
 {
     ui->setupUi(this);
     ui->name->setText(instance->name());
-    if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
+    if (m_provider == ModPlatform::ResourceProvider::MODRINTH) {
         ui->summary->setText(instance->notes().split(QRegularExpression("\\r?\\n"))[0]);
-    else
+        ui->author->hide();
+        ui->authorLabel->hide();
+    } else {
         ui->summaryLabel->setText("ProjectID");
+    }
 
     // ensure a valid pack is generated
     // the name and version fields mustn't be empty
@@ -96,9 +99,14 @@ void ExportMrPackDialog::done(int result)
 {
     if (result == Accepted) {
         const QString filename = FS::RemoveInvalidFilenameChars(ui->name->text());
-        const QString output = QFileDialog::getSaveFileName(this, tr("Export %1").arg(ui->name->text()),
-                                                            FS::PathCombine(QDir::homePath(), filename + ".mrpack"),
-                                                            "Modrinth pack (*.mrpack *.zip)", nullptr);
+        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;
@@ -107,7 +115,7 @@ void ExportMrPackDialog::done(int result)
             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,
+            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,
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.ui b/launcher/ui/dialogs/ExportMrPackDialog.ui
index 9a789737..59ecb17c 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.ui
+++ b/launcher/ui/dialogs/ExportMrPackDialog.ui
@@ -24,7 +24,7 @@
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="3" column="0">
-       <widget class="QLabel" name="versionLabel">
+       <widget class="QLabel" name="summaryLabel">
         <property name="text">
          <string>Summary</string>
         </property>
@@ -41,7 +41,7 @@
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="summaryLabel">
+       <widget class="QLabel" name="versionLabel">
         <property name="text">
          <string>Version</string>
         </property>
@@ -57,6 +57,16 @@
         </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>
-- 
cgit 


From 85495c794de2b7c9ae64bbf43156b3e4e6ecfed0 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 22 Jun 2023 21:12:02 +0300
Subject: changed map tipe

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 4ac2c8ab..6114f1b1 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -209,7 +209,7 @@ QByteArray FlamePackExportTask::generateIndex()
         auto meta = mod->metadata();
         if (meta == nullptr || meta->provider != ModPlatform::ResourceProvider::FLAME)
             continue;
-        resolvedFiles[gameRoot.relativeFilePath(mod->fileinfo().absoluteFilePath())] = {};
+        resolvedFiles[gameRoot.relativeFilePath(mod->fileinfo().absoluteFilePath())] = true;
 
         QJsonObject file;
         file["projectID"] = meta->project_id.toInt();
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index c3cda926..370cd67e 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -54,7 +54,7 @@ class FlamePackExportTask : public Task {
     typedef std::optional<QString> BuildZipResult;
 
     QFileInfoList files;
-    QMap<QString, QString> resolvedFiles;
+    QMap<QString, bool> resolvedFiles;
     Task::Ptr task;
     QFuture<BuildZipResult> buildZipFuture;
     QFutureWatcher<BuildZipResult> buildZipWatcher;
-- 
cgit 


From 0a566318315c4e1566cb4ef7c99321a025e998a2 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 23 Jun 2023 19:35:41 +0300
Subject: Added curseforge search

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 130 ++++++++++++++++++---
 launcher/modplatform/flame/FlamePackExportTask.h   |  13 ++-
 launcher/ui/dialogs/ExportMrPackDialog.cpp         |   5 +-
 3 files changed, 133 insertions(+), 15 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 6114f1b1..7130b502 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -24,12 +24,15 @@
 #include <QFileInfo>
 #include <QMessageBox>
 #include <QtConcurrentRun>
+#include <memory>
 #include "Json.h"
 #include "MMCZip.h"
 #include "minecraft/PackProfile.h"
+#include "minecraft/mod/ModDetails.h"
 #include "minecraft/mod/ModFolderModel.h"
 #include "modplatform/ModIndex.h"
 #include "modplatform/helpers/ExportModsToStringTask.h"
+#include "modplatform/helpers/HashUtils.h"
 
 const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}({authors})</a></li>";
 
@@ -88,13 +91,118 @@ void FlamePackExportTask::collectFiles()
         return;
     }
 
+    pendingHashes.clear();
     resolvedFiles.clear();
 
-    mcInstance->loaderModList()->update();
-    connect(mcInstance->loaderModList().get(), &ModFolderModel::updateFinished, this, [this]() {
-        mods = mcInstance->loaderModList()->allMods();
+    if (mcInstance) {
+        mcInstance->loaderModList()->update();
+        connect(mcInstance->loaderModList().get(), &ModFolderModel::updateFinished, this, [this]() {
+            mods = mcInstance->loaderModList()->allMods();
+            collectHashes();
+        });
+    } else
+        collectHashes();
+}
+
+void FlamePackExportTask::collectHashes()
+{
+    ConcurrentTask::Ptr hashing_task(new ConcurrentTask(this, "MakeHashesTask", 10));
+    for (auto* mod : mods) {
+        if (!mod || !mod->valid() || mod->type() == ResourceType::FOLDER)
+            continue;
+        if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) {
+            resolvedFiles.insert(mod->fileinfo().absoluteFilePath(),
+                                 { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled() });
+            continue;
+        }
+
+        auto hash_task = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath());
+        connect(hash_task.get(), &Task::succeeded, [this, hash_task, mod] { pendingHashes.insert(hash_task->getResult(), mod); });
+        connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
+        connect(hash_task.get(), &Task::finished, [hash_task] { hash_task->deleteLater(); });
+        hashing_task->addTask(hash_task);
+    }
+    connect(hashing_task.get(), &Task::succeeded, this, &FlamePackExportTask::makeApiRequest);
+    connect(hashing_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
+    connect(hashing_task.get(), &Task::finished, [hashing_task] { hashing_task->deleteLater(); });
+    hashing_task->start();
+}
+
+void FlamePackExportTask::makeApiRequest()
+{
+    setAbortable(true);
+    if (pendingHashes.isEmpty()) {
+        buildZip();
+        return;
+    }
+
+    auto response = std::make_shared<QByteArray>();
+
+    QList<uint> fingerprints;
+    for (auto& murmur : pendingHashes.keys()) {
+        fingerprints.push_back(murmur.toUInt());
+    }
+
+    auto task = api.matchFingerprints(fingerprints, response.get());
+
+    connect(task.get(), &Task::succeeded, this, [this, response] {
+        QJsonParseError parse_error{};
+        QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
+        if (parse_error.error != QJsonParseError::NoError) {
+            qWarning() << "Error while parsing JSON response from Modrinth::CurrentVersions at " << parse_error.offset
+                       << " reason: " << parse_error.errorString();
+            qWarning() << *response;
+
+            failed(parse_error.errorString());
+            return;
+        }
+
+        try {
+            auto doc_obj = Json::requireObject(doc);
+            auto data_obj = Json::requireObject(doc_obj, "data");
+            auto data_arr = Json::requireArray(data_obj, "exactMatches");
+
+            if (data_arr.isEmpty()) {
+                qWarning() << "No matches found for fingerprint search!";
+
+                return;
+            }
+
+            for (auto match : data_arr) {
+                auto match_obj = Json::ensureObject(match, {});
+                auto file_obj = Json::ensureObject(match_obj, "file", {});
+
+                if (match_obj.isEmpty() || file_obj.isEmpty()) {
+                    qWarning() << "Fingerprint match is empty!";
+
+                    return;
+                }
+
+                auto fingerprint = QString::number(Json::ensureVariant(file_obj, "fileFingerprint").toUInt());
+                auto mod = pendingHashes.find(fingerprint);
+                if (mod == pendingHashes.end()) {
+                    qWarning() << "Invalid fingerprint from the API response.";
+                    continue;
+                }
+
+                setStatus(tr("Parsing API response from CurseForge for '%1'...").arg((*mod)->name()));
+
+                resolvedFiles.insert(
+                    mod.value()->fileinfo().absoluteFilePath(),
+                    { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "modId"), mod.value()->enabled() });
+            }
+
+        } catch (Json::JsonException& e) {
+            qDebug() << e.cause();
+            qDebug() << doc;
+        }
+        pendingHashes.clear();
         buildZip();
     });
+
+    connect(task.get(), &NetJob::finished, [task]() { task->deleteLater(); });
+    connect(task.get(), &NetJob::failed, this, &FlamePackExportTask::emitFailed);
+    task->start();
 }
 
 void FlamePackExportTask::buildZip()
@@ -177,7 +285,8 @@ QByteArray FlamePackExportTask::generateIndex()
     obj["name"] = name;
     obj["version"] = version;
     obj["author"] = author;
-    obj["projectID"] = projectID.toInt();
+    if (projectID.toInt() != 0)
+        obj["projectID"] = projectID.toInt();
     obj["overrides"] = "overrides";
     if (mcInstance) {
         QJsonObject version;
@@ -205,16 +314,11 @@ QByteArray FlamePackExportTask::generateIndex()
     }
 
     QJsonArray files;
-    for (auto mod : mods) {
-        auto meta = mod->metadata();
-        if (meta == nullptr || meta->provider != ModPlatform::ResourceProvider::FLAME)
-            continue;
-        resolvedFiles[gameRoot.relativeFilePath(mod->fileinfo().absoluteFilePath())] = true;
-
+    for (auto mod : resolvedFiles) {
         QJsonObject file;
-        file["projectID"] = meta->project_id.toInt();
-        file["fileID"] = meta->file_id.toInt();
-        file["required"] = true;
+        file["projectID"] = mod.addonId;
+        file["fileID"] = mod.version;
+        file["required"] = mod.enabled;
         files << file;
     }
     obj["files"] = files;
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index 370cd67e..58f66cc5 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -23,6 +23,7 @@
 #include "BaseInstance.h"
 #include "MMCZip.h"
 #include "minecraft/MinecraftInstance.h"
+#include "modplatform/flame/FlameAPI.h"
 #include "tasks/Task.h"
 
 class FlamePackExportTask : public Task {
@@ -52,15 +53,25 @@ class FlamePackExportTask : public Task {
     const MMCZip::FilterFunction filter;
 
     typedef std::optional<QString> BuildZipResult;
+    struct ResolvedFile {
+        int addonId;
+        int version;
+        bool enabled;
+    };
+
+    FlameAPI api;
 
     QFileInfoList files;
-    QMap<QString, bool> resolvedFiles;
+    QMap<QString, Mod*> pendingHashes;
+    QMap<QString, ResolvedFile> resolvedFiles;
     Task::Ptr task;
     QFuture<BuildZipResult> buildZipFuture;
     QFutureWatcher<BuildZipResult> buildZipWatcher;
     QList<Mod*> mods;
 
     void collectFiles();
+    void collectHashes();
+    void makeApiRequest();
     void buildZip();
     void finish();
 
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.cpp b/launcher/ui/dialogs/ExportMrPackDialog.cpp
index aaa528aa..3711bb8f 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportMrPackDialog.cpp
@@ -44,6 +44,8 @@ ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent, Mo
         ui->author->hide();
         ui->authorLabel->hide();
     } else {
+        setWindowTitle("Export CurseForge Pack");
+        ui->version->setText("");
         ui->summaryLabel->setText("ProjectID");
     }
 
@@ -137,6 +139,7 @@ void ExportMrPackDialog::done(int result)
 
 void ExportMrPackDialog::validate()
 {
-    const bool invalid = ui->name->text().isEmpty() || ui->version->text().isEmpty();
+    const bool invalid =
+        ui->name->text().isEmpty() || ((m_provider == ModPlatform::ResourceProvider::MODRINTH) && ui->version->text().isEmpty());
     ui->buttonBox->button(QDialogButtonBox::Ok)->setDisabled(invalid);
 }
-- 
cgit 


From 222a10891c103d1357448d6aaff5da8d94e576af Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 23 Jun 2023 19:41:55 +0300
Subject: Fixed merge

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 7130b502..28c62f53 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -143,7 +143,7 @@ void FlamePackExportTask::makeApiRequest()
         fingerprints.push_back(murmur.toUInt());
     }
 
-    auto task = api.matchFingerprints(fingerprints, response.get());
+    auto task = api.matchFingerprints(fingerprints, response);
 
     connect(task.get(), &Task::succeeded, this, [this, response] {
         QJsonParseError parse_error{};
-- 
cgit 


From 823cd3862d15f8e9d47cdc5fc8662a20f774567a Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 23 Jun 2023 22:41:01 +0300
Subject: Fixed hash checking

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 41 +++++++++++++---------
 launcher/modplatform/flame/FlamePackExportTask.h   |  5 ++-
 launcher/modplatform/helpers/HashUtils.cpp         |  2 ++
 3 files changed, 29 insertions(+), 19 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 28c62f53..880d4324 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -28,11 +28,11 @@
 #include "Json.h"
 #include "MMCZip.h"
 #include "minecraft/PackProfile.h"
-#include "minecraft/mod/ModDetails.h"
 #include "minecraft/mod/ModFolderModel.h"
 #include "modplatform/ModIndex.h"
 #include "modplatform/helpers/ExportModsToStringTask.h"
 #include "modplatform/helpers/HashUtils.h"
+#include "tasks/Task.h"
 
 const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}({authors})</a></li>";
 
@@ -94,43 +94,51 @@ void FlamePackExportTask::collectFiles()
     pendingHashes.clear();
     resolvedFiles.clear();
 
-    if (mcInstance) {
+    if (mcInstance != nullptr) {
+        connect(mcInstance->loaderModList().get(), &ModFolderModel::updateFinished, this, &FlamePackExportTask::collectHashes);
         mcInstance->loaderModList()->update();
-        connect(mcInstance->loaderModList().get(), &ModFolderModel::updateFinished, this, [this]() {
-            mods = mcInstance->loaderModList()->allMods();
-            collectHashes();
-        });
     } else
         collectHashes();
 }
 
 void FlamePackExportTask::collectHashes()
 {
+    setAbortable(true);
+    setStatus(tr("Find file hashes..."));
+    auto mods = mcInstance->loaderModList()->allMods();
     ConcurrentTask::Ptr hashing_task(new ConcurrentTask(this, "MakeHashesTask", 10));
+    task.reset(hashing_task);
+    setProgress(0, mods.count());
     for (auto* mod : mods) {
-        if (!mod || !mod->valid() || mod->type() == ResourceType::FOLDER)
+        if (!mod || mod->type() == ResourceType::FOLDER) {
+            setProgress(m_progress + 1, mods.count());
             continue;
+        }
         if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) {
             resolvedFiles.insert(mod->fileinfo().absoluteFilePath(),
                                  { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled() });
+            setProgress(m_progress + 1, mods.count());
             continue;
         }
 
         auto hash_task = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath());
-        connect(hash_task.get(), &Task::succeeded, [this, hash_task, mod] { pendingHashes.insert(hash_task->getResult(), mod); });
+        connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, mods](QString hash) {
+            if (m_state == Task::State::Running) {
+                setProgress(m_progress + 1, mods.count());
+                pendingHashes.insert(hash, mod);
+            }
+        });
         connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
-        connect(hash_task.get(), &Task::finished, [hash_task] { hash_task->deleteLater(); });
         hashing_task->addTask(hash_task);
     }
     connect(hashing_task.get(), &Task::succeeded, this, &FlamePackExportTask::makeApiRequest);
     connect(hashing_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
-    connect(hashing_task.get(), &Task::finished, [hashing_task] { hashing_task->deleteLater(); });
     hashing_task->start();
 }
 
 void FlamePackExportTask::makeApiRequest()
 {
-    setAbortable(true);
+    setStatus(tr("Find versions for hashes..."));
     if (pendingHashes.isEmpty()) {
         buildZip();
         return;
@@ -143,7 +151,7 @@ void FlamePackExportTask::makeApiRequest()
         fingerprints.push_back(murmur.toUInt());
     }
 
-    auto task = api.matchFingerprints(fingerprints, response);
+    task.reset(api.matchFingerprints(fingerprints, response));
 
     connect(task.get(), &Task::succeeded, this, [this, response] {
         QJsonParseError parse_error{};
@@ -167,8 +175,9 @@ void FlamePackExportTask::makeApiRequest()
 
                 return;
             }
-
+            size_t progress = 0;
             for (auto match : data_arr) {
+                setProgress(progress++, data_arr.count());
                 auto match_obj = Json::ensureObject(match, {});
                 auto file_obj = Json::ensureObject(match_obj, "file", {});
 
@@ -200,7 +209,6 @@ void FlamePackExportTask::makeApiRequest()
         buildZip();
     });
 
-    connect(task.get(), &NetJob::finished, [task]() { task->deleteLater(); });
     connect(task.get(), &NetJob::failed, this, &FlamePackExportTask::emitFailed);
     task->start();
 }
@@ -231,7 +239,7 @@ void FlamePackExportTask::buildZip()
             QFile::remove(output);
             return BuildZipResult(tr("Could not create index"));
         }
-        QString content = ExportToString::ExportModsToStringTask(mods, TEMPLATE);
+        QString content = ExportToString::ExportModsToStringTask(mcInstance->loaderModList()->allMods(), TEMPLATE);
         content = "<ul>" + content + "</ul>";
         modlist.write(content.toUtf8());
 
@@ -244,7 +252,8 @@ void FlamePackExportTask::buildZip()
 
             setProgress(progress, files.length());
             const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
-            if (!resolvedFiles.contains(relative) && !JlCompress::compressFile(&zip, file.absoluteFilePath(), "overrides/" + relative)) {
+            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));
             }
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index 58f66cc5..f0069678 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -62,12 +62,11 @@ class FlamePackExportTask : public Task {
     FlameAPI api;
 
     QFileInfoList files;
-    QMap<QString, Mod*> pendingHashes;
-    QMap<QString, ResolvedFile> resolvedFiles;
+    QMap<QString, Mod*> pendingHashes{};
+    QMap<QString, ResolvedFile> resolvedFiles{};
     Task::Ptr task;
     QFuture<BuildZipResult> buildZipFuture;
     QFutureWatcher<BuildZipResult> buildZipWatcher;
-    QList<Mod*> mods;
 
     void collectFiles();
     void collectHashes();
diff --git a/launcher/modplatform/helpers/HashUtils.cpp b/launcher/modplatform/helpers/HashUtils.cpp
index 7d188a2f..6ff1d171 100644
--- a/launcher/modplatform/helpers/HashUtils.cpp
+++ b/launcher/modplatform/helpers/HashUtils.cpp
@@ -89,6 +89,7 @@ void FlameHasher::executeTask()
         emitFailed("Empty hash!");
     } else {
         emitSucceeded();
+        emit resultsReady(m_hash);
     }
 }
 
@@ -120,6 +121,7 @@ void BlockedModHasher::executeTask()
         emitFailed("Empty hash!");
     } else {
         emitSucceeded();
+        emit resultsReady(m_hash);
     }
 }
 
-- 
cgit 


From cf94adb363c1ae791ebd6f0149899f63c78bfb1b Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 01:05:49 +0300
Subject: Added some warnings

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/minecraft/mod/Mod.cpp                     |   7 ++
 launcher/minecraft/mod/Mod.h                       |   1 +
 launcher/modplatform/ModIndex.cpp                  |   9 +-
 launcher/modplatform/ModIndex.h                    |   1 +
 launcher/modplatform/flame/FlamePackExportTask.cpp | 124 ++++++++++++++++++---
 launcher/modplatform/flame/FlamePackExportTask.h   |   7 ++
 .../modplatform/helpers/ExportModsToStringTask.cpp |  22 +---
 launcher/ui/MainWindow.cpp                         |  13 ++-
 launcher/ui/dialogs/ExportMrPackDialog.cpp         |   4 +-
 launcher/ui/dialogs/ExportMrPackDialog.ui          |   7 ++
 10 files changed, 158 insertions(+), 37 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index e613ddeb..e93ff8bc 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -166,6 +166,13 @@ auto Mod::homeurl() const -> QString
     return details().homeurl;
 }
 
+auto Mod::metaurl() const -> QString
+{
+    if (metadata() == nullptr)
+        return homeurl();
+    return ModPlatform::getMetaURL(metadata()->provider, metadata()->slug);
+}
+
 auto Mod::description() const -> QString
 {
     return details().description;
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index d4e419f4..d6272f4d 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -70,6 +70,7 @@ public:
     auto provider()    const -> std::optional<QString>;
     auto licenses()     const -> const QList<ModLicense>&;
     auto issueTracker() const -> QString;
+    auto metaurl()     const -> QString;
 
     /** Get the intneral path to the mod's icon file*/
     QString iconPath() const { return m_local_details.icon_file; };
diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index 6a507caf..c68333c5 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -70,11 +70,18 @@ auto ProviderCapabilities::hash(ResourceProvider p, QIODevice* device, QString t
     }
 
     QCryptographicHash hash(algo);
-    if(!hash.addData(device))
+    if (!hash.addData(device))
         qCritical() << "Failed to read JAR to create hash!";
 
     Q_ASSERT(hash.result().length() == hash.hashLength(algo));
     return { hash.result().toHex() };
 }
 
+QString getMetaURL(ResourceProvider provider, QString slug)
+{
+    return ((provider == ModPlatform::ResourceProvider::FLAME) ? "https://www.curseforge.com/minecraft/mc-mods/"
+                                                               : "https://modrinth.com/mod/") +
+           slug.remove(".pw.toml");
+}
+
 }  // namespace ModPlatform
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 82da2ab2..7d8199b3 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -118,6 +118,7 @@ struct IndexedPack {
         return std::any_of(versions.constBegin(), versions.constEnd(), [](auto const& v) { return v.is_currently_selected; });
     }
 };
+QString getMetaURL(ResourceProvider provider, QString slug);
 
 }  // namespace ModPlatform
 
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 880d4324..2f1201e1 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -24,13 +24,14 @@
 #include <QFileInfo>
 #include <QMessageBox>
 #include <QtConcurrentRun>
+#include <algorithm>
 #include <memory>
 #include "Json.h"
 #include "MMCZip.h"
 #include "minecraft/PackProfile.h"
 #include "minecraft/mod/ModFolderModel.h"
 #include "modplatform/ModIndex.h"
-#include "modplatform/helpers/ExportModsToStringTask.h"
+#include "modplatform/flame/FlameModIndex.h"
 #include "modplatform/helpers/HashUtils.h"
 #include "tasks/Task.h"
 
@@ -40,6 +41,7 @@ FlamePackExportTask::FlamePackExportTask(const QString& name,
                                          const QString& version,
                                          const QString& author,
                                          const QVariant& projectID,
+                                         const bool generateModList,
                                          InstancePtr instance,
                                          const QString& output,
                                          MMCZip::FilterFunction filter)
@@ -52,6 +54,7 @@ FlamePackExportTask::FlamePackExportTask(const QString& name,
     , gameRoot(instance->gameRoot())
     , output(output)
     , filter(filter)
+    , generateModList(generateModList)
 {}
 
 void FlamePackExportTask::executeTask()
@@ -116,7 +119,8 @@ void FlamePackExportTask::collectHashes()
         }
         if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) {
             resolvedFiles.insert(mod->fileinfo().absoluteFilePath(),
-                                 { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled() });
+                                 { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(),
+                                   mod->metadata()->name, mod->metadata()->slug, mod->authors().join(", ") });
             setProgress(m_progress + 1, mods.count());
             continue;
         }
@@ -195,10 +199,10 @@ void FlamePackExportTask::makeApiRequest()
                 }
 
                 setStatus(tr("Parsing API response from CurseForge for '%1'...").arg((*mod)->name()));
-
-                resolvedFiles.insert(
-                    mod.value()->fileinfo().absoluteFilePath(),
-                    { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "modId"), mod.value()->enabled() });
+                if (Json::ensureBoolean(file_obj, "isAvailable", false))
+                    resolvedFiles.insert(
+                        mod.value()->fileinfo().absoluteFilePath(),
+                        { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "id"), mod.value()->enabled() });
             }
 
         } catch (Json::JsonException& e) {
@@ -206,13 +210,94 @@ void FlamePackExportTask::makeApiRequest()
             qDebug() << doc;
         }
         pendingHashes.clear();
-        buildZip();
     });
-
+    connect(task.get(), &Task::finished, this, &FlamePackExportTask::getProjectsInfo);
     connect(task.get(), &NetJob::failed, this, &FlamePackExportTask::emitFailed);
     task->start();
 }
 
+void FlamePackExportTask::getProjectsInfo()
+{
+    if (!generateModList) {
+        buildZip();
+        return;
+    }
+    setStatus(tr("Find project info from curseforge..."));
+    QList<QString> addonIds;
+    for (auto resolved : resolvedFiles) {
+        if (resolved.slug.isEmpty()) {
+            addonIds << QString::number(resolved.addonId);
+        }
+    }
+
+    auto response = std::make_shared<QByteArray>();
+    Task::Ptr proj_task;
+
+    if (addonIds.isEmpty()) {
+        buildZip();
+        return;
+    } else if (addonIds.size() == 1) {
+        proj_task = api.getProject(*addonIds.begin(), response);
+    } else {
+        proj_task = api.getProjects(addonIds, response);
+    }
+
+    connect(proj_task.get(), &Task::succeeded, this, [this, response, addonIds] {
+        QJsonParseError parse_error{};
+        auto doc = QJsonDocument::fromJson(*response, &parse_error);
+        if (parse_error.error != QJsonParseError::NoError) {
+            qWarning() << "Error while parsing JSON response from Modrinth projects task at " << parse_error.offset
+                       << " reason: " << parse_error.errorString();
+            qWarning() << *response;
+            return;
+        }
+
+        try {
+            QJsonArray entries;
+            if (addonIds.size() == 1)
+                entries = { Json::requireObject(Json::requireObject(doc), "data") };
+            else
+                entries = Json::requireArray(Json::requireObject(doc), "data");
+
+            size_t progress = 0;
+            for (auto entry : entries) {
+                setProgress(progress++, entries.count());
+                auto entry_obj = Json::requireObject(entry);
+
+                try {
+                    setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(Json::requireString(entry_obj, "name")));
+
+                    ModPlatform::IndexedPack pack;
+                    FlameMod::loadIndexedPack(pack, entry_obj);
+                    for (auto key : resolvedFiles.keys()) {
+                        auto val = resolvedFiles.value(key);
+                        if (val.addonId == pack.addonId) {
+                            val.name = pack.name;
+                            val.slug = pack.slug;
+                            QStringList authors;
+                            for (auto author : pack.authors)
+                                authors << author.name;
+
+                            val.authors = authors.join(", ");
+                            resolvedFiles[key] = val;
+                        }
+                    }
+
+                } catch (Json::JsonException& e) {
+                    qDebug() << e.cause();
+                    qDebug() << entries;
+                }
+            }
+        } catch (Json::JsonException& e) {
+            qDebug() << e.cause();
+            qDebug() << doc;
+        }
+        buildZip();
+    });
+    task.reset(proj_task);
+    task->start();
+}
+
 void FlamePackExportTask::buildZip()
 {
     setStatus(tr("Adding files..."));
@@ -234,14 +319,23 @@ void FlamePackExportTask::buildZip()
         }
         indexFile.write(generateIndex());
 
-        QuaZipFile modlist(&zip);
-        if (!modlist.open(QIODevice::WriteOnly, QuaZipNewInfo("modlist.html"))) {
-            QFile::remove(output);
-            return BuildZipResult(tr("Could not create index"));
+        if (generateModList) {
+            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) {
+                content += QString(TEMPLATE)
+                               .replace("{name}", mod.name)
+                               .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug))
+                               .replace("{authors}", mod.authors) +
+                           "\n";
+            }
+            content = "<ul>" + content + "</ul>";
+            modlist.write(content.toUtf8());
         }
-        QString content = ExportToString::ExportModsToStringTask(mcInstance->loaderModList()->allMods(), TEMPLATE);
-        content = "<ul>" + content + "</ul>";
-        modlist.write(content.toUtf8());
 
         size_t progress = 0;
         for (const QFileInfo& file : files) {
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index f0069678..7f27e0d0 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -32,6 +32,7 @@ class FlamePackExportTask : public Task {
                         const QString& version,
                         const QString& author,
                         const QVariant& projectID,
+                        const bool generateModList,
                         InstancePtr instance,
                         const QString& output,
                         MMCZip::FilterFunction filter);
@@ -51,12 +52,17 @@ class FlamePackExportTask : public Task {
     const QDir gameRoot;
     const QString output;
     const MMCZip::FilterFunction filter;
+    const bool generateModList;
 
     typedef std::optional<QString> BuildZipResult;
     struct ResolvedFile {
         int addonId;
         int version;
         bool enabled;
+
+        QString name;
+        QString slug;
+        QString authors;
     };
 
     FlameAPI api;
@@ -71,6 +77,7 @@ class FlamePackExportTask : public Task {
     void collectFiles();
     void collectHashes();
     void makeApiRequest();
+    void getProjectsInfo();
     void buildZip();
     void finish();
 
diff --git a/launcher/modplatform/helpers/ExportModsToStringTask.cpp b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
index e7be5ce1..03e1f4ba 100644
--- a/launcher/modplatform/helpers/ExportModsToStringTask.cpp
+++ b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
@@ -19,6 +19,7 @@
 #include "modplatform/ModIndex.h"
 
 namespace ExportToString {
+
 QString ExportModsToStringTask(QList<Mod*> mods, Formats format, OptionalData extraData)
 {
     switch (format) {
@@ -28,12 +29,7 @@ QString ExportModsToStringTask(QList<Mod*> mods, Formats format, OptionalData ex
                 auto meta = mod->metadata();
                 auto modName = mod->name();
                 if (extraData & Url) {
-                    auto url = mod->homeurl();
-                    if (meta != nullptr) {
-                        url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
-                                                                                      : "https://modrinth.com/mod/") +
-                              meta->slug.remove(".pw.toml");
-                    }
+                    auto url = mod->metaurl();
                     if (!url.isEmpty())
                         modName = QString("<a href=\"%1\">%2</a>").arg(url, modName);
                 }
@@ -57,12 +53,7 @@ QString ExportModsToStringTask(QList<Mod*> mods, Formats format, OptionalData ex
                 auto meta = mod->metadata();
                 auto modName = mod->name();
                 if (extraData & Url) {
-                    auto url = mod->homeurl();
-                    if (meta != nullptr) {
-                        url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
-                                                                                      : "https://modrinth.com/mod/") +
-                              meta->slug.remove(".pw.toml");
-                    }
+                    auto url = mod->metaurl();
                     if (!url.isEmpty())
                         modName = QString("[%1](%2)").arg(modName, url);
                 }
@@ -93,12 +84,7 @@ QString ExportModsToStringTask(QList<Mod*> mods, QString lineTemplate)
         auto meta = mod->metadata();
         auto modName = mod->name();
 
-        auto url = mod->homeurl();
-        if (meta != nullptr) {
-            url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
-                                                                          : "https://modrinth.com/mod/") +
-                  meta->slug.remove(".pw.toml");
-        }
+        auto url = mod->metaurl();
         auto ver = mod->version();
         if (ver.isEmpty() && meta != nullptr)
             ver = meta->version().toString();
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 0027d180..eb09efbc 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1420,8 +1420,17 @@ void MainWindow::on_actionExportInstanceMrPack_triggered()
 void MainWindow::on_actionExportInstanceFlamePack_triggered()
 {
     if (m_selectedInstance) {
-        ExportMrPackDialog dlg(m_selectedInstance, this, ModPlatform::ResourceProvider::FLAME);
-        dlg.exec();
+        auto instance = dynamic_cast<MinecraftInstance*>(m_selectedInstance.get());
+        if (instance) {
+            if (instance->getPackProfile()->getComponent("org.quiltmc.quilt-loader")) {
+                QMessageBox msgBox;
+                msgBox.setText(tr("Quilt is not yet supported by curseforge."));
+                msgBox.exec();
+                return;
+            }
+            ExportMrPackDialog dlg(m_selectedInstance, this, ModPlatform::ResourceProvider::FLAME);
+            dlg.exec();
+        }
     }
 }
 
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.cpp b/launcher/ui/dialogs/ExportMrPackDialog.cpp
index 3711bb8f..edd2148a 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportMrPackDialog.cpp
@@ -43,6 +43,7 @@ ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent, Mo
         ui->summary->setText(instance->notes().split(QRegularExpression("\\r?\\n"))[0]);
         ui->author->hide();
         ui->authorLabel->hide();
+        ui->gnerateModlist->hide();
     } else {
         setWindowTitle("Export CurseForge Pack");
         ui->version->setText("");
@@ -117,7 +118,8 @@ void ExportMrPackDialog::done(int result)
             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,
+            task = new FlamePackExportTask(ui->name->text(), ui->version->text(), ui->author->text(), ui->summary->text(),
+                                           ui->gnerateModlist->isChecked(), instance, output,
                                            [this](const QString& path) { return proxy->blockedPaths().covers(path); });
 
         connect(task, &Task::failed,
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.ui b/launcher/ui/dialogs/ExportMrPackDialog.ui
index 59ecb17c..1b137eb4 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.ui
+++ b/launcher/ui/dialogs/ExportMrPackDialog.ui
@@ -67,6 +67,13 @@
       <item row="4" column="1">
        <widget class="QLineEdit" name="author"/>
       </item>
+      <item row="5" column="2">
+       <widget class="QCheckBox" name="gnerateModlist">
+        <property name="text">
+         <string>Generate modlist</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
-- 
cgit 


From cd1e8dc8cc87acf905ab3140efc48ef482973c7e Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 11:12:23 +0300
Subject: Removed modlist checkbox

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 36 +++++++++-------------
 launcher/modplatform/flame/FlamePackExportTask.h   |  2 --
 launcher/ui/dialogs/ExportMrPackDialog.cpp         |  4 +--
 launcher/ui/dialogs/ExportMrPackDialog.ui          |  7 -----
 4 files changed, 15 insertions(+), 34 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 2f1201e1..927b2e46 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -41,7 +41,6 @@ FlamePackExportTask::FlamePackExportTask(const QString& name,
                                          const QString& version,
                                          const QString& author,
                                          const QVariant& projectID,
-                                         const bool generateModList,
                                          InstancePtr instance,
                                          const QString& output,
                                          MMCZip::FilterFunction filter)
@@ -54,7 +53,6 @@ FlamePackExportTask::FlamePackExportTask(const QString& name,
     , gameRoot(instance->gameRoot())
     , output(output)
     , filter(filter)
-    , generateModList(generateModList)
 {}
 
 void FlamePackExportTask::executeTask()
@@ -218,10 +216,6 @@ void FlamePackExportTask::makeApiRequest()
 
 void FlamePackExportTask::getProjectsInfo()
 {
-    if (!generateModList) {
-        buildZip();
-        return;
-    }
     setStatus(tr("Find project info from curseforge..."));
     QList<QString> addonIds;
     for (auto resolved : resolvedFiles) {
@@ -319,23 +313,21 @@ void FlamePackExportTask::buildZip()
         }
         indexFile.write(generateIndex());
 
-        if (generateModList) {
-            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) {
-                content += QString(TEMPLATE)
-                               .replace("{name}", mod.name)
-                               .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug))
-                               .replace("{authors}", mod.authors) +
-                           "\n";
-            }
-            content = "<ul>" + content + "</ul>";
-            modlist.write(content.toUtf8());
+        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) {
+            content += QString(TEMPLATE)
+                           .replace("{name}", mod.name)
+                           .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug))
+                           .replace("{authors}", mod.authors) +
+                       "\n";
         }
+        content = "<ul>" + content + "</ul>";
+        modlist.write(content.toUtf8());
 
         size_t progress = 0;
         for (const QFileInfo& file : files) {
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index 7f27e0d0..9ec9a230 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -32,7 +32,6 @@ class FlamePackExportTask : public Task {
                         const QString& version,
                         const QString& author,
                         const QVariant& projectID,
-                        const bool generateModList,
                         InstancePtr instance,
                         const QString& output,
                         MMCZip::FilterFunction filter);
@@ -52,7 +51,6 @@ class FlamePackExportTask : public Task {
     const QDir gameRoot;
     const QString output;
     const MMCZip::FilterFunction filter;
-    const bool generateModList;
 
     typedef std::optional<QString> BuildZipResult;
     struct ResolvedFile {
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.cpp b/launcher/ui/dialogs/ExportMrPackDialog.cpp
index 3c593d20..8a95997b 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportMrPackDialog.cpp
@@ -43,7 +43,6 @@ ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent, Mo
         ui->summary->setText(instance->notes().split(QRegularExpression("\\r?\\n"))[0]);
         ui->author->hide();
         ui->authorLabel->hide();
-        ui->gnerateModlist->hide();
     } else {
         setWindowTitle("Export CurseForge Pack");
         ui->version->setText("");
@@ -118,8 +117,7 @@ void ExportMrPackDialog::done(int result)
             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(),
-                                           ui->gnerateModlist->isChecked(), instance, output,
+            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,
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.ui b/launcher/ui/dialogs/ExportMrPackDialog.ui
index 1b137eb4..59ecb17c 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.ui
+++ b/launcher/ui/dialogs/ExportMrPackDialog.ui
@@ -67,13 +67,6 @@
       <item row="4" column="1">
        <widget class="QLineEdit" name="author"/>
       </item>
-      <item row="5" column="2">
-       <widget class="QCheckBox" name="gnerateModlist">
-        <property name="text">
-         <string>Generate modlist</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
-- 
cgit 


From a325d814e242ee450141088513d9cd282d79141f Mon Sep 17 00:00:00 2001
From: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 11:13:08 +0300
Subject: Update launcher/modplatform/flame/FlamePackExportTask.cpp

Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 927b2e46..cd242491 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -35,7 +35,7 @@
 #include "modplatform/helpers/HashUtils.h"
 #include "tasks/Task.h"
 
-const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}({authors})</a></li>";
+const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name} (by {authors})</a></li>";
 
 FlamePackExportTask::FlamePackExportTask(const QString& name,
                                          const QString& version,
-- 
cgit 


From 8939096db659d1df5c75b938fc011a24af36e488 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 13:24:40 +0300
Subject: Fixed windows build

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 927b2e46..2920cb86 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -197,7 +197,7 @@ void FlamePackExportTask::makeApiRequest()
                 }
 
                 setStatus(tr("Parsing API response from CurseForge for '%1'...").arg((*mod)->name()));
-                if (Json::ensureBoolean(file_obj, "isAvailable", false))
+                if (Json::ensureBoolean(file_obj, "isAvailable", false, "isAvailable"))
                     resolvedFiles.insert(
                         mod.value()->fileinfo().absoluteFilePath(),
                         { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "id"), mod.value()->enabled() });
-- 
cgit 


From 9804996db652eb719a0eb40c41157d0813372eb2 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 14:37:02 +0300
Subject: Added resource packs to export

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 0d7abc9f..45fc2e63 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -109,25 +109,42 @@ void FlamePackExportTask::collectHashes()
     auto mods = mcInstance->loaderModList()->allMods();
     ConcurrentTask::Ptr hashing_task(new ConcurrentTask(this, "MakeHashesTask", 10));
     task.reset(hashing_task);
-    setProgress(0, mods.count());
+    int totalProgres = mods.count();
+    setProgress(0, totalProgres);
     for (auto* mod : mods) {
         if (!mod || mod->type() == ResourceType::FOLDER) {
-            setProgress(m_progress + 1, mods.count());
+            setProgress(m_progress + 1, totalProgres);
             continue;
         }
         if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) {
             resolvedFiles.insert(mod->fileinfo().absoluteFilePath(),
                                  { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(),
                                    mod->metadata()->name, mod->metadata()->slug, mod->authors().join(", ") });
-            setProgress(m_progress + 1, mods.count());
+            setProgress(m_progress + 1, totalProgres);
             continue;
         }
 
         auto hash_task = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath());
-        connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, mods](QString hash) {
+        connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, totalProgres](QString hash) {
             if (m_state == Task::State::Running) {
-                setProgress(m_progress + 1, mods.count());
-                pendingHashes.insert(hash, mod);
+                setProgress(m_progress + 1, totalProgres);
+                pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled() });
+            }
+        });
+        connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
+        hashing_task->addTask(hash_task);
+    }
+
+    for (const QFileInfo& file : files) {
+        const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
+        if (!relative.endsWith(".zip") || !relative.startsWith("resourcepacks/"))
+            continue;
+        totalProgres++;
+        auto hash_task = Hashing::createFlameHasher(file.absoluteFilePath());
+        connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, relative, file, totalProgres](QString hash) {
+            if (m_state == Task::State::Running) {
+                setProgress(m_progress + 1, totalProgres);
+                pendingHashes.insert(hash, { relative, file.absoluteFilePath(), true });
             }
         });
         connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
@@ -196,11 +213,10 @@ void FlamePackExportTask::makeApiRequest()
                     continue;
                 }
 
-                setStatus(tr("Parsing API response from CurseForge for '%1'...").arg((*mod)->name()));
+                setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(mod->name));
                 if (Json::ensureBoolean(file_obj, "isAvailable", false, "isAvailable"))
-                    resolvedFiles.insert(
-                        mod.value()->fileinfo().absoluteFilePath(),
-                        { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "id"), mod.value()->enabled() });
+                    resolvedFiles.insert(mod->path,
+                                         { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "id"), mod->enabled });
             }
 
         } catch (Json::JsonException& e) {
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index 9ec9a230..629493d8 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -62,11 +62,16 @@ class FlamePackExportTask : public Task {
         QString slug;
         QString authors;
     };
+    struct HashInfo {
+        QString name;
+        QString path;
+        bool enabled;
+    };
 
     FlameAPI api;
 
     QFileInfoList files;
-    QMap<QString, Mod*> pendingHashes{};
+    QMap<QString, HashInfo> pendingHashes{};
     QMap<QString, ResolvedFile> resolvedFiles{};
     Task::Ptr task;
     QFuture<BuildZipResult> buildZipFuture;
-- 
cgit 


From 30ef5475c75514c08a4d1b2c8e4c6ec5abba41ea Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 14:50:05 +0300
Subject: Made sure CurseForge string is corect

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 2 +-
 launcher/ui/MainWindow.ui                          | 2 +-
 launcher/ui/dialogs/ExportMrPackDialog.cpp         | 2 +-
 launcher/ui/pages/global/LauncherPage.ui           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 45fc2e63..fb5bcc0b 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -232,7 +232,7 @@ void FlamePackExportTask::makeApiRequest()
 
 void FlamePackExportTask::getProjectsInfo()
 {
-    setStatus(tr("Find project info from curseforge..."));
+    setStatus(tr("Find project info from CurseForge..."));
     QList<QString> addonIds;
     for (auto resolved : resolvedFiles) {
         if (resolved.slug.isEmpty()) {
diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui
index 1cfb59cd..190219b9 100644
--- a/launcher/ui/MainWindow.ui
+++ b/launcher/ui/MainWindow.ui
@@ -484,7 +484,7 @@
     <iconset theme="flame"/>
    </property>
    <property name="text">
-    <string>Curseforge (zip)</string>
+    <string>CurseForge (zip)</string>
    </property>
   </action>
   <action name="actionCreateInstanceShortcut">
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.cpp b/launcher/ui/dialogs/ExportMrPackDialog.cpp
index 8a95997b..94987c7e 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportMrPackDialog.cpp
@@ -108,7 +108,7 @@ void ExportMrPackDialog::done(int result)
                                                   nullptr);
         else
             output = QFileDialog::getSaveFileName(this, tr("Export %1").arg(ui->name->text()),
-                                                  FS::PathCombine(QDir::homePath(), filename + ".zip"), "Curseforge pack (*.zip)", nullptr);
+                                                  FS::PathCombine(QDir::homePath(), filename + ".zip"), "CurseForge pack (*.zip)", nullptr);
 
         if (output.isEmpty())
             return;
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index d9116bfc..26408f44 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -169,7 +169,7 @@
           <item>
            <widget class="QCheckBox" name="metadataDisableBtn">
             <property name="toolTip">
-             <string>Disable using metadata provided by mod providers (like Modrinth or Curseforge) for mods.</string>
+             <string>Disable using metadata provided by mod providers (like Modrinth or CurseForge) for mods.</string>
             </property>
             <property name="text">
              <string>Disable using metadata for mods</string>
-- 
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/modplatform')

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 4a84084d9d605ae4fa9a8063f36bfdbcdc4c5c3d Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 15:02:00 +0300
Subject: Added condition for modlist

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 20 +++++++++++---------
 launcher/modplatform/flame/FlamePackExportTask.h   |  2 ++
 launcher/ui/dialogs/ExportPackDialog.cpp           |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index fb5bcc0b..dc407653 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -118,7 +118,7 @@ void FlamePackExportTask::collectHashes()
         }
         if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) {
             resolvedFiles.insert(mod->fileinfo().absoluteFilePath(),
-                                 { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(),
+                                 { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(), true,
                                    mod->metadata()->name, mod->metadata()->slug, mod->authors().join(", ") });
             setProgress(m_progress + 1, totalProgres);
             continue;
@@ -128,7 +128,7 @@ void FlamePackExportTask::collectHashes()
         connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, totalProgres](QString hash) {
             if (m_state == Task::State::Running) {
                 setProgress(m_progress + 1, totalProgres);
-                pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled() });
+                pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled(), true });
             }
         });
         connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
@@ -215,8 +215,8 @@ void FlamePackExportTask::makeApiRequest()
 
                 setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(mod->name));
                 if (Json::ensureBoolean(file_obj, "isAvailable", false, "isAvailable"))
-                    resolvedFiles.insert(mod->path,
-                                         { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "id"), mod->enabled });
+                    resolvedFiles.insert(mod->path, { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "id"),
+                                                      mod->enabled, mod->isMod });
             }
 
         } catch (Json::JsonException& e) {
@@ -336,11 +336,13 @@ void FlamePackExportTask::buildZip()
         }
         QString content = "";
         for (auto mod : resolvedFiles) {
-            content += QString(TEMPLATE)
-                           .replace("{name}", mod.name)
-                           .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug))
-                           .replace("{authors}", mod.authors) +
-                       "\n";
+            if (mod.isMod) {
+                content += QString(TEMPLATE)
+                               .replace("{name}", mod.name)
+                               .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug))
+                               .replace("{authors}", mod.authors) +
+                           "\n";
+            }
         }
         content = "<ul>" + content + "</ul>";
         modlist.write(content.toUtf8());
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index 629493d8..ee1f4e8d 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -57,6 +57,7 @@ class FlamePackExportTask : public Task {
         int addonId;
         int version;
         bool enabled;
+        bool isMod;
 
         QString name;
         QString slug;
@@ -66,6 +67,7 @@ class FlamePackExportTask : public Task {
         QString name;
         QString path;
         bool enabled;
+        bool isMod;
     };
 
     FlameAPI api;
diff --git a/launcher/ui/dialogs/ExportPackDialog.cpp b/launcher/ui/dialogs/ExportPackDialog.cpp
index 8e921f89..fb71f4a5 100644
--- a/launcher/ui/dialogs/ExportPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportPackDialog.cpp
@@ -22,7 +22,7 @@
 #include "modplatform/flame/FlamePackExportTask.h"
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui/dialogs/ProgressDialog.h"
-#include "ui_ExportMrPackDialog.h"
+#include "ui_ExportPackDialog.h"
 
 #include <QFileDialog>
 #include <QFileSystemModel>
-- 
cgit 


From 19cb6ad5883c59c27f954042025bf89d44bed096 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 15:04:18 +0300
Subject: Updated Modrinth esport messages

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index dc407653..837ded0f 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -157,12 +157,12 @@ void FlamePackExportTask::collectHashes()
 
 void FlamePackExportTask::makeApiRequest()
 {
-    setStatus(tr("Find versions for hashes..."));
     if (pendingHashes.isEmpty()) {
         buildZip();
         return;
     }
 
+    setStatus(tr("Find versions for hashes..."));
     auto response = std::make_shared<QByteArray>();
 
     QList<uint> fingerprints;
diff --git a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
index c607bb89..dd748687 100644
--- a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
@@ -64,7 +64,8 @@ bool ModrinthPackExportTask::abort()
 
     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.
+        // NOTE: Here we don't do `emitAborted()` because it will be done when `buildZipFuture` actually cancels, which may not occur
+        // immediately.
         return true;
     }
 
@@ -94,6 +95,7 @@ void ModrinthPackExportTask::collectFiles()
 
 void ModrinthPackExportTask::collectHashes()
 {
+    setStatus(tr("Find file hashes..."));
     for (const QFileInfo& file : files) {
         QCoreApplication::processEvents();
 
@@ -157,6 +159,7 @@ void ModrinthPackExportTask::makeApiRequest()
     if (pendingHashes.isEmpty())
         buildZip();
     else {
+        setStatus(tr("Find versions for hashes..."));
         auto response = std::make_shared<QByteArray>();
         task = api.currentVersions(pendingHashes.values(), "sha512", response);
         connect(task.get(), &NetJob::succeeded, [this, response]() { parseApiResponse(response); });
-- 
cgit 


From f825d7753afd6c00111c9ff9deedeee8ded5b27a Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 15:11:15 +0300
Subject: Updated copyright headers

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 837ded0f..2759ae09 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index ee1f4e8d..cf67ed5f 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
-- 
cgit 


From df932c65875a20fd95a47c3394a802d131e93993 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 20:22:18 +0300
Subject: Updated authors string in modlist

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 2759ae09..54294d7b 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -36,7 +36,7 @@
 #include "modplatform/helpers/HashUtils.h"
 #include "tasks/Task.h"
 
-const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name} (by {authors})</a></li>";
+const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}{authors}</a></li>";
 
 FlamePackExportTask::FlamePackExportTask(const QString& name,
                                          const QString& version,
@@ -338,11 +338,12 @@ void FlamePackExportTask::buildZip()
         QString content = "";
         for (auto mod : resolvedFiles) {
             if (mod.isMod) {
-                content += QString(TEMPLATE)
-                               .replace("{name}", mod.name)
-                               .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug))
-                               .replace("{authors}", mod.authors) +
-                           "\n";
+                auto line = QString(TEMPLATE)
+                                .replace("{name}", mod.name)
+                                .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug));
+                if (!mod.authors.isEmpty())
+                    line = line.replace("{authors}", QString(" (by {%1})").arg(mod.authors));
+                content += line + "\n";
             }
         }
         content = "<ul>" + content + "</ul>";
-- 
cgit 


From f0e4e07c05bdf68994c9d6a460f4ec4c03a2e627 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 20:43:45 +0300
Subject: Updated url function

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/minecraft/mod/Mod.cpp                     |  2 +-
 launcher/modplatform/ModIndex.cpp                  |  7 +++----
 launcher/modplatform/ModIndex.h                    |  2 +-
 launcher/modplatform/flame/FlamePackExportTask.cpp | 12 +++++-------
 4 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index e93ff8bc..d5b96bad 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -170,7 +170,7 @@ auto Mod::metaurl() const -> QString
 {
     if (metadata() == nullptr)
         return homeurl();
-    return ModPlatform::getMetaURL(metadata()->provider, metadata()->slug);
+    return ModPlatform::getMetaURL(metadata()->provider, metadata()->project_id);
 }
 
 auto Mod::description() const -> QString
diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index c68333c5..a1c4d891 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -77,11 +77,10 @@ auto ProviderCapabilities::hash(ResourceProvider p, QIODevice* device, QString t
     return { hash.result().toHex() };
 }
 
-QString getMetaURL(ResourceProvider provider, QString slug)
+QString getMetaURL(ResourceProvider provider, QVariant projectID)
 {
-    return ((provider == ModPlatform::ResourceProvider::FLAME) ? "https://www.curseforge.com/minecraft/mc-mods/"
-                                                               : "https://modrinth.com/mod/") +
-           slug.remove(".pw.toml");
+    return ((provider == ModPlatform::ResourceProvider::FLAME) ? "https://www.curseforge.com/projects/" : "https://modrinth.com/mod/") +
+           projectID.toString();
 }
 
 }  // namespace ModPlatform
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 83412169..773ee934 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -128,7 +128,7 @@ struct IndexedPack {
         return std::any_of(versions.constBegin(), versions.constEnd(), [](auto const& v) { return v.is_currently_selected; });
     }
 };
-QString getMetaURL(ResourceProvider provider, QString slug);
+QString getMetaURL(ResourceProvider provider, QVariant projectID);
 
 struct OverrideDep {
     QString quilt;
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 54294d7b..d729e977 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -36,7 +36,7 @@
 #include "modplatform/helpers/HashUtils.h"
 #include "tasks/Task.h"
 
-const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}{authors}</a></li>";
+const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}{authors}</a></li>\n";
 
 FlamePackExportTask::FlamePackExportTask(const QString& name,
                                          const QString& version,
@@ -338,12 +338,10 @@ void FlamePackExportTask::buildZip()
         QString content = "";
         for (auto mod : resolvedFiles) {
             if (mod.isMod) {
-                auto line = QString(TEMPLATE)
-                                .replace("{name}", mod.name)
-                                .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug));
-                if (!mod.authors.isEmpty())
-                    line = line.replace("{authors}", QString(" (by {%1})").arg(mod.authors));
-                content += line + "\n";
+                content += QString(TEMPLATE)
+                               .replace("{name}", mod.name)
+                               .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.addonId))
+                               .replace("{authors}", !mod.authors.isEmpty() ? QString(" (by {%1})").arg(mod.authors) : "");
             }
         }
         content = "<ul>" + content + "</ul>";
-- 
cgit 


From 69c21454ecf683b1794aec55ddad66d53d3afc7c Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 22:15:18 +0300
Subject: removed projectID

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp |  6 +-----
 launcher/modplatform/flame/FlamePackExportTask.h   |  2 --
 launcher/ui/dialogs/ExportPackDialog.cpp           |  6 ++----
 launcher/ui/dialogs/ExportPackDialog.ui            | 11 +----------
 4 files changed, 4 insertions(+), 21 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index d729e977..ac85a628 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -41,14 +41,12 @@ const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}{authors}
 FlamePackExportTask::FlamePackExportTask(const QString& name,
                                          const QString& version,
                                          const QString& author,
-                                         const QVariant& projectID,
                                          InstancePtr instance,
                                          const QString& output,
                                          MMCZip::FilterFunction filter)
     : name(name)
     , version(version)
     , author(author)
-    , projectID(projectID)
     , instance(instance)
     , mcInstance(dynamic_cast<MinecraftInstance*>(instance.get()))
     , gameRoot(instance->gameRoot())
@@ -341,7 +339,7 @@ void FlamePackExportTask::buildZip()
                 content += QString(TEMPLATE)
                                .replace("{name}", mod.name)
                                .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.addonId))
-                               .replace("{authors}", !mod.authors.isEmpty() ? QString(" (by {%1})").arg(mod.authors) : "");
+                               .replace("{authors}", !mod.authors.isEmpty() ? QString(" (by %1)").arg(mod.authors) : "");
             }
         }
         content = "<ul>" + content + "</ul>";
@@ -398,8 +396,6 @@ QByteArray FlamePackExportTask::generateIndex()
     obj["name"] = name;
     obj["version"] = version;
     obj["author"] = author;
-    if (projectID.toInt() != 0)
-        obj["projectID"] = projectID.toInt();
     obj["overrides"] = "overrides";
     if (mcInstance) {
         QJsonObject version;
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index cf67ed5f..5c8caa45 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -32,7 +32,6 @@ class FlamePackExportTask : public Task {
     FlamePackExportTask(const QString& name,
                         const QString& version,
                         const QString& author,
-                        const QVariant& projectID,
                         InstancePtr instance,
                         const QString& output,
                         MMCZip::FilterFunction filter);
@@ -46,7 +45,6 @@ class FlamePackExportTask : public Task {
 
     // inputs
     const QString name, version, author;
-    const QVariant projectID;
     const InstancePtr instance;
     MinecraftInstance* mcInstance;
     const QDir gameRoot;
diff --git a/launcher/ui/dialogs/ExportPackDialog.cpp b/launcher/ui/dialogs/ExportPackDialog.cpp
index fb71f4a5..ea364939 100644
--- a/launcher/ui/dialogs/ExportPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportPackDialog.cpp
@@ -41,12 +41,10 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla
     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");
+        ui->summaryLabel->setText("Author");
     }
 
     // ensure a valid pack is generated
@@ -117,7 +115,7 @@ void ExportPackDialog::done(int result)
             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,
+            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,
diff --git a/launcher/ui/dialogs/ExportPackDialog.ui b/launcher/ui/dialogs/ExportPackDialog.ui
index 5762508a..658e2199 100644
--- a/launcher/ui/dialogs/ExportPackDialog.ui
+++ b/launcher/ui/dialogs/ExportPackDialog.ui
@@ -57,16 +57,7 @@
         </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>
-- 
cgit 


From 932531c8ba1197e38dcd66c1ad146aeebc9ca177 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 24 Jun 2023 23:48:18 +0300
Subject: fixed authors

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 2 +-
 launcher/ui/dialogs/ExportPackDialog.cpp           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index ac85a628..e73f3de5 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -95,8 +95,8 @@ void FlamePackExportTask::collectFiles()
     resolvedFiles.clear();
 
     if (mcInstance != nullptr) {
-        connect(mcInstance->loaderModList().get(), &ModFolderModel::updateFinished, this, &FlamePackExportTask::collectHashes);
         mcInstance->loaderModList()->update();
+        connect(mcInstance->loaderModList().get(), &ModFolderModel::updateFinished, this, &FlamePackExportTask::collectHashes);
     } else
         collectHashes();
 }
diff --git a/launcher/ui/dialogs/ExportPackDialog.cpp b/launcher/ui/dialogs/ExportPackDialog.cpp
index ea364939..fd374246 100644
--- a/launcher/ui/dialogs/ExportPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportPackDialog.cpp
@@ -73,6 +73,7 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla
 
     MinecraftInstance* mcInstance = dynamic_cast<MinecraftInstance*>(instance.get());
     if (mcInstance) {
+        mcInstance->loaderModList()->update();
         const QDir index = mcInstance->loaderModList()->indexDir();
         if (index.exists())
             proxy->blockedPaths().insert(root.relativeFilePath(index.absolutePath()));
-- 
cgit 


From ce4a86fbcd0c891472b842e76066d285de3aef7b Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 25 Jun 2023 10:41:29 +0300
Subject: Made custom url function

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/minecraft/mod/Mod.cpp               |  7 +++++++
 launcher/minecraft/mod/Mod.h                 |  1 +
 launcher/modplatform/ModIndex.cpp            |  8 +++++++-
 launcher/modplatform/ModIndex.h              |  1 +
 launcher/ui/pages/instance/ModFolderPage.cpp | 18 +++++-------------
 launcher/ui/widgets/InfoFrame.cpp            | 21 +++------------------
 6 files changed, 24 insertions(+), 32 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index e613ddeb..d5b96bad 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -166,6 +166,13 @@ auto Mod::homeurl() const -> QString
     return details().homeurl;
 }
 
+auto Mod::metaurl() const -> QString
+{
+    if (metadata() == nullptr)
+        return homeurl();
+    return ModPlatform::getMetaURL(metadata()->provider, metadata()->project_id);
+}
+
 auto Mod::description() const -> QString
 {
     return details().description;
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index d4e419f4..d6272f4d 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -70,6 +70,7 @@ public:
     auto provider()    const -> std::optional<QString>;
     auto licenses()     const -> const QList<ModLicense>&;
     auto issueTracker() const -> QString;
+    auto metaurl()     const -> QString;
 
     /** Get the intneral path to the mod's icon file*/
     QString iconPath() const { return m_local_details.icon_file; };
diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index 6a507caf..a1c4d891 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -70,11 +70,17 @@ auto ProviderCapabilities::hash(ResourceProvider p, QIODevice* device, QString t
     }
 
     QCryptographicHash hash(algo);
-    if(!hash.addData(device))
+    if (!hash.addData(device))
         qCritical() << "Failed to read JAR to create hash!";
 
     Q_ASSERT(hash.result().length() == hash.hashLength(algo));
     return { hash.result().toHex() };
 }
 
+QString getMetaURL(ResourceProvider provider, QVariant projectID)
+{
+    return ((provider == ModPlatform::ResourceProvider::FLAME) ? "https://www.curseforge.com/projects/" : "https://modrinth.com/mod/") +
+           projectID.toString();
+}
+
 }  // namespace ModPlatform
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 3b0a03a1..3f51e700 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -144,6 +144,7 @@ inline auto getOverrideDeps() -> QList<OverrideDep>
              { "qvIfYCYJ", "P7dR8mSH", "API", ModPlatform::ResourceProvider::MODRINTH },
              { "lwVhp9o5", "Ha28R6CL", "KotlinLibraries", ModPlatform::ResourceProvider::MODRINTH } };
 };
+QString getMetaURL(ResourceProvider provider, QVariant projectID);
 
 }  // namespace ModPlatform
 
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index 9722d483..1d31a292 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -298,17 +298,9 @@ bool NilModFolderPage::shouldDisplay() const
 void ModFolderPage::visitModPages()
 {
     auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection()).indexes();
-    for (auto mod : m_model->selectedMods(selection))
-        if (auto meta = mod->metadata(); meta != nullptr) {
-            auto slug = meta->slug.remove(".pw.toml");
-            switch (meta->provider) {
-                case ModPlatform::ResourceProvider::MODRINTH:
-                    DesktopServices::openUrl(QString("https://modrinth.com/mod/%1").arg(slug));
-                    break;
-                case ModPlatform::ResourceProvider::FLAME:
-                    DesktopServices::openUrl(QString("https://www.curseforge.com/minecraft/mc-mods/%1").arg(slug));
-                    break;
-            }
-        } else if (mod->homeurl().size() != 0)
-            DesktopServices::openUrl(mod->homeurl());
+    for (auto mod : m_model->selectedMods(selection)) {
+        auto url = mod->metaurl();
+        if (!url.isEmpty())
+            DesktopServices::openUrl(url);
+    }
 }
\ No newline at end of file
diff --git a/launcher/ui/widgets/InfoFrame.cpp b/launcher/ui/widgets/InfoFrame.cpp
index 52e79dc0..57562a93 100644
--- a/launcher/ui/widgets/InfoFrame.cpp
+++ b/launcher/ui/widgets/InfoFrame.cpp
@@ -41,9 +41,7 @@
 
 #include "ui/dialogs/CustomMessageBox.h"
 
-InfoFrame::InfoFrame(QWidget *parent) :
-    QFrame(parent),
-    ui(new Ui::InfoFrame)
+InfoFrame::InfoFrame(QWidget* parent) : QFrame(parent), ui(new Ui::InfoFrame)
 {
     ui->setupUi(this);
     ui->descriptionLabel->setHidden(true);
@@ -67,31 +65,18 @@ void InfoFrame::updateWithMod(Mod const& m)
 
     QString text = "";
     QString name = "";
-    QString link = "";
+    QString link = m.metaurl();
     QString toolTip = "";
     if (m.name().isEmpty())
         name = m.internal_id();
     else
         name = m.name();
 
-    if (auto meta = m.metadata(); meta != nullptr) {
-        auto slug = meta->slug.remove(".pw.toml");
-        switch (meta->provider) {
-            case ModPlatform::ResourceProvider::MODRINTH:
-                link = QString("https://modrinth.com/mod/%1").arg(slug);
-                break;
-            case ModPlatform::ResourceProvider::FLAME:
-                link = QString("https://www.curseforge.com/minecraft/mc-mods/%1").arg(slug);
-                break;
-        }
-    } else if (!m.homeurl().isEmpty())
-        link = m.homeurl();
-
     if (link.isEmpty())
         text = name;
     else {
         text = "<a href=\"" + link + "\">" + name + "</a>";
-        toolTip = tr("Go to mod's home page");
+        toolTip = link;
     }
     if (!m.authors().isEmpty())
         text += " by " + m.authors().join(", ");
-- 
cgit 


From fd5b155ee7d796015c84c8b348f384bf21d8328d Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 25 Jun 2023 12:24:59 +0300
Subject: Added error message when exporting snapshots with curseforge

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 18 +++++++++++-------
 launcher/ui/MainWindow.cpp                         |  9 ++++++++-
 2 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index e73f3de5..e5eeb098 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -409,16 +409,20 @@ QByteArray FlamePackExportTask::generateIndex()
         // convert all available components to mrpack dependencies
         if (minecraft != nullptr)
             version["version"] = minecraft->m_version;
-
-        QJsonObject loader;
+        QString id;
         if (quilt != nullptr)
-            loader["id"] = "quilt-" + quilt->getVersion();
+            id = "quilt-" + quilt->getVersion();
         else if (fabric != nullptr)
-            loader["id"] = "fabric-" + fabric->getVersion();
+            id = "fabric-" + fabric->getVersion();
         else if (forge != nullptr)
-            loader["id"] = "forge-" + forge->getVersion();
-        loader["primary"] = true;
-        version["modLoaders"] = QJsonArray({ loader });
+            id = "forge-" + forge->getVersion();
+        version["modLoaders"] = QJsonArray();
+        if (!id.isEmpty()) {
+            QJsonObject loader;
+            loader["id"] = id;
+            loader["primary"] = true;
+            version["modLoaders"] = QJsonArray({ loader });
+        }
         obj["minecraft"] = version;
     }
 
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 91809c7b..50eb9e64 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1422,9 +1422,16 @@ 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()) {
                 QMessageBox msgBox;
-                msgBox.setText(tr("Quilt is currently not supported by CurseForge modpacks."));
+                msgBox.setText(errorMsg);
                 msgBox.exec();
                 return;
             }
-- 
cgit 


From 84c63f4f017324b42c2470fb2e7a1ac5858fcaa0 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 25 Jun 2023 14:11:41 +0300
Subject: Added plantxt export

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/CMakeLists.txt                            |  10 +-
 launcher/minecraft/mod/Mod.cpp                     |   7 +
 launcher/minecraft/mod/Mod.h                       |   1 +
 launcher/modplatform/ModIndex.cpp                  |   8 +-
 launcher/modplatform/ModIndex.h                    |   1 +
 .../modplatform/helpers/ExportModsToStringTask.cpp | 114 ------------
 .../modplatform/helpers/ExportModsToStringTask.h   |  33 ----
 launcher/modplatform/helpers/ExportToModList.cpp   | 122 +++++++++++++
 launcher/modplatform/helpers/ExportToModList.h     |  33 ++++
 launcher/ui/MainWindow.cpp                         |   8 +-
 launcher/ui/MainWindow.h                           |   2 +-
 launcher/ui/MainWindow.ui                          |   4 +-
 launcher/ui/dialogs/ExportModsToStringDialog.cpp   | 122 -------------
 launcher/ui/dialogs/ExportModsToStringDialog.h     |  46 -----
 launcher/ui/dialogs/ExportModsToStringDialog.ui    | 171 ------------------
 launcher/ui/dialogs/ExportToModListDialog.cpp      | 171 ++++++++++++++++++
 launcher/ui/dialogs/ExportToModListDialog.h        |  52 ++++++
 launcher/ui/dialogs/ExportToModListDialog.ui       | 199 +++++++++++++++++++++
 18 files changed, 605 insertions(+), 499 deletions(-)
 delete mode 100644 launcher/modplatform/helpers/ExportModsToStringTask.cpp
 delete mode 100644 launcher/modplatform/helpers/ExportModsToStringTask.h
 create mode 100644 launcher/modplatform/helpers/ExportToModList.cpp
 create mode 100644 launcher/modplatform/helpers/ExportToModList.h
 delete mode 100644 launcher/ui/dialogs/ExportModsToStringDialog.cpp
 delete mode 100644 launcher/ui/dialogs/ExportModsToStringDialog.h
 delete mode 100644 launcher/ui/dialogs/ExportModsToStringDialog.ui
 create mode 100644 launcher/ui/dialogs/ExportToModListDialog.cpp
 create mode 100644 launcher/ui/dialogs/ExportToModListDialog.h
 create mode 100644 launcher/ui/dialogs/ExportToModListDialog.ui

(limited to 'launcher/modplatform')

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index aab7e90d..a4e82576 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -490,8 +490,8 @@ set(API_SOURCES
     modplatform/helpers/OverrideUtils.h
     modplatform/helpers/OverrideUtils.cpp
 
-    modplatform/helpers/ExportModsToStringTask.h
-    modplatform/helpers/ExportModsToStringTask.cpp
+    modplatform/helpers/ExportToModList.h
+    modplatform/helpers/ExportToModList.cpp
 )
 
 set(FTB_SOURCES
@@ -913,8 +913,8 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/ExportInstanceDialog.h
     ui/dialogs/ExportMrPackDialog.cpp
     ui/dialogs/ExportMrPackDialog.h
-    ui/dialogs/ExportModsToStringDialog.cpp
-    ui/dialogs/ExportModsToStringDialog.h
+    ui/dialogs/ExportToModListDialog.cpp
+    ui/dialogs/ExportToModListDialog.h
     ui/dialogs/IconPickerDialog.cpp
     ui/dialogs/IconPickerDialog.h
     ui/dialogs/ImportResourceDialog.cpp
@@ -1062,7 +1062,7 @@ qt_wrap_ui(LAUNCHER_UI
     ui/dialogs/SkinUploadDialog.ui
     ui/dialogs/ExportInstanceDialog.ui
     ui/dialogs/ExportMrPackDialog.ui
-    ui/dialogs/ExportModsToStringDialog.ui
+    ui/dialogs/ExportToModListDialog.ui
     ui/dialogs/IconPickerDialog.ui
     ui/dialogs/ImportResourceDialog.ui
     ui/dialogs/MSALoginDialog.ui
diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index e613ddeb..d5b96bad 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -166,6 +166,13 @@ auto Mod::homeurl() const -> QString
     return details().homeurl;
 }
 
+auto Mod::metaurl() const -> QString
+{
+    if (metadata() == nullptr)
+        return homeurl();
+    return ModPlatform::getMetaURL(metadata()->provider, metadata()->project_id);
+}
+
 auto Mod::description() const -> QString
 {
     return details().description;
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index d4e419f4..d6272f4d 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -70,6 +70,7 @@ public:
     auto provider()    const -> std::optional<QString>;
     auto licenses()     const -> const QList<ModLicense>&;
     auto issueTracker() const -> QString;
+    auto metaurl()     const -> QString;
 
     /** Get the intneral path to the mod's icon file*/
     QString iconPath() const { return m_local_details.icon_file; };
diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index 6a507caf..a1c4d891 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -70,11 +70,17 @@ auto ProviderCapabilities::hash(ResourceProvider p, QIODevice* device, QString t
     }
 
     QCryptographicHash hash(algo);
-    if(!hash.addData(device))
+    if (!hash.addData(device))
         qCritical() << "Failed to read JAR to create hash!";
 
     Q_ASSERT(hash.result().length() == hash.hashLength(algo));
     return { hash.result().toHex() };
 }
 
+QString getMetaURL(ResourceProvider provider, QVariant projectID)
+{
+    return ((provider == ModPlatform::ResourceProvider::FLAME) ? "https://www.curseforge.com/projects/" : "https://modrinth.com/mod/") +
+           projectID.toString();
+}
+
 }  // namespace ModPlatform
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 3b0a03a1..3f51e700 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -144,6 +144,7 @@ inline auto getOverrideDeps() -> QList<OverrideDep>
              { "qvIfYCYJ", "P7dR8mSH", "API", ModPlatform::ResourceProvider::MODRINTH },
              { "lwVhp9o5", "Ha28R6CL", "KotlinLibraries", ModPlatform::ResourceProvider::MODRINTH } };
 };
+QString getMetaURL(ResourceProvider provider, QVariant projectID);
 
 }  // namespace ModPlatform
 
diff --git a/launcher/modplatform/helpers/ExportModsToStringTask.cpp b/launcher/modplatform/helpers/ExportModsToStringTask.cpp
deleted file mode 100644
index e7be5ce1..00000000
--- a/launcher/modplatform/helpers/ExportModsToStringTask.cpp
+++ /dev/null
@@ -1,114 +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->homeurl();
-                    if (meta != nullptr) {
-                        url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
-                                                                                      : "https://modrinth.com/mod/") +
-                              meta->slug.remove(".pw.toml");
-                    }
-                    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->homeurl();
-                    if (meta != nullptr) {
-                        url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
-                                                                                      : "https://modrinth.com/mod/") +
-                              meta->slug.remove(".pw.toml");
-                    }
-                    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->homeurl();
-        if (meta != nullptr) {
-            url = (meta->provider == ModPlatform::ResourceProvider::FLAME ? "https://www.curseforge.com/minecraft/mc-mods/"
-                                                                          : "https://modrinth.com/mod/") +
-                  meta->slug.remove(".pw.toml");
-        }
-        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
diff --git a/launcher/modplatform/helpers/ExportToModList.cpp b/launcher/modplatform/helpers/ExportToModList.cpp
new file mode 100644
index 00000000..5e01367f
--- /dev/null
+++ b/launcher/modplatform/helpers/ExportToModList.cpp
@@ -0,0 +1,122 @@
+// 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 "ExportToModList.h"
+
+namespace ExportToModList {
+QString ExportToModList(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><li>\n\t%1\n</li></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");
+        }
+        case PLAINTXT: {
+            QStringList lines;
+            for (auto mod : mods) {
+                auto meta = mod->metadata();
+                auto modName = mod->name();
+
+                auto line = "name: " + modName + ";";
+                if (extraData & Url) {
+                    auto url = mod->metaurl();
+                    if (!url.isEmpty())
+                        line += " url: " + url + ";";
+                }
+                if (extraData & Version) {
+                    auto ver = mod->version();
+                    if (ver.isEmpty() && meta != nullptr)
+                        ver = meta->version().toString();
+                    if (!ver.isEmpty())
+                        line += " version: " + QString("[%1]").arg(ver) + ";";
+                }
+                if (extraData & Authors && !mod->authors().isEmpty())
+                    line += " authors " + mod->authors().join(", ") + ";";
+                lines << line;
+            }
+            return lines.join("\n");
+        }
+        default: {
+            return QString("unknown format:%1").arg(format);
+        }
+    }
+}
+
+QString ExportToModList(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 ExportToModList
\ No newline at end of file
diff --git a/launcher/modplatform/helpers/ExportToModList.h b/launcher/modplatform/helpers/ExportToModList.h
new file mode 100644
index 00000000..9ff8d25a
--- /dev/null
+++ b/launcher/modplatform/helpers/ExportToModList.h
@@ -0,0 +1,33 @@
+// 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 ExportToModList {
+
+enum Formats { HTML, MARKDOWN, PLAINTXT, CUSTOM };
+enum OptionalData {
+    Authors = 1 << 0,
+    Url = 1 << 1,
+    Version = 1 << 2,
+};
+QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData);
+QString ExportToModList(QList<Mod*> mods, QString lineTemplate);
+}  // namespace ExportToModList
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 02ea30c3..37f4d4ed 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -43,7 +43,7 @@
 #include "FileSystem.h"
 
 #include "MainWindow.h"
-#include "ui/dialogs/ExportModsToStringDialog.h"
+#include "ui/dialogs/ExportToModListDialog.h"
 #include "ui_MainWindow.h"
 
 #include <QVariant>
@@ -206,7 +206,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->actionExportInstanceToString);
+        exportInstanceMenu->addAction(ui->actionExportInstanceToModList);
         ui->actionExportInstance->setMenu(exportInstanceMenu);
     }
 
@@ -1418,10 +1418,10 @@ void MainWindow::on_actionExportInstanceMrPack_triggered()
     }
 }
 
-void MainWindow::on_actionExportInstanceToString_triggered()
+void MainWindow::on_actionExportInstanceToModList_triggered()
 {
     if (m_selectedInstance) {
-        ExportModsToStringDialog dlg(m_selectedInstance, this);
+        ExportToModListDialog dlg(m_selectedInstance, this);
         dlg.exec();
     }
 }
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index 9b38810f..f62e39e1 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -157,7 +157,7 @@ private slots:
     inline void on_actionExportInstance_triggered() { on_actionExportInstanceZip_triggered(); }
     void on_actionExportInstanceZip_triggered();
     void on_actionExportInstanceMrPack_triggered();
-    void on_actionExportInstanceToString_triggered();
+    void on_actionExportInstanceToModList_triggered();
 
     void on_actionRenameInstance_triggered();
 
diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui
index ecc7e236..027742ba 100644
--- a/launcher/ui/MainWindow.ui
+++ b/launcher/ui/MainWindow.ui
@@ -479,12 +479,12 @@
     <string>Modrinth (mrpack)</string>
    </property>
   </action>
-  <action name="actionExportInstanceToString">
+  <action name="actionExportInstanceToModList">
    <property name="icon">
     <iconset theme="new"/>
    </property>
    <property name="text">
-    <string>Text</string>
+    <string>ModList (txt)</string>
    </property>
   </action>
   <action name="actionCreateInstanceShortcut">
diff --git a/launcher/ui/dialogs/ExportModsToStringDialog.cpp b/launcher/ui/dialogs/ExportModsToStringDialog.cpp
deleted file mode 100644
index 29d69918..00000000
--- a/launcher/ui/dialogs/ExportModsToStringDialog.cpp
+++ /dev/null
@@ -1,122 +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 "ExportModsToStringDialog.h"
-#include <QCheckBox>
-#include <QComboBox>
-#include <QTextEdit>
-#include "minecraft/MinecraftInstance.h"
-#include "minecraft/mod/ModFolderModel.h"
-#include "modplatform/helpers/ExportModsToStringTask.h"
-#include "ui_ExportModsToStringDialog.h"
-
-#include <QFileDialog>
-#include <QFileSystemModel>
-#include <QJsonDocument>
-#include <QMessageBox>
-#include <QPushButton>
-
-ExportModsToStringDialog::ExportModsToStringDialog(InstancePtr instance, QWidget* parent)
-    : QDialog(parent), m_template_selected(false), ui(new Ui::ExportModsToStringDialog)
-{
-    ui->setupUi(this);
-    ui->templateGroup->setDisabled(true);
-
-    MinecraftInstance* mcInstance = dynamic_cast<MinecraftInstance*>(instance.get());
-    if (mcInstance) {
-        mcInstance->loaderModList()->update();
-        connect(mcInstance->loaderModList().get(), &ModFolderModel::updateFinished, this, [this, mcInstance]() {
-            m_allMods = mcInstance->loaderModList()->allMods();
-            triggerImp();
-        });
-    }
-
-    connect(ui->formatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ExportModsToStringDialog::formatChanged);
-    connect(ui->authorsCheckBox, &QCheckBox::stateChanged, this, &ExportModsToStringDialog::trigger);
-    connect(ui->versionCheckBox, &QCheckBox::stateChanged, this, &ExportModsToStringDialog::trigger);
-    connect(ui->urlCheckBox, &QCheckBox::stateChanged, this, &ExportModsToStringDialog::trigger);
-    connect(ui->templateText, &QTextEdit::textChanged, this, &ExportModsToStringDialog::triggerImp);
-    connect(ui->copyButton, &QPushButton::clicked, this, [this](bool) {
-        this->ui->finalText->selectAll();
-        this->ui->finalText->copy();
-    });
-}
-
-ExportModsToStringDialog::~ExportModsToStringDialog()
-{
-    delete ui;
-}
-
-void ExportModsToStringDialog::formatChanged(int index)
-{
-    switch (index) {
-        case 0: {
-            ui->templateGroup->setDisabled(true);
-            ui->optionsGroup->setDisabled(false);
-            break;
-        }
-        case 1: {
-            ui->templateGroup->setDisabled(true);
-            ui->optionsGroup->setDisabled(false);
-            break;
-        }
-        case 2: {
-            ui->templateGroup->setDisabled(false);
-            ui->optionsGroup->setDisabled(true);
-            break;
-        }
-    }
-    triggerImp();
-}
-
-void ExportModsToStringDialog::triggerImp()
-{
-    auto format = ExportToString::HTML;
-    switch (ui->formatComboBox->currentIndex()) {
-        case 2: {
-            m_template_selected = true;
-            ui->finalText->setPlainText(ExportToString::ExportModsToStringTask(m_allMods, ui->templateText->toPlainText()));
-            return;
-        }
-        case 0: {
-            format = ExportToString::HTML;
-            break;
-        }
-        case 1: {
-            format = ExportToString::MARKDOWN;
-            break;
-        }
-        default: {
-            return;
-        }
-    }
-    auto opt = 0;
-    if (ui->authorsCheckBox->isChecked())
-        opt |= ExportToString::Authors;
-    if (ui->versionCheckBox->isChecked())
-        opt |= ExportToString::Version;
-    if (ui->urlCheckBox->isChecked())
-        opt |= ExportToString::Url;
-    ui->finalText->setPlainText(ExportToString::ExportModsToStringTask(m_allMods, format, static_cast<ExportToString::OptionalData>(opt)));
-    if (!m_template_selected) {
-        auto exampleLine = format == ExportToString::HTML ? "<ul><a href=\"{url}\">{name}</a>[{version}] by {authors}</ul>"
-                                                          : "[{name}]({url})[{version}] by {authors}";
-        if (ui->templateText->toPlainText() != exampleLine)
-            ui->templateText->setPlainText(exampleLine);
-    }
-}
diff --git a/launcher/ui/dialogs/ExportModsToStringDialog.h b/launcher/ui/dialogs/ExportModsToStringDialog.h
deleted file mode 100644
index d195d1ce..00000000
--- a/launcher/ui/dialogs/ExportModsToStringDialog.h
+++ /dev/null
@@ -1,46 +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 <QDialog>
-#include <QList>
-#include "BaseInstance.h"
-#include "minecraft/mod/Mod.h"
-
-namespace Ui {
-class ExportModsToStringDialog;
-}
-
-class ExportModsToStringDialog : public QDialog {
-    Q_OBJECT
-
-   public:
-    explicit ExportModsToStringDialog(InstancePtr instance, QWidget* parent = nullptr);
-    ~ExportModsToStringDialog();
-
-   protected slots:
-    void formatChanged(int index);
-    void triggerImp();
-    void trigger(int) { triggerImp(); };
-
-   private:
-    QList<Mod*> m_allMods;
-    bool m_template_selected;
-    Ui::ExportModsToStringDialog* ui;
-};
diff --git a/launcher/ui/dialogs/ExportModsToStringDialog.ui b/launcher/ui/dialogs/ExportModsToStringDialog.ui
deleted file mode 100644
index 4451a278..00000000
--- a/launcher/ui/dialogs/ExportModsToStringDialog.ui
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ExportModsToStringDialog</class>
- <widget class="QDialog" name="ExportModsToStringDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>650</width>
-    <height>446</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>
-    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
-     <item>
-      <widget class="QGroupBox" name="groupBox_3">
-       <property name="title">
-        <string>Settings</string>
-       </property>
-       <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0">
-         <widget class="QLabel" name="label">
-          <property name="frameShape">
-           <enum>QFrame::NoFrame</enum>
-          </property>
-          <property name="frameShadow">
-           <enum>QFrame::Plain</enum>
-          </property>
-          <property name="lineWidth">
-           <number>1</number>
-          </property>
-          <property name="text">
-           <string>Format</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QComboBox" name="formatComboBox">
-          <item>
-           <property name="text">
-            <string>HTML</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Markdown</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Custom</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QGroupBox" name="templateGroup">
-          <property name="title">
-           <string>Template</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_4">
-           <item>
-            <widget class="QTextEdit" name="templateText"/>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QGroupBox" name="optionsGroup">
-          <property name="title">
-           <string>Optional Info</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_5">
-           <item>
-            <widget class="QCheckBox" name="versionCheckBox">
-             <property name="text">
-              <string>Version</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="authorsCheckBox">
-             <property name="text">
-              <string>Authors</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="urlCheckBox">
-             <property name="text">
-              <string>URL</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QGroupBox" name="groupBox_4">
-       <property name="title">
-        <string>Result</string>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QPlainTextEdit" name="finalText">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>143</height>
-           </size>
-          </property>
-          <property name="readOnly">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QPushButton" name="copyButton">
-       <property name="text">
-        <string>Copy</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Ok</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>ExportModsToStringDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>334</x>
-     <y>435</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>324</x>
-     <y>206</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/launcher/ui/dialogs/ExportToModListDialog.cpp b/launcher/ui/dialogs/ExportToModListDialog.cpp
new file mode 100644
index 00000000..0550725f
--- /dev/null
+++ b/launcher/ui/dialogs/ExportToModListDialog.cpp
@@ -0,0 +1,171 @@
+// 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 "ExportToModListDialog.h"
+#include <QCheckBox>
+#include <QComboBox>
+#include <QTextEdit>
+#include "FileSystem.h"
+#include "minecraft/MinecraftInstance.h"
+#include "minecraft/mod/ModFolderModel.h"
+#include "modplatform/helpers/ExportToModList.h"
+#include "ui_ExportToModListDialog.h"
+
+#include <QFileDialog>
+#include <QFileSystemModel>
+#include <QJsonDocument>
+#include <QMessageBox>
+#include <QPushButton>
+
+ExportToModListDialog::ExportToModListDialog(InstancePtr instance, QWidget* parent)
+    : QDialog(parent), m_template_selected(false), name(instance->name()), ui(new Ui::ExportToModListDialog)
+{
+    ui->setupUi(this);
+    ui->templateGroup->setDisabled(true);
+
+    MinecraftInstance* mcInstance = dynamic_cast<MinecraftInstance*>(instance.get());
+    if (mcInstance) {
+        mcInstance->loaderModList()->update();
+        connect(mcInstance->loaderModList().get(), &ModFolderModel::updateFinished, this, [this, mcInstance]() {
+            m_allMods = mcInstance->loaderModList()->allMods();
+            triggerImp();
+        });
+    }
+
+    connect(ui->formatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ExportToModListDialog::formatChanged);
+    connect(ui->authorsCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
+    connect(ui->versionCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
+    connect(ui->urlCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
+    connect(ui->templateText, &QTextEdit::textChanged, this, &ExportToModListDialog::triggerImp);
+    connect(ui->copyButton, &QPushButton::clicked, this, [this](bool) {
+        this->ui->finalText->selectAll();
+        this->ui->finalText->copy();
+    });
+}
+
+ExportToModListDialog::~ExportToModListDialog()
+{
+    delete ui;
+}
+
+void ExportToModListDialog::formatChanged(int index)
+{
+    switch (index) {
+        case 0: {
+            ui->templateGroup->setDisabled(true);
+            ui->optionsGroup->setDisabled(false);
+            ui->resultText->show();
+            format = ExportToModList::HTML;
+            break;
+        }
+        case 1: {
+            ui->templateGroup->setDisabled(true);
+            ui->optionsGroup->setDisabled(false);
+            ui->resultText->show();
+            format = ExportToModList::MARKDOWN;
+            break;
+        }
+        case 2: {
+            ui->templateGroup->setDisabled(true);
+            ui->optionsGroup->setDisabled(false);
+            ui->resultText->hide();
+            format = ExportToModList::PLAINTXT;
+            break;
+        }
+        case 3: {
+            ui->templateGroup->setDisabled(false);
+            ui->optionsGroup->setDisabled(true);
+            ui->resultText->hide();
+            format = ExportToModList::CUSTOM;
+            break;
+        }
+    }
+    triggerImp();
+}
+
+void ExportToModListDialog::triggerImp()
+{
+    if (format == ExportToModList::CUSTOM) {
+        m_template_selected = true;
+        ui->finalText->setPlainText(ExportToModList::ExportToModList(m_allMods, ui->templateText->toPlainText()));
+        return;
+    }
+    auto opt = 0;
+    if (ui->authorsCheckBox->isChecked())
+        opt |= ExportToModList::Authors;
+    if (ui->versionCheckBox->isChecked())
+        opt |= ExportToModList::Version;
+    if (ui->urlCheckBox->isChecked())
+        opt |= ExportToModList::Url;
+    auto txt = ExportToModList::ExportToModList(m_allMods, format, static_cast<ExportToModList::OptionalData>(opt));
+    ui->finalText->setPlainText(txt);
+    QString exampleLine;
+    switch (format) {
+        case ExportToModList::HTML: {
+            exampleLine = "<ul><a href=\"{url}\">{name}</a>[{version}] by {authors}</ul>";
+            ui->resultText->setHtml(txt);
+            break;
+        }
+        case ExportToModList::MARKDOWN: {
+            exampleLine = "[{name}]({url})[{version}] by {authors}";
+            ui->resultText->setMarkdown(txt);
+            break;
+        }
+        case ExportToModList::PLAINTXT: {
+            exampleLine = "name: {name}; url: {url}; version: {version}; authors: {authors};";
+            break;
+        }
+        case ExportToModList::CUSTOM:
+            return;
+    }
+    if (!m_template_selected) {
+        if (ui->templateText->toPlainText() != exampleLine)
+            ui->templateText->setPlainText(exampleLine);
+    }
+}
+
+void ExportToModListDialog::done(int result)
+{
+    if (result == Accepted) {
+        const QString filename = FS::RemoveInvalidFilenameChars(name);
+        const QString output =
+            QFileDialog::getSaveFileName(this, tr("Export %1").arg(name), FS::PathCombine(QDir::homePath(), filename + extension()),
+                                         "File (*.txt *.html *.md)", nullptr);
+
+        if (output.isEmpty())
+            return;
+        FS::write(output, ui->finalText->toPlainText().toUtf8());
+    }
+
+    QDialog::done(result);
+}
+
+QString ExportToModListDialog::extension()
+{
+    switch (format) {
+        case ExportToModList::HTML:
+            return ".html";
+        case ExportToModList::MARKDOWN:
+            return ".md";
+        case ExportToModList::PLAINTXT:
+            return ".txt";
+        case ExportToModList::CUSTOM:
+            return ".txt";
+    }
+    return ".txt";
+}
diff --git a/launcher/ui/dialogs/ExportToModListDialog.h b/launcher/ui/dialogs/ExportToModListDialog.h
new file mode 100644
index 00000000..a7a6bcdc
--- /dev/null
+++ b/launcher/ui/dialogs/ExportToModListDialog.h
@@ -0,0 +1,52 @@
+// 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 <QList>
+#include "BaseInstance.h"
+#include "minecraft/mod/Mod.h"
+#include "modplatform/helpers/ExportToModList.h"
+
+namespace Ui {
+class ExportToModListDialog;
+}
+
+class ExportToModListDialog : public QDialog {
+    Q_OBJECT
+
+   public:
+    explicit ExportToModListDialog(InstancePtr instance, QWidget* parent = nullptr);
+    ~ExportToModListDialog();
+
+    void done(int result) override;
+
+   protected slots:
+    void formatChanged(int index);
+    void triggerImp();
+    void trigger(int) { triggerImp(); };
+
+   private:
+    QString extension();
+    QList<Mod*> m_allMods;
+    bool m_template_selected;
+    QString name;
+    ExportToModList::Formats format = ExportToModList::Formats::HTML;
+    Ui::ExportToModListDialog* ui;
+};
diff --git a/launcher/ui/dialogs/ExportToModListDialog.ui b/launcher/ui/dialogs/ExportToModListDialog.ui
new file mode 100644
index 00000000..640b1766
--- /dev/null
+++ b/launcher/ui/dialogs/ExportToModListDialog.ui
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ExportToModListDialog</class>
+ <widget class="QDialog" name="ExportToModListDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>650</width>
+    <height>446</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Export Pack to ModList</string>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
+     <item>
+      <widget class="QGroupBox" name="groupBox_3">
+       <property name="title">
+        <string>Settings</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <widget class="QLabel" name="label">
+          <property name="frameShape">
+           <enum>QFrame::NoFrame</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Plain</enum>
+          </property>
+          <property name="lineWidth">
+           <number>1</number>
+          </property>
+          <property name="text">
+           <string>Format</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="formatComboBox">
+          <item>
+           <property name="text">
+            <string>HTML</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Markdown</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Plaintext</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Custom</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QGroupBox" name="templateGroup">
+          <property name="title">
+           <string>Template</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_4">
+           <item>
+            <widget class="QTextEdit" name="templateText"/>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QGroupBox" name="optionsGroup">
+          <property name="title">
+           <string>Optional Info</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_5">
+           <item>
+            <widget class="QCheckBox" name="versionCheckBox">
+             <property name="text">
+              <string>Version</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="authorsCheckBox">
+             <property name="text">
+              <string>Authors</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="urlCheckBox">
+             <property name="text">
+              <string>URL</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox_4">
+       <property name="title">
+        <string>Result</string>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QPlainTextEdit" name="finalText">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>143</height>
+           </size>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QTextBrowser" name="resultText">
+          <property name="openExternalLinks">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QPushButton" name="copyButton">
+       <property name="text">
+        <string>Copy</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ExportToModListDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>334</x>
+     <y>435</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>324</x>
+     <y>206</y>
+    </hint>
+   </hints>
+  </connection>
+   <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ExportToModListDialog</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 


From d1603f19459a499e5278f38b69222e3f4e0875b4 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 25 Jun 2023 14:43:11 +0300
Subject: Made it more similar to mrpack export

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index e5eeb098..b14c6eb4 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -37,6 +37,8 @@
 #include "tasks/Task.h"
 
 const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}{authors}</a></li>\n";
+const QStringList FlamePackExportTask::PREFIXES({ "mods/", "resourcepacks/" });
+const QStringList FlamePackExportTask::FILE_EXTENSIONS({ "jar", "zip" });
 
 FlamePackExportTask::FlamePackExportTask(const QString& name,
                                          const QString& version,
@@ -105,33 +107,62 @@ void FlamePackExportTask::collectHashes()
 {
     setAbortable(true);
     setStatus(tr("Find file hashes..."));
-    auto mods = mcInstance->loaderModList()->allMods();
+    auto allMods = mcInstance->loaderModList()->allMods();
     ConcurrentTask::Ptr hashing_task(new ConcurrentTask(this, "MakeHashesTask", 10));
     task.reset(hashing_task);
-    int totalProgres = mods.count();
+    int totalProgres = allMods.count();
     setProgress(0, totalProgres);
-    for (auto* mod : mods) {
-        if (!mod || mod->type() == ResourceType::FOLDER) {
-            setProgress(m_progress + 1, totalProgres);
+
+    for (const QFileInfo& file : files) {
+        const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
+        // require sensible file types
+        if (!std::any_of(PREFIXES.begin(), PREFIXES.end(), [&relative](const QString& prefix) { return relative.startsWith(prefix); }))
             continue;
-        }
-        if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) {
-            resolvedFiles.insert(mod->fileinfo().absoluteFilePath(),
-                                 { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(), true,
-                                   mod->metadata()->name, mod->metadata()->slug, mod->authors().join(", ") });
-            setProgress(m_progress + 1, totalProgres);
+        if (!std::any_of(FILE_EXTENSIONS.begin(), FILE_EXTENSIONS.end(), [&relative](const QString& extension) {
+                return relative.endsWith('.' + extension) || relative.endsWith('.' + extension + ".disabled");
+            }))
+            continue;
+
+        if (relative.startsWith("resourcepacks/") &&
+            (relative.endsWith(".zip") || relative.endsWith(".zip.disabled"))) {  // is resourcepack
+            totalProgres++;
+            auto hash_task = Hashing::createFlameHasher(file.absoluteFilePath());
+            connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, relative, file, totalProgres](QString hash) {
+                if (m_state == Task::State::Running) {
+                    setProgress(m_progress + 1, totalProgres);
+                    pendingHashes.insert(hash, { relative, file.absoluteFilePath(), relative.endsWith(".zip") });
+                }
+            });
+            connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
+            hashing_task->addTask(hash_task);
             continue;
         }
 
-        auto hash_task = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath());
-        connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, totalProgres](QString hash) {
-            if (m_state == Task::State::Running) {
+        if (auto modIter = std::find_if(allMods.begin(), allMods.end(), [&file](Mod* mod) { return mod->fileinfo() == file; });
+            modIter != allMods.end()) {
+            const Mod* mod = *modIter;
+            if (!mod || mod->type() == ResourceType::FOLDER) {
                 setProgress(m_progress + 1, totalProgres);
-                pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled(), true });
+                continue;
             }
-        });
-        connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
-        hashing_task->addTask(hash_task);
+            if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) {
+                resolvedFiles.insert(mod->fileinfo().absoluteFilePath(),
+                                     { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(), true,
+                                       mod->metadata()->name, mod->metadata()->slug, mod->authors().join(", ") });
+                setProgress(m_progress + 1, totalProgres);
+                continue;
+            }
+
+            auto hash_task = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath());
+            connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, totalProgres](QString hash) {
+                if (m_state == Task::State::Running) {
+                    setProgress(m_progress + 1, totalProgres);
+                    pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled(), true });
+                }
+            });
+            connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
+            hashing_task->addTask(hash_task);
+        }
     }
 
     for (const QFileInfo& file : files) {
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index 5c8caa45..b6a6c352 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -42,6 +42,8 @@ class FlamePackExportTask : public Task {
 
    private:
     static const QString TEMPLATE;
+    static const QStringList PREFIXES;
+    static const QStringList FILE_EXTENSIONS;
 
     // inputs
     const QString name, version, author;
-- 
cgit 


From fa3a46498f7fe4a7d6e26558c03b0485126b377c Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 25 Jun 2023 16:23:50 +0300
Subject: Removed dupliacte code

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index b14c6eb4..cbb57afa 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -165,21 +165,6 @@ void FlamePackExportTask::collectHashes()
         }
     }
 
-    for (const QFileInfo& file : files) {
-        const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
-        if (!relative.endsWith(".zip") || !relative.startsWith("resourcepacks/"))
-            continue;
-        totalProgres++;
-        auto hash_task = Hashing::createFlameHasher(file.absoluteFilePath());
-        connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, relative, file, totalProgres](QString hash) {
-            if (m_state == Task::State::Running) {
-                setProgress(m_progress + 1, totalProgres);
-                pendingHashes.insert(hash, { relative, file.absoluteFilePath(), true });
-            }
-        });
-        connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
-        hashing_task->addTask(hash_task);
-    }
     connect(hashing_task.get(), &Task::succeeded, this, &FlamePackExportTask::makeApiRequest);
     connect(hashing_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
     hashing_task->start();
-- 
cgit 


From 8ade44c9a3b186fb5ab19d9802a4d7b4187b7258 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Sun, 25 Jun 2023 14:39:45 +0100
Subject: Simplify

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 3 ---
 launcher/modplatform/flame/FlamePackExportTask.h   | 1 -
 2 files changed, 4 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index cbb57afa..1460a4c3 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -37,7 +37,6 @@
 #include "tasks/Task.h"
 
 const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}{authors}</a></li>\n";
-const QStringList FlamePackExportTask::PREFIXES({ "mods/", "resourcepacks/" });
 const QStringList FlamePackExportTask::FILE_EXTENSIONS({ "jar", "zip" });
 
 FlamePackExportTask::FlamePackExportTask(const QString& name,
@@ -116,8 +115,6 @@ void FlamePackExportTask::collectHashes()
     for (const QFileInfo& file : files) {
         const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
         // require sensible file types
-        if (!std::any_of(PREFIXES.begin(), PREFIXES.end(), [&relative](const QString& prefix) { return relative.startsWith(prefix); }))
-            continue;
         if (!std::any_of(FILE_EXTENSIONS.begin(), FILE_EXTENSIONS.end(), [&relative](const QString& extension) {
                 return relative.endsWith('.' + extension) || relative.endsWith('.' + extension + ".disabled");
             }))
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h
index b6a6c352..3dee0a7e 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.h
+++ b/launcher/modplatform/flame/FlamePackExportTask.h
@@ -42,7 +42,6 @@ class FlamePackExportTask : public Task {
 
    private:
     static const QString TEMPLATE;
-    static const QStringList PREFIXES;
     static const QStringList FILE_EXTENSIONS;
 
     // inputs
-- 
cgit 


From d344ffe37047037bd3bca070557a49fbfadcb361 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 25 Jun 2023 17:50:56 +0300
Subject: Removed some setProgress calls

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index cbb57afa..c781ece5 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -110,8 +110,7 @@ void FlamePackExportTask::collectHashes()
     auto allMods = mcInstance->loaderModList()->allMods();
     ConcurrentTask::Ptr hashing_task(new ConcurrentTask(this, "MakeHashesTask", 10));
     task.reset(hashing_task);
-    int totalProgres = allMods.count();
-    setProgress(0, totalProgres);
+    int totalProgres = 0;
 
     for (const QFileInfo& file : files) {
         const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
@@ -142,17 +141,16 @@ void FlamePackExportTask::collectHashes()
             modIter != allMods.end()) {
             const Mod* mod = *modIter;
             if (!mod || mod->type() == ResourceType::FOLDER) {
-                setProgress(m_progress + 1, totalProgres);
                 continue;
             }
             if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) {
                 resolvedFiles.insert(mod->fileinfo().absoluteFilePath(),
                                      { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(), true,
                                        mod->metadata()->name, mod->metadata()->slug, mod->authors().join(", ") });
-                setProgress(m_progress + 1, totalProgres);
                 continue;
             }
 
+            totalProgres++;
             auto hash_task = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath());
             connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, totalProgres](QString hash) {
                 if (m_state == Task::State::Running) {
@@ -209,9 +207,7 @@ void FlamePackExportTask::makeApiRequest()
 
                 return;
             }
-            size_t progress = 0;
             for (auto match : data_arr) {
-                setProgress(progress++, data_arr.count());
                 auto match_obj = Json::ensureObject(match, {});
                 auto file_obj = Json::ensureObject(match_obj, "file", {});
 
@@ -284,9 +280,7 @@ void FlamePackExportTask::getProjectsInfo()
             else
                 entries = Json::requireArray(Json::requireObject(doc), "data");
 
-            size_t progress = 0;
             for (auto entry : entries) {
-                setProgress(progress++, entries.count());
                 auto entry_obj = Json::requireObject(entry);
 
                 try {
-- 
cgit 


From 87155e346c33288fccb68c3b9029a11b658395b2 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 25 Jun 2023 19:44:18 +0300
Subject: Complicated a little task progress

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 54 ++++++++++++++++------
 1 file changed, 40 insertions(+), 14 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index dfad364f..13308b50 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -58,7 +58,7 @@ FlamePackExportTask::FlamePackExportTask(const QString& name,
 void FlamePackExportTask::executeTask()
 {
     setStatus(tr("Searching for files..."));
-    setProgress(0, 0);
+    setProgress(0, 5);
     collectFiles();
 }
 
@@ -106,11 +106,10 @@ void FlamePackExportTask::collectHashes()
 {
     setAbortable(true);
     setStatus(tr("Find file hashes..."));
+    setProgress(1, 5);
     auto allMods = mcInstance->loaderModList()->allMods();
     ConcurrentTask::Ptr hashing_task(new ConcurrentTask(this, "MakeHashesTask", 10));
     task.reset(hashing_task);
-    int totalProgres = 0;
-
     for (const QFileInfo& file : files) {
         const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
         // require sensible file types
@@ -121,11 +120,9 @@ void FlamePackExportTask::collectHashes()
 
         if (relative.startsWith("resourcepacks/") &&
             (relative.endsWith(".zip") || relative.endsWith(".zip.disabled"))) {  // is resourcepack
-            totalProgres++;
             auto hash_task = Hashing::createFlameHasher(file.absoluteFilePath());
-            connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, relative, file, totalProgres](QString hash) {
+            connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, relative, file](QString hash) {
                 if (m_state == Task::State::Running) {
-                    setProgress(m_progress + 1, totalProgres);
                     pendingHashes.insert(hash, { relative, file.absoluteFilePath(), relative.endsWith(".zip") });
                 }
             });
@@ -147,11 +144,9 @@ void FlamePackExportTask::collectHashes()
                 continue;
             }
 
-            totalProgres++;
             auto hash_task = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath());
-            connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, totalProgres](QString hash) {
+            connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod](QString hash) {
                 if (m_state == Task::State::Running) {
-                    setProgress(m_progress + 1, totalProgres);
                     pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled(), true });
                 }
             });
@@ -159,9 +154,28 @@ void FlamePackExportTask::collectHashes()
             hashing_task->addTask(hash_task);
         }
     }
+    auto step_progress = std::make_shared<TaskStepProgress>();
+    connect(hashing_task.get(), &Task::finished, this, [this, step_progress] {
+        step_progress->state = TaskStepState::Succeeded;
+        stepProgress(*step_progress);
+    });
 
     connect(hashing_task.get(), &Task::succeeded, this, &FlamePackExportTask::makeApiRequest);
-    connect(hashing_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
+    connect(hashing_task.get(), &Task::failed, this, [this, step_progress](QString reason) {
+        step_progress->state = TaskStepState::Failed;
+        stepProgress(*step_progress);
+        emitFailed(reason);
+    });
+    connect(hashing_task.get(), &Task::stepProgress, this, &FlamePackExportTask::propogateStepProgress);
+
+    connect(hashing_task.get(), &Task::progress, this, [this, step_progress](qint64 current, qint64 total) {
+        step_progress->update(current, total);
+        stepProgress(*step_progress);
+    });
+    connect(hashing_task.get(), &Task::status, this, [this, step_progress](QString status) {
+        step_progress->status = status;
+        stepProgress(*step_progress);
+    });
     hashing_task->start();
 }
 
@@ -173,6 +187,7 @@ void FlamePackExportTask::makeApiRequest()
     }
 
     setStatus(tr("Find versions for hashes..."));
+    setProgress(2, 5);
     auto response = std::make_shared<QByteArray>();
 
     QList<uint> fingerprints;
@@ -186,7 +201,7 @@ void FlamePackExportTask::makeApiRequest()
         QJsonParseError parse_error{};
         QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
         if (parse_error.error != QJsonParseError::NoError) {
-            qWarning() << "Error while parsing JSON response from Modrinth::CurrentVersions at " << parse_error.offset
+            qWarning() << "Error while parsing JSON response from CurseForge::CurrentVersions at " << parse_error.offset
                        << " reason: " << parse_error.errorString();
             qWarning() << *response;
 
@@ -241,6 +256,7 @@ void FlamePackExportTask::makeApiRequest()
 void FlamePackExportTask::getProjectsInfo()
 {
     setStatus(tr("Find project info from CurseForge..."));
+    setProgress(3, 5);
     QList<QString> addonIds;
     for (auto resolved : resolvedFiles) {
         if (resolved.slug.isEmpty()) {
@@ -264,9 +280,10 @@ void FlamePackExportTask::getProjectsInfo()
         QJsonParseError parse_error{};
         auto doc = QJsonDocument::fromJson(*response, &parse_error);
         if (parse_error.error != QJsonParseError::NoError) {
-            qWarning() << "Error while parsing JSON response from Modrinth projects task at " << parse_error.offset
+            qWarning() << "Error while parsing JSON response from CurseForge projects task at " << parse_error.offset
                        << " reason: " << parse_error.errorString();
             qWarning() << *response;
+            failed(parse_error.errorString());
             return;
         }
 
@@ -317,6 +334,7 @@ void FlamePackExportTask::getProjectsInfo()
 void FlamePackExportTask::buildZip()
 {
     setStatus(tr("Adding files..."));
+    setProgress(4, 5);
 
     buildZipFuture = QtConcurrent::run(QThreadPool::globalInstance(), [this]() {
         QuaZip zip(output);
@@ -352,14 +370,19 @@ void FlamePackExportTask::buildZip()
         content = "<ul>" + content + "</ul>";
         modlist.write(content.toUtf8());
 
+        auto step_progress = std::make_shared<TaskStepProgress>();
+
         size_t progress = 0;
         for (const QFileInfo& file : files) {
             if (buildZipFuture.isCanceled()) {
                 QFile::remove(output);
+                step_progress->state = TaskStepState::Failed;
+                stepProgress(*step_progress);
                 return BuildZipResult();
             }
+            step_progress->update(progress, files.length());
+            stepProgress(*step_progress);
 
-            setProgress(progress, files.length());
             const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
             if (!resolvedFiles.contains(file.absoluteFilePath()) &&
                 !JlCompress::compressFile(&zip, file.absoluteFilePath(), "overrides/" + relative)) {
@@ -373,9 +396,12 @@ void FlamePackExportTask::buildZip()
 
         if (zip.getZipError() != 0) {
             QFile::remove(output);
+            step_progress->state = TaskStepState::Failed;
+            stepProgress(*step_progress);
             return BuildZipResult(tr("A zip error occurred"));
         }
-
+        step_progress->state = TaskStepState::Succeeded;
+        stepProgress(*step_progress);
         return BuildZipResult();
     });
     connect(&buildZipWatcher, &QFutureWatcher<BuildZipResult>::finished, this, &FlamePackExportTask::finish);
-- 
cgit 


From aad5ca5474ff015da30809260fe0f9d6cb503d61 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 2 Jul 2023 16:45:15 +0300
Subject: fixed typos

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 13308b50..927146e1 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -105,7 +105,7 @@ void FlamePackExportTask::collectFiles()
 void FlamePackExportTask::collectHashes()
 {
     setAbortable(true);
-    setStatus(tr("Find file hashes..."));
+    setStatus(tr("Finding file hashes..."));
     setProgress(1, 5);
     auto allMods = mcInstance->loaderModList()->allMods();
     ConcurrentTask::Ptr hashing_task(new ConcurrentTask(this, "MakeHashesTask", 10));
@@ -186,7 +186,7 @@ void FlamePackExportTask::makeApiRequest()
         return;
     }
 
-    setStatus(tr("Find versions for hashes..."));
+    setStatus(tr("Finding versions for hashes..."));
     setProgress(2, 5);
     auto response = std::make_shared<QByteArray>();
 
@@ -255,10 +255,10 @@ void FlamePackExportTask::makeApiRequest()
 
 void FlamePackExportTask::getProjectsInfo()
 {
-    setStatus(tr("Find project info from CurseForge..."));
+    setStatus(tr("Finding project info from CurseForge..."));
     setProgress(3, 5);
-    QList<QString> addonIds;
-    for (auto resolved : resolvedFiles) {
+    QStringList addonIds;
+    for (const auto& resolved : resolvedFiles) {
         if (resolved.slug.isEmpty()) {
             addonIds << QString::number(resolved.addonId);
         }
diff --git a/launcher/ui/dialogs/ExportPackDialog.cpp b/launcher/ui/dialogs/ExportPackDialog.cpp
index a54a3c86..2abe2805 100644
--- a/launcher/ui/dialogs/ExportPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportPackDialog.cpp
@@ -41,6 +41,7 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla
     ui->name->setText(instance->name());
     if (m_provider == ModPlatform::ResourceProvider::MODRINTH) {
         ui->summary->setText(instance->notes().split(QRegularExpression("\\r?\\n"))[0]);
+        setWindowTitle("Export Modrinth Pack");
     } else {
         setWindowTitle("Export CurseForge Pack");
         ui->version->setText("");
diff --git a/launcher/ui/dialogs/ExportPackDialog.ui b/launcher/ui/dialogs/ExportPackDialog.ui
index 658e2199..3976e28f 100644
--- a/launcher/ui/dialogs/ExportPackDialog.ui
+++ b/launcher/ui/dialogs/ExportPackDialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Export Modrinth Pack</string>
+   <string>Export Pack</string>
   </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>
-- 
cgit 


From 5f63c781b400aab29298b1eb2822477e35d87c01 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 2 Jul 2023 18:50:29 +0300
Subject: resolved local vaiables names

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 927146e1..1b75908a 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -108,8 +108,8 @@ void FlamePackExportTask::collectHashes()
     setStatus(tr("Finding file hashes..."));
     setProgress(1, 5);
     auto allMods = mcInstance->loaderModList()->allMods();
-    ConcurrentTask::Ptr hashing_task(new ConcurrentTask(this, "MakeHashesTask", 10));
-    task.reset(hashing_task);
+    ConcurrentTask::Ptr hashingTask(new ConcurrentTask(this, "MakeHashesTask", 10));
+    task.reset(hashingTask);
     for (const QFileInfo& file : files) {
         const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
         // require sensible file types
@@ -120,14 +120,14 @@ void FlamePackExportTask::collectHashes()
 
         if (relative.startsWith("resourcepacks/") &&
             (relative.endsWith(".zip") || relative.endsWith(".zip.disabled"))) {  // is resourcepack
-            auto hash_task = Hashing::createFlameHasher(file.absoluteFilePath());
-            connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, relative, file](QString hash) {
+            auto hashTask = Hashing::createFlameHasher(file.absoluteFilePath());
+            connect(hashTask.get(), &Hashing::Hasher::resultsReady, [this, relative, file](QString hash) {
                 if (m_state == Task::State::Running) {
                     pendingHashes.insert(hash, { relative, file.absoluteFilePath(), relative.endsWith(".zip") });
                 }
             });
-            connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
-            hashing_task->addTask(hash_task);
+            connect(hashTask.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
+            hashingTask->addTask(hashTask);
             continue;
         }
 
@@ -144,39 +144,39 @@ void FlamePackExportTask::collectHashes()
                 continue;
             }
 
-            auto hash_task = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath());
-            connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod](QString hash) {
+            auto hashTask = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath());
+            connect(hashTask.get(), &Hashing::Hasher::resultsReady, [this, mod](QString hash) {
                 if (m_state == Task::State::Running) {
                     pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled(), true });
                 }
             });
-            connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
-            hashing_task->addTask(hash_task);
+            connect(hashTask.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
+            hashingTask->addTask(hashTask);
         }
     }
-    auto step_progress = std::make_shared<TaskStepProgress>();
-    connect(hashing_task.get(), &Task::finished, this, [this, step_progress] {
-        step_progress->state = TaskStepState::Succeeded;
-        stepProgress(*step_progress);
+    auto progressStep = std::make_shared<TaskStepProgress>();
+    connect(hashingTask.get(), &Task::finished, this, [this, progressStep] {
+        progressStep->state = TaskStepState::Succeeded;
+        stepProgress(*progressStep);
     });
 
-    connect(hashing_task.get(), &Task::succeeded, this, &FlamePackExportTask::makeApiRequest);
-    connect(hashing_task.get(), &Task::failed, this, [this, step_progress](QString reason) {
-        step_progress->state = TaskStepState::Failed;
-        stepProgress(*step_progress);
+    connect(hashingTask.get(), &Task::succeeded, this, &FlamePackExportTask::makeApiRequest);
+    connect(hashingTask.get(), &Task::failed, this, [this, progressStep](QString reason) {
+        progressStep->state = TaskStepState::Failed;
+        stepProgress(*progressStep);
         emitFailed(reason);
     });
-    connect(hashing_task.get(), &Task::stepProgress, this, &FlamePackExportTask::propogateStepProgress);
+    connect(hashingTask.get(), &Task::stepProgress, this, &FlamePackExportTask::propogateStepProgress);
 
-    connect(hashing_task.get(), &Task::progress, this, [this, step_progress](qint64 current, qint64 total) {
-        step_progress->update(current, total);
-        stepProgress(*step_progress);
+    connect(hashingTask.get(), &Task::progress, this, [this, progressStep](qint64 current, qint64 total) {
+        progressStep->update(current, total);
+        stepProgress(*progressStep);
     });
-    connect(hashing_task.get(), &Task::status, this, [this, step_progress](QString status) {
-        step_progress->status = status;
-        stepProgress(*step_progress);
+    connect(hashingTask.get(), &Task::status, this, [this, progressStep](QString status) {
+        progressStep->status = status;
+        stepProgress(*progressStep);
     });
-    hashing_task->start();
+    hashingTask->start();
 }
 
 void FlamePackExportTask::makeApiRequest()
@@ -198,38 +198,38 @@ void FlamePackExportTask::makeApiRequest()
     task.reset(api.matchFingerprints(fingerprints, response));
 
     connect(task.get(), &Task::succeeded, this, [this, response] {
-        QJsonParseError parse_error{};
-        QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
-        if (parse_error.error != QJsonParseError::NoError) {
-            qWarning() << "Error while parsing JSON response from CurseForge::CurrentVersions at " << parse_error.offset
-                       << " reason: " << parse_error.errorString();
+        QJsonParseError parseError{};
+        QJsonDocument doc = QJsonDocument::fromJson(*response, &parseError);
+        if (parseError.error != QJsonParseError::NoError) {
+            qWarning() << "Error while parsing JSON response from CurseForge::CurrentVersions at " << parseError.offset
+                       << " reason: " << parseError.errorString();
             qWarning() << *response;
 
-            failed(parse_error.errorString());
+            failed(parseError.errorString());
             return;
         }
 
         try {
-            auto doc_obj = Json::requireObject(doc);
-            auto data_obj = Json::requireObject(doc_obj, "data");
-            auto data_arr = Json::requireArray(data_obj, "exactMatches");
+            auto docObj = Json::requireObject(doc);
+            auto dataObj = Json::requireObject(docObj, "data");
+            auto dataArr = Json::requireArray(dataObj, "exactMatches");
 
-            if (data_arr.isEmpty()) {
+            if (dataArr.isEmpty()) {
                 qWarning() << "No matches found for fingerprint search!";
 
                 return;
             }
-            for (auto match : data_arr) {
-                auto match_obj = Json::ensureObject(match, {});
-                auto file_obj = Json::ensureObject(match_obj, "file", {});
+            for (auto match : dataArr) {
+                auto matchObj = Json::ensureObject(match, {});
+                auto fileObj = Json::ensureObject(matchObj, "file", {});
 
-                if (match_obj.isEmpty() || file_obj.isEmpty()) {
+                if (matchObj.isEmpty() || fileObj.isEmpty()) {
                     qWarning() << "Fingerprint match is empty!";
 
                     return;
                 }
 
-                auto fingerprint = QString::number(Json::ensureVariant(file_obj, "fileFingerprint").toUInt());
+                auto fingerprint = QString::number(Json::ensureVariant(fileObj, "fileFingerprint").toUInt());
                 auto mod = pendingHashes.find(fingerprint);
                 if (mod == pendingHashes.end()) {
                     qWarning() << "Invalid fingerprint from the API response.";
@@ -237,8 +237,8 @@ void FlamePackExportTask::makeApiRequest()
                 }
 
                 setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(mod->name));
-                if (Json::ensureBoolean(file_obj, "isAvailable", false, "isAvailable"))
-                    resolvedFiles.insert(mod->path, { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "id"),
+                if (Json::ensureBoolean(fileObj, "isAvailable", false, "isAvailable"))
+                    resolvedFiles.insert(mod->path, { Json::requireInteger(fileObj, "modId"), Json::requireInteger(fileObj, "id"),
                                                       mod->enabled, mod->isMod });
             }
 
@@ -265,25 +265,25 @@ void FlamePackExportTask::getProjectsInfo()
     }
 
     auto response = std::make_shared<QByteArray>();
-    Task::Ptr proj_task;
+    Task::Ptr projTask;
 
     if (addonIds.isEmpty()) {
         buildZip();
         return;
     } else if (addonIds.size() == 1) {
-        proj_task = api.getProject(*addonIds.begin(), response);
+        projTask = api.getProject(*addonIds.begin(), response);
     } else {
-        proj_task = api.getProjects(addonIds, response);
+        projTask = api.getProjects(addonIds, response);
     }
 
-    connect(proj_task.get(), &Task::succeeded, this, [this, response, addonIds] {
-        QJsonParseError parse_error{};
-        auto doc = QJsonDocument::fromJson(*response, &parse_error);
-        if (parse_error.error != QJsonParseError::NoError) {
-            qWarning() << "Error while parsing JSON response from CurseForge projects task at " << parse_error.offset
-                       << " reason: " << parse_error.errorString();
+    connect(projTask.get(), &Task::succeeded, this, [this, response, addonIds] {
+        QJsonParseError parseError{};
+        auto doc = QJsonDocument::fromJson(*response, &parseError);
+        if (parseError.error != QJsonParseError::NoError) {
+            qWarning() << "Error while parsing JSON response from CurseForge projects task at " << parseError.offset
+                       << " reason: " << parseError.errorString();
             qWarning() << *response;
-            failed(parse_error.errorString());
+            failed(parseError.errorString());
             return;
         }
 
@@ -295,13 +295,13 @@ void FlamePackExportTask::getProjectsInfo()
                 entries = Json::requireArray(Json::requireObject(doc), "data");
 
             for (auto entry : entries) {
-                auto entry_obj = Json::requireObject(entry);
+                auto entryObj = Json::requireObject(entry);
 
                 try {
-                    setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(Json::requireString(entry_obj, "name")));
+                    setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(Json::requireString(entryObj, "name")));
 
                     ModPlatform::IndexedPack pack;
-                    FlameMod::loadIndexedPack(pack, entry_obj);
+                    FlameMod::loadIndexedPack(pack, entryObj);
                     for (auto key : resolvedFiles.keys()) {
                         auto val = resolvedFiles.value(key);
                         if (val.addonId == pack.addonId) {
@@ -327,7 +327,7 @@ void FlamePackExportTask::getProjectsInfo()
         }
         buildZip();
     });
-    task.reset(proj_task);
+    task.reset(projTask);
     task->start();
 }
 
@@ -370,18 +370,18 @@ void FlamePackExportTask::buildZip()
         content = "<ul>" + content + "</ul>";
         modlist.write(content.toUtf8());
 
-        auto step_progress = std::make_shared<TaskStepProgress>();
+        auto progressStep = std::make_shared<TaskStepProgress>();
 
         size_t progress = 0;
         for (const QFileInfo& file : files) {
             if (buildZipFuture.isCanceled()) {
                 QFile::remove(output);
-                step_progress->state = TaskStepState::Failed;
-                stepProgress(*step_progress);
+                progressStep->state = TaskStepState::Failed;
+                stepProgress(*progressStep);
                 return BuildZipResult();
             }
-            step_progress->update(progress, files.length());
-            stepProgress(*step_progress);
+            progressStep->update(progress, files.length());
+            stepProgress(*progressStep);
 
             const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
             if (!resolvedFiles.contains(file.absoluteFilePath()) &&
@@ -396,12 +396,12 @@ void FlamePackExportTask::buildZip()
 
         if (zip.getZipError() != 0) {
             QFile::remove(output);
-            step_progress->state = TaskStepState::Failed;
-            stepProgress(*step_progress);
+            progressStep->state = TaskStepState::Failed;
+            stepProgress(*progressStep);
             return BuildZipResult(tr("A zip error occurred"));
         }
-        step_progress->state = TaskStepState::Succeeded;
-        stepProgress(*step_progress);
+        progressStep->state = TaskStepState::Succeeded;
+        stepProgress(*progressStep);
         return BuildZipResult();
     });
     connect(&buildZipWatcher, &QFutureWatcher<BuildZipResult>::finished, this, &FlamePackExportTask::finish);
diff --git a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
index a9a1f1c4..c8206f1e 100644
--- a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
@@ -95,7 +95,7 @@ void ModrinthPackExportTask::collectFiles()
 
 void ModrinthPackExportTask::collectHashes()
 {
-    setStatus(tr("Find file hashes..."));
+    setStatus(tr("Finding file hashes..."));
     for (const QFileInfo& file : files) {
         QCoreApplication::processEvents();
 
@@ -159,7 +159,7 @@ void ModrinthPackExportTask::makeApiRequest()
     if (pendingHashes.isEmpty())
         buildZip();
     else {
-        setStatus(tr("Find versions for hashes..."));
+        setStatus(tr("Finding versions for hashes..."));
         auto response = std::make_shared<QByteArray>();
         task = api.currentVersions(pendingHashes.values(), "sha512", response);
         connect(task.get(), &NetJob::succeeded, [this, response]() { parseApiResponse(response); });
-- 
cgit 


From fa7cfc77d8b723a53577734a0a3c76df7d9dc6d7 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon, 3 Jul 2023 16:08:20 +0300
Subject: fixed template

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 1b75908a..b8edf7df 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -36,7 +36,7 @@
 #include "modplatform/helpers/HashUtils.h"
 #include "tasks/Task.h"
 
-const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}{authors}</a></li>\n";
+const QString FlamePackExportTask::TEMPLATE = "<li><a href=\"{url}\">{name}{authors}</a></li>\n";
 const QStringList FlamePackExportTask::FILE_EXTENSIONS({ "jar", "zip" });
 
 FlamePackExportTask::FlamePackExportTask(const QString& name,
-- 
cgit 


From 908ac813e0f96126a643851e99379956faa08cda Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 4 Jul 2023 15:16:54 +0300
Subject: escaped modlist inner html

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FlamePackExportTask.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index b8edf7df..ac0da214 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -362,9 +362,9 @@ void FlamePackExportTask::buildZip()
         for (auto mod : resolvedFiles) {
             if (mod.isMod) {
                 content += QString(TEMPLATE)
-                               .replace("{name}", mod.name)
-                               .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.addonId))
-                               .replace("{authors}", !mod.authors.isEmpty() ? QString(" (by %1)").arg(mod.authors) : "");
+                               .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>";
-- 
cgit 


From 8ae67b84dbf154bef957bfba1342eac27cd4837e Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Thu, 6 Jul 2023 20:03:25 +0100
Subject: Optional mods in mrpack export

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 .../modrinth/ModrinthPackExportTask.cpp            | 50 +++++++++++++---------
 1 file changed, 30 insertions(+), 20 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
index 4cd88aa6..cbdfd04f 100644
--- a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
@@ -263,13 +263,13 @@ void ModrinthPackExportTask::finish()
 
 QByteArray ModrinthPackExportTask::generateIndex()
 {
-    QJsonObject obj;
-    obj["formatVersion"] = 1;
-    obj["game"] = "minecraft";
-    obj["name"] = name;
-    obj["versionId"] = version;
+    QJsonObject out;
+    out["formatVersion"] = 1;
+    out["game"] = "minecraft";
+    out["name"] = name;
+    out["versionId"] = version;
     if (!summary.isEmpty())
-        obj["summary"] = summary;
+        out["summary"] = summary;
 
     if (mcInstance) {
         auto profile = mcInstance->getPackProfile();
@@ -290,30 +290,40 @@ QByteArray ModrinthPackExportTask::generateIndex()
         if (forge != nullptr)
             dependencies["forge"] = forge->m_version;
 
-        obj["dependencies"] = dependencies;
+        out["dependencies"] = dependencies;
     }
 
-    QJsonArray files;
-    QMapIterator<QString, ResolvedFile> iterator(resolvedFiles);
-    while (iterator.hasNext()) {
-        iterator.next();
+    QJsonArray filesOut;
+    for (auto iterator = resolvedFiles.constBegin(); iterator != resolvedFiles.constEnd(); iterator++) {
+        QJsonObject fileOut;
 
+        QString path = iterator.key();
         const ResolvedFile& value = iterator.value();
 
-        QJsonObject file;
-        file["path"] = iterator.key();
-        file["downloads"] = QJsonArray({ iterator.value().url });
+        // detect disabled mod
+        QString disabledSuffix = ".disabled";
+        if (path.endsWith(disabledSuffix)) {
+            // rename it
+            path = path.left(path.length() - disabledSuffix.length());
+            // ...and make it optional
+            QJsonObject env;
+            env["client"] = "optional";
+            env["server"] = "optional";
+            fileOut["env"] = env;
+        }
+
+        fileOut["path"] = path;
+        fileOut["downloads"] = QJsonArray{ iterator.value().url };
 
         QJsonObject hashes;
         hashes["sha1"] = value.sha1;
         hashes["sha512"] = value.sha512;
+        fileOut["hashes"] = hashes;
 
-        file["hashes"] = hashes;
-        file["fileSize"] = value.size;
-
-        files << file;
+        fileOut["fileSize"] = value.size;
+        filesOut << fileOut;
     }
-    obj["files"] = files;
+    out["files"] = filesOut;
 
-    return QJsonDocument(obj).toJson(QJsonDocument::Compact);
+    return QJsonDocument(out).toJson(QJsonDocument::Compact);
 }
-- 
cgit 


From e70407289266a205147bfb1293763e64dacb0f3e Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sat, 8 Jul 2023 13:38:00 -0700
Subject: fix(flame install): don't assume .zip is a resource pack. default to
 mod

let identifier move it if needed

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/minecraft/mod/tasks/LocalResourceParse.cpp      | 9 +++++----
 launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 8 +++++---
 launcher/modplatform/flame/PackManifest.cpp              | 9 ++-------
 3 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
index 4d760df2..6d9b4d97 100644
--- a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
+++ b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
@@ -44,7 +44,11 @@ static const QMap<PackedResourceType, QString> s_packed_type_names = {
 namespace ResourceUtils {
 PackedResourceType identify(QFileInfo file){
     if (file.exists() && file.isFile()) {
-        if (ResourcePackUtils::validate(file)) {
+        if (ModUtils::validate(file)) {
+            // mods can contain resource and data packs so they much be tested first
+            qDebug() << file.fileName() << "is a mod";
+            return PackedResourceType::Mod;
+        } else if (ResourcePackUtils::validate(file)) {
             qDebug() << file.fileName() << "is a resource pack";
             return PackedResourceType::ResourcePack;
         } else if (TexturePackUtils::validate(file)) {
@@ -53,9 +57,6 @@ PackedResourceType identify(QFileInfo file){
         } else if (DataPackUtils::validate(file)) {
             qDebug() << file.fileName() << "is a data pack";
             return PackedResourceType::DataPack;
-        } else if (ModUtils::validate(file)) {
-            qDebug() << file.fileName() << "is a mod";
-            return PackedResourceType::Mod;
         } else if (WorldSaveUtils::validate(file)) {
             qDebug() << file.fileName() << "is a world save";
             return PackedResourceType::WorldSave;
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index e7641d64..b57db288 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -563,6 +563,8 @@ void FlameCreationTask::validateZIPResouces()
                 if (FS::move(localPath, destPath)) {
                     return destPath;
                 }
+            } else {
+                qDebug() << "Target folder of" << fileName << "is correct at" << targetFolder;
             }
             return localPath;
         };
@@ -584,6 +586,9 @@ void FlameCreationTask::validateZIPResouces()
         QString worldPath;
 
         switch (type) {
+            case PackedResourceType::Mod :
+                validatePath(fileName, targetFolder, "mods");
+                break;
             case PackedResourceType::ResourcePack :
                 validatePath(fileName, targetFolder, "resourcepacks");
                 break;
@@ -593,9 +598,6 @@ void FlameCreationTask::validateZIPResouces()
             case PackedResourceType::DataPack :
                 validatePath(fileName, targetFolder, "datapacks");
                 break;
-            case PackedResourceType::Mod :
-                validatePath(fileName, targetFolder, "mods");
-                break;
             case PackedResourceType::ShaderPack :
                 // in theroy flame API can't do this but who knows, that *may* change ?
                 // better to handle it if it *does* occure in the future
diff --git a/launcher/modplatform/flame/PackManifest.cpp b/launcher/modplatform/flame/PackManifest.cpp
index 22008297..ee4d0766 100644
--- a/launcher/modplatform/flame/PackManifest.cpp
+++ b/launcher/modplatform/flame/PackManifest.cpp
@@ -76,13 +76,8 @@ bool Flame::File::parseFromObject(const QJsonObject& obj,  bool throw_on_blocked
     // It is also optional
     type = File::Type::SingleFile;
 
-    if (fileName.endsWith(".zip")) {
-        // this is probably a resource pack
-        targetFolder = "resourcepacks";
-    } else {
-        // this is probably a mod, dunno what else could modpacks download
-        targetFolder = "mods";
-    }
+    targetFolder = "mods";
+
     // get the hash
     hash = QString();
     auto hashes = Json::ensureArray(obj, "hashes");
-- 
cgit 


From d53d58a5d42684c5151680016f38a0f4bd1c0298 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Sat, 8 Jul 2023 22:03:47 +0100
Subject: LiteMod downloading

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/minecraft/PackProfile.cpp             | 3 ++-
 launcher/modplatform/flame/FlameAPI.h          | 2 ++
 launcher/modplatform/modrinth/ModrinthAPI.h    | 6 +++---
 launcher/ui/dialogs/ResourceDownloadDialog.cpp | 9 +++++++--
 4 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp
index aff05dbc..e8fd2157 100644
--- a/launcher/minecraft/PackProfile.cpp
+++ b/launcher/minecraft/PackProfile.cpp
@@ -65,7 +65,8 @@
 static const QMap<QString, ResourceAPI::ModLoaderType> modloaderMapping{
     {"net.minecraftforge", ResourceAPI::Forge},
     {"net.fabricmc.fabric-loader", ResourceAPI::Fabric},
-    {"org.quiltmc.quilt-loader", ResourceAPI::Quilt}
+    {"org.quiltmc.quilt-loader", ResourceAPI::Quilt},
+    {"com.mumfrey.liteloader", ResourceAPI::LiteLoader}
 };
 
 PackProfile::PackProfile(MinecraftInstance * instance)
diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index 0a6dc78f..49bc316f 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -23,6 +23,8 @@ class FlameAPI : public NetworkResourceAPI {
 
     [[nodiscard]] auto getSortingMethods() const -> QList<ResourceAPI::SortingMethod> override;
 
+    static inline auto validateModLoaders(ModLoaderTypes loaders) -> bool { return loaders & (Forge | Fabric | Quilt); }
+
    private:
     static int getClassId(ModPlatform::ResourceType type)
     {
diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h
index e83ed2bf..58af14cc 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.h
+++ b/launcher/modplatform/modrinth/ModrinthAPI.h
@@ -38,7 +38,7 @@ class ModrinthAPI : public NetworkResourceAPI {
     static auto getModLoaderStrings(const ModLoaderTypes types) -> const QStringList
     {
         QStringList l;
-        for (auto loader : { Forge, Fabric, Quilt }) {
+        for (auto loader : { Forge, Fabric, Quilt, LiteLoader }) {
             if (types & loader) {
                 l << getModLoaderString(loader);
             }
@@ -92,7 +92,7 @@ class ModrinthAPI : public NetworkResourceAPI {
     {
         if (args.loaders.has_value()) {
             if (!validateModLoaders(args.loaders.value())) {
-                qWarning() << "Modrinth only have Forge and Fabric-compatible mods!";
+                qWarning() << "Modrinth - or our interface - does not support any the provided mod loaders!";
                 return {};
             }
         }
@@ -141,7 +141,7 @@ class ModrinthAPI : public NetworkResourceAPI {
         return s.isEmpty() ? QString() : s;
     }
 
-    inline auto validateModLoaders(ModLoaderTypes loaders) const -> bool { return loaders & (Forge | Fabric | Quilt); }
+    static inline auto validateModLoaders(ModLoaderTypes loaders) -> bool { return loaders & (Forge | Fabric | Quilt | LiteLoader); }
 
     [[nodiscard]] std::optional<QString> getDependencyURL(DependencySearchArgs const& args) const override
     {
diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.cpp b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
index 4f59f560..b17eced3 100644
--- a/launcher/ui/dialogs/ResourceDownloadDialog.cpp
+++ b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
@@ -43,6 +43,8 @@
 #include "ui/pages/modplatform/flame/FlameResourcePages.h"
 #include "ui/pages/modplatform/modrinth/ModrinthResourcePages.h"
 
+#include "modplatform/flame/FlameAPI.h"
+#include "modplatform/modrinth/ModrinthAPI.h"
 #include "ui/widgets/PageContainer.h"
 
 namespace ResourceDownload {
@@ -281,8 +283,11 @@ QList<BasePage*> ModDownloadDialog::getPages()
 {
     QList<BasePage*> pages;
 
-    pages.append(ModrinthModPage::create(this, *m_instance));
-    if (APPLICATION->capabilities() & Application::SupportsFlame)
+    auto loaders = static_cast<MinecraftInstance*>(m_instance)->getPackProfile()->getModLoaders().value();
+
+    if (ModrinthAPI::validateModLoaders(loaders))
+        pages.append(ModrinthModPage::create(this, *m_instance));
+    if (APPLICATION->capabilities() & Application::SupportsFlame && FlameAPI::validateModLoaders(loaders))
         pages.append(FlameModPage::create(this, *m_instance));
 
     m_selectedPage = dynamic_cast<ModPage*>(pages[0]);
-- 
cgit 


From 6e2fcc9e1102d3955a509c3346b8df15ce52a6a1 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Sun, 9 Jul 2023 12:08:15 +0100
Subject: Replace string manipulation in favour of QFileInfo

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/modplatform/modrinth/ModrinthPackExportTask.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
index cbdfd04f..50f6a33c 100644
--- a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
@@ -301,10 +301,10 @@ QByteArray ModrinthPackExportTask::generateIndex()
         const ResolvedFile& value = iterator.value();
 
         // detect disabled mod
-        QString disabledSuffix = ".disabled";
-        if (path.endsWith(disabledSuffix)) {
+        const QFileInfo pathInfo(path);
+        if (pathInfo.suffix() == "disabled") {
             // rename it
-            path = path.left(path.length() - disabledSuffix.length());
+            path = pathInfo.dir().filePath(pathInfo.completeBaseName());
             // ...and make it optional
             QJsonObject env;
             env["client"] = "optional";
-- 
cgit 


From 9ee68b926829495b4b87e7044bd31352ef6a6a84 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 12 Jul 2023 18:12:31 +0300
Subject: small pointer check

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/EnsureMetadataTask.cpp b/launcher/modplatform/EnsureMetadataTask.cpp
index 93b5ce76..d7649700 100644
--- a/launcher/modplatform/EnsureMetadataTask.cpp
+++ b/launcher/modplatform/EnsureMetadataTask.cpp
@@ -154,7 +154,8 @@ void EnsureMetadataTask::executeTask()
 
     connect(version_task.get(), &Task::finished, [=] {
         version_task->deleteLater();
-        m_current_task = nullptr;
+        if (m_current_task)
+            m_current_task.reset();
     });
 
     if (m_mods.size() > 1)
-- 
cgit 


From 25f7cf23d3572e444617c347ade71fffddd8af8b Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 12 Jul 2023 19:55:11 +0300
Subject: the other place

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/EnsureMetadataTask.cpp b/launcher/modplatform/EnsureMetadataTask.cpp
index d7649700..c3eadd06 100644
--- a/launcher/modplatform/EnsureMetadataTask.cpp
+++ b/launcher/modplatform/EnsureMetadataTask.cpp
@@ -145,7 +145,8 @@ void EnsureMetadataTask::executeTask()
         connect(project_task.get(), &Task::finished, this, [=] {
             invalidade_leftover();
             project_task->deleteLater();
-            m_current_task = nullptr;
+            if (m_current_task)
+                m_current_task.reset();
         });
 
         m_current_task = project_task;
-- 
cgit 


From b0a018d8239df32272a7145f2cf71d1413333060 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 14 Jul 2023 12:28:23 +0300
Subject: format

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 .../modplatform/legacy_ftb/PackInstallTask.cpp     | 57 +++++++++-------------
 launcher/modplatform/legacy_ftb/PackInstallTask.h  | 23 +++++----
 2 files changed, 35 insertions(+), 45 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
index 36c142ac..4b01e469 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
@@ -37,16 +37,16 @@
 
 #include <QtConcurrent>
 
-#include "MMCZip.h"
 #include "BaseInstance.h"
 #include "FileSystem.h"
-#include "settings/INISettingsObject.h"
+#include "MMCZip.h"
+#include "minecraft/GradleSpecifier.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
-#include "minecraft/GradleSpecifier.h"
+#include "settings/INISettingsObject.h"
 
-#include "BuildConfig.h"
 #include "Application.h"
+#include "BuildConfig.h"
 
 namespace LegacyFTB {
 
@@ -120,16 +120,17 @@ void PackInstallTask::unzip()
     QDir extractDir(m_stagingPath);
 
     m_packZip.reset(new QuaZip(archivePath));
-    if(!m_packZip->open(QuaZip::mdUnzip))
-    {
+    if (!m_packZip->open(QuaZip::mdUnzip)) {
         emitFailed(tr("Failed to open modpack file %1!").arg(archivePath));
         return;
     }
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), QOverload<QString, QString>::of(MMCZip::extractDir), archivePath, extractDir.absolutePath() + "/unzip");
+    m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), QOverload<QString, QString>::of(MMCZip::extractDir), archivePath,
+                                        extractDir.absolutePath() + "/unzip");
 #else
-    m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractDir, archivePath, extractDir.absolutePath() + "/unzip");
+    m_extractFuture =
+        QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractDir, archivePath, extractDir.absolutePath() + "/unzip");
 #endif
     connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::finished, this, &PackInstallTask::onUnzipFinished);
     connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::canceled, this, &PackInstallTask::onUnzipCanceled);
@@ -151,11 +152,9 @@ void PackInstallTask::install()
     setStatus(tr("Installing modpack"));
     progress(3, 4);
     QDir unzipMcDir(m_stagingPath + "/unzip/minecraft");
-    if(unzipMcDir.exists())
-    {
-        //ok, found minecraft dir, move contents to instance dir
-        if(!QDir().rename(m_stagingPath + "/unzip/minecraft", m_stagingPath + "/.minecraft"))
-        {
+    if (unzipMcDir.exists()) {
+        // ok, found minecraft dir, move contents to instance dir
+        if (!QDir().rename(m_stagingPath + "/unzip/minecraft", m_stagingPath + "/.minecraft")) {
             emitFailed(tr("Failed to move unzipped Minecraft!"));
             return;
         }
@@ -172,23 +171,20 @@ void PackInstallTask::install()
 
     bool fallback = true;
 
-    //handle different versions
+    // handle different versions
     QFile packJson(m_stagingPath + "/.minecraft/pack.json");
     QDir jarmodDir = QDir(m_stagingPath + "/unzip/instMods");
-    if(packJson.exists())
-    {
+    if (packJson.exists()) {
         packJson.open(QIODevice::ReadOnly | QIODevice::Text);
         QJsonDocument doc = QJsonDocument::fromJson(packJson.readAll());
         packJson.close();
 
-        //we only care about the libs
+        // we only care about the libs
         QJsonArray libs = doc.object().value("libraries").toArray();
 
-        foreach (const QJsonValue &value, libs)
-        {
+        foreach (const QJsonValue& value, libs) {
             QString nameValue = value.toObject().value("name").toString();
-            if(!nameValue.startsWith("net.minecraftforge"))
-            {
+            if (!nameValue.startsWith("net.minecraftforge")) {
                 continue;
             }
 
@@ -199,16 +195,13 @@ void PackInstallTask::install()
             fallback = false;
             break;
         }
-
     }
 
-    if(jarmodDir.exists())
-    {
+    if (jarmodDir.exists()) {
         qDebug() << "Found jarmods, installing...";
 
         QStringList jarmods;
-        for (auto info: jarmodDir.entryInfoList(QDir::NoDotAndDotDot | QDir::Files))
-        {
+        for (auto info : jarmodDir.entryInfoList(QDir::NoDotAndDotDot | QDir::Files)) {
             qDebug() << "Jarmod:" << info.fileName();
             jarmods.push_back(info.absoluteFilePath());
         }
@@ -217,12 +210,11 @@ void PackInstallTask::install()
         fallback = false;
     }
 
-    //just nuke unzip directory, it s not needed anymore
+    // just nuke unzip directory, it s not needed anymore
     FS::deletePath(m_stagingPath + "/unzip");
 
-    if(fallback)
-    {
-        //TODO: Some fallback mechanism... or just keep failing!
+    if (fallback) {
+        // TODO: Some fallback mechanism... or just keep failing!
         emitFailed(tr("No installation method found!"));
         return;
     }
@@ -232,8 +224,7 @@ void PackInstallTask::install()
     progress(4, 4);
 
     instance.setName(name());
-    if(m_instIcon == "default")
-    {
+    if (m_instIcon == "default") {
         m_instIcon = "ftb_logo";
     }
     instance.setIconKey(m_instIcon);
@@ -252,4 +243,4 @@ bool PackInstallTask::abort()
     return InstanceTask::abort();
 }
 
-}
+}  // namespace LegacyFTB
diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.h b/launcher/modplatform/legacy_ftb/PackInstallTask.h
index da791e06..94bb2901 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.h
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h
@@ -1,12 +1,12 @@
 #pragma once
-#include "InstanceTask.h"
-#include "net/NetJob.h"
 #include <quazip/quazip.h>
 #include <quazip/quazipdir.h>
+#include "InstanceTask.h"
+#include "PackHelpers.h"
 #include "meta/Index.h"
 #include "meta/Version.h"
 #include "meta/VersionList.h"
-#include "PackHelpers.h"
+#include "net/NetJob.h"
 
 #include "net/NetJob.h"
 
@@ -14,27 +14,26 @@
 
 namespace LegacyFTB {
 
-class PackInstallTask : public InstanceTask
-{
+class PackInstallTask : public InstanceTask {
     Q_OBJECT
 
-public:
+   public:
     explicit PackInstallTask(shared_qobject_ptr<QNetworkAccessManager> network, Modpack pack, QString version);
-    virtual ~PackInstallTask(){}
+    virtual ~PackInstallTask() {}
 
     bool canAbort() const override { return true; }
     bool abort() override;
 
-protected:
+   protected:
     //! Entry point for tasks.
     virtual void executeTask() override;
 
-private:
+   private:
     void downloadPack();
     void unzip();
     void install();
 
-private slots:
+   private slots:
     void onDownloadSucceeded();
     void onDownloadFailed(QString reason);
     void onDownloadProgress(qint64 current, qint64 total);
@@ -43,7 +42,7 @@ private slots:
     void onUnzipFinished();
     void onUnzipCanceled();
 
-private: /* data */
+   private: /* data */
     shared_qobject_ptr<QNetworkAccessManager> m_network;
     bool abortable = false;
     std::unique_ptr<QuaZip> m_packZip;
@@ -56,4 +55,4 @@ private: /* data */
     QString m_version;
 };
 
-}
+}  // namespace LegacyFTB
-- 
cgit 


From c8533c0b0d4e510bfe6c6818a25f5c45bc796a53 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 12 Jul 2023 17:58:24 +0300
Subject: fixed substatus on ftb_import

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
index 4b01e469..a4c78397 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
@@ -65,6 +65,7 @@ void PackInstallTask::executeTask()
 void PackInstallTask::downloadPack()
 {
     setStatus(tr("Downloading zip for %1").arg(m_pack.name));
+    setProgress(1, 4);
     setAbortable(false);
 
     archivePath = QString("%1/%2/%3").arg(m_pack.dir, m_version.replace(".", "_"), m_pack.file);
@@ -78,11 +79,10 @@ void PackInstallTask::downloadPack()
     }
     netJobContainer->addNetAction(Net::Download::makeFile(url, archivePath));
 
-    connect(netJobContainer.get(), &NetJob::succeeded, this, &PackInstallTask::onDownloadSucceeded);
-    connect(netJobContainer.get(), &NetJob::failed, this, &PackInstallTask::onDownloadFailed);
-    connect(netJobContainer.get(), &NetJob::progress, this, &PackInstallTask::onDownloadProgress);
+    connect(netJobContainer.get(), &NetJob::succeeded, this, &PackInstallTask::unzip);
+    connect(netJobContainer.get(), &NetJob::failed, this, &PackInstallTask::emitFailed);
     connect(netJobContainer.get(), &NetJob::stepProgress, this, &PackInstallTask::propogateStepProgress);
-    connect(netJobContainer.get(), &NetJob::aborted, this, &PackInstallTask::onDownloadAborted);
+    connect(netJobContainer.get(), &NetJob::aborted, this, &PackInstallTask::emitAborted);
 
     netJobContainer->start();
 
@@ -90,27 +90,6 @@ void PackInstallTask::downloadPack()
     progress(1, 4);
 }
 
-void PackInstallTask::onDownloadSucceeded()
-{
-    unzip();
-}
-
-void PackInstallTask::onDownloadFailed(QString reason)
-{
-    emitFailed(reason);
-}
-
-void PackInstallTask::onDownloadProgress(qint64 current, qint64 total)
-{
-    progress(current, total * 4);
-    setStatus(tr("Downloading zip for %1 (%2%)").arg(m_pack.name).arg(current / 10));
-}
-
-void PackInstallTask::onDownloadAborted()
-{
-    emitAborted();
-}
-
 void PackInstallTask::unzip()
 {
     setStatus(tr("Extracting modpack"));
diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.h b/launcher/modplatform/legacy_ftb/PackInstallTask.h
index 94bb2901..30ff4859 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.h
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h
@@ -34,10 +34,6 @@ class PackInstallTask : public InstanceTask {
     void install();
 
    private slots:
-    void onDownloadSucceeded();
-    void onDownloadFailed(QString reason);
-    void onDownloadProgress(qint64 current, qint64 total);
-    void onDownloadAborted();
 
     void onUnzipFinished();
     void onUnzipCanceled();
-- 
cgit 


From 515197fba2da1d674dbe7bd17dae4e0f22f64097 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon, 26 Jun 2023 11:57:21 +0300
Subject: fix: html sintax for modlist export

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/helpers/ExportToModList.cpp | 16 ++++++++--------
 launcher/ui/dialogs/ExportToModListDialog.cpp    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/helpers/ExportToModList.cpp b/launcher/modplatform/helpers/ExportToModList.cpp
index 5e01367f..d837fb0b 100644
--- a/launcher/modplatform/helpers/ExportToModList.cpp
+++ b/launcher/modplatform/helpers/ExportToModList.cpp
@@ -37,13 +37,13 @@ QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData
                     if (ver.isEmpty() && meta != nullptr)
                         ver = meta->version().toString();
                     if (!ver.isEmpty())
-                        line += QString("[%1]").arg(ver);
+                        line += QString(" [%1]").arg(ver);
                 }
                 if (extraData & Authors && !mod->authors().isEmpty())
                     line += " by " + mod->authors().join(", ");
-                lines.append(QString("<ul>%1</ul>").arg(line));
+                lines.append(QString("<li>%1</li>").arg(line));
             }
-            return QString("<html><body><li>\n\t%1\n</li></body></html>").arg(lines.join("\n\t"));
+            return QString("<html><body><ul>\n\t%1\n</ul></body></html>").arg(lines.join("\n\t"));
         }
         case MARKDOWN: {
             QStringList lines;
@@ -61,7 +61,7 @@ QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData
                     if (ver.isEmpty() && meta != nullptr)
                         ver = meta->version().toString();
                     if (!ver.isEmpty())
-                        line += QString("[%1]").arg(ver);
+                        line += QString(" [%1]").arg(ver);
                 }
                 if (extraData & Authors && !mod->authors().isEmpty())
                     line += " by " + mod->authors().join(", ");
@@ -75,21 +75,21 @@ QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData
                 auto meta = mod->metadata();
                 auto modName = mod->name();
 
-                auto line = "name: " + modName + ";";
+                auto line = modName;
                 if (extraData & Url) {
                     auto url = mod->metaurl();
                     if (!url.isEmpty())
-                        line += " url: " + url + ";";
+                        line += QString(" (%1)").arg(url);
                 }
                 if (extraData & Version) {
                     auto ver = mod->version();
                     if (ver.isEmpty() && meta != nullptr)
                         ver = meta->version().toString();
                     if (!ver.isEmpty())
-                        line += " version: " + QString("[%1]").arg(ver) + ";";
+                        line += QString(" [%1]").arg(ver);
                 }
                 if (extraData & Authors && !mod->authors().isEmpty())
-                    line += " authors " + mod->authors().join(", ") + ";";
+                    line += " by " + mod->authors().join(", ");
                 lines << line;
             }
             return lines.join("\n");
diff --git a/launcher/ui/dialogs/ExportToModListDialog.cpp b/launcher/ui/dialogs/ExportToModListDialog.cpp
index 149f6b35..700e7178 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.cpp
+++ b/launcher/ui/dialogs/ExportToModListDialog.cpp
@@ -118,7 +118,7 @@ void ExportToModListDialog::triggerImp()
     QString exampleLine;
     switch (format) {
         case ExportToModList::HTML: {
-            exampleLine = "<ul><a href=\"{url}\">{name}</a> [{version}] by {authors}</ul>";
+            exampleLine = "<li><a href=\"{url}\">{name}</a> [{version}] by {authors}</li>";
             ui->resultText->setHtml(txt);
             break;
         }
-- 
cgit 


From 9a3931dac6e75a79989f13b10604a142dbafcfbb Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 27 Jun 2023 16:57:30 +0300
Subject: Added json and csv format

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/helpers/ExportToModList.cpp | 56 ++++++++++++++++++++++++
 launcher/modplatform/helpers/ExportToModList.h   |  2 +-
 launcher/ui/dialogs/ExportToModListDialog.cpp    | 26 ++++++++++-
 launcher/ui/dialogs/ExportToModListDialog.ui     | 10 +++++
 4 files changed, 92 insertions(+), 2 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/helpers/ExportToModList.cpp b/launcher/modplatform/helpers/ExportToModList.cpp
index d837fb0b..86bb9c41 100644
--- a/launcher/modplatform/helpers/ExportToModList.cpp
+++ b/launcher/modplatform/helpers/ExportToModList.cpp
@@ -16,6 +16,9 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "ExportToModList.h"
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
 
 namespace ExportToModList {
 QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData)
@@ -94,6 +97,59 @@ QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData
             }
             return lines.join("\n");
         }
+        case JSON: {
+            QJsonArray lines;
+            for (auto mod : mods) {
+                auto meta = mod->metadata();
+                auto modName = mod->name();
+                QJsonObject line;
+                line["name"] = modName;
+                if (extraData & Url) {
+                    auto url = mod->metaurl();
+                    if (!url.isEmpty())
+                        line["url"] = url;
+                }
+                if (extraData & Version) {
+                    auto ver = mod->version();
+                    if (ver.isEmpty() && meta != nullptr)
+                        ver = meta->version().toString();
+                    if (!ver.isEmpty())
+                        line["version"] = ver;
+                }
+                if (extraData & Authors && !mod->authors().isEmpty())
+                    line["authors"] = QJsonArray::fromStringList(mod->authors());
+                lines << line;
+            }
+            QJsonDocument doc;
+            doc.setArray(lines);
+            return doc.toJson();
+        }
+        case CSV: {
+            QStringList lines;
+            for (auto mod : mods) {
+                QStringList data;
+                auto meta = mod->metadata();
+                auto modName = mod->name();
+
+                data << modName;
+                if (extraData & Url) {
+                    auto url = mod->metaurl();
+                    if (!url.isEmpty())
+                        data << url;
+                }
+                if (extraData & Version) {
+                    auto ver = mod->version();
+                    if (ver.isEmpty() && meta != nullptr)
+                        ver = meta->version().toString();
+                    if (!ver.isEmpty())
+                        data << ver;
+                }
+                if (extraData & Authors && !mod->authors().isEmpty())
+                    data << QString("\"%1\"").arg(mod->authors().join(","));
+                lines << data.join(",");
+            }
+            return lines.join("\n");
+        }
         default: {
             return QString("unknown format:%1").arg(format);
         }
diff --git a/launcher/modplatform/helpers/ExportToModList.h b/launcher/modplatform/helpers/ExportToModList.h
index 9ff8d25a..abd6e9bc 100644
--- a/launcher/modplatform/helpers/ExportToModList.h
+++ b/launcher/modplatform/helpers/ExportToModList.h
@@ -22,7 +22,7 @@
 
 namespace ExportToModList {
 
-enum Formats { HTML, MARKDOWN, PLAINTXT, CUSTOM };
+enum Formats { HTML, MARKDOWN, PLAINTXT, JSON, CSV, CUSTOM };
 enum OptionalData {
     Authors = 1 << 0,
     Url = 1 << 1,
diff --git a/launcher/ui/dialogs/ExportToModListDialog.cpp b/launcher/ui/dialogs/ExportToModListDialog.cpp
index 700e7178..cfd28cf8 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.cpp
+++ b/launcher/ui/dialogs/ExportToModListDialog.cpp
@@ -89,6 +89,20 @@ void ExportToModListDialog::formatChanged(int index)
             break;
         }
         case 3: {
+            ui->templateGroup->setDisabled(true);
+            ui->optionsGroup->setDisabled(false);
+            ui->resultText->hide();
+            format = ExportToModList::JSON;
+            break;
+        }
+        case 4: {
+            ui->templateGroup->setDisabled(true);
+            ui->optionsGroup->setDisabled(false);
+            ui->resultText->hide();
+            format = ExportToModList::CSV;
+            break;
+        }
+        case 5: {
             ui->templateGroup->setDisabled(false);
             ui->optionsGroup->setDisabled(true);
             ui->resultText->hide();
@@ -133,6 +147,12 @@ void ExportToModListDialog::triggerImp()
         }
         case ExportToModList::CUSTOM:
             return;
+        case ExportToModList::JSON:
+            exampleLine = "{\"name\":\"{name}\",\"url\":\"{url}\",\"version\":\"{version}\",\"authors\":\"{authors}\"},";
+            break;
+        case ExportToModList::CSV:
+            exampleLine = "{name},{url},{version},\"{authors}\"";
+            break;
     }
     if (!m_template_selected) {
         if (ui->templateText->toPlainText() != exampleLine)
@@ -146,7 +166,7 @@ void ExportToModListDialog::done(int result)
         const QString filename = FS::RemoveInvalidFilenameChars(name);
         const QString output =
             QFileDialog::getSaveFileName(this, tr("Export %1").arg(name), FS::PathCombine(QDir::homePath(), filename + extension()),
-                                         "File (*.txt *.html *.md)", nullptr);
+                                         "File (*.txt *.html *.md *.json *.csv)", nullptr);
 
         if (output.isEmpty())
             return;
@@ -167,6 +187,10 @@ QString ExportToModListDialog::extension()
             return ".txt";
         case ExportToModList::CUSTOM:
             return ".txt";
+        case ExportToModList::JSON:
+            return ".json";
+        case ExportToModList::CSV:
+            return ".csv";
     }
     return ".txt";
 }
diff --git a/launcher/ui/dialogs/ExportToModListDialog.ui b/launcher/ui/dialogs/ExportToModListDialog.ui
index 640b1766..e0f138f9 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.ui
+++ b/launcher/ui/dialogs/ExportToModListDialog.ui
@@ -58,6 +58,16 @@
             <string>Plaintext</string>
            </property>
           </item>
+          <item>
+           <property name="text">
+            <string>JSON</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>CSV</string>
+           </property>
+          </item>
           <item>
            <property name="text">
             <string>Custom</string>
-- 
cgit 


From 50dae9d4f38d84f168922552e9f87bf2d1130d98 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 27 Jun 2023 18:09:29 +0300
Subject: Moved to separate functions

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/helpers/ExportToModList.cpp | 264 ++++++++++++-----------
 1 file changed, 143 insertions(+), 121 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/helpers/ExportToModList.cpp b/launcher/modplatform/helpers/ExportToModList.cpp
index 86bb9c41..a8a015e3 100644
--- a/launcher/modplatform/helpers/ExportToModList.cpp
+++ b/launcher/modplatform/helpers/ExportToModList.cpp
@@ -21,135 +21,157 @@
 #include <QJsonObject>
 
 namespace ExportToModList {
-QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData)
+QString toHTML(QList<Mod*> mods, 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("<li>%1</li>").arg(line));
-            }
-            return QString("<html><body><ul>\n\t%1\n</ul></body></html>").arg(lines.join("\n\t"));
+    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);
         }
-        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");
+        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);
         }
-        case PLAINTXT: {
-            QStringList lines;
-            for (auto mod : mods) {
-                auto meta = mod->metadata();
-                auto modName = mod->name();
+        if (extraData & Authors && !mod->authors().isEmpty())
+            line += " by " + mod->authors().join(", ");
+        lines.append(QString("<li>%1</li>").arg(line));
+    }
+    return QString("<html><body><ul>\n\t%1\n</ul></body></html>").arg(lines.join("\n\t"));
+}
 
-                auto line = modName;
-                if (extraData & Url) {
-                    auto url = mod->metaurl();
-                    if (!url.isEmpty())
-                        line += QString(" (%1)").arg(url);
-                }
-                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");
+QString toMARKDOWN(QList<Mod*> mods, OptionalData extraData)
+{
+    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);
         }
-        case JSON: {
-            QJsonArray lines;
-            for (auto mod : mods) {
-                auto meta = mod->metadata();
-                auto modName = mod->name();
-                QJsonObject line;
-                line["name"] = modName;
-                if (extraData & Url) {
-                    auto url = mod->metaurl();
-                    if (!url.isEmpty())
-                        line["url"] = url;
-                }
-                if (extraData & Version) {
-                    auto ver = mod->version();
-                    if (ver.isEmpty() && meta != nullptr)
-                        ver = meta->version().toString();
-                    if (!ver.isEmpty())
-                        line["version"] = ver;
-                }
-                if (extraData & Authors && !mod->authors().isEmpty())
-                    line["authors"] = QJsonArray::fromStringList(mod->authors());
-                lines << line;
-            }
-            QJsonDocument doc;
-            doc.setArray(lines);
-            return doc.toJson();
+        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);
         }
-        case CSV: {
-            QStringList lines;
-            for (auto mod : mods) {
-                QStringList data;
-                auto meta = mod->metadata();
-                auto modName = mod->name();
+        if (extraData & Authors && !mod->authors().isEmpty())
+            line += " by " + mod->authors().join(", ");
+        lines << "- " + line;
+    }
+    return lines.join("\n");
+}
 
-                data << modName;
-                if (extraData & Url) {
-                    auto url = mod->metaurl();
-                    if (!url.isEmpty())
-                        data << url;
-                }
-                if (extraData & Version) {
-                    auto ver = mod->version();
-                    if (ver.isEmpty() && meta != nullptr)
-                        ver = meta->version().toString();
-                    if (!ver.isEmpty())
-                        data << ver;
-                }
-                if (extraData & Authors && !mod->authors().isEmpty())
-                    data << QString("\"%1\"").arg(mod->authors().join(","));
-                lines << data.join(",");
-            }
-            return lines.join("\n");
+QString toPLAINTXT(QList<Mod*> mods, OptionalData extraData)
+{
+    QStringList lines;
+    for (auto mod : mods) {
+        auto meta = mod->metadata();
+        auto modName = mod->name();
+
+        auto line = modName;
+        if (extraData & Url) {
+            auto url = mod->metaurl();
+            if (!url.isEmpty())
+                line += QString(" (%1)").arg(url);
+        }
+        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");
+}
+
+QString toJSON(QList<Mod*> mods, OptionalData extraData)
+{
+    QJsonArray lines;
+    for (auto mod : mods) {
+        auto meta = mod->metadata();
+        auto modName = mod->name();
+        QJsonObject line;
+        line["name"] = modName;
+        if (extraData & Url) {
+            auto url = mod->metaurl();
+            if (!url.isEmpty())
+                line["url"] = url;
+        }
+        if (extraData & Version) {
+            auto ver = mod->version();
+            if (ver.isEmpty() && meta != nullptr)
+                ver = meta->version().toString();
+            if (!ver.isEmpty())
+                line["version"] = ver;
+        }
+        if (extraData & Authors && !mod->authors().isEmpty())
+            line["authors"] = QJsonArray::fromStringList(mod->authors());
+        lines << line;
+    }
+    QJsonDocument doc;
+    doc.setArray(lines);
+    return doc.toJson();
+}
+
+QString toCSV(QList<Mod*> mods, OptionalData extraData)
+{
+    QStringList lines;
+    for (auto mod : mods) {
+        QStringList data;
+        auto meta = mod->metadata();
+        auto modName = mod->name();
+
+        data << modName;
+        if (extraData & Url)
+            data << mod->metaurl();
+        if (extraData & Version) {
+            auto ver = mod->version();
+            if (ver.isEmpty() && meta != nullptr)
+                ver = meta->version().toString();
+            data << ver;
+        }
+        if (extraData & Authors) {
+            QString authors;
+            if (mod->authors().length() == 1)
+                authors = mod->authors().back();
+            else if (mod->authors().length() > 1)
+                authors = QString("\"%1\"").arg(mod->authors().join(","));
+            data << authors;
+        }
+        lines << data.join(",");
+    }
+    return lines.join("\n");
+}
+
+QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData)
+{
+    switch (format) {
+        case HTML:
+            return toHTML(mods, extraData);
+        case MARKDOWN:
+            return toMARKDOWN(mods, extraData);
+        case PLAINTXT:
+            return toPLAINTXT(mods, extraData);
+        case JSON:
+            return toJSON(mods, extraData);
+        case CSV:
+            return toCSV(mods, extraData);
         default: {
             return QString("unknown format:%1").arg(format);
         }
-- 
cgit 


From 9b02c31f8dab0f36f3d0c30115ab323dabe21541 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 4 Jul 2023 17:48:20 +0300
Subject: escaped text for html export

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/helpers/ExportToModList.cpp b/launcher/modplatform/helpers/ExportToModList.cpp
index a8a015e3..e7bafac4 100644
--- a/launcher/modplatform/helpers/ExportToModList.cpp
+++ b/launcher/modplatform/helpers/ExportToModList.cpp
@@ -26,9 +26,9 @@ QString toHTML(QList<Mod*> mods, OptionalData extraData)
     QStringList lines;
     for (auto mod : mods) {
         auto meta = mod->metadata();
-        auto modName = mod->name();
+        auto modName = mod->name().toHtmlEscaped();
         if (extraData & Url) {
-            auto url = mod->metaurl();
+            auto url = mod->metaurl().toHtmlEscaped();
             if (!url.isEmpty())
                 modName = QString("<a href=\"%1\">%2</a>").arg(url, modName);
         }
@@ -38,10 +38,10 @@ QString toHTML(QList<Mod*> mods, OptionalData extraData)
             if (ver.isEmpty() && meta != nullptr)
                 ver = meta->version().toString();
             if (!ver.isEmpty())
-                line += QString(" [%1]").arg(ver);
+                line += QString(" [%1]").arg(ver.toHtmlEscaped());
         }
         if (extraData & Authors && !mod->authors().isEmpty())
-            line += " by " + mod->authors().join(", ");
+            line += " by " + mod->authors().join(", ").toHtmlEscaped();
         lines.append(QString("<li>%1</li>").arg(line));
     }
     return QString("<html><body><ul>\n\t%1\n</ul></body></html>").arg(lines.join("\n\t"));
-- 
cgit 


From 1495bfb73ead50b45942e94a8e3b18e111820b4b Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 11 Jul 2023 22:43:27 +0300
Subject: Made custom template enabled all time

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/helpers/ExportToModList.h |  2 +-
 launcher/ui/dialogs/ExportToModListDialog.cpp  | 53 ++++++++++++--------------
 launcher/ui/dialogs/ExportToModListDialog.h    |  3 +-
 launcher/ui/dialogs/ExportToModListDialog.ui   | 14 ++++++-
 4 files changed, 40 insertions(+), 32 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/helpers/ExportToModList.h b/launcher/modplatform/helpers/ExportToModList.h
index abd6e9bc..49252fc4 100644
--- a/launcher/modplatform/helpers/ExportToModList.h
+++ b/launcher/modplatform/helpers/ExportToModList.h
@@ -16,7 +16,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #pragma once
-#include <qlist.h>
+#include <QList>
 #include <QString>
 #include "minecraft/mod/Mod.h"
 
diff --git a/launcher/ui/dialogs/ExportToModListDialog.cpp b/launcher/ui/dialogs/ExportToModListDialog.cpp
index cfd28cf8..b86b1056 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.cpp
+++ b/launcher/ui/dialogs/ExportToModListDialog.cpp
@@ -33,11 +33,19 @@
 #include <QMessageBox>
 #include <QPushButton>
 
+const QHash<ExportToModList::Formats, QString> ExportToModListDialog::exampleLines = {
+    { ExportToModList::HTML, "<li><a href=\"{url}\">{name}</a> [{version}] by {authors}</li>" },
+    { ExportToModList::MARKDOWN, "[{name}]({url}) [{version}] by {authors}" },
+    { ExportToModList::PLAINTXT, "{name} ({url}) [{version}] by {authors}" },
+    { ExportToModList::JSON, "{\"name\":\"{name}\",\"url\":\"{url}\",\"version\":\"{version}\",\"authors\":\"{authors}\"}," },
+    { ExportToModList::CSV, "{name},{url},{version},\"{authors}\"" },
+};
+
 ExportToModListDialog::ExportToModListDialog(InstancePtr instance, QWidget* parent)
-    : QDialog(parent), m_template_selected(false), name(instance->name()), ui(new Ui::ExportToModListDialog)
+    : QDialog(parent), m_template_changed(false), name(instance->name()), ui(new Ui::ExportToModListDialog)
 {
     ui->setupUi(this);
-    ui->templateGroup->setDisabled(true);
+    ui->optionsGroup->setDisabled(false);
 
     MinecraftInstance* mcInstance = dynamic_cast<MinecraftInstance*>(instance.get());
     if (mcInstance) {
@@ -52,7 +60,12 @@ ExportToModListDialog::ExportToModListDialog(InstancePtr instance, QWidget* pare
     connect(ui->authorsCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
     connect(ui->versionCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
     connect(ui->urlCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
-    connect(ui->templateText, &QTextEdit::textChanged, this, &ExportToModListDialog::triggerImp);
+    connect(ui->templateText, &QTextEdit::textChanged, this, [this] {
+        if (ui->templateText->toPlainText() != exampleLines[format])
+            ui->formatComboBox->setCurrentIndex(5);
+        else
+            triggerImp();
+    });
     connect(ui->copyButton, &QPushButton::clicked, this, [this](bool) {
         this->ui->finalText->selectAll();
         this->ui->finalText->copy();
@@ -68,42 +81,37 @@ void ExportToModListDialog::formatChanged(int index)
 {
     switch (index) {
         case 0: {
-            ui->templateGroup->setDisabled(true);
             ui->optionsGroup->setDisabled(false);
             ui->resultText->show();
             format = ExportToModList::HTML;
             break;
         }
         case 1: {
-            ui->templateGroup->setDisabled(true);
             ui->optionsGroup->setDisabled(false);
             ui->resultText->show();
             format = ExportToModList::MARKDOWN;
             break;
         }
         case 2: {
-            ui->templateGroup->setDisabled(true);
             ui->optionsGroup->setDisabled(false);
             ui->resultText->hide();
             format = ExportToModList::PLAINTXT;
             break;
         }
         case 3: {
-            ui->templateGroup->setDisabled(true);
             ui->optionsGroup->setDisabled(false);
             ui->resultText->hide();
             format = ExportToModList::JSON;
             break;
         }
         case 4: {
-            ui->templateGroup->setDisabled(true);
             ui->optionsGroup->setDisabled(false);
             ui->resultText->hide();
             format = ExportToModList::CSV;
             break;
         }
         case 5: {
-            ui->templateGroup->setDisabled(false);
+            m_template_changed = true;
             ui->optionsGroup->setDisabled(true);
             ui->resultText->hide();
             format = ExportToModList::CUSTOM;
@@ -116,7 +124,6 @@ void ExportToModListDialog::formatChanged(int index)
 void ExportToModListDialog::triggerImp()
 {
     if (format == ExportToModList::CUSTOM) {
-        m_template_selected = true;
         ui->finalText->setPlainText(ExportToModList::ExportToModList(m_allMods, ui->templateText->toPlainText()));
         return;
     }
@@ -129,35 +136,25 @@ void ExportToModListDialog::triggerImp()
         opt |= ExportToModList::Url;
     auto txt = ExportToModList::ExportToModList(m_allMods, format, static_cast<ExportToModList::OptionalData>(opt));
     ui->finalText->setPlainText(txt);
-    QString exampleLine;
     switch (format) {
-        case ExportToModList::HTML: {
-            exampleLine = "<li><a href=\"{url}\">{name}</a> [{version}] by {authors}</li>";
+        case ExportToModList::CUSTOM:
+            return;
+        case ExportToModList::HTML:
             ui->resultText->setHtml(txt);
             break;
-        }
-        case ExportToModList::MARKDOWN: {
-            exampleLine = "[{name}]({url}) [{version}] by {authors}";
+        case ExportToModList::MARKDOWN:
             ui->resultText->setHtml(markdownToHTML(txt));
             break;
-        }
-        case ExportToModList::PLAINTXT: {
-            exampleLine = "{name} ({url}) [{version}] by {authors}";
+        case ExportToModList::PLAINTXT:
             break;
-        }
-        case ExportToModList::CUSTOM:
-            return;
         case ExportToModList::JSON:
-            exampleLine = "{\"name\":\"{name}\",\"url\":\"{url}\",\"version\":\"{version}\",\"authors\":\"{authors}\"},";
             break;
         case ExportToModList::CSV:
-            exampleLine = "{name},{url},{version},\"{authors}\"";
             break;
     }
-    if (!m_template_selected) {
-        if (ui->templateText->toPlainText() != exampleLine)
-            ui->templateText->setPlainText(exampleLine);
-    }
+    auto exampleLine = exampleLines[format];
+    if (!m_template_changed && ui->templateText->toPlainText() != exampleLine)
+        ui->templateText->setPlainText(exampleLine);
 }
 
 void ExportToModListDialog::done(int result)
diff --git a/launcher/ui/dialogs/ExportToModListDialog.h b/launcher/ui/dialogs/ExportToModListDialog.h
index a7a6bcdc..b8a83d83 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.h
+++ b/launcher/ui/dialogs/ExportToModListDialog.h
@@ -45,8 +45,9 @@ class ExportToModListDialog : public QDialog {
    private:
     QString extension();
     QList<Mod*> m_allMods;
-    bool m_template_selected;
+    bool m_template_changed;
     QString name;
     ExportToModList::Formats format = ExportToModList::Formats::HTML;
     Ui::ExportToModListDialog* ui;
+    static const QHash<ExportToModList::Formats, QString> exampleLines;
 };
diff --git a/launcher/ui/dialogs/ExportToModListDialog.ui b/launcher/ui/dialogs/ExportToModListDialog.ui
index e0f138f9..90f179a6 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.ui
+++ b/launcher/ui/dialogs/ExportToModListDialog.ui
@@ -18,7 +18,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
+    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0">
      <item>
       <widget class="QGroupBox" name="groupBox_3">
        <property name="title">
@@ -149,6 +149,16 @@
        </layout>
       </widget>
      </item>
+     <item>
+      <widget class="QLabel" name="warningLabel">
+       <property name="text">
+        <string>This depends on the mods meta data. To ensure the meta data run at least one time the mods update on the selected instance(no need to update the mods).</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -189,7 +199,7 @@
     </hint>
    </hints>
   </connection>
-   <connection>
+  <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>ExportToModListDialog</receiver>
-- 
cgit 


From 1ccfba13ebe11a1d6ea2897db45b47c2452931f5 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 14 Jul 2023 23:39:54 +0300
Subject: renames

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/helpers/ExportToModList.cpp | 12 ++++++------
 launcher/modplatform/helpers/ExportToModList.h   |  4 ++--
 launcher/ui/dialogs/ExportToModListDialog.cpp    |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/helpers/ExportToModList.cpp b/launcher/modplatform/helpers/ExportToModList.cpp
index e7bafac4..1f01c4a8 100644
--- a/launcher/modplatform/helpers/ExportToModList.cpp
+++ b/launcher/modplatform/helpers/ExportToModList.cpp
@@ -47,7 +47,7 @@ QString toHTML(QList<Mod*> mods, OptionalData extraData)
     return QString("<html><body><ul>\n\t%1\n</ul></body></html>").arg(lines.join("\n\t"));
 }
 
-QString toMARKDOWN(QList<Mod*> mods, OptionalData extraData)
+QString toMarkdown(QList<Mod*> mods, OptionalData extraData)
 {
     QStringList lines;
     for (auto mod : mods) {
@@ -73,7 +73,7 @@ QString toMARKDOWN(QList<Mod*> mods, OptionalData extraData)
     return lines.join("\n");
 }
 
-QString toPLAINTXT(QList<Mod*> mods, OptionalData extraData)
+QString toPlainTXT(QList<Mod*> mods, OptionalData extraData)
 {
     QStringList lines;
     for (auto mod : mods) {
@@ -159,15 +159,15 @@ QString toCSV(QList<Mod*> mods, OptionalData extraData)
     return lines.join("\n");
 }
 
-QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData)
+QString exportToModList(QList<Mod*> mods, Formats format, OptionalData extraData)
 {
     switch (format) {
         case HTML:
             return toHTML(mods, extraData);
         case MARKDOWN:
-            return toMARKDOWN(mods, extraData);
+            return toMarkdown(mods, extraData);
         case PLAINTXT:
-            return toPLAINTXT(mods, extraData);
+            return toPlainTXT(mods, extraData);
         case JSON:
             return toJSON(mods, extraData);
         case CSV:
@@ -178,7 +178,7 @@ QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData
     }
 }
 
-QString ExportToModList(QList<Mod*> mods, QString lineTemplate)
+QString exportToModList(QList<Mod*> mods, QString lineTemplate)
 {
     QStringList lines;
     for (auto mod : mods) {
diff --git a/launcher/modplatform/helpers/ExportToModList.h b/launcher/modplatform/helpers/ExportToModList.h
index 49252fc4..7ea4ba9c 100644
--- a/launcher/modplatform/helpers/ExportToModList.h
+++ b/launcher/modplatform/helpers/ExportToModList.h
@@ -28,6 +28,6 @@ enum OptionalData {
     Url = 1 << 1,
     Version = 1 << 2,
 };
-QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData);
-QString ExportToModList(QList<Mod*> mods, QString lineTemplate);
+QString exportToModList(QList<Mod*> mods, Formats format, OptionalData extraData);
+QString exportToModList(QList<Mod*> mods, QString lineTemplate);
 }  // namespace ExportToModList
diff --git a/launcher/ui/dialogs/ExportToModListDialog.cpp b/launcher/ui/dialogs/ExportToModListDialog.cpp
index a0f8ee7b..c811bfe6 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.cpp
+++ b/launcher/ui/dialogs/ExportToModListDialog.cpp
@@ -127,7 +127,7 @@ void ExportToModListDialog::formatChanged(int index)
 void ExportToModListDialog::triggerImp()
 {
     if (format == ExportToModList::CUSTOM) {
-        ui->finalText->setPlainText(ExportToModList::ExportToModList(m_allMods, ui->templateText->toPlainText()));
+        ui->finalText->setPlainText(ExportToModList::exportToModList(m_allMods, ui->templateText->toPlainText()));
         return;
     }
     auto opt = 0;
@@ -137,7 +137,7 @@ void ExportToModListDialog::triggerImp()
         opt |= ExportToModList::Version;
     if (ui->urlCheckBox->isChecked())
         opt |= ExportToModList::Url;
-    auto txt = ExportToModList::ExportToModList(m_allMods, format, static_cast<ExportToModList::OptionalData>(opt));
+    auto txt = ExportToModList::exportToModList(m_allMods, format, static_cast<ExportToModList::OptionalData>(opt));
     ui->finalText->setPlainText(txt);
     switch (format) {
         case ExportToModList::CUSTOM:
-- 
cgit 


From c346d875a2d26435f680efb07f785c43af5ad95a Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 15 Jul 2023 23:26:52 +0300
Subject: make FileResolvingTask accept empty modlist

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/flame/FileResolvingTask.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index ce7a6055..34bd401d 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -21,6 +21,10 @@ bool Flame::FileResolvingTask::abort()
 
 void Flame::FileResolvingTask::executeTask()
 {
+    if (m_toProcess.files.isEmpty()) {  // no file to resolve so leave it empty and emit success immediately
+        emitSucceeded();
+        return;
+    }
     setStatus(tr("Resolving mod IDs..."));
     setProgress(0, 3);
     m_dljob.reset(new NetJob("Mod id resolver", m_network));
@@ -128,12 +132,13 @@ void Flame::FileResolvingTask::netJobFinished()
     m_checkJob->start();
 }
 
-void Flame::FileResolvingTask::modrinthCheckFinished() {
+void Flame::FileResolvingTask::modrinthCheckFinished()
+{
     setProgress(2, 3);
     qDebug() << "Finished with blocked mods : " << blockedProjects.size();
 
     for (auto it = blockedProjects.keyBegin(); it != blockedProjects.keyEnd(); it++) {
-        auto &out = *it;
+        auto& out = *it;
         auto bytes = blockedProjects[out];
         if (!out->resolved) {
             continue;
@@ -153,15 +158,13 @@ void Flame::FileResolvingTask::modrinthCheckFinished() {
             out->resolved = false;
         }
     }
-    //copy to an output list and filter out projects found on modrinth
+    // copy to an output list and filter out projects found on modrinth
     auto block = std::make_shared<QList<File*>>();
     auto it = blockedProjects.keys();
-    std::copy_if(it.begin(), it.end(), std::back_inserter(*block), [](File *f) {
-        return !f->resolved;
-    });
-    //Display not found mods early
+    std::copy_if(it.begin(), it.end(), std::back_inserter(*block), [](File* f) { return !f->resolved; });
+    // Display not found mods early
     if (!block->empty()) {
-        //blocked mods found, we need the slug for displaying.... we need another job :D !
+        // blocked mods found, we need the slug for displaying.... we need another job :D !
         m_slugJob.reset(new NetJob("Slug Job", m_network));
         int index = 0;
         for (auto mod : *block) {
@@ -173,8 +176,8 @@ void Flame::FileResolvingTask::modrinthCheckFinished() {
             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
                 auto json = QJsonDocument::fromJson(*output);
-                auto base = Json::requireString(Json::requireObject(Json::requireObject(Json::requireObject(json),"data"),"links"),
-                        "websiteUrl");
+                auto base =
+                    Json::requireString(Json::requireObject(Json::requireObject(Json::requireObject(json), "data"), "links"), "websiteUrl");
                 auto link = QString("%1/download/%2").arg(base, QString::number(mod->fileId));
                 mod->websiteUrl = link;
             });
-- 
cgit 


From 391497645ff2054dbc1eac48c8bc49133b86b319 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 18 Jul 2023 22:33:39 +0300
Subject: feat:made flame instace creation use metadata for recommended version

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 .../flame/FlameInstanceCreationTask.cpp            | 116 ++++++++++++++-------
 .../modplatform/flame/FlameInstanceCreationTask.h  |   6 +-
 2 files changed, 80 insertions(+), 42 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index b57db288..710ec06a 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -57,15 +57,11 @@
 #include <QDebug>
 #include <QFileInfo>
 
+#include "meta/Index.h"
+#include "meta/VersionList.h"
 #include "minecraft/World.h"
 #include "minecraft/mod/tasks/LocalResourceParse.h"
 
-
-const static QMap<QString, QString> forgemap = { { "1.2.5", "3.4.9.171" },
-                                                 { "1.4.2", "6.0.1.355" },
-                                                 { "1.4.7", "6.6.2.534" },
-                                                 { "1.5.2", "7.8.1.737" } };
-
 static const FlameAPI api;
 
 bool FlameCreationTask::abort()
@@ -259,6 +255,51 @@ bool FlameCreationTask::updateInstance()
     return false;
 }
 
+QString FlameCreationTask::getVersionForLoader(QString uid, QString loaderType, QString version, QString mcVersion)
+{
+    if (version == "recommended") {
+        auto vlist = APPLICATION->metadataIndex()->get(uid);
+        if (!vlist) {
+            setError(tr("Failed to get local metadata index for %1").arg(uid));
+            return Q_NULLPTR;
+        }
+
+        if (!vlist->isLoaded()) {
+            vlist->load(Net::Mode::Online);
+        }
+
+        for (int i = 0; i < vlist->versions().size(); i++) {
+            auto version = vlist->versions().at(i);
+            // first recommended build we find, we use.
+            if (!version->isRecommended())
+                continue;
+            auto reqs = version->requiredSet();
+
+            // filter by minecraft version, if the loader depends on a certain version.
+            // not all mod loaders depend on a given Minecraft version, so we won't do this
+            // filtering for those loaders.
+            if (loaderType == "forge") {
+                auto iter = std::find_if(reqs.begin(), reqs.end(), [mcVersion](const Meta::Require& req) {
+                    return req.uid == "net.minecraft" && req.equalsVersion == mcVersion;
+                });
+                if (iter == reqs.end())
+                    continue;
+            }
+            return version->descriptor();
+        }
+
+        setError(tr("Failed to find version for %1 loader").arg(loaderType));
+        return Q_NULLPTR;
+    }
+
+    if (version == Q_NULLPTR || version.isEmpty()) {
+        emitFailed(tr("No loader version set for modpack!"));
+        return Q_NULLPTR;
+    }
+
+    return version;
+}
+
 bool FlameCreationTask::createInstance()
 {
     QEventLoop loop;
@@ -297,22 +338,29 @@ bool FlameCreationTask::createInstance()
         }
     }
 
-    QString forgeVersion;
-    QString fabricVersion;
-    // TODO: is Quilt relevant here?
+    QString loaderType;
+    QString loaderUid;
+    QString loaderVersion;
+
     for (auto& loader : m_pack.minecraft.modLoaders) {
         auto id = loader.id;
         if (id.startsWith("forge-")) {
             id.remove("forge-");
-            forgeVersion = id;
-            continue;
-        }
-        if (id.startsWith("fabric-")) {
+            loaderType = "forge";
+            loaderUid = "net.minecraftforge";
+        } else if (loaderType == "fabric") {
             id.remove("fabric-");
-            fabricVersion = id;
+            loaderType = "fabric";
+            loaderUid = "net.fabricmc.fabric-loader";
+        } else if (loaderType == "quilt") {
+            id.remove("quilt-");
+            loaderType = "quilt";
+            loaderUid = "org.quiltmc.quilt-loader";
+        } else {
+            logWarning(tr("Unknown mod loader in manifest: %1").arg(id));
             continue;
         }
-        logWarning(tr("Unknown mod loader in manifest: %1").arg(id));
+        loaderVersion = id;
     }
 
     QString configPath = FS::PathCombine(m_stagingPath, "instance.cfg");
@@ -329,19 +377,12 @@ bool FlameCreationTask::createInstance()
     auto components = instance.getPackProfile();
     components->buildingFromScratch();
     components->setComponentVersion("net.minecraft", mcVersion, true);
-    if (!forgeVersion.isEmpty()) {
-        // FIXME: dirty, nasty, hack. Proper solution requires dependency resolution and knowledge of the metadata.
-        if (forgeVersion == "recommended") {
-            if (forgemap.contains(mcVersion)) {
-                forgeVersion = forgemap[mcVersion];
-            } else {
-                logWarning(tr("Could not map recommended Forge version for Minecraft %1").arg(mcVersion));
-            }
-        }
-        components->setComponentVersion("net.minecraftforge", forgeVersion);
+    if (!loaderType.isEmpty()) {
+        auto version = getVersionForLoader(loaderUid, loaderType, loaderVersion, mcVersion);
+        if (version == Q_NULLPTR || version.isEmpty())
+            return false;
+        components->setComponentVersion(loaderUid, version);
     }
-    if (!fabricVersion.isEmpty())
-        components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion);
 
     if (m_instIcon != "default") {
         instance.setIconKey(m_instIcon);
@@ -502,7 +543,7 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
         m_files_job.reset();
         setError(reason);
     });
-    connect(m_files_job.get(), &NetJob::progress, this, [this](qint64 current, qint64 total){
+    connect(m_files_job.get(), &NetJob::progress, this, [this](qint64 current, qint64 total) {
         setDetails(tr("%1 out of %2 complete").arg(current).arg(total));
         setProgress(current, total);
     });
@@ -545,7 +586,6 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
     setAbortable(true);
 }
 
-
 void FlameCreationTask::validateZIPResouces()
 {
     qDebug() << "Validating whether resources stored as .zip are in the right place";
@@ -569,7 +609,7 @@ void FlameCreationTask::validateZIPResouces()
             return localPath;
         };
 
-        auto installWorld = [this](QString worldPath){
+        auto installWorld = [this](QString worldPath) {
             qDebug() << "Installing World from" << worldPath;
             QFileInfo worldFileInfo(worldPath);
             World w(worldFileInfo);
@@ -586,29 +626,29 @@ void FlameCreationTask::validateZIPResouces()
         QString worldPath;
 
         switch (type) {
-            case PackedResourceType::Mod :
+            case PackedResourceType::Mod:
                 validatePath(fileName, targetFolder, "mods");
                 break;
-            case PackedResourceType::ResourcePack :
+            case PackedResourceType::ResourcePack:
                 validatePath(fileName, targetFolder, "resourcepacks");
                 break;
-            case PackedResourceType::TexturePack :
+            case PackedResourceType::TexturePack:
                 validatePath(fileName, targetFolder, "texturepacks");
                 break;
-            case PackedResourceType::DataPack :
+            case PackedResourceType::DataPack:
                 validatePath(fileName, targetFolder, "datapacks");
                 break;
-            case PackedResourceType::ShaderPack :
+            case PackedResourceType::ShaderPack:
                 // in theroy flame API can't do this but who knows, that *may* change ?
                 // better to handle it if it *does* occure in the future
                 validatePath(fileName, targetFolder, "shaderpacks");
                 break;
-            case PackedResourceType::WorldSave :
+            case PackedResourceType::WorldSave:
                 worldPath = validatePath(fileName, targetFolder, "saves");
                 installWorld(worldPath);
                 break;
-            case PackedResourceType::UNKNOWN :
-            default :
+            case PackedResourceType::UNKNOWN:
+            default:
                 qDebug() << "Can't Identify" << fileName << "at" << localPath << ", leaving it where it is.";
                 break;
         }
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.h b/launcher/modplatform/flame/FlameInstanceCreationTask.h
index 0ae4735b..603d3693 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.h
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.h
@@ -57,10 +57,7 @@ class FlameCreationTask final : public InstanceCreationTask {
                       QString id,
                       QString version_id,
                       QString original_instance_id = {})
-        : InstanceCreationTask()
-        , m_parent(parent)
-        , m_managed_id(std::move(id))
-        , m_managed_version_id(std::move(version_id))
+        : InstanceCreationTask(), m_parent(parent), m_managed_id(std::move(id)), m_managed_version_id(std::move(version_id))
     {
         setStagingPath(staging_path);
         setParentSettings(global_settings);
@@ -78,6 +75,7 @@ class FlameCreationTask final : public InstanceCreationTask {
     void setupDownloadJob(QEventLoop&);
     void copyBlockedMods(QList<BlockedMod> const& blocked_mods);
     void validateZIPResouces();
+    QString getVersionForLoader(QString uid, QString loaderType, QString version, QString mcVersion);
 
    private:
     QWidget* m_parent = nullptr;
-- 
cgit 


From f393aa684e74ca870eb2108e2b74a7c93a70c366 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 18 Jul 2023 23:59:43 +0300
Subject: wait to load metadata

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 .../flame/FlameInstanceCreationTask.cpp            | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 710ec06a..e8453c60 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -255,17 +255,23 @@ bool FlameCreationTask::updateInstance()
     return false;
 }
 
-QString FlameCreationTask::getVersionForLoader(QString uid, QString loaderType, QString version, QString mcVersion)
+QString FlameCreationTask::getVersionForLoader(QString uid, QString loaderType, QString loaderVersion, QString mcVersion)
 {
-    if (version == "recommended") {
+    if (loaderVersion == "recommended") {
         auto vlist = APPLICATION->metadataIndex()->get(uid);
         if (!vlist) {
             setError(tr("Failed to get local metadata index for %1").arg(uid));
-            return Q_NULLPTR;
+            return {};
         }
 
         if (!vlist->isLoaded()) {
-            vlist->load(Net::Mode::Online);
+            QEventLoop loadVersionLoop;
+            auto task = vlist->getLoadTask();
+            connect(task.get(), &Task::finished, &loadVersionLoop, &QEventLoop::quit);
+            if (!task->isRunning())
+                task->start();
+
+            loadVersionLoop.exec();
         }
 
         for (int i = 0; i < vlist->versions().size(); i++) {
@@ -289,15 +295,15 @@ QString FlameCreationTask::getVersionForLoader(QString uid, QString loaderType,
         }
 
         setError(tr("Failed to find version for %1 loader").arg(loaderType));
-        return Q_NULLPTR;
+        return {};
     }
 
-    if (version == Q_NULLPTR || version.isEmpty()) {
+    if (loaderVersion.isEmpty()) {
         emitFailed(tr("No loader version set for modpack!"));
-        return Q_NULLPTR;
+        return {};
     }
 
-    return version;
+    return loaderVersion;
 }
 
 bool FlameCreationTask::createInstance()
@@ -379,7 +385,7 @@ bool FlameCreationTask::createInstance()
     components->setComponentVersion("net.minecraft", mcVersion, true);
     if (!loaderType.isEmpty()) {
         auto version = getVersionForLoader(loaderUid, loaderType, loaderVersion, mcVersion);
-        if (version == Q_NULLPTR || version.isEmpty())
+        if (version.isEmpty())
             return false;
         components->setComponentVersion(loaderUid, version);
     }
-- 
cgit 


From f8d9cd9a0344d8afa806e7b3b73e8b3c59315d17 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 19 Jul 2023 23:08:16 +0300
Subject: use range for

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

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index e8453c60..29145d89 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -274,8 +274,7 @@ QString FlameCreationTask::getVersionForLoader(QString uid, QString loaderType,
             loadVersionLoop.exec();
         }
 
-        for (int i = 0; i < vlist->versions().size(); i++) {
-            auto version = vlist->versions().at(i);
+        for (auto version : vlist->versions()) {
             // first recommended build we find, we use.
             if (!version->isRecommended())
                 continue;
-- 
cgit 


From af59c4171344d6727c8d67205cc02406729250a3 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 26 Jul 2023 16:20:30 -0400
Subject: fix: typo in task.h

Signed-off-by: seth <getchoo@tuta.io>
---
 launcher/InstanceImportTask.cpp                                | 6 +++---
 launcher/InstanceList.cpp                                      | 2 +-
 launcher/ResourceDownloadTask.cpp                              | 2 +-
 launcher/launch/steps/Update.cpp                               | 2 +-
 launcher/minecraft/MinecraftLoadAndCheck.cpp                   | 2 +-
 launcher/minecraft/MinecraftUpdate.cpp                         | 4 ++--
 launcher/minecraft/update/AssetUpdateTask.cpp                  | 4 ++--
 launcher/minecraft/update/FMLLibrariesTask.cpp                 | 2 +-
 launcher/minecraft/update/LibrariesTask.cpp                    | 2 +-
 launcher/modplatform/atlauncher/ATLPackInstallTask.cpp         | 4 ++--
 launcher/modplatform/flame/FileResolvingTask.cpp               | 6 +++---
 launcher/modplatform/flame/FlameInstanceCreationTask.cpp       | 4 ++--
 launcher/modplatform/flame/FlamePackExportTask.cpp             | 2 +-
 launcher/modplatform/legacy_ftb/PackInstallTask.cpp            | 2 +-
 launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp | 2 +-
 launcher/modplatform/technic/SingleZipPackInstallTask.cpp      | 2 +-
 launcher/modplatform/technic/SolderPackInstallTask.cpp         | 2 +-
 launcher/tasks/Task.cpp                                        | 2 +-
 launcher/tasks/Task.h                                          | 2 +-
 19 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index 352848f0..d6a96deb 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -99,7 +99,7 @@ void InstanceImportTask::executeTask()
 
         connect(m_filesNetJob.get(), &NetJob::succeeded, this, &InstanceImportTask::downloadSucceeded);
         connect(m_filesNetJob.get(), &NetJob::progress, this, &InstanceImportTask::downloadProgressChanged);
-        connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &InstanceImportTask::propogateStepProgress);
+        connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &InstanceImportTask::propagateStepProgress);
         connect(m_filesNetJob.get(), &NetJob::failed, this, &InstanceImportTask::downloadFailed);
         connect(m_filesNetJob.get(), &NetJob::aborted, this, &InstanceImportTask::downloadAborted);
 
@@ -293,7 +293,7 @@ void InstanceImportTask::processFlame()
     });
     connect(inst_creation_task.get(), &Task::failed, this, &InstanceImportTask::emitFailed);
     connect(inst_creation_task.get(), &Task::progress, this, &InstanceImportTask::setProgress);
-    connect(inst_creation_task.get(), &Task::stepProgress, this, &InstanceImportTask::propogateStepProgress);
+    connect(inst_creation_task.get(), &Task::stepProgress, this, &InstanceImportTask::propagateStepProgress);
     connect(inst_creation_task.get(), &Task::status, this, &InstanceImportTask::setStatus);
     connect(inst_creation_task.get(), &Task::details, this, &InstanceImportTask::setDetails);
 
@@ -385,7 +385,7 @@ void InstanceImportTask::processModrinth()
     });
     connect(inst_creation_task, &Task::failed, this, &InstanceImportTask::emitFailed);
     connect(inst_creation_task, &Task::progress, this, &InstanceImportTask::setProgress);
-    connect(inst_creation_task, &Task::stepProgress, this, &InstanceImportTask::propogateStepProgress);
+    connect(inst_creation_task, &Task::stepProgress, this, &InstanceImportTask::propagateStepProgress);
     connect(inst_creation_task, &Task::status, this, &InstanceImportTask::setStatus);
     connect(inst_creation_task, &Task::details, this, &InstanceImportTask::setDetails);
     connect(inst_creation_task, &Task::finished, inst_creation_task, &InstanceCreationTask::deleteLater);
diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp
index b4c520cd..0485db19 100644
--- a/launcher/InstanceList.cpp
+++ b/launcher/InstanceList.cpp
@@ -799,7 +799,7 @@ class InstanceStaging : public Task {
         connect(child, &Task::status, this, &InstanceStaging::setStatus);
         connect(child, &Task::details, this, &InstanceStaging::setDetails);
         connect(child, &Task::progress, this, &InstanceStaging::setProgress);
-        connect(child, &Task::stepProgress, this, &InstanceStaging::propogateStepProgress);
+        connect(child, &Task::stepProgress, this, &InstanceStaging::propagateStepProgress);
         connect(&m_backoffTimer, &QTimer::timeout, this, &InstanceStaging::childSucceded);
     }
 
diff --git a/launcher/ResourceDownloadTask.cpp b/launcher/ResourceDownloadTask.cpp
index 06c03c77..8bb9b64e 100644
--- a/launcher/ResourceDownloadTask.cpp
+++ b/launcher/ResourceDownloadTask.cpp
@@ -54,7 +54,7 @@ ResourceDownloadTask::ResourceDownloadTask(ModPlatform::IndexedPack::Ptr pack,
     m_filesNetJob->addNetAction(Net::Download::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);
+    connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &ResourceDownloadTask::propagateStepProgress);
     connect(m_filesNetJob.get(), &NetJob::failed, this, &ResourceDownloadTask::downloadFailed);
 
     addTask(m_filesNetJob);
diff --git a/launcher/launch/steps/Update.cpp b/launcher/launch/steps/Update.cpp
index 77c8a18e..8df2bc67 100644
--- a/launcher/launch/steps/Update.cpp
+++ b/launcher/launch/steps/Update.cpp
@@ -28,7 +28,7 @@ void Update::executeTask()
     {
         connect(m_updateTask.get(), &Task::finished, this, &Update::updateFinished);
         connect(m_updateTask.get(), &Task::progress, this, &Update::setProgress);
-        connect(m_updateTask.get(), &Task::stepProgress, this, &Update::propogateStepProgress);
+        connect(m_updateTask.get(), &Task::stepProgress, this, &Update::propagateStepProgress);
         connect(m_updateTask.get(), &Task::status, this, &Update::setStatus);
         connect(m_updateTask.get(), &Task::details, this, &Update::setDetails);
         emit progressReportingRequest();
diff --git a/launcher/minecraft/MinecraftLoadAndCheck.cpp b/launcher/minecraft/MinecraftLoadAndCheck.cpp
index 1c3f6fb7..2a369879 100644
--- a/launcher/minecraft/MinecraftLoadAndCheck.cpp
+++ b/launcher/minecraft/MinecraftLoadAndCheck.cpp
@@ -22,7 +22,7 @@ void MinecraftLoadAndCheck::executeTask()
     connect(m_task.get(), &Task::failed, this, &MinecraftLoadAndCheck::subtaskFailed);
     connect(m_task.get(), &Task::aborted, this, [this]{ subtaskFailed(tr("Aborted")); });
     connect(m_task.get(), &Task::progress, this, &MinecraftLoadAndCheck::progress);
-    connect(m_task.get(), &Task::stepProgress, this, &MinecraftLoadAndCheck::propogateStepProgress);
+    connect(m_task.get(), &Task::stepProgress, this, &MinecraftLoadAndCheck::propagateStepProgress);
     connect(m_task.get(), &Task::status, this, &MinecraftLoadAndCheck::setStatus);
 }
 
diff --git a/launcher/minecraft/MinecraftUpdate.cpp b/launcher/minecraft/MinecraftUpdate.cpp
index 35430bb0..236d0224 100644
--- a/launcher/minecraft/MinecraftUpdate.cpp
+++ b/launcher/minecraft/MinecraftUpdate.cpp
@@ -100,7 +100,7 @@ void MinecraftUpdate::next()
         disconnect(task.get(), &Task::failed, this, &MinecraftUpdate::subtaskFailed);
         disconnect(task.get(), &Task::aborted, this, &Task::abort);
         disconnect(task.get(), &Task::progress, this, &MinecraftUpdate::progress);
-        disconnect(task.get(), &Task::stepProgress, this, &MinecraftUpdate::propogateStepProgress);
+        disconnect(task.get(), &Task::stepProgress, this, &MinecraftUpdate::propagateStepProgress);
         disconnect(task.get(), &Task::status, this, &MinecraftUpdate::setStatus);
         disconnect(task.get(), &Task::details, this, &MinecraftUpdate::setDetails);
     }
@@ -120,7 +120,7 @@ void MinecraftUpdate::next()
     connect(task.get(), &Task::failed, this, &MinecraftUpdate::subtaskFailed);
     connect(task.get(), &Task::aborted, this, &Task::abort);
     connect(task.get(), &Task::progress, this, &MinecraftUpdate::progress);
-    connect(task.get(), &Task::stepProgress, this, &MinecraftUpdate::propogateStepProgress);
+    connect(task.get(), &Task::stepProgress, this, &MinecraftUpdate::propagateStepProgress);
     connect(task.get(), &Task::status, this, &MinecraftUpdate::setStatus);
     connect(task.get(), &Task::details, this, &MinecraftUpdate::setDetails);
     // if the task is already running, do not start it again
diff --git a/launcher/minecraft/update/AssetUpdateTask.cpp b/launcher/minecraft/update/AssetUpdateTask.cpp
index 31fd5eb1..fda85ba8 100644
--- a/launcher/minecraft/update/AssetUpdateTask.cpp
+++ b/launcher/minecraft/update/AssetUpdateTask.cpp
@@ -45,7 +45,7 @@ void AssetUpdateTask::executeTask()
     connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetIndexFailed);
     connect(downloadJob.get(), &NetJob::aborted, this, [this]{ emitFailed(tr("Aborted")); });
     connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
-    connect(downloadJob.get(), &NetJob::stepProgress, this, &AssetUpdateTask::propogateStepProgress);
+    connect(downloadJob.get(), &NetJob::stepProgress, this, &AssetUpdateTask::propagateStepProgress);
 
     qDebug() << m_inst->name() << ": Starting asset index download";
     downloadJob->start();
@@ -84,7 +84,7 @@ void AssetUpdateTask::assetIndexFinished()
         connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetsFailed);
         connect(downloadJob.get(), &NetJob::aborted, this, [this]{ emitFailed(tr("Aborted")); });
         connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
-        connect(downloadJob.get(), &NetJob::stepProgress, this, &AssetUpdateTask::propogateStepProgress);
+        connect(downloadJob.get(), &NetJob::stepProgress, this, &AssetUpdateTask::propagateStepProgress);
         downloadJob->start();
         return;
     }
diff --git a/launcher/minecraft/update/FMLLibrariesTask.cpp b/launcher/minecraft/update/FMLLibrariesTask.cpp
index 75e5c572..d9fa0595 100644
--- a/launcher/minecraft/update/FMLLibrariesTask.cpp
+++ b/launcher/minecraft/update/FMLLibrariesTask.cpp
@@ -75,7 +75,7 @@ void FMLLibrariesTask::executeTask()
     connect(dljob.get(), &NetJob::failed, this, &FMLLibrariesTask::fmllibsFailed);
     connect(dljob.get(), &NetJob::aborted, this, [this]{ emitFailed(tr("Aborted")); });
     connect(dljob.get(), &NetJob::progress, this, &FMLLibrariesTask::progress);
-    connect(dljob.get(), &NetJob::stepProgress, this, &FMLLibrariesTask::propogateStepProgress);
+    connect(dljob.get(), &NetJob::stepProgress, this, &FMLLibrariesTask::propagateStepProgress);
     downloadJob.reset(dljob);
     downloadJob->start();
 }
diff --git a/launcher/minecraft/update/LibrariesTask.cpp b/launcher/minecraft/update/LibrariesTask.cpp
index 415b9a66..9d1c0295 100644
--- a/launcher/minecraft/update/LibrariesTask.cpp
+++ b/launcher/minecraft/update/LibrariesTask.cpp
@@ -70,7 +70,7 @@ void LibrariesTask::executeTask()
     connect(downloadJob.get(), &NetJob::failed, this, &LibrariesTask::jarlibFailed);
     connect(downloadJob.get(), &NetJob::aborted, this, [this]{ emitFailed(tr("Aborted")); });
     connect(downloadJob.get(), &NetJob::progress, this, &LibrariesTask::progress);
-    connect(downloadJob.get(), &NetJob::stepProgress, this, &LibrariesTask::propogateStepProgress);
+    connect(downloadJob.get(), &NetJob::stepProgress, this, &LibrariesTask::propagateStepProgress);
 
     downloadJob->start();
 }
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index 22ea02da..82a51c27 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -684,7 +684,7 @@ void PackInstallTask::installConfigs()
         abortable = true;
         setProgress(current, total);
     });
-    connect(jobPtr.get(), &NetJob::stepProgress, this, &PackInstallTask::propogateStepProgress);
+    connect(jobPtr.get(), &NetJob::stepProgress, this, &PackInstallTask::propagateStepProgress);
     connect(jobPtr.get(), &NetJob::aborted, [&]{
         abortable = false;
         jobPtr.reset();
@@ -852,7 +852,7 @@ void PackInstallTask::downloadMods()
         abortable = true;
         setProgress(current, total);
     });
-    connect(jobPtr.get(), &NetJob::stepProgress, this, &PackInstallTask::propogateStepProgress);
+    connect(jobPtr.get(), &NetJob::stepProgress, this, &PackInstallTask::propagateStepProgress);
     connect(jobPtr.get(), &NetJob::aborted, [&]
     {
         abortable = false;
diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 34bd401d..ae168bbd 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -52,7 +52,7 @@ void Flame::FileResolvingTask::executeTask()
         stepProgress(*step_progress);
         emitFailed(reason);
     });
-    connect(m_dljob.get(), &NetJob::stepProgress, this, &FileResolvingTask::propogateStepProgress);
+    connect(m_dljob.get(), &NetJob::stepProgress, this, &FileResolvingTask::propagateStepProgress);
     connect(m_dljob.get(), &NetJob::progress, this, [this, step_progress](qint64 current, qint64 total) {
         qDebug() << "Resolve slug progress" << current << total;
         step_progress->update(current, total);
@@ -118,7 +118,7 @@ void Flame::FileResolvingTask::netJobFinished()
         stepProgress(*step_progress);
         emitFailed(reason);
     });
-    connect(m_checkJob.get(), &NetJob::stepProgress, this, &FileResolvingTask::propogateStepProgress);
+    connect(m_checkJob.get(), &NetJob::stepProgress, this, &FileResolvingTask::propagateStepProgress);
     connect(m_checkJob.get(), &NetJob::progress, this, [this, step_progress](qint64 current, qint64 total) {
         qDebug() << "Resolve slug progress" << current << total;
         step_progress->update(current, total);
@@ -195,7 +195,7 @@ void Flame::FileResolvingTask::modrinthCheckFinished()
             stepProgress(*step_progress);
             emitFailed(reason);
         });
-        connect(m_slugJob.get(), &NetJob::stepProgress, this, &FileResolvingTask::propogateStepProgress);
+        connect(m_slugJob.get(), &NetJob::stepProgress, this, &FileResolvingTask::propagateStepProgress);
         connect(m_slugJob.get(), &NetJob::progress, this, [this, step_progress](qint64 current, qint64 total) {
             qDebug() << "Resolve slug progress" << current << total;
             step_progress->update(current, total);
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 29145d89..e17cf1c2 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -432,7 +432,7 @@ bool FlameCreationTask::createInstance()
     });
     connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::progress, this, &FlameCreationTask::setProgress);
     connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::status, this, &FlameCreationTask::setStatus);
-    connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::stepProgress, this, &FlameCreationTask::propogateStepProgress);
+    connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::stepProgress, this, &FlameCreationTask::propagateStepProgress);
     connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::details, this, &FlameCreationTask::setDetails);
     m_mod_id_resolver->start();
 
@@ -552,7 +552,7 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
         setDetails(tr("%1 out of %2 complete").arg(current).arg(total));
         setProgress(current, total);
     });
-    connect(m_files_job.get(), &NetJob::stepProgress, this, &FlameCreationTask::propogateStepProgress);
+    connect(m_files_job.get(), &NetJob::stepProgress, this, &FlameCreationTask::propagateStepProgress);
     connect(m_files_job.get(), &NetJob::finished, &loop, &QEventLoop::quit);
 
     setStatus(tr("Downloading mods..."));
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index ac0da214..87bf780c 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -166,7 +166,7 @@ void FlamePackExportTask::collectHashes()
         stepProgress(*progressStep);
         emitFailed(reason);
     });
-    connect(hashingTask.get(), &Task::stepProgress, this, &FlamePackExportTask::propogateStepProgress);
+    connect(hashingTask.get(), &Task::stepProgress, this, &FlamePackExportTask::propagateStepProgress);
 
     connect(hashingTask.get(), &Task::progress, this, [this, progressStep](qint64 current, qint64 total) {
         progressStep->update(current, total);
diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
index a4c78397..1afe5783 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
@@ -81,7 +81,7 @@ void PackInstallTask::downloadPack()
 
     connect(netJobContainer.get(), &NetJob::succeeded, this, &PackInstallTask::unzip);
     connect(netJobContainer.get(), &NetJob::failed, this, &PackInstallTask::emitFailed);
-    connect(netJobContainer.get(), &NetJob::stepProgress, this, &PackInstallTask::propogateStepProgress);
+    connect(netJobContainer.get(), &NetJob::stepProgress, this, &PackInstallTask::propagateStepProgress);
     connect(netJobContainer.get(), &NetJob::aborted, this, &PackInstallTask::emitAborted);
 
     netJobContainer->start();
diff --git a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
index 76f07277..bd0b828c 100644
--- a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
@@ -267,7 +267,7 @@ bool ModrinthCreationTask::createInstance()
         setDetails(tr("%1 out of %2 complete").arg(current).arg(total));
         setProgress(current, total); 
     });
-    connect(m_files_job.get(), &NetJob::stepProgress, this, &ModrinthCreationTask::propogateStepProgress);
+    connect(m_files_job.get(), &NetJob::stepProgress, this, &ModrinthCreationTask::propagateStepProgress);
 
     setStatus(tr("Downloading mods..."));
     m_files_job->start();
diff --git a/launcher/modplatform/technic/SingleZipPackInstallTask.cpp b/launcher/modplatform/technic/SingleZipPackInstallTask.cpp
index f07ca24a..ab91c466 100644
--- a/launcher/modplatform/technic/SingleZipPackInstallTask.cpp
+++ b/launcher/modplatform/technic/SingleZipPackInstallTask.cpp
@@ -50,7 +50,7 @@ void Technic::SingleZipPackInstallTask::executeTask()
     auto job = m_filesNetJob.get();
     connect(job, &NetJob::succeeded, this, &Technic::SingleZipPackInstallTask::downloadSucceeded);
     connect(job, &NetJob::progress, this, &Technic::SingleZipPackInstallTask::downloadProgressChanged);
-    connect(job, &NetJob::stepProgress, this, &Technic::SingleZipPackInstallTask::propogateStepProgress);
+    connect(job, &NetJob::stepProgress, this, &Technic::SingleZipPackInstallTask::propagateStepProgress);
     connect(job, &NetJob::failed, this, &Technic::SingleZipPackInstallTask::downloadFailed);
     m_filesNetJob->start();
 }
diff --git a/launcher/modplatform/technic/SolderPackInstallTask.cpp b/launcher/modplatform/technic/SolderPackInstallTask.cpp
index 6a05d17a..cc1d261e 100644
--- a/launcher/modplatform/technic/SolderPackInstallTask.cpp
+++ b/launcher/modplatform/technic/SolderPackInstallTask.cpp
@@ -126,7 +126,7 @@ void Technic::SolderPackInstallTask::fileListSucceeded()
 
     connect(m_filesNetJob.get(), &NetJob::succeeded, this, &Technic::SolderPackInstallTask::downloadSucceeded);
     connect(m_filesNetJob.get(), &NetJob::progress, this, &Technic::SolderPackInstallTask::downloadProgressChanged);
-    connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &Technic::SolderPackInstallTask::propogateStepProgress);
+    connect(m_filesNetJob.get(), &NetJob::stepProgress, this, &Technic::SolderPackInstallTask::propagateStepProgress);
     connect(m_filesNetJob.get(), &NetJob::failed, this, &Technic::SolderPackInstallTask::downloadFailed);
     connect(m_filesNetJob.get(), &NetJob::aborted, this, &Technic::SolderPackInstallTask::downloadAborted);
     m_filesNetJob->start();
diff --git a/launcher/tasks/Task.cpp b/launcher/tasks/Task.cpp
index 29c55cd4..fd82ec00 100644
--- a/launcher/tasks/Task.cpp
+++ b/launcher/tasks/Task.cpp
@@ -161,7 +161,7 @@ void Task::emitSucceeded()
     emit finished();
 }
 
-void Task::propogateStepProgress(TaskStepProgress const& task_progress)
+void Task::propagateStepProgress(TaskStepProgress const& task_progress)
 {
     emit stepProgress(task_progress);
 }
diff --git a/launcher/tasks/Task.h b/launcher/tasks/Task.h
index 6d8bbbb4..57177697 100644
--- a/launcher/tasks/Task.h
+++ b/launcher/tasks/Task.h
@@ -167,7 +167,7 @@ class Task : public QObject, public QRunnable {
     virtual void emitAborted();
     virtual void emitFailed(QString reason = "");
 
-    virtual void propogateStepProgress(TaskStepProgress const& task_progress);
+    virtual void propagateStepProgress(TaskStepProgress const& task_progress);
 
    public slots:
     void setStatus(const QString& status);
-- 
cgit