From ca2bb09ae0b22831c195453f0ccc47a8eb83a43c Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 18 Apr 2020 15:06:19 +0800
Subject: Deprecate old ScreenHelper.getLastHandledScreen in favour of
 REIHelper.getPreviousHandledScreen

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 .../me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java')

diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java
index 40b1d7b84..024eea242 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java
+++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java
@@ -25,7 +25,7 @@ package me.shedaniel.rei.plugin;
 
 import com.google.common.collect.Ordering;
 import me.shedaniel.math.Rectangle;
-import me.shedaniel.rei.impl.ScreenHelper;
+import me.shedaniel.rei.api.REIHelper;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
@@ -40,12 +40,12 @@ import java.util.function.Supplier;
 public class DefaultPotionEffectExclusionZones implements Supplier<List<Rectangle>> {
     @Override
     public List<Rectangle> get() {
-        if (!(ScreenHelper.getLastHandledScreen() instanceof AbstractInventoryScreen) || !((AbstractInventoryScreen) ScreenHelper.getLastHandledScreen()).drawStatusEffects)
+        if (!(REIHelper.getInstance().getPreviousHandledScreen() instanceof AbstractInventoryScreen) || !((AbstractInventoryScreen<?>) REIHelper.getInstance().getPreviousHandledScreen()).drawStatusEffects)
             return Collections.emptyList();
         Collection<StatusEffectInstance> activePotionEffects = MinecraftClient.getInstance().player.getStatusEffects();
         if (activePotionEffects.isEmpty())
             return Collections.emptyList();
-        HandledScreen<?> handledScreen = ScreenHelper.getLastHandledScreen();
+        HandledScreen<?> handledScreen = REIHelper.getInstance().getPreviousHandledScreen();
         List<Rectangle> list = new ArrayList<>();
         int x = handledScreen.x - 124;
         int y = handledScreen.y;
-- 
cgit