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

clean up and add review suggestions, links open

Browse Source 
Signed-off-by: cullvox <cullvox@outlook.com>
This commit is contained in:
cullvox 2023-09-11 15:49:01 -04:00
parent b16085f66c
commit df88ccd419
2 changed files with 43 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,87 +185,23 @@ struct TextFormat {
bool italic = false; bool italic = false;
bool underlined = false; bool underlined = false;
bool strikethrough = false; bool strikethrough = false;
bool is_linked = false;
QString link_url = "";
}; };
bool textColorToHexColor(const QString& text_color, QString& result)
{
static const QHash<QString, QString> text_to_hex = {
{ "black", "#000000" }, { "dark_blue", "#0000AA" }, { "dark_green", "#00AA00" }, { "dark_aqua", "#00AAAA" },
{ "dark_red", "#AA0000" }, { "dark_purple", "#AA00AA" }, { "gold", "#FFAA00" }, { "gray", "#AAAAAA" },
{ "dark_gray", "#555555" }, { "blue", "#5555FF" }, { "green", "#55FF55" }, { "aqua", "#55FFFF" },
{ "red", "#FF5555" }, { "light_purple", "#FF55FF" }, { "yellow", "#FFFF55" }, { "white", "#FFFFFF" },
};
auto it = text_to_hex.find(text_color);
if (it == text_to_hex.end()) {
qWarning() << "Invalid color string in component!";
result = "#000000"; // return black if color not found
return false;
}
result = it.value();
return true;
}
bool getBoolOrFromText(const QJsonValue& val, bool& result)
{
if (val.isUndefined()) {
result = false;
return true;
}
if (val.isBool()) {
result = val.toBool();
return true;
} else if (val.isString()) {
auto bool_str = val.toString();
if (bool_str == "true") {
result = true;
return true;
} else if (bool_str == "false") {
result = false;
return true;
} else {
qWarning() << "Invalid bool value in component!";
return false;
}
} else {
qWarning() << "Invalid type where bool expected!";
return false;
}
}
bool readFormat(const QJsonObject& obj, TextFormat& format) bool readFormat(const QJsonObject& obj, TextFormat& format)
{ {
auto text = obj.value("text"); format.color = Json::ensureString(obj, "color");
auto color = obj.value("color"); format.bold = Json::ensureBoolean(obj, "bold", false);
auto bold = obj.value("bold"); format.italic = Json::ensureBoolean(obj, "italic", false);
auto italic = obj.value("italic"); format.underlined = Json::ensureBoolean(obj, "underlined", false);
auto underlined = obj.value("underlined"); format.strikethrough = Json::ensureBoolean(obj, "strikethrough", false);
auto strikethrough = obj.value("strikethrough");
auto extra = obj.value("extra");
if (color.isString()) { auto click_event = Json::ensureObject(obj, "clickEvent");
// colors can either be a hex code or one of a few text colors format.is_linked = Json::ensureBoolean(click_event, "open_url", false);
auto col_str = color.toString(); format.link_url = Json::ensureString(click_event, "value");
const QRegularExpression hex_expression("^#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$"); return true;
const auto hex_match = hex_expression.match(col_str);
if (hex_match.hasMatch()) {
format.color = color.toString();
} else {
if (!textColorToHexColor(color.toString(), format.color)) {
qWarning() << "Invalid color type in component!";
return false;
}
}
}
return getBoolOrFromText(bold, format.bold) && getBoolOrFromText(italic, format.italic) &&
getBoolOrFromText(underlined, format.underlined) && getBoolOrFromText(strikethrough, format.strikethrough);
} }
void appendBeginFormat(TextFormat& format, QString& toAppend) void appendBeginFormat(TextFormat& format, QString& toAppend)
@ -279,35 +215,36 @@ void appendBeginFormat(TextFormat& format, QString& toAppend)
toAppend.append("<u>"); toAppend.append("<u>");
if (format.strikethrough) if (format.strikethrough)
toAppend.append("<s>"); toAppend.append("<s>");
if (format.is_linked)
toAppend.append("<a href=\"" + format.link_url + "\">");
} }
void appendEndFormat(TextFormat& format, QString& toAppend) void appendEndFormat(TextFormat& format, QString& toAppend)
{ {
toAppend.append("</font>"); if (format.is_linked)
if (format.bold) toAppend.append("</a>");
toAppend.append("</b>"); if (format.strikethrough)
toAppend.append("</s>");
if (format.italic) if (format.italic)
toAppend.append("</i>"); toAppend.append("</i>");
if (format.underlined) if (format.underlined)
toAppend.append("</u>"); toAppend.append("</u>");
if (format.strikethrough) if (format.bold)
toAppend.append("</s>"); toAppend.append("</b>");
toAppend.append("</font>");
} }
bool processComponent(const QJsonValue& value, QString& result, TextFormat* parentFormat = nullptr); bool processComponentList(const QJsonArray& arr, QString& result)
bool processComponentList(const QJsonArray& arr, QString& result, TextFormat* parentFormat = nullptr)
{ {
for (const QJsonValue& val : arr) { for (const QJsonValue& val : arr) {
if (!processComponent(val, result, parentFormat)) if (!processComponent(val, result))
return false; return false;
} }
return true; return true;
} }
bool processComponent(const QJsonValue& value, QString& result, TextFormat* parentFormat) bool processComponent(const QJsonValue& value, QString& result)
{ {
if (value.isString()) { if (value.isString()) {
result.append(value.toString()); result.append(value.toString());
@ -315,8 +252,6 @@ bool processComponent(const QJsonValue& value, QString& result, TextFormat* pare
auto obj = value.toObject(); auto obj = value.toObject();
TextFormat format{}; TextFormat format{};
if (parentFormat)
format = *parentFormat;
if (!readFormat(obj, format)) if (!readFormat(obj, format))
return false; return false;
@ -329,7 +264,7 @@ bool processComponent(const QJsonValue& value, QString& result, TextFormat* pare
auto extra = obj.value("extra"); auto extra = obj.value("extra");
if (extra.isArray()) if (extra.isArray())
if (!processComponentList(extra.toArray(), result, &format)) if (!processComponentList(extra.toArray(), result))
return false; return false;
appendEndFormat(format, result); appendEndFormat(format, result);
@ -342,6 +277,7 @@ bool processComponent(const QJsonValue& value, QString& result, TextFormat* pare
} }
// https://minecraft.fandom.com/wiki/Tutorials/Creating_a_resource_pack#Formatting_pack.mcmeta // https://minecraft.fandom.com/wiki/Tutorials/Creating_a_resource_pack#Formatting_pack.mcmeta
// https://minecraft.fandom.com/wiki/Raw_JSON_text_format#Plain_Text
bool processMCMeta(ResourcePack& pack, QByteArray&& raw_data) bool processMCMeta(ResourcePack& pack, QByteArray&& raw_data)
{ {
try { try {
@ -350,20 +286,31 @@ bool processMCMeta(ResourcePack& pack, QByteArray&& raw_data)
pack.setPackFormat(Json::ensureInteger(pack_obj, "pack_format", 0)); pack.setPackFormat(Json::ensureInteger(pack_obj, "pack_format", 0));
// description could either be string, or array of dictionaries // description could be many things according to minecraft
auto desc_val = pack_obj.value("description"); auto desc_val = pack_obj.value("description");
QString desc;
if (desc_val.isString()) { if (desc_val.isString()) {
pack.setDescription(desc_val.toString()); desc = desc_val.toString();
} else if (desc_val.isArray()) { } else if (desc_val.isArray()) {
QString desc;
if (!processComponentList(desc_val.toArray(), desc)) if (!processComponentList(desc_val.toArray(), desc))
return false; return false;
pack.setDescription(desc); } else if (desc_val.isObject()) {
if (!processComponent(desc_val, desc))
return false;
} else if (desc_val.isBool()) {
desc = desc_val.toBool() ? "true" : "false";
} else if (desc_val.isDouble()) {
desc = QString::number(desc_val.toDouble());
} else { } else {
qWarning() << "Invalid description type!";
return false; return false;
} }
qInfo() << desc;
pack.setDescription(desc);
} catch (Json::JsonException& e) { } catch (Json::JsonException& e) {
qWarning() << "JsonException: " << e.what() << e.cause(); qWarning() << "JsonException: " << e.what() << e.cause();
return false; return false;

3
launcher/minecraft/mod/tasks/LocalResourcePackParseTask.h
View File

@ -34,6 +34,9 @@ bool process(ResourcePack& pack, ProcessingLevel level = ProcessingLevel::Full);
bool processZIP(ResourcePack& pack, ProcessingLevel level = ProcessingLevel::Full); bool processZIP(ResourcePack& pack, ProcessingLevel level = ProcessingLevel::Full);
bool processFolder(ResourcePack& pack, ProcessingLevel level = ProcessingLevel::Full); bool processFolder(ResourcePack& pack, ProcessingLevel level = ProcessingLevel::Full);
bool processComponent(const QJsonValue& value, QString& result);
bool processComponentList(const QJsonArray& value, QString& result);
bool processMCMeta(ResourcePack& pack, QByteArray&& raw_data); bool processMCMeta(ResourcePack& pack, QByteArray&& raw_data);
bool processPackPNG(const ResourcePack& pack, QByteArray&& raw_data); bool processPackPNG(const ResourcePack& pack, QByteArray&& raw_data);