From 9c942c68943afa47512a01d1c229c2bbdf7925b3 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Wed, 26 Mar 2025 23:35:40 +0000
Subject: [PATCH] Fix CurseForge support

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/modplatform/flame/FlameAPI.h               | 10 +++++++---
 launcher/modplatform/import_ftb/PackInstallTask.cpp |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index f9b4c11a5..db96b6971 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -100,8 +100,12 @@ class FlameAPI : public NetworkResourceAPI {
         if (args.sorting.has_value())
             get_arguments.append(QString("sortField=%1").arg(args.sorting.value().index));
         get_arguments.append("sortOrder=desc");
-        if (args.loaders.has_value() && args.loaders.value() != 0)
-            get_arguments.append(QString("modLoaderTypes=%1").arg(getModLoaderFilters(args.loaders.value())));
+        if (args.loaders.has_value()) {
+            ModPlatform::ModLoaderTypes loaders = args.loaders.value();
+            loaders &= ~ModPlatform::ModLoaderType::DataPack;
+            if (loaders != 0)
+                get_arguments.append(QString("modLoaderTypes=%1").arg(getModLoaderFilters(loaders)));
+        }
         if (args.categoryIds.has_value() && !args.categoryIds->empty())
             get_arguments.append(QString("categoryIds=[%1]").arg(args.categoryIds->join(",")));
 
@@ -119,7 +123,7 @@ 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())) {
+        if (args.loaders.has_value() && args.loaders.value() != ModPlatform::ModLoaderType::DataPack && ModPlatform::hasSingleModLoaderSelected(args.loaders.value())) {
             int mappedModLoader = getMappedModLoader(static_cast<ModPlatform::ModLoaderType>(static_cast<int>(args.loaders.value())));
             url += QString("&modLoaderType=%1").arg(mappedModLoader);
         }
diff --git a/launcher/modplatform/import_ftb/PackInstallTask.cpp b/launcher/modplatform/import_ftb/PackInstallTask.cpp
index 8046300e1..7cb8b6ebc 100644
--- a/launcher/modplatform/import_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/import_ftb/PackInstallTask.cpp
@@ -89,6 +89,8 @@ void PackInstallTask::copySettings()
                 break;
             case ModPlatform::LiteLoader:
                 break;
+            case ModPlatform::DataPack:
+                break;
         }
     components->saveNow();