From 31d1e1935eae254ba2ff18df57dcd8ad9d9b0fa5 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 1 Jun 2023 16:56:31 +0800 Subject: Fix merge conflicts --- .../rei/impl/client/gui/widget/favorites/history/DisplayEntry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/src') diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java index 03db37b7e..a6299a09d 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java @@ -128,8 +128,8 @@ public class DisplayEntry extends WidgetWithBounds { throwable.printStackTrace(); List w = new ArrayList<>(); w.add(Widgets.createRecipeBase(displayBounds).color(0xFFBB0000)); - w.add(Widgets.createLabel(new Point(displayBounds.getCenterX(), displayBounds.getCenterY() - 8), new TextComponent("Failed to initiate setupDisplay"))); - w.add(Widgets.createLabel(new Point(displayBounds.getCenterX(), displayBounds.getCenterY() + 1), new TextComponent("Check console for error"))); + w.add(Widgets.createLabel(new Point(displayBounds.getCenterX(), displayBounds.getCenterY() - 8), Component.literal("Failed to initiate setupDisplay"))); + w.add(Widgets.createLabel(new Point(displayBounds.getCenterX(), displayBounds.getCenterY() + 1), Component.literal("Check console for error"))); return w; } } -- cgit