From 6db8f1d0b95e1079274d1b570d376b839f2cf8e3 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 30 Jan 2021 14:37:22 +0800
Subject: Fix merge conflicts

---
 .../java/me/shedaniel/rei/gui/config/SyntaxHighlightingMode.java  | 8 ++++----
 .../main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/SyntaxHighlightingMode.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/SyntaxHighlightingMode.java
index 23aac1f44..51dfe42f7 100644
--- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/SyntaxHighlightingMode.java
+++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/SyntaxHighlightingMode.java
@@ -23,13 +23,13 @@
 
 package me.shedaniel.rei.gui.config;
 
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.resources.I18n;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import java.util.Locale;
 
-@Environment(EnvType.CLIENT)
+@OnlyIn(Dist.CLIENT)
 public enum SyntaxHighlightingMode {
     PLAIN,
     PLAIN_UNDERSCORED,
diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
index 9b0486f7b..fc8fd84dc 100644
--- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
+++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
@@ -33,12 +33,12 @@ import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.util.IReorderingProcessor;
 import net.minecraft.util.SharedConstants;
 import net.minecraft.util.Util;
-import net.minecraft.network.chat.Style;
-import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.vector.Matrix4f;
+import net.minecraft.util.text.Style;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
@@ -632,9 +632,9 @@ public class TextFieldWidget extends WidgetWithBounds implements IScreen {
     
     public interface TextFormatter {
         TextFormatter DEFAULT = (widget, text, index) -> {
-            return FormattedCharSequence.forward(text, Style.EMPTY);
+            return IReorderingProcessor.forward(text, Style.EMPTY);
         };
         
-        FormattedCharSequence format(TextFieldWidget widget, String text, int index);
+        IReorderingProcessor format(TextFieldWidget widget, String text, int index);
     }
 }
-- 
cgit