Merge branch '1.14-dev' into 1.14

6 files changed, 10 insertions, 9 deletions

diff --git a/src/main/java/me/shedaniel/rei/client/BaseBoundsHandlerImpl.java b/src/main/java/me/shedaniel/rei/client/BaseBoundsHandlerImpl.java
index 8732dfda3..ca2720e8f 100644
--- a/src/main/java/me/shedaniel/rei/client/BaseBoundsHandlerImpl.java
+++ b/src/main/java/me/shedaniel/rei/client/BaseBoundsHandlerImpl.java
@@ -43,12 +43,12 @@ public class BaseBoundsHandlerImpl implements BaseBoundsHandler {
     
     @Override
     public Rectangle getLeftBounds(Screen screen) {
-        return DisplayHelper.DisplayBoundsHandler.EMPTY;
+        return new Rectangle();
     }
     
     @Override
     public Rectangle getRightBounds(Screen screen) {
-        return DisplayHelper.DisplayBoundsHandler.EMPTY;
+        return new Rectangle();
     }
     
     @Override
diff --git a/src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java b/src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java
index b127a2461..207723944 100644
--- a/src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java
+++ b/src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java
@@ -30,7 +30,7 @@ import net.minecraft.client.util.InputUtil;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.text.TranslatableTextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.DefaultedList;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.PacketByteBuf;
@@ -154,7 +154,7 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
             String madeUpCommand = og.replaceAll("\\{player_name}", MinecraftClient.getInstance().player.getEntityName()).replaceAll("\\{item_name}", identifier.getPath()).replaceAll("\\{item_identifier}", identifier.toString()).replaceAll("\\{nbt}", tagMessage).replaceAll("\\{count}", String.valueOf(cheatedStack.getAmount()));
             if (madeUpCommand.length() > 256) {
                 madeUpCommand = og.replaceAll("\\{player_name}", MinecraftClient.getInstance().player.getEntityName()).replaceAll("\\{item_name}", identifier.getPath()).replaceAll("\\{item_identifier}", identifier.toString()).replaceAll("\\{nbt}", "").replaceAll("\\{count}", String.valueOf(cheatedStack.getAmount()));
-                MinecraftClient.getInstance().player.addChatMessage(new TranslatableTextComponent("text.rei.too_long_nbt"), false);
+                MinecraftClient.getInstance().player.addChatMessage(new TranslatableComponent("text.rei.too_long_nbt"), false);
             }
             MinecraftClient.getInstance().player.sendChatMessage(madeUpCommand);
             return true;
diff --git a/src/main/java/me/shedaniel/rei/client/ConfigManagerImpl.java b/src/main/java/me/shedaniel/rei/client/ConfigManagerImpl.java
index d6ec4e15c..741bd9fc4 100644
--- a/src/main/java/me/shedaniel/rei/client/ConfigManagerImpl.java
+++ b/src/main/java/me/shedaniel/rei/client/ConfigManagerImpl.java
@@ -15,7 +15,7 @@ import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Screen;
 import net.minecraft.client.resource.language.I18n;
-import net.minecraft.text.StringTextComponent;
+import net.minecraft.network.chat.TextComponent;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -143,7 +143,7 @@ public class ConfigManagerImpl implements ConfigManager {
                 e.printStackTrace();
             }
         }
-        return new Screen(new StringTextComponent("")) {
+        return new Screen(new TextComponent("")) {
             @Override
             public void render(int int_1, int int_2, float float_1) {
                 renderDirtBackground(0);
diff --git a/src/main/java/me/shedaniel/rei/client/DisplayHelperImpl.java b/src/main/java/me/shedaniel/rei/client/DisplayHelperImpl.java
index 93419651e..4cac6a11f 100644
--- a/src/main/java/me/shedaniel/rei/client/DisplayHelperImpl.java
+++ b/src/main/java/me/shedaniel/rei/client/DisplayHelperImpl.java
@@ -28,12 +28,12 @@ public class DisplayHelperImpl implements DisplayHelper {
         
         @Override
         public Rectangle getLeftBounds(Object screen) {
-            return DisplayBoundsHandler.EMPTY;
+            return new Rectangle();
         }
         
         @Override
         public Rectangle getRightBounds(Object screen) {
-            return DisplayBoundsHandler.EMPTY;
+            return new Rectangle();
         }
         
         @Override
diff --git a/src/main/java/me/shedaniel/rei/client/ItemRegistryImpl.java b/src/main/java/me/shedaniel/rei/client/ItemRegistryImpl.java
index 5d05b8570..951e6cccc 100644
--- a/src/main/java/me/shedaniel/rei/client/ItemRegistryImpl.java
+++ b/src/main/java/me/shedaniel/rei/client/ItemRegistryImpl.java
@@ -26,6 +26,7 @@ public class ItemRegistryImpl implements ItemRegistry {
         return Collections.unmodifiableList(itemList);
     }
     
+    @SuppressWarnings("deprecation")
     @Override
     public List<ItemStack> getModifiableItemList() {
         return itemList;
diff --git a/src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java b/src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java
index 80db040d1..db46aa08f 100644
--- a/src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java
+++ b/src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java
@@ -250,7 +250,7 @@ public class RecipeHelperImpl implements RecipeHelper {
     }
     
     @Override
-    public List<Recipe> getVanillaSortedRecipes() {
+    public List<Recipe> getAllSortedRecipes() {
         return getRecipeManager().values().stream().sorted(RECIPE_COMPARATOR).collect(Collectors.toList());
     }