mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-10-06 06:50:16 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE Support parsing CurseForge modpacks on modpacks.ch

Browse Source 
CurseForge packs don't have specs, and files versions are integers.
This commit is contained in:
Jamie Mansfield 2022-05-02 14:58:20 +01:00 committed by Petr Mrázek
parent 863cf3807e
commit 8c1d95b484
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
launcher/modplatform/modpacksch/FTBPackManifest.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2020 Jamie Mansfield <jmansfield@cadixdev.org> * Copyright 2020-2022 Jamie Mansfield <jmansfield@cadixdev.org>
* Copyright 2020-2021 Petr Mrazek <peterix@gmail.com> * Copyright 2020-2021 Petr Mrazek <peterix@gmail.com>
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -60,8 +60,12 @@ static void loadVersionInfo(ModpacksCH::VersionInfo & v, QJsonObject & obj)
v.name = Json::requireString(obj, "name"); v.name = Json::requireString(obj, "name");
v.type = Json::requireString(obj, "type"); v.type = Json::requireString(obj, "type");
v.updated = Json::requireInteger(obj, "updated"); v.updated = Json::requireInteger(obj, "updated");
auto specs = Json::requireObject(obj, "specs");
loadSpecs(v.specs, specs); // CurseForge packs don't have specs.
if (obj.contains("specs")) {
auto specs = Json::requireObject(obj, "specs");
loadSpecs(v.specs, specs);
}
} }
void ModpacksCH::loadModpack(ModpacksCH::Modpack & m, QJsonObject & obj) void ModpacksCH::loadModpack(ModpacksCH::Modpack & m, QJsonObject & obj)
@ -126,7 +130,19 @@ static void loadVersionFile(ModpacksCH::VersionFile & a, QJsonObject & obj)
a.type = Json::requireString(obj, "type"); a.type = Json::requireString(obj, "type");
a.path = Json::requireString(obj, "path"); a.path = Json::requireString(obj, "path");
a.name = Json::requireString(obj, "name"); a.name = Json::requireString(obj, "name");
a.version = Json::requireString(obj, "version");
// This will be an integer with CurseForge packs.
auto versionVal = obj.value("version");
if (versionVal.isString()) {
a.version = versionVal.toString();
}
else if (versionVal.isDouble()) {
a.version = QString(versionVal.toInt());
}
else {
throw Json::JsonException("'version' is not a string or integer");
}
a.url = Json::requireString(obj, "url"); a.url = Json::requireString(obj, "url");
a.sha1 = Json::requireString(obj, "sha1"); a.sha1 = Json::requireString(obj, "sha1");
a.size = Json::requireInteger(obj, "size"); a.size = Json::requireInteger(obj, "size");
@ -146,8 +162,13 @@ void ModpacksCH::loadVersion(ModpacksCH::Version & m, QJsonObject & obj)
m.plays = Json::requireInteger(obj, "plays"); m.plays = Json::requireInteger(obj, "plays");
m.updated = Json::requireInteger(obj, "updated"); m.updated = Json::requireInteger(obj, "updated");
m.refreshed = Json::requireInteger(obj, "refreshed"); m.refreshed = Json::requireInteger(obj, "refreshed");
auto specs = Json::requireObject(obj, "specs");
loadSpecs(m.specs, specs); // CurseForge packs don't have specs.
if (obj.contains("specs")) {
auto specs = Json::requireObject(obj, "specs");
loadSpecs(m.specs, specs);
}
auto targetArr = Json::requireArray(obj, "targets"); auto targetArr = Json::requireArray(obj, "targets");
for (QJsonValueRef targetRaw : targetArr) for (QJsonValueRef targetRaw : targetArr)
{ {