add curseforge modpack filter

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

launcher/modplatform/flame/FlameAPI.cpp

@@ -221,14 +221,20 @@ QList<ResourceAPI::SortingMethod> FlameAPI::getSortingMethods() const
              { 8, "GameVersion", QObject::tr("Sort by Game Version") } };
 }
 
-Task::Ptr FlameAPI::getModCategories(std::shared_ptr<QByteArray> response)
+Task::Ptr FlameAPI::getCategories(std::shared_ptr<QByteArray> response, ModPlatform::ResourceType type)
 {
     auto netJob = makeShared<NetJob>(QString("Flame::GetCategories"), APPLICATION->network());
-    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl("https://api.curseforge.com/v1/categories?gameId=432&classId=6"), response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(
+        QUrl(QString("https://api.curseforge.com/v1/categories?gameId=432&classId=%1").arg(getClassId(type))), response));
     QObject::connect(netJob.get(), &Task::failed, [](QString msg) { qDebug() << "Flame failed to get categories:" << msg; });
     return netJob;
 }
 
+Task::Ptr FlameAPI::getModCategories(std::shared_ptr<QByteArray> response)
+{
+    return getCategories(response, ModPlatform::ResourceType::MOD);
+}
+
 QList<ModPlatform::Category> FlameAPI::loadModCategories(std::shared_ptr<QByteArray> response)
 {
     QList<ModPlatform::Category> categories;

launcher/modplatform/flame/FlameAPI.h

@@ -25,6 +25,7 @@ class FlameAPI : public NetworkResourceAPI {
     Task::Ptr getFiles(const QStringList& fileIds, std::shared_ptr<QByteArray> response) const;
     Task::Ptr getFile(const QString& addonId, const QString& fileId, std::shared_ptr<QByteArray> response) const;
 
+    static Task::Ptr getCategories(std::shared_ptr<QByteArray> response, ModPlatform::ResourceType type);
     static Task::Ptr getModCategories(std::shared_ptr<QByteArray> response);
     static QList<ModPlatform::Category> loadModCategories(std::shared_ptr<QByteArray> response);
 
@@ -46,6 +47,8 @@ class FlameAPI : public NetworkResourceAPI {
                 return 12;
             case ModPlatform::ResourceType::SHADER_PACK:
                 return 6552;
+            case ModPlatform::ResourceType::MODPACK:
+                return 4471;
         }
     }
 
@@ -82,8 +85,8 @@ class FlameAPI : public NetworkResourceAPI {
 
     static const QString getModLoaderFilters(ModPlatform::ModLoaderTypes types) { return "[" + getModLoaderStrings(types).join(',') + "]"; }
 
-   private:
-    [[nodiscard]] std::optional<QString> getSearchURL(SearchArgs const& args) const override
+   public:
+    static std::optional<QString> getStaticSearchURL(SearchArgs const& args)
     {
         auto gameVersionStr =
             args.versions.has_value() ? QString("gameVersion=%1").arg(args.versions.value().front().toString()) : QString();
@@ -105,12 +108,14 @@ class FlameAPI : public NetworkResourceAPI {
         get_arguments.append(gameVersionStr);
 
         return "https://api.curseforge.com/v1/mods/search?gameId=432&" + get_arguments.join('&');
-    };
+    }
+    [[nodiscard]] std::optional<QString> getSearchURL(SearchArgs const& args) const override { return getStaticSearchURL(args); }
 
+   private:
     [[nodiscard]] std::optional<QString> getInfoURL(QString const& id) const override
     {
         return QString("https://api.curseforge.com/v1/mods/%1").arg(id);
-    };
+    }
 
     [[nodiscard]] std::optional<QString> getVersionsURL(VersionSearchArgs const& args) const override
     {
@@ -125,7 +130,7 @@ class FlameAPI : public NetworkResourceAPI {
             url += QString("&modLoaderType=%1").arg(mappedModLoader);
         }
         return url;
-    };
+    }
 
     [[nodiscard]] std::optional<QString> getDependencyURL(DependencySearchArgs const& args) const override
     {
@@ -137,5 +142,5 @@ class FlameAPI : public NetworkResourceAPI {
             url += QString("&modLoaderType=%1").arg(mappedModLoader);
         }
         return url;
-    };
+    }
 };

launcher/modplatform/flame/FlamePackIndex.cpp

@@ -3,6 +3,7 @@
 #include <QUrl>
 
 #include "Json.h"
+#include "modplatform/ModIndex.h"
 
 void Flame::loadIndexedPack(Flame::IndexedPack& pack, QJsonObject& obj)
 {
@@ -88,8 +89,27 @@ void Flame::loadIndexedPackVersions(Flame::IndexedPack& pack, QJsonArray& arr)
             continue;
         }
 
+        for (auto mcVer : versionArray) {
+            auto str = mcVer.toString();
+
+            if (str.contains('.'))
+                file.mcVersion.append(str);
+
+            if (auto loader = str.toLower(); loader == "neoforge")
+                file.loaders |= ModPlatform::NeoForge;
+            else if (loader == "forge")
+                file.loaders |= ModPlatform::Forge;
+            else if (loader == "cauldron")
+                file.loaders |= ModPlatform::Cauldron;
+            else if (loader == "liteloader")
+                file.loaders |= ModPlatform::LiteLoader;
+            else if (loader == "fabric")
+                file.loaders |= ModPlatform::Fabric;
+            else if (loader == "quilt")
+                file.loaders |= ModPlatform::Quilt;
+        }
+
         // pick the latest version supported
-        file.mcVersion = versionArray[0].toString();
         file.version = Json::requireString(version, "displayName");
 
         ModPlatform::IndexedVersionType::VersionType ver_type;

launcher/modplatform/flame/FlamePackIndex.h

@@ -18,6 +18,7 @@ struct IndexedVersion {
     int fileId;
     QString version;
     ModPlatform::IndexedVersionType version_type;
+    ModPlatform::ModLoaderTypes loaders = {};
     QString mcVersion;
     QString downloadUrl;
 };