From 288d0d1fd4562e4020c964955918a5681b547705 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sat, 26 Aug 2023 22:26:01 +0300
Subject: [PATCH] Added back api loader filtering if just one is selected

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/ModIndex.h                  |  6 ++++++
 launcher/modplatform/flame/FileResolvingTask.cpp |  7 +------
 launcher/modplatform/flame/FlameAPI.h            | 13 ++++++++++++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 780f68b4d..7d144176d 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -152,6 +152,12 @@ QString getMetaURL(ResourceProvider provider, QVariant projectID);
 
 auto getModLoaderString(ModLoaderType type) -> const QString;
 
+constexpr bool hasSingleModLoaderSelected(ModLoaderTypes l) noexcept
+{
+    auto x = static_cast<int>(l);
+    return x && !(x & (x - 1));
+}
+
 }  // namespace ModPlatform
 
 Q_DECLARE_METATYPE(ModPlatform::IndexedPack)
diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 6fc3a21c5..5865bee91 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -135,11 +135,6 @@ void Flame::FileResolvingTask::netJobFinished()
     m_checkJob->start();
 }
 
-constexpr bool has_single_bit(int x) noexcept
-{
-    return x && !(x & (x - 1));
-}
-
 void Flame::FileResolvingTask::modrinthCheckFinished()
 {
     setProgress(2, 3);
@@ -159,7 +154,7 @@ void Flame::FileResolvingTask::modrinthCheckFinished()
         // If there's more than one mod loader for this version, we can't know for sure
         // which file is relative to each loader, so it's best to not use any one and
         // let the user download it manually.
-        if (!file.loaders || has_single_bit(file.loaders)) {
+        if (!file.loaders || hasSingleModLoaderSelected(file.loaders)) {
             out->url = file.downloadUrl;
             qDebug() << "Found alternative on modrinth " << out->fileName;
         } else {
diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index 745f889d5..47350c33e 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -111,12 +111,23 @@ class FlameAPI : public NetworkResourceAPI {
 
         if (args.mcVersions.has_value())
             url += QString("&gameVersion=%1").arg(args.mcVersions.value().front().toString());
+
+        if (args.loaders.has_value() && ModPlatform::hasSingleModLoaderSelected(args.loaders.value())) {
+            int mappedModLoader = getMappedModLoader(static_cast<ModPlatform::ModLoaderType>(static_cast<int>(args.loaders.value())));
+            url += QString("&modLoaderType=%1").arg(mappedModLoader);
+        }
         return url;
     };
 
     [[nodiscard]] std::optional<QString> getDependencyURL(DependencySearchArgs const& args) const override
     {
         auto addonId = args.dependency.addonId.toString();
-        return QString("https://api.curseforge.com/v1/mods/%1/files?pageSize=10000&gameVersion=%2").arg(addonId, args.mcVersion.toString());
+        auto url =
+            QString("https://api.curseforge.com/v1/mods/%1/files?pageSize=10000&gameVersion=%2").arg(addonId, args.mcVersion.toString());
+        if (args.loader && ModPlatform::hasSingleModLoaderSelected(args.loader)) {
+            int mappedModLoader = getMappedModLoader(static_cast<ModPlatform::ModLoaderType>(static_cast<int>(args.loader)));
+            url += QString("&modLoaderType=%1").arg(mappedModLoader);
+        }
+        return url;
     };
 };