From 4b37c46889cb8973d8eb8c22f0c45fe36fdb81cf Mon Sep 17 00:00:00 2001
From: timoreo <timo.oreo34@gmail.com>
Date: Sat, 15 Jan 2022 08:51:47 +0100
Subject: Filtering per mod loader & mc version

---
 launcher/modplatform/modrinth/ModrinthPackIndex.cpp | 9 ++++++++-
 launcher/modplatform/modrinth/ModrinthPackIndex.h   | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index 89e827b4..ce408ca0 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -34,12 +34,19 @@ void Modrinth::loadIndexedPackVersions(Modrinth::IndexedPack & pack, QJsonArray
             continue;
         }
         // pick the latest version supported
-        file.mcVersion = versionArray[0].toString();
+        for(auto mcVer : versionArray){
+            file.mcVersion.append(mcVer.toString());
+        }
+        auto loaders = Json::requireArray(obj,"loaders");
+        for(auto loader : loaders){
+            file.loaders.append(loader.toString());
+        }
         file.version = Json::requireString(obj, "name");
         //TODO show all the files ?
         auto parent = Json::requireArray(obj, "files")[0].toObject();
         file.downloadUrl = Json::requireString(parent, "url");
         file.fileName = Json::requireString(parent, "filename");
+
         unsortedVersions.append(file);
     }
     auto orderSortPredicate = [](const IndexedVersion & a, const IndexedVersion & b) -> bool
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.h b/launcher/modplatform/modrinth/ModrinthPackIndex.h
index e39b69ab..b3cffc40 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.h
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.h
@@ -19,10 +19,11 @@ struct IndexedVersion {
     QString addonId;
     QString fileId;
     QString version;
-    QString mcVersion;
+    QVector<QString> mcVersion;
     QString downloadUrl;
     QString date;
     QString fileName;
+    QVector<QString> loaders;
 };
 
 struct IndexedPack
-- 
cgit