Deprecate old ScreenHelper.getLastHandledScreen in favour of REIHelper.getPreviousHandledScreen

Signed-off-by: shedaniel <daniel@shedaniel.me>

4 files changed, 18 insertions, 8 deletions

diff --git a/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java b/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
index a098eb5c0..ce523c33f 100644
--- a/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
+++ b/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
@@ -146,7 +146,7 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
     
     @Override
     public void sendDeletePacket() {
-        if (ScreenHelper.getLastHandledScreen() instanceof CreativeInventoryScreen) {
+        if (REIHelper.getInstance().getPreviousHandledScreen() instanceof CreativeInventoryScreen) {
             MinecraftClient.getInstance().player.inventory.setCursorStack(ItemStack.EMPTY);
             return;
         }
@@ -257,7 +257,7 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
             screen = new VillagerRecipeViewingScreen(map, category);
         } else if (ConfigObject.getInstance().getRecipeScreenType() == RecipeScreenType.UNSET) {
             @Nullable Identifier finalCategory = category;
-            screen = new PreRecipeViewingScreen(ScreenHelper.getLastHandledScreen(), RecipeScreenType.UNSET, true, original -> {
+            screen = new PreRecipeViewingScreen(REIHelper.getInstance().getPreviousHandledScreen(), RecipeScreenType.UNSET, true, original -> {
                 ConfigObject.getInstance().setRecipeScreenType(original ? RecipeScreenType.ORIGINAL : RecipeScreenType.VILLAGER);
                 ConfigManager.getInstance().saveConfig();
                 openRecipeViewingScreen(map, finalCategory, ingredientNotice, resultNotice);
diff --git a/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java b/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java
index c9f9c78e0..b281b3104 100644
--- a/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java
+++ b/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java
@@ -115,7 +115,7 @@ public class ConfigManagerImpl implements ConfigManager {
                         Collections.singletonList(new RecipeScreenTypeEntry(220, i13n, getUnsafely(field, config, RecipeScreenType.UNSET), getUnsafely(field, defaults), type -> setUnsafely(field, config, type)))
                 , (field) -> field.getType() == RecipeScreenType.class, ConfigObjectImpl.UseSpecialRecipeTypeScreen.class);
         guiRegistry.registerAnnotationProvider((i13n, field, config, defaults, guiProvider) ->
-                        ScreenHelper.getLastHandledScreen() == null || MinecraftClient.getInstance().getNetworkHandler() == null || MinecraftClient.getInstance().getNetworkHandler().getRecipeManager() == null ?
+                        REIHelper.getInstance().getPreviousHandledScreen() == null || MinecraftClient.getInstance().getNetworkHandler() == null || MinecraftClient.getInstance().getNetworkHandler().getRecipeManager() == null ?
                                 Collections.singletonList(new NoFilteringEntry(getUnsafely(field, config, new ArrayList<>()), getUnsafely(field, defaults), list -> setUnsafely(field, config, list)))
                                 :
                                 Collections.singletonList(new FilteringEntry(getUnsafely(field, config, new ArrayList<>()), getUnsafely(field, defaults), list -> setUnsafely(field, config, list)))
diff --git a/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java b/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java
index eb662fe3c..28048335d 100644
--- a/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java
+++ b/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java
@@ -54,7 +54,7 @@ public final class InternalWidgets {
     private InternalWidgets() {}
     
     public static Widget createAutoCraftingButtonWidget(Rectangle displayBounds, me.shedaniel.math.Rectangle rectangle, String text, Supplier<RecipeDisplay> displaySupplier, List<Widget> setupDisplay, RecipeCategory<?> category) {
-        HandledScreen<?> handledScreen = ScreenHelper.getLastHandledScreen();
+        HandledScreen<?> handledScreen = REIHelper.getInstance().getPreviousHandledScreen();
         boolean[] visible = {false};
         List<String>[] errorTooltip = new List[]{null};
         Button autoCraftingButton = Widgets.createButton(rectangle, text)
@@ -215,7 +215,7 @@ public final class InternalWidgets {
         public List<? extends Element> children() {
             return widgets;
         }
-    
+        
         @Override
         public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
             for (Widget widget : this.widgets) {
@@ -243,7 +243,7 @@ public final class InternalWidgets {
         public List<? extends Element> children() {
             return Collections.singletonList(this.widget);
         }
-    
+        
         @Override
         public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
             return this.widget.mouseScrolled(mouseX, mouseY, amount);
@@ -277,7 +277,7 @@ public final class InternalWidgets {
         public List<? extends Element> children() {
             return Collections.singletonList(this.widget);
         }
-    
+        
         @Override
         public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
             return this.widget.mouseScrolled(mouseX, mouseY, amount);
@@ -318,7 +318,7 @@ public final class InternalWidgets {
         public List<? extends Element> children() {
             return Collections.singletonList(this.widget);
         }
-    
+        
         @Override
         public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
             return this.widget.mouseScrolled(mouseX, mouseY, amount);
diff --git a/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java b/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java
index 5cdb2a87f..0b21f6175 100644
--- a/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java
+++ b/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java
@@ -149,10 +149,20 @@ public class ScreenHelper implements ClientModInitializer, REIHelper {
         return getLastOverlay(false, false);
     }
     
+    /**
+     * @see REIHelper#getPreviousHandledScreen()
+     */
+    @Deprecated
+    @ApiStatus.ScheduledForRemoval
     public static HandledScreen<?> getLastHandledScreen() {
         return lastHandledScreen;
     }
     
+    @Override
+    public HandledScreen<?> getPreviousHandledScreen() {
+        return lastHandledScreen;
+    }
+    
     public static void setLastHandledScreen(HandledScreen<?> lastScreenWithHandler) {
         ScreenHelper.lastHandledScreen = lastScreenWithHandler;
     }