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

Merge branch 'components-resource-pack-fix' of https://github.com/cadenmiller/PrismLauncher into components-resource-pack-fix

Browse Source
This commit is contained in:
cullvox 2023-09-15 20:41:27 -04:00
commit 07645984b5
6 changed files with 78 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,7 +272,6 @@ struct TextFormatter {
bool processComponent(const QJsonValue& value, QString& result, const TextFormatter* parentFormat) bool processComponent(const QJsonValue& value, QString& result, const TextFormatter* parentFormat)
{ {
TextFormatter formatter; TextFormatter formatter;
if (parentFormat) if (parentFormat)
formatter = *parentFormat; formatter = *parentFormat;

6
tests/testdata/MetaComponentParse/component_basic.json vendored
View File

@ -1,4 +1,8 @@
{ {
"description": [{"text": "Hello, Component!"}], "description": [
{
"text": "Hello, Component!"
}
],
"expected_output": "Hello, Component!" "expected_output": "Hello, Component!"
} }

3
tests/testdata/MetaComponentParse/component_with_mixed.json vendored
View File

@ -36,5 +36,6 @@
] ]
} }
], ],
"expected_output": "<font color=\"blue\"><i>The quick </i></font><font color=\"#873600\"><b><u>brown fox </u></b></font><font color=\"blue\"><i><s>jumped over </s></i></font><font color=\"green\"><b><i><u><s>the lazy dog's back. </s></u></i></b></font><font color=\"black\"><b><i><u>1234567890 </u></i></b></font><font color=\"black\"><b><i><u>How vexingly quick daft zebras jump!</u></i></b></font>" "expected_output":
"<font color=\"blue\"><i>The quick </i></font><font color=\"#873600\"><b><u>brown fox </u></b></font><font color=\"blue\"><i><s>jumped over </s></i></font><font color=\"green\"><b><i><u><s>the lazy dog's back. </s></u></i></b></font><font color=\"black\"><b><i><u>1234567890 </u></i></b></font><font color=\"black\"><b><i><u>How vexingly quick daft zebras jump!</u></i></b></font>"
} }