From 375b44103d136a5c4a598c52d659eef1b26eee17 Mon Sep 17 00:00:00 2001 From: Anthony Hilyard Date: Tue, 19 Oct 2021 10:45:51 -0700 Subject: Added StringRecomposer helper. Fixed crash bug due to missing fonts. --- .../iceberg/util/StringRecomposer.java | 55 +++++++++++++++------- 1 file changed, 39 insertions(+), 16 deletions(-) (limited to 'src/main/java/com/anthonyhilyard/iceberg/util/StringRecomposer.java') diff --git a/src/main/java/com/anthonyhilyard/iceberg/util/StringRecomposer.java b/src/main/java/com/anthonyhilyard/iceberg/util/StringRecomposer.java index d88ae41..4ad448d 100644 --- a/src/main/java/com/anthonyhilyard/iceberg/util/StringRecomposer.java +++ b/src/main/java/com/anthonyhilyard/iceberg/util/StringRecomposer.java @@ -1,32 +1,55 @@ package com.anthonyhilyard.iceberg.util; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTextTooltip; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.network.chat.FormattedText; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.Style; import net.minecraft.network.chat.TextComponent; import net.minecraft.util.FormattedCharSink; -public class StringRecomposer implements FormattedCharSink +public class StringRecomposer { - private StringBuilder builder = new StringBuilder(); - private MutableComponent text = new TextComponent("").withStyle(Style.EMPTY); - - @Override - public boolean accept(int index, Style style, int charCode) + public static List recompose(List components) { - builder.append(Character.toChars(charCode)); - - if (!style.equals(text.getStyle())) + List recomposedLines = new ArrayList<>(); + for (ClientTooltipComponent component : components) { - text.append(new TextComponent(builder.toString()).withStyle(style)); - builder.setLength(0); + if (component instanceof ClientTextTooltip) + { + RecomposerSink recomposer = new RecomposerSink(); + ((ClientTextTooltip)component).text.accept(recomposer); + recomposedLines.add(recomposer.getFormattedText()); + } } - return true; + return recomposedLines; } - - public FormattedText getFormattedText() + + private static class RecomposerSink implements FormattedCharSink { - text.append(new TextComponent(builder.toString()).withStyle(text.getStyle())); - return text; + private StringBuilder builder = new StringBuilder(); + private MutableComponent text = new TextComponent("").withStyle(Style.EMPTY); + + @Override + public boolean accept(int index, Style style, int charCode) + { + builder.append(Character.toChars(charCode)); + + if (!style.equals(text.getStyle())) + { + text.append(new TextComponent(builder.toString()).withStyle(style)); + builder.setLength(0); + } + return true; + } + + public FormattedText getFormattedText() + { + text.append(new TextComponent(builder.toString()).withStyle(text.getStyle())); + return text; + } } } -- cgit