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;

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

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

28
tests/testdata/MetaComponentParse/component_with_extra.json vendored
View File

@ -1,18 +1,18 @@
{ {
"description": [ "description": [
{
"text": "Hello, ",
"color": "red",
"bold": true,
"italic": true,
"extra": [
{ {
"extra": "Component!", "text": "Hello, ",
"bold": false, "color": "red",
"italic": false "bold": true,
"italic": true,
"extra": [
{
"extra": "Component!",
"bold": false,
"italic": false
}
]
} }
] ],
} "expected_output": "<font color=\"red\"><b><i>Hello, </i></b></font><font color=\"red\">Component!</font>"
],
"expected_output": "<font color=\"red\"><b><i>Hello, </i></b></font><font color=\"red\">Component!</font>"
} }

22
tests/testdata/MetaComponentParse/component_with_format.json vendored
View File

@ -1,13 +1,13 @@
{ {
"description": [ "description": [
{ {
"text": "Hello, Component!", "text": "Hello, Component!",
"color": "blue", "color": "blue",
"bold": true, "bold": true,
"italic": true, "italic": true,
"underlined": true, "underlined": true,
"strikethrough": true "strikethrough": true
} }
], ],
"expected_output": "<font color=\"blue\"><b><i><u><s>Hello, Component!</s></u></i></b></font>" "expected_output": "<font color=\"blue\"><b><i><u><s>Hello, Component!</s></u></i></b></font>"
} }

20
tests/testdata/MetaComponentParse/component_with_link.json vendored
View File

@ -1,12 +1,12 @@
{ {
"description": [ "description": [
{ {
"text": "Hello, Component!", "text": "Hello, Component!",
"clickEvent": { "clickEvent": {
"open_url": true, "open_url": true,
"value": "https://google.com" "value": "https://google.com"
} }
} }
], ],
"expected_output": "<a href=\"https://google.com\">Hello, Component!</a>" "expected_output": "<a href=\"https://google.com\">Hello, Component!</a>"
} }

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

@ -1,40 +1,41 @@
{ {
"description": [ "description": [
{
"text": "The quick ",
"color": "blue",
"italic": true
},
{
"text": "brown fox ",
"color": "#873600",
"bold": true,
"underlined": true,
"extra": {
"text": "jumped over ",
"color": "blue",
"bold": false,
"underlined": false,
"italic": true,
"strikethrough": true
}
},
{
"text": "the lazy dog's back. ",
"color": "green",
"bold": true,
"italic": true,
"underlined": true,
"strikethrough": true,
"extra": [
{ {
"text": "1234567890 ", "text": "The quick ",
"color": "black", "color": "blue",
"strikethrough": false, "italic": true
"extra": "How vexingly quick daft zebras jump!" },
{
"text": "brown fox ",
"color": "#873600",
"bold": true,
"underlined": true,
"extra": {
"text": "jumped over ",
"color": "blue",
"bold": false,
"underlined": false,
"italic": true,
"strikethrough": true
}
},
{
"text": "the lazy dog's back. ",
"color": "green",
"bold": true,
"italic": true,
"underlined": true,
"strikethrough": true,
"extra": [
{
"text": "1234567890 ",
"color": "black",
"strikethrough": false,
"extra": "How vexingly quick daft zebras jump!"
}
]
} }
] ],
} "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>"
} }