0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1154 from Scrumplex/epic-formatting-codes

Browse Source
This commit is contained in:
Sefa Eyeoglu 2022-10-08 12:12:26 +02:00 committed by GitHub
commit fc3a64056c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
launcher/ui/widgets/InfoFrame.cpp
View File

@ -97,14 +97,6 @@ void InfoFrame::updateWithResource(const Resource& resource)
setImage(); setImage();
} }
// https://www.sportskeeda.com/minecraft-wiki/color-codes
static const QMap<QChar, QString> s_value_to_color = {
{'0', "#000000"}, {'1', "#0000AA"}, {'2', "#00AA00"}, {'3', "#00AAAA"}, {'4', "#AA0000"},
{'5', "#AA00AA"}, {'6', "#FFAA00"}, {'7', "#AAAAAA"}, {'8', "#555555"}, {'9', "#5555FF"},
{'a', "#55FF55"}, {'b', "#55FFFF"}, {'c', "#FF5555"}, {'d', "#FF55FF"}, {'e', "#FFFF55"},
{'f', "#FFFFFF"}
};
QString InfoFrame::renderColorCodes(QString input) { QString InfoFrame::renderColorCodes(QString input) {
// We have to manually set the colors for use. // We have to manually set the colors for use.
// //
@ -113,32 +105,53 @@ QString InfoFrame::renderColorCodes(QString input) {
// We traverse the description and, when one of those is found, we create // We traverse the description and, when one of those is found, we create
// a span element with that color set. // a span element with that color set.
// //
// TODO: Make the same logic for font formatting too.
// TODO: Wrap links inside <a> tags // TODO: Wrap links inside <a> tags
// https://minecraft.fandom.com/wiki/Formatting_codes#Color_codes
const QMap<QChar, QString> color_codes_map = {
{'0', "#000000"}, {'1', "#0000AA"}, {'2', "#00AA00"}, {'3', "#00AAAA"}, {'4', "#AA0000"},
{'5', "#AA00AA"}, {'6', "#FFAA00"}, {'7', "#AAAAAA"}, {'8', "#555555"}, {'9', "#5555FF"},
{'a', "#55FF55"}, {'b', "#55FFFF"}, {'c', "#FF5555"}, {'d', "#FF55FF"}, {'e', "#FFFF55"},
{'f', "#FFFFFF"}
};
// https://minecraft.fandom.com/wiki/Formatting_codes#Formatting_codes
const QMap<QChar, QString> formatting_codes_map = {
{'l', "b"}, {'m', "s"}, {'n', "u"}, {'o', "i"}
};
QString html("<html>"); QString html("<html>");
bool in_div = false; QList<QString> tags{};
auto it = input.constBegin(); auto it = input.constBegin();
while (it != input.constEnd()) { while (it != input.constEnd()) {
if (*it == u'§') { // is current char § and is there a following char
if (in_div) if (*it == u'§' && (it + 1) != input.constEnd()) {
html += "</span>"; auto const& code = *(++it); // incrementing here!
auto const& num = *(++it); auto const color_entry = color_codes_map.constFind(code);
html += QString("<span style=\"color: %1;\">").arg(s_value_to_color.constFind(num).value()); auto const tag_entry = formatting_codes_map.constFind(code);
in_div = true; if (color_entry != color_codes_map.constEnd()) { // color code
html += QString("<span style=\"color: %1;\">").arg(color_entry.value());
it++; tags << "span";
} else if (tag_entry != formatting_codes_map.constEnd()) { // formatting code
html += QString("<%1>").arg(tag_entry.value());
tags << tag_entry.value();
} else if (code == 'r') { // reset all formatting
while (!tags.isEmpty()) {
html += QString("</%1>").arg(tags.takeLast());
} }
} else { // pass unknown codes through
html += QString("§%1").arg(code);
}
} else {
html += *it; html += *it;
}
it++; it++;
} }
while (!tags.isEmpty()) {
if (in_div) html += QString("</%1>").arg(tags.takeLast());
html += "</span>"; }
html += "</html>"; html += "</html>";
html.replace("\n", "<br>"); html.replace("\n", "<br>");
@ -147,14 +160,14 @@ QString InfoFrame::renderColorCodes(QString input) {
void InfoFrame::updateWithResourcePack(ResourcePack& resource_pack) void InfoFrame::updateWithResourcePack(ResourcePack& resource_pack)
{ {
setName(resource_pack.name()); setName(renderColorCodes(resource_pack.name()));
setDescription(renderColorCodes(resource_pack.description())); setDescription(renderColorCodes(resource_pack.description()));
setImage(resource_pack.image({64, 64})); setImage(resource_pack.image({64, 64}));
} }
void InfoFrame::updateWithTexturePack(TexturePack& texture_pack) void InfoFrame::updateWithTexturePack(TexturePack& texture_pack)
{ {
setName(texture_pack.name()); setName(renderColorCodes(texture_pack.name()));
setDescription(renderColorCodes(texture_pack.description())); setDescription(renderColorCodes(texture_pack.description()));
setImage(texture_pack.image({64, 64})); setImage(texture_pack.image({64, 64}));
} }