Skip to content

Reapply chat fixes for 1.18#10

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

Merged
TechStreetDev merged 1 commit into from
Aug 26, 2022
Merged

Reapply chat fixes for 1.18 #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 29 additions & 25 deletions src/main/java/io/github/techstreet/dfscript/util/ComponentUtil.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,35 +55,39 @@ public static MutableText fromString(String message) {
public static String toFormattedString(Text message) {
StringBuilder result = new StringBuilder();

Style style = message.getStyle();
if(message.getSiblings().isEmpty()){
Style style = message.getStyle();

String format = "";
String format = "";

if (style.getColor() != null) {
format += "§x§" + String.join("§", String.format("%06X", style.getColor().getRgb()).split(""));
}

if (style.isBold()) {
format += "§l";
}
if (style.isItalic()) {
format += "§o";
}
if (style.isUnderlined()) {
format += "§n";
}
if (style.isStrikethrough()) {
format += "§m";
}
if (style.isObfuscated()) {
format += "§k";
}
if (style.getColor() != null) {
format += "§x§" + String.join("§", String.format("%06X", style.getColor().getRgb()).split(""));
}

result.append(format);
result.append(message.getString());
if (style.isBold()) {
format += "§l";
}
if (style.isItalic()) {
format += "§o";
}
if (style.isUnderlined()) {
format += "§n";
}
if (style.isStrikethrough()) {
format += "§m";
}
if (style.isObfuscated()) {
format += "§k";
}

for (Text sibling : message.getSiblings()) {
result.append(toFormattedString(sibling));
result.append(format);
result.append(message.getString());
}
else {
for (Text sibling : message.getSiblings()) {
result.append("§r");
result.append(toFormattedString(sibling));
}
}

return result.toString();
Expand Down