aboutsummaryrefslogtreecommitdiff
path: root/fabric/src/main/java
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2022-01-29 16:18:03 +0800
committershedaniel <daniel@shedaniel.me>2022-01-29 16:18:03 +0800
commit6d5eb08f5f21afdbd7f0cd30ea89aba6e25bca45 (patch)
tree3274c0e8f5f33ae93062436a9108fefbe00c5ae1 /fabric/src/main/java
parenta4d1b4abdb8d20109590c7eb4de803b230ff10e8 (diff)
downloadRoughlyEnoughItems-6d5eb08f5f21afdbd7f0cd30ea89aba6e25bca45.tar.gz
RoughlyEnoughItems-6d5eb08f5f21afdbd7f0cd30ea89aba6e25bca45.tar.bz2
RoughlyEnoughItems-6d5eb08f5f21afdbd7f0cd30ea89aba6e25bca45.zip
Fix #605
Diffstat (limited to 'fabric/src/main/java')
-rw-r--r--fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java b/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java
index 370e0bb9c..f3a730371 100644
--- a/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java
+++ b/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java
@@ -30,7 +30,9 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
import net.minecraft.locale.Language;
+import net.minecraft.network.chat.FormattedText;
import net.minecraft.network.chat.Style;
+import net.minecraft.util.FormattedCharSequence;
import net.minecraft.world.inventory.tooltip.TooltipComponent;
import java.util.List;
@@ -42,9 +44,10 @@ public class ScreenOverlayImplImpl {
List<ClientTooltipComponent> lines = tooltip.entries().stream()
.flatMap(component -> {
if (component.isText()) {
- return Minecraft.getInstance().font.getSplitter().splitLines(component.getAsText(), 100000, Style.EMPTY).stream()
- .map(Language.getInstance()::getVisualOrder)
- .map(ClientTooltipComponent::create);
+ List<FormattedText> texts = Minecraft.getInstance().font.getSplitter().splitLines(component.getAsText(), 100000, Style.EMPTY);
+ Stream<FormattedCharSequence> sequenceStream = texts.isEmpty() ? Stream.of(component.getAsText().getVisualOrderText())
+ : texts.stream().map(Language.getInstance()::getVisualOrder);
+ return sequenceStream.map(ClientTooltipComponent::create);
} else {
return Stream.of(component.getAsComponent());
}