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 make FTBA import more lenient towards missing fields

Browse Source
This commit is contained in:
Petr Mrázek 2022-05-29 04:24:55 +02:00
parent 43ebd02dcf
commit f59822fd65
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
launcher/ui/pages/modplatform/import_ftb/Model.cpp
View File

@ -160,26 +160,26 @@ bool parseModpackJson(const QByteArray& data, Modpack & out) {
{
auto document = Json::requireDocument(data);
auto object = Json::requireObject(document);
bool isInstalled = Json::requireBoolean(object, "installComplete");
bool isInstalled = Json::ensureBoolean(object, "installComplete", true);
if(!isInstalled) {
return false;
}
out.id = Json::requireInteger(object, "id");
out.name = Json::requireString(object, "name");
out.version = Json::requireString(object, "version");
out.description = Json::requireString(object, "description");
auto authorsArray = Json::requireArray(object, "authors");
out.description = Json::ensureString(object, "description", QObject::tr("Description is missing in the FTB App instance."));
auto authorsArray = Json::ensureArray(object, "authors", QJsonArray());
for(auto author: authorsArray) {
out.authors.append(Json::requireString(author));
}
out.mcVersion = Json::requireString(object, "mcVersion");
out.modLoader = Json::requireString(object, "modLoader");
out.hasInstMods = Json::requireBoolean(object, "hasInstMods");
out.modLoader = Json::ensureString(object, "modLoader", QString());
out.hasInstMods = Json::ensureBoolean(object, "hasInstMods", false);
out.minMemory = Json::requireInteger(object, "minMemory");
out.recMemory = Json::requireInteger(object, "recMemory");
out.memory = Json::requireInteger(object, "memory");
out.minMemory = Json::ensureInteger(object, "minMemory", 1024);
out.recMemory = Json::ensureInteger(object, "recMemory", 2048);
out.memory = Json::ensureInteger(object, "memory", 2048);
return true;
}
catch (Json::JsonException & e)