External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-14 12:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

NOISSUE Display warnings when selecting optional mods

Browse Source
This commit is contained in:
Jamie Mansfield
2022-05-05 20:58:12 +01:00
parent 41f728b22f
commit c24a89f3af
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
launcher/modplatform/atlauncher/ATLPackManifest.cpp
View File

@@ -178,6 +178,7 @@ static void loadVersionMod(ATLauncher::VersionMod & p, QJsonObject & obj) {
p.depends.append(Json::requireValueString(depends));
}
}
p.warning = Json::ensureString(obj, QString("warning"), "");
p.client = Json::ensureBoolean(obj, QString("client"), false);
@@ -251,6 +252,14 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
loadVersionConfigs(v.configs, configsObj);
}
if(obj.contains("warnings")) {
auto warningsObj = Json::requireObject(obj, "warnings");
for (const auto &key : warningsObj.keys()) {
v.warnings[key] = Json::requireValueString(warningsObj.value(key), "warning");
}
}
if(obj.contains("messages")) {
auto messages = Json::requireObject(obj, "messages");
loadVersionMessages(v.messages, messages);

2
launcher/modplatform/atlauncher/ATLPackManifest.h
View File

@@ -109,6 +109,7 @@ struct VersionMod
bool library;
QString group;
QVector<QString> depends;
QString warning;
bool client;
@@ -153,6 +154,7 @@ struct PackVersion
QVector<VersionMod> mods;
VersionConfigs configs;
QMap<QString, QString> warnings;
VersionMessages messages;
};