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>
---
 .../java/me/shedaniel/rei/impl/ScreenHelper.java   | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/main/java/me/shedaniel/rei/impl/ScreenHelper.java')

diff --git a/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java b/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java
index 10e0065c2..4cf3558a1 100644
--- a/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java
+++ b/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java
@@ -44,7 +44,7 @@ import net.fabricmc.fabric.api.event.client.ClientTickCallback;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.client.gui.screen.ingame.ContainerScreen;
 import net.minecraft.client.util.Window;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
@@ -64,7 +64,7 @@ public class ScreenHelper implements ClientModInitializer, REIHelper {
     @ApiStatus.Internal
     public static List<ItemStack> inventoryStacks = Lists.newArrayList();
     private static ContainerScreenOverlay overlay;
-    private static HandledScreen<?> lastHandledScreen = null;
+    private static ContainerScreen<?> previousContainerScreen = null;
     private static LinkedHashSet<RecipeScreen> lastRecipeScreen = Sets.newLinkedHashSetWithExpectedSize(5);
     private static ScreenHelper instance;
     
@@ -152,21 +152,21 @@ public class ScreenHelper implements ClientModInitializer, REIHelper {
     }
     
     /**
-     * @see REIHelper#getPreviousHandledScreen()
+     * @see REIHelper#getPreviousContainerScreen()
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval
-    public static HandledScreen<?> getLastHandledScreen() {
-        return lastHandledScreen;
+    public static ContainerScreen<?> getLastHandledScreen() {
+        return previousContainerScreen;
     }
     
     @Override
-    public HandledScreen<?> getPreviousHandledScreen() {
-        return lastHandledScreen;
+    public ContainerScreen<?> getPreviousContainerScreen() {
+        return previousContainerScreen;
     }
     
-    public static void setLastHandledScreen(HandledScreen<?> lastScreenWithHandler) {
-        ScreenHelper.lastHandledScreen = lastScreenWithHandler;
+    public static void setPreviousContainerScreen(ContainerScreen<?> previousContainerScreen) {
+        ScreenHelper.previousContainerScreen = previousContainerScreen;
     }
     
     public static void drawHoveringWidget(MatrixStack matrices, int x, int y, TriConsumer<MatrixStack, Point, Float> consumer, int width, int height, float delta) {
@@ -215,8 +215,8 @@ public class ScreenHelper implements ClientModInitializer, REIHelper {
                 }
                 client.currentScreen = null;
                 client.openScreen(warningAndErrorScreen);
-            } else if (lastHandledScreen != screen && screen instanceof HandledScreen)
-                lastHandledScreen = (HandledScreen<?>) screen;
+            } else if (previousContainerScreen != screen && screen instanceof ContainerScreen)
+                previousContainerScreen = (ContainerScreen<?>) screen;
             return ActionResult.PASS;
         });
         boolean loaded = FabricLoader.getInstance().isModLoaded("fabric-events-lifecycle-v0");
-- 
cgit