Fix merge conflicts

3 files changed, 4 insertions, 6 deletions

diff --git a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinInputConstantsKey.java b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinInputConstantsKey.java
index 99a4b3ee1..a74c12d31 100644
--- a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinInputConstantsKey.java
+++ b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinInputConstantsKey.java
@@ -27,7 +27,6 @@ import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.systems.RenderSystem;
 import me.shedaniel.rei.api.client.config.ConfigObject;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -43,7 +42,7 @@ public abstract class MixinInputConstantsKey {
     @Inject(method = "getDisplayName", at = @At("HEAD"), cancellable = true)
     private void getDisplayName(CallbackInfoReturnable<Component> cir) {
         if (isPatchingAsyncThreadCrash() && !RenderSystem.isOnRenderThread()) {
-            cir.setReturnValue(new TranslatableComponent(getName()));
+            cir.setReturnValue(Component.translatable(getName()));
         }
     }
     
diff --git a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinInputConstantsKey.java b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinInputConstantsKey.java
index b6e815267..df0348de1 100644
--- a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinInputConstantsKey.java
+++ b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinInputConstantsKey.java
@@ -27,7 +27,6 @@ import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.systems.RenderSystem;
 import me.shedaniel.rei.api.client.config.ConfigObject;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -43,7 +42,7 @@ public abstract class MixinInputConstantsKey {
     @Inject(method = "getDisplayName", at = @At("HEAD"), cancellable = true)
     private void getDisplayName(CallbackInfoReturnable<Component> cir) {
         if (isPatchingAsyncThreadCrash() && !RenderSystem.isOnRenderThread()) {
-            cir.setReturnValue(new TranslatableComponent(getName()));
+            cir.setReturnValue(Component.translatable(getName()));
         }
     }
     
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;
         }
     }