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

added support for components in resource pack descriptions.

Browse Source 
Signed-off-by: Caden Miller <me@cadenmiller.dev>
This commit is contained in:
cullvox 2023-09-09 12:35:34 -04:00
parent ba3a1b6280
commit d2e662ddbb
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,35 @@ bool processMCMeta(ResourcePack& pack, QByteArray&& raw_data)
auto pack_obj = Json::requireObject(json_doc.object(), "pack", {}); auto pack_obj = Json::requireObject(json_doc.object(), "pack", {});
pack.setPackFormat(Json::ensureInteger(pack_obj, "pack_format", 0)); pack.setPackFormat(Json::ensureInteger(pack_obj, "pack_format", 0));
pack.setDescription(Json::ensureString(pack_obj, "description", ""));
// description could either be string, or array of dictionaries
auto desc_val = pack_obj.value("description");
if (desc_val.isString()) {
pack.setDescription(Json::ensureString(pack_obj, "description", ""));
} else if (desc_val.isArray()) {
// rebuild the description from the dictionaries without colors
QString build_desc;
auto arr = desc_val.toArray();
for(const QJsonValue& dict : arr) {
// must be an object, for a dictionary
if (!dict.isObject()) throw Json::JsonException("Invalid value description.");
auto obj = dict.toObject();
auto val = obj.value(obj.keys()[0]);
// value must be a string type
if (!val.isString()) throw Json::JsonException("Invalid value description type.");
build_desc.append(val.toString());
};
pack.setDescription(build_desc);
} else {
throw Json::JsonException("Invalid description type.");
}
} catch (Json::JsonException& e) { } catch (Json::JsonException& e) {
qWarning() << "JsonException: " << e.what() << e.cause(); qWarning() << "JsonException: " << e.what() << e.cause();
return false; return false;