Technically fix #611, would need CPAS to use the new methods

1 files changed, 23 insertions, 0 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ExclusionZones.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ExclusionZones.java
index cdddcae18..19a58c430 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ExclusionZones.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ExclusionZones.java
@@ -26,6 +26,7 @@ package me.shedaniel.rei.api.client.registry.screen;
 import me.shedaniel.math.Rectangle;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.screens.Screen;
 
 import java.util.List;
 
@@ -36,7 +37,9 @@ public interface ExclusionZones extends OverlayDecider {
      *
      * @param currentScreenClass the current screen class
      * @return the list of exclusion zones
+     * @deprecated use the screen instance instead
      */
+    @Deprecated
     default List<Rectangle> getExclusionZones(Class<?> currentScreenClass) {
         return getExclusionZones(currentScreenClass, false);
     }
@@ -46,9 +49,29 @@ public interface ExclusionZones extends OverlayDecider {
      *
      * @param currentScreenClass the current screen class
      * @return the list of exclusion zones
+     * @deprecated use the screen instance instead
      */
+    @Deprecated
     List<Rectangle> getExclusionZones(Class<?> currentScreenClass, boolean sort);
     
+    /**
+     * Returns the exclusion zones by the screen
+     *
+     * @param screen the screen
+     * @return the list of exclusion zones
+     */
+    default List<Rectangle> getExclusionZones(Screen screen) {
+        return getExclusionZones(screen, false);
+    }
+    
+    /**
+     * Returns the exclusion zones by the screen
+     *
+     * @param screen the screen
+     * @return the list of exclusion zones
+     */
+    List<Rectangle> getExclusionZones(Screen screen, boolean sort);
+    
     int getZonesCount();
     
     /**