aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform
diff options
context:
space:
mode:
authortimoreo <timo.oreo34@gmail.com>2022-01-15 08:51:47 +0100
committertimoreo <timo.oreo34@gmail.com>2022-01-15 08:51:47 +0100
commit4b37c46889cb8973d8eb8c22f0c45fe36fdb81cf (patch)
tree070b7bad81ec464eeb60de1ce4105636e245777e /launcher/modplatform
parent2896f70cd83761a1248d55b28e2b5cc2cf465049 (diff)
downloadPrismLauncher-4b37c46889cb8973d8eb8c22f0c45fe36fdb81cf.tar.gz
PrismLauncher-4b37c46889cb8973d8eb8c22f0c45fe36fdb81cf.tar.bz2
PrismLauncher-4b37c46889cb8973d8eb8c22f0c45fe36fdb81cf.zip
Filtering per mod loader & mc version
Diffstat (limited to 'launcher/modplatform')
-rw-r--r--launcher/modplatform/modrinth/ModrinthPackIndex.cpp9
-rw-r--r--launcher/modplatform/modrinth/ModrinthPackIndex.h3
2 files changed, 10 insertions, 2 deletions
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