From 27921ce9373a4dc9bf98aee39df715708d42ecdb Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 11 Jun 2022 01:27:37 +0800 Subject: Fix merge conflicts --- .../java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/src/main/java') diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java index 9bc1b55c4..932ed9704 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java @@ -436,10 +436,10 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget { String name = ConfigObject.getInstance().getFavoriteKeyCode().getLocalizedName().getString(); if (reverseFavoritesAction()) tooltip.addAllTexts(Stream.of(I18n.get("text.rei.remove_favorites_tooltip", name).split("\n")) - .map(TextComponent::new).collect(Collectors.toList())); + .map(Component::literal).collect(Collectors.toList())); else tooltip.addAllTexts(Stream.of(I18n.get("text.rei.favorites_tooltip", name).split("\n")) - .map(TextComponent::new).collect(Collectors.toList())); + .map(Component::literal).collect(Collectors.toList())); } if (tooltipProcessors != null) { -- cgit