4.0-unstable

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

1 files changed, 1 insertions, 32 deletions

diff --git a/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java b/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java
index 15d46e4de..1bd251725 100644
--- a/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java
+++ b/src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java
@@ -5,14 +5,10 @@
 
 package me.shedaniel.rei.api;
 
-import com.google.common.collect.Lists;
 import me.shedaniel.math.api.Rectangle;
-import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import net.minecraft.client.gui.screen.Screen;
-import org.jetbrains.annotations.ApiStatus;
 
 import java.util.List;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 public interface BaseBoundsHandler extends DisplayHelper.DisplayBoundsHandler<Screen> {
@@ -20,21 +16,12 @@ public interface BaseBoundsHandler extends DisplayHelper.DisplayBoundsHandler<Sc
      * Gets the exclusion zones by the screen class
      *
      * @param currentScreenClass the current screen class
-     * @param isOnRightSide      whether the user has set the overlay to the right
      * @return the list of exclusion zones
      */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    default List<Rectangle> getCurrentExclusionZones(Class<?> currentScreenClass, boolean isOnRightSide) {
+    default List<Rectangle> getExclusionZones(Class<?> currentScreenClass) {
         return getExclusionZones(currentScreenClass, false);
     }
     
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    default List<Rectangle> getCurrentExclusionZones(Class<?> currentScreenClass, boolean isOnRightSide, boolean sort) {
-        return getExclusionZones(currentScreenClass, sort);
-    }
-    
     List<Rectangle> getExclusionZones(Class<?> currentScreenClass, boolean sort);
     
     int supplierSize();
@@ -43,24 +30,6 @@ public interface BaseBoundsHandler extends DisplayHelper.DisplayBoundsHandler<Sc
      * Register an exclusion zone
      *
      * @param screenClass the screen
-     * @param supplier    the exclusion zone supplier, isOnRightSide -> the list of exclusion zones
-     * @see #registerExclusionZones(Class, Supplier) for non deprecated version
-     */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval
-    default void registerExclusionZones(Class<?> screenClass, Function<Boolean, List<Rectangle>> supplier) {
-        RoughlyEnoughItemsCore.LOGGER.warn("[REI] Someone is registering exclusion zones with the deprecated method: " + supplier.getClass().getName());
-        registerExclusionZones(screenClass, () -> {
-            List<Rectangle> zones = Lists.newArrayList(supplier.apply(false));
-            zones.addAll(supplier.apply(true));
-            return zones;
-        });
-    }
-    
-    /**
-     * Register an exclusion zone
-     *
-     * @param screenClass the screen
      * @param supplier    the exclusion zone supplier, returns the list of exclusion zones
      */
     void registerExclusionZones(Class<?> screenClass, Supplier<List<Rectangle>> supplier);