External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2026-01-01 13:16:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'MultiMC:develop' into develop

Browse Source
This commit is contained in:
Sebastian
2022-05-29 01:14:22 -05:00
committed by GitHub
parent 11383e2be4 66c6e6e05d
commit d3d3ddb446
16 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/ui/dialogs/UpdateDialog.cpp
View File

@@ -81,7 +81,7 @@ QString reprocessCommits(QByteArray json)
for(int i = commitarray.size() - 1; i >= 0; i--)
{
const auto & commitval = commitarray[i];
auto commitobj = Json::requireObject(commitval);
auto commitobj = Json::requireValueObject(commitval);
auto parents_info = Json::ensureArray(commitobj, "parents");
// NOTE: this ignores merge commits, because they have more than one parent
if(parents_info.size() > 1)

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

@@ -160,26 +160,27 @@ 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.authors.append(Json::requireValueString(author));
}
out.mcVersion = Json::requireString(object, "mcVersion");
out.modLoader = Json::requireString(object, "modLoader");
out.hasInstMods = Json::requireBoolean(object, "hasInstMods");
out.minMemory = Json::requireInteger(object, "minMemory");
out.recMemory = Json::requireInteger(object, "recMemory");
out.memory = Json::requireInteger(object, "memory");
out.mcVersion = Json::requireString(object, "mcVersion");
out.modLoader = Json::ensureString(object, "modLoader", QString());
out.hasInstMods = Json::ensureBoolean(object, "hasInstMods", false);
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)

2
launcher/ui/pages/modplatform/technic/TechnicModel.cpp
View File

@@ -128,7 +128,7 @@ void Technic::ListModel::searchRequestFinished()
auto objs = Json::requireArray(root, "modpacks");
for (auto technicPack: objs) {
Modpack pack;
auto technicPackObject = Json::requireObject(technicPack);
auto technicPackObject = Json::requireValueObject(technicPack);
pack.name = Json::requireString(technicPackObject, "name");
pack.slug = Json::requireString(technicPackObject, "slug");
if (pack.slug == "vanilla")