diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-04-22 00:29:24 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-04-22 00:29:24 +0200 |
| commit | 6a525db78d2f3fd9deec817bfd3fc9c5162991c3 (patch) | |
| tree | 818a374a2fc2f7568bb174c3739fb73c82010644 /api/logic | |
| parent | 1d71214d4a9891f87791547575a8febc7abb9bbf (diff) | |
| download | MultiMC-6a525db78d2f3fd9deec817bfd3fc9c5162991c3.tar MultiMC-6a525db78d2f3fd9deec817bfd3fc9c5162991c3.tar.gz MultiMC-6a525db78d2f3fd9deec817bfd3fc9c5162991c3.tar.lz MultiMC-6a525db78d2f3fd9deec817bfd3fc9c5162991c3.tar.xz MultiMC-6a525db78d2f3fd9deec817bfd3fc9c5162991c3.zip | |
NOISSUE 'required' attribute of curse manifests is optional, libraries attribute reading
Diffstat (limited to 'api/logic')
| -rw-r--r-- | api/logic/minecraft/curse/PackManifest.cpp | 5 | ||||
| -rw-r--r-- | api/logic/minecraft/curse/PackManifest.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/api/logic/minecraft/curse/PackManifest.cpp b/api/logic/minecraft/curse/PackManifest.cpp index fd40a37c..2fde8a01 100644 --- a/api/logic/minecraft/curse/PackManifest.cpp +++ b/api/logic/minecraft/curse/PackManifest.cpp @@ -5,7 +5,8 @@ static void loadFileV1(Curse::File & f, QJsonObject & file) { f.projectId = Json::requireInteger(file, "projectID"); f.fileId = Json::requireInteger(file, "fileID"); - f.required = Json::requireBoolean(file, "required"); + // FIXME: what does this mean? + f.required = Json::ensureBoolean(file, QString("required"), true); } static void loadModloaderV1(Curse::Modloader & m, QJsonObject & modLoader) @@ -17,6 +18,8 @@ static void loadModloaderV1(Curse::Modloader & m, QJsonObject & modLoader) static void loadMinecraftV1(Curse::Minecraft & m, QJsonObject & minecraft) { m.version = Json::requireString(minecraft, "version"); + // FIXME: default unknown, assuming empty. Meaning also unknown. + m.libraries = Json::ensureString(minecraft, QString("libraries"), QString()); auto arr = Json::ensureArray(minecraft, "modLoaders", QJsonArray()); for (const auto & item : arr) { diff --git a/api/logic/minecraft/curse/PackManifest.h b/api/logic/minecraft/curse/PackManifest.h index 8b9602a4..36e05cc2 100644 --- a/api/logic/minecraft/curse/PackManifest.h +++ b/api/logic/minecraft/curse/PackManifest.h @@ -26,6 +26,7 @@ struct Modloader struct Minecraft { QString version; + QString libraries; QVector<Curse::Modloader> modLoaders; }; |