From 90b8a8181eb7e642fb88832f8bd8baa3acdcf804 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Fri, 11 Dec 2020 20:24:47 +0800
Subject: Remove deprecated classes

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 .../me/shedaniel/rei/impl/ClientHelperImpl.java    | 24 +++++-----------------
 1 file changed, 5 insertions(+), 19 deletions(-)

(limited to 'RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java')

diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
index 35900f2ff..254f5d3ab 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
@@ -95,14 +95,14 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
     }
     
     @Override
-    public String getModFromModId(String modid) {
-        if (modid == null)
+    public String getModFromModId(String modId) {
+        if (modId == null)
             return "";
-        String any = modNameCache.getOrDefault(modid, null);
+        String any = modNameCache.getOrDefault(modId, null);
         if (any != null)
             return any;
-        String s = FabricLoader.getInstance().getModContainer(modid).map(ModContainer::getMetadata).map(ModMetadata::getName).orElse(modid);
-        modNameCache.put(modid, s);
+        String s = FabricLoader.getInstance().getModContainer(modId).map(ModContainer::getMetadata).map(ModMetadata::getName).orElse(modId);
+        modNameCache.put(modId, s);
         return s;
     }
     
@@ -175,11 +175,6 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
         }
     }
     
-    @Override
-    public List<ItemStack> getInventoryItemsTypes() {
-        return Minecraft.getInstance().player.getInventory().compartments.stream().flatMap(Collection::stream).collect(Collectors.toList());
-    }
-    
     @ApiStatus.Internal
     public Set<EntryStack> _getInventoryItemsTypes() {
         return Minecraft.getInstance().player.getInventory().compartments.stream()
@@ -188,15 +183,6 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
                 .collect(Collectors.toSet());
     }
     
-    @ApiStatus.ScheduledForRemoval
-    @Deprecated
-    @Override
-    public void openRecipeViewingScreen(Map<RecipeCategory<?>, List<RecipeDisplay>> map) {
-        openRecipeViewingScreen(map, null, null, null);
-    }
-    
-    @ApiStatus.ScheduledForRemoval
-    @Deprecated
     @ApiStatus.Internal
     public void openRecipeViewingScreen(Map<RecipeCategory<?>, List<RecipeDisplay>> map, @Nullable ResourceLocation category, @Nullable EntryStack ingredientNotice, @Nullable EntryStack resultNotice) {
         openView(new LegacyWrapperViewSearchBuilder(map).setPreferredOpenedCategory(category).setInputNotice(ingredientNotice).setOutputNotice(resultNotice).fillPreferredOpenedCategory());
-- 
cgit