From c27630f0c0eb7e5084f28139aaf2ba45ff3a7e23 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 9 May 2020 00:26:18 +0800
Subject: Welcome back: Container

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 .../shedaniel/rei/server/ContainerInfoHandler.java | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/main/java/me/shedaniel/rei/server/ContainerInfoHandler.java')

diff --git a/src/main/java/me/shedaniel/rei/server/ContainerInfoHandler.java b/src/main/java/me/shedaniel/rei/server/ContainerInfoHandler.java
index fdf27135e..c6214092e 100644
--- a/src/main/java/me/shedaniel/rei/server/ContainerInfoHandler.java
+++ b/src/main/java/me/shedaniel/rei/server/ContainerInfoHandler.java
@@ -24,25 +24,25 @@
 package me.shedaniel.rei.server;
 
 import com.google.common.collect.Maps;
-import net.minecraft.screen.ScreenHandler;
+import net.minecraft.container.Container;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Map;
 
 public class ContainerInfoHandler {
-    private static final Map<String, Map<Class<? extends ScreenHandler>, ContainerInfo<? extends ScreenHandler>>> containerInfoMap = Maps.newLinkedHashMap();
+    private static final Map<String, Map<Class<? extends Container>, ContainerInfo<? extends Container>>> containerInfoMap = Maps.newLinkedHashMap();
+    
+    public static void registerContainerInfo(Identifier category, ContainerInfo<? extends Container> containerInfo) {
+        registerScreenWithHandlerInfo(category, containerInfo);
+    }
     
     /**
-     * @deprecated Use {@link #registerScreenWithHandlerInfo(Identifier, ContainerInfo)}
+     * @deprecated Use {@link #registerContainerInfo(Identifier, ContainerInfo)}
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval
-    public static void registerContainerInfo(Identifier category, ContainerInfo<? extends ScreenHandler> containerInfo) {
-        registerScreenWithHandlerInfo(category, containerInfo);
-    }
-    
-    public static void registerScreenWithHandlerInfo(Identifier category, ContainerInfo<? extends ScreenHandler> containerInfo) {
+    public static void registerScreenWithHandlerInfo(Identifier category, ContainerInfo<? extends Container> containerInfo) {
         if (!containerInfoMap.containsKey(category.toString()))
             containerInfoMap.put(category.toString(), Maps.newLinkedHashMap());
         containerInfoMap.get(category.toString()).put(containerInfo.getContainerClass(), containerInfo);
@@ -52,13 +52,13 @@ public class ContainerInfoHandler {
         return containerInfoMap.containsKey(category.toString()) && !containerInfoMap.get(category.toString()).isEmpty();
     }
     
-    public static ContainerInfo<? extends ScreenHandler> getContainerInfo(Identifier category, Class<?> containerClass) {
+    public static ContainerInfo<? extends Container> getContainerInfo(Identifier category, Class<?> containerClass) {
         if (!isCategoryHandled(category))
             return null;
-        Map<Class<? extends ScreenHandler>, ContainerInfo<? extends ScreenHandler>> infoMap = containerInfoMap.get(category.toString());
+        Map<Class<? extends Container>, ContainerInfo<? extends Container>> infoMap = containerInfoMap.get(category.toString());
         if (infoMap.containsKey(containerClass))
             return infoMap.get(containerClass);
-        for (Map.Entry<Class<? extends ScreenHandler>, ContainerInfo<? extends ScreenHandler>> entry : infoMap.entrySet())
+        for (Map.Entry<Class<? extends Container>, ContainerInfo<? extends Container>> entry : infoMap.entrySet())
             if (entry.getKey().isAssignableFrom(containerClass))
                 return entry.getValue();
         return null;
-- 
cgit