From 2e4f4b41332474e1610af8e4e83b24b44eea83bc Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 8 Aug 2020 18:25:12 +0800
Subject: Fix duplicate mod id with hwyla

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 .../src/main/java/me/shedaniel/rei/api/widgets/Label.java         | 8 ++++----
 .../src/main/java/me/shedaniel/rei/impl/Internals.java            | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'RoughlyEnoughItems-api/src/main/java')

diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/widgets/Label.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/widgets/Label.java
index df28214c8..afa638e23 100644
--- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/widgets/Label.java
+++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/widgets/Label.java
@@ -28,7 +28,7 @@ import me.shedaniel.rei.api.REIHelper;
 import me.shedaniel.rei.gui.widget.WidgetWithBounds;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.LiteralText;
-import net.minecraft.text.StringRenderable;
+import net.minecraft.text.StringVisitable;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -303,13 +303,13 @@ public abstract class Label extends WidgetWithBounds {
         return new LiteralText("");
     }
     
-    public abstract StringRenderable getMessage();
+    public abstract StringVisitable getMessage();
     
     public final void setText(@NotNull Text text) {
         setMessage(text);
     }
     
-    public abstract void setMessage(@NotNull StringRenderable message);
+    public abstract void setMessage(@NotNull StringVisitable message);
     
     @NotNull
     public final Label text(@NotNull Text text) {
@@ -318,7 +318,7 @@ public abstract class Label extends WidgetWithBounds {
     }
     
     @NotNull
-    public final Label message(@NotNull StringRenderable message) {
+    public final Label message(@NotNull StringVisitable message) {
         setMessage(message);
         return this;
     }
diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/impl/Internals.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/impl/Internals.java
index 90a3f0e85..895d748a9 100644
--- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/impl/Internals.java
+++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/impl/Internals.java
@@ -35,7 +35,7 @@ import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.ItemStack;
-import net.minecraft.text.StringRenderable;
+import net.minecraft.text.StringVisitable;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.ApiStatus;
@@ -148,7 +148,7 @@ public final class Internals {
         
         Panel createPanelWidget(Rectangle bounds);
         
-        Label createLabel(Point point, StringRenderable text);
+        Label createLabel(Point point, StringVisitable text);
         
         Arrow createArrow(Rectangle rectangle);
         
-- 
cgit