CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE fix some build fails on linux and windows

Browse Source
This commit is contained in:
Petr Mrázek 2021-02-07 23:51:10 +01:00
parent ab19b86341
commit 85d5e9ff23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/logic/modplatform/atlauncher/ATLPackIndex.cpp
View File

@ -26,7 +26,7 @@ void ATLauncher::loadIndexedPack(ATLauncher::IndexedPack & m, QJsonObject & obj)
loadIndexedVersion(version, versionObj); loadIndexedVersion(version, versionObj);
m.versions.append(version); m.versions.append(version);
} }
m.system = Json::ensureBoolean(obj, "system", false); m.system = Json::ensureBoolean(obj, QString("system"), false);
m.description = Json::ensureString(obj, "description", ""); m.description = Json::ensureString(obj, "description", "");
m.safeName = Json::requireString(obj, "name").replace(QRegularExpression("[^A-Za-z0-9]"), ""); m.safeName = Json::requireString(obj, "name").replace(QRegularExpression("[^A-Za-z0-9]"), "");

8
api/logic/modplatform/atlauncher/ATLPackManifest.cpp
View File

@ -81,9 +81,9 @@ static ATLauncher::ModType parseModType(QString rawType) {
static void loadVersionLoader(ATLauncher::VersionLoader & p, QJsonObject & obj) { static void loadVersionLoader(ATLauncher::VersionLoader & p, QJsonObject & obj) {
p.type = Json::requireString(obj, "type"); p.type = Json::requireString(obj, "type");
p.latest = Json::ensureBoolean(obj, "latest", false); p.latest = Json::ensureBoolean(obj, QString("latest"), false);
p.choose = Json::ensureBoolean(obj, "choose", false); p.choose = Json::ensureBoolean(obj, QString("choose"), false);
p.recommended = Json::ensureBoolean(obj, "recommended", false); p.recommended = Json::ensureBoolean(obj, QString("recommended"), false);
auto metadata = Json::requireObject(obj, "metadata"); auto metadata = Json::requireObject(obj, "metadata");
p.version = Json::requireString(metadata, "version"); p.version = Json::requireString(metadata, "version");
@ -141,7 +141,7 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
{ {
v.version = Json::requireString(obj, "version"); v.version = Json::requireString(obj, "version");
v.minecraft = Json::requireString(obj, "minecraft"); v.minecraft = Json::requireString(obj, "minecraft");
v.noConfigs = Json::ensureBoolean(obj, "noConfigs", false); v.noConfigs = Json::ensureBoolean(obj, QString("noConfigs"), false);
if(obj.contains("mainClass")) { if(obj.contains("mainClass")) {
auto main = Json::requireObject(obj, "mainClass"); auto main = Json::requireObject(obj, "mainClass");