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

fix style, and use qWarning instead of throw.

Browse Source 
Signed-off-by: cullvox <cullvox@outlook.com>
This commit is contained in:
cullvox 2023-09-09 19:03:33 -04:00
parent d2e662ddbb
commit 093d09efe3
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp
View File

@ -189,9 +189,13 @@ bool processMCMeta(ResourcePack& pack, QByteArray&& raw_data)
// description could either be string, or array of dictionaries // description could either be string, or array of dictionaries
auto desc_val = pack_obj.value("description"); auto desc_val = pack_obj.value("description");
if (desc_val.isUndefined()) {
qWarning() << "No resource pack description found.";
return false;
}
if (desc_val.isString()) { if (desc_val.isString()) {
pack.setDescription(Json::ensureString(pack_obj, "description", "")); pack.setDescription(desc_val.toString());
} else if (desc_val.isArray()) { } else if (desc_val.isArray()) {
// rebuild the description from the dictionaries without colors // rebuild the description from the dictionaries without colors
@ -200,20 +204,27 @@ bool processMCMeta(ResourcePack& pack, QByteArray&& raw_data)
for(const QJsonValue& dict : arr) { for(const QJsonValue& dict : arr) {
// must be an object, for a dictionary // must be an object, for a dictionary
if (!dict.isObject()) throw Json::JsonException("Invalid value description."); if (!dict.isObject())
{
qWarning() << "Invalid component object.";
continue;
}
auto obj = dict.toObject(); auto obj = dict.toObject();
auto val = obj.value(obj.keys()[0]); auto val = obj.value(obj.keys()[0]);
// value must be a string type if (!val.isString())
if (!val.isString()) throw Json::JsonException("Invalid value description type."); {
qWarning() << "Invalid text description type in components.";
continue;
}
build_desc.append(val.toString()); build_desc.append(val.toString());
}; };
pack.setDescription(build_desc); pack.setDescription(build_desc);
} else { } else {
throw Json::JsonException("Invalid description type."); qWarning() << "Invalid description type.";
} }
} catch (Json::JsonException& e) { } catch (Json::JsonException& e) {
qWarning() << "JsonException: " << e.what() << e.cause(); qWarning() << "JsonException: " << e.what() << e.cause();