diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-06-01 16:56:31 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2023-06-01 16:57:01 +0800 |
| commit | 31d1e1935eae254ba2ff18df57dcd8ad9d9b0fa5 (patch) | |
| tree | 87cc6f7167d2b329b497c1fc4456d7dedf2e5c0d /runtime/src | |
| parent | e7b215a7da342a18b0c0cd297cd847eda11c65e8 (diff) | |
| download | RoughlyEnoughItems-31d1e1935eae254ba2ff18df57dcd8ad9d9b0fa5.tar.gz RoughlyEnoughItems-31d1e1935eae254ba2ff18df57dcd8ad9d9b0fa5.tar.bz2 RoughlyEnoughItems-31d1e1935eae254ba2ff18df57dcd8ad9d9b0fa5.zip | |
Fix merge conflicts
Diffstat (limited to 'runtime/src')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java | 4 |
1 files changed, 2 insertions, 2 deletions
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<Widget> 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; } } |