Skip to content

Commit

Permalink
text optimize: apply to sub-formats like font too
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Jan 19, 2023
1 parent b6dec9d commit f684697
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions plugin/src/main/java/com/denizenscript/denizen/utilities/FormattedTextHelper.java
View file
Expand Up @@ -425,15 +425,15 @@ public static BaseComponent[] parse(String str, ChatColor baseColor, boolean cle
return null;
}
try {
return parseInternal(str, baseColor, cleanBase);
return parseInternal(str, baseColor, cleanBase, false);
}
catch (Throwable ex) {
Debug.echoError(ex);
}
return new BaseComponent[]{new TextComponent(str)};
}

public static BaseComponent[] parseInternal(String str, ChatColor baseColor, boolean cleanBase) {
public static BaseComponent[] parseInternal(String str, ChatColor baseColor, boolean cleanBase, boolean optimize) {
str = CoreUtilities.clearNBSPs(str);
int firstChar = str.indexOf(ChatColor.COLOR_CHAR);
if (firstChar == -1) {
Expand All @@ -458,14 +458,16 @@ public static BaseComponent[] parseInternal(String str, ChatColor baseColor, boo
List<String> innardParts = CoreUtilities.split(translatable, ';');
component.setTranslate(unescape(innardParts.get(0)));
for (int i = 1; i < innardParts.size(); i++) {
for (BaseComponent subComponent : parseInternal(unescape(innardParts.get(i)), baseColor, false)) {
for (BaseComponent subComponent : parseInternal(unescape(innardParts.get(i)), baseColor, false, optimize)) {
component.addWith(subComponent);
}
}
return new BaseComponent[] { component };
}
}
boolean optimize = str.contains(ChatColor.COLOR_CHAR + "[optimize=true]");
if (!optimize) {
optimize = str.contains(ChatColor.COLOR_CHAR + "[optimize=true]");
}
TextComponent root = new TextComponent();
TextComponent base = new TextComponent();
if (cleanBase && !optimize) {
Expand Down Expand Up @@ -527,7 +529,7 @@ else if (innardType.equals("translate")) {
TranslatableComponent component = new TranslatableComponent();
component.setTranslate(unescape(innardBase.get(1)));
for (String extra : innardParts) {
for (BaseComponent subComponent : parseInternal(unescape(extra), baseColor, false)) {
for (BaseComponent subComponent : parseInternal(unescape(extra), baseColor, false, optimize)) {
component.addWith(subComponent);
}
}
Expand All @@ -541,7 +543,7 @@ else if (innardType.equals("click") && innardParts.size() == 1) {
TextComponent clickableText = new TextComponent();
ClickEvent.Action action = ElementTag.asEnum(ClickEvent.Action.class, innardBase.get(1));
clickableText.setClickEvent(new ClickEvent(action == null ? ClickEvent.Action.SUGGEST_COMMAND : action, unescape(innardParts.get(0))));
for (BaseComponent subComponent : parseInternal(str.substring(endBracket + 1, endIndex), baseColor, false)) {
for (BaseComponent subComponent : parseInternal(str.substring(endBracket + 1, endIndex), baseColor, false, optimize)) {
clickableText.addExtra(subComponent);
}
lastText.addExtra(clickableText);
Expand All @@ -557,7 +559,7 @@ else if (innardType.equals("hover")) {
if (HoverFormatHelper.processHoverInput(action == null ? HoverEvent.Action.SHOW_TEXT : action, hoverableText, innardParts.get(0))) {
continue;
}
for (BaseComponent subComponent : parseInternal(str.substring(endBracket + 1, endIndex), baseColor, false)) {
for (BaseComponent subComponent : parseInternal(str.substring(endBracket + 1, endIndex), baseColor, false, optimize)) {
hoverableText.addExtra(subComponent);
}
lastText.addExtra(hoverableText);
Expand All @@ -574,7 +576,7 @@ else if (innardType.equals("insertion")) {
}
TextComponent insertableText = new TextComponent();
insertableText.setInsertion(unescape(innardBase.get(1)));
for (BaseComponent subComponent : parseInternal(str.substring(endBracket + 1, endIndex), baseColor, false)) {
for (BaseComponent subComponent : parseInternal(str.substring(endBracket + 1, endIndex), baseColor, false, optimize)) {
insertableText.addExtra(subComponent);
}
lastText.addExtra(insertableText);
Expand Down Expand Up @@ -626,7 +628,7 @@ else if (CoreConfiguration.debugVerbose) {
else {
TextComponent colorText = new TextComponent();
colorText.setColor(color);
for (BaseComponent subComponent : parseInternal(str.substring(endBracket + 1, endIndex), color, false)) {
for (BaseComponent subComponent : parseInternal(str.substring(endBracket + 1, endIndex), color, false, optimize)) {
colorText.addExtra(subComponent);
}
lastText.addExtra(colorText);
Expand All @@ -650,7 +652,7 @@ else if (innardType.equals("gradient") && innardParts.size() == 2) {
endIndex = str.length();
}
String gradientText = BukkitElementExtensions.doGradient(str.substring(endBracket + 1, endIndex), fromColor, toColor, styleEnum);
for (BaseComponent subComponent : parseInternal(gradientText, baseColor, false)) {
for (BaseComponent subComponent : parseInternal(gradientText, baseColor, false, optimize)) {
lastText.addExtra(subComponent);
}
endBracket = endIndex - 1;
Expand All @@ -664,7 +666,7 @@ else if (innardType.equals("font") && Utilities.matchesNamespacedKey(innardBase.
else {
TextComponent fontText = new TextComponent();
fontText.setFont(innardBase.get(1));
for (BaseComponent subComponent : parseInternal(str.substring(endBracket + 1, endIndex), baseColor, false)) {
for (BaseComponent subComponent : parseInternal(str.substring(endBracket + 1, endIndex), baseColor, false, optimize)) {
fontText.addExtra(subComponent);
}
lastText.addExtra(fontText);
Expand Down

0 comments on commit f684697

Please sign in to comment.