Skip to content

Fix issues with TextData lists that aren't prefixed #5668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paypur wants to merge 3 commits into
base: 1.20.1
Choose a base branch
from
+7 −13
Open

Fix issues with TextData lists that aren't prefixed #5668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69f434a
Moved padding from prop-list to specific uses
paypur Apr 28, 2026
f7000a6
Add p tag to other lists that arent list
paypur Apr 29, 2026
5da1439
Use mantle list item helper
paypur Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/main/java/slimeknights/tconstruct/library/client/book/content/ContentModifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,7 @@ public HtmlSerializable toHTML(BookData book) {
.add(TextData.toHtml(text, book)),
HtmlElement.div().style("width", 210)
.add(HtmlElement.p().classes("underline").add(I18n.get(KEY_EFFECTS)))
.add(HtmlElement.ul().classes("prop-list")
.add(Arrays.stream(effects).map(effect -> HtmlElement.li().add(HTMLUtils.parse(effect)))))
.add(HtmlElement.ul().style("margin-top", 8).classes("prop-list").add(HTMLUtils.toListItems(effects)))
)
);
}
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/slimeknights/tconstruct/library/client/book/content/ContentTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,9 @@ public HtmlSerializable toHTML(BookData book) {
HtmlElement.div().style("padding-left", 10).add(
HtmlElement.div().classes("column").style("height", 128)
.add(TextData.toHtml(text, book)),
HtmlElement.div().style("width", 210).add(
HtmlElement.p().classes("underline").add(I18n.get(KEY_PROPERTIES)),
HtmlElement.ul().classes("prop-list")
.add(Arrays.stream(properties).map(prop -> HtmlElement.li().add(HTMLUtils.parse(prop))))
HtmlElement.div().style("width", 210)
.add(HtmlElement.p().classes("underline").add(I18n.get(KEY_PROPERTIES))
.add(HtmlElement.ul().style("margin-top", 8).classes("prop-list").add(HTMLUtils.toListItems(properties)))
)
)
);
Expand Down
10 changes: 3 additions & 7 deletions src/main/java/slimeknights/tconstruct/library/client/book/content/FluidEffectContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,12 @@ private void addHtmlList(HtmlElement div, String key, @Nullable String[] strings
if (components.isEmpty() && strings == null) return;

// append hardcoded text
HtmlElement list = HtmlElement.ul().classes("prop-list");
HtmlElement list = HtmlElement.ul().style("margin-top", 8).classes("prop-list");
if (strings != null) {
for (String string : strings) {
list.add(HtmlElement.li().add(string));
}
list.add(HTMLUtils.toListItems(strings));
} else {
// append generated text
for (Component component : components) {
list.add(HtmlElement.li().add(HTMLUtils.toHtml(component)));
}
list.add(HTMLUtils.toListItems(components));
}

// add elements to final div
Expand Down