1 files changed, 13 insertions, 12 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
index 62daa5b07..5e5ec1ae3 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
+++ b/runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
@@ -35,7 +35,8 @@ import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.api.*;
-import me.shedaniel.rei.api.entry.EntryStacks;
+import me.shedaniel.rei.api.ingredient.EntryStack;
+import me.shedaniel.rei.api.ingredient.util.EntryStacks;
 import me.shedaniel.rei.api.favorites.FavoriteEntry;
 import me.shedaniel.rei.api.widgets.Button;
 import me.shedaniel.rei.api.widgets.Tooltip;
@@ -214,7 +215,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl
         this.children().clear();
         this.removeOverlayMenu();
         this.window = Minecraft.getInstance().getWindow();
-        this.bounds = DisplayHelper.getInstance().getOverlayBounds(ConfigObject.getInstance().getDisplayPanelLocation(), Minecraft.getInstance().screen);
+        this.bounds = DisplayBoundsRegistry.getInstance().getOverlayBounds(ConfigObject.getInstance().getDisplayPanelLocation(), Minecraft.getInstance().screen);
         widgets.add(ENTRY_LIST_WIDGET);
         if (ConfigObject.getInstance().isFavoritesEnabled()) {
             if (favoritesListWidget == null)
@@ -454,9 +455,9 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl
                 return getBottomSideSearchFieldArea(widthRemoved);
             default:
             case CENTER: {
-                for (OverlayDecider decider : DisplayHelper.getInstance().getSortedOverlayDeciders(Minecraft.getInstance().screen.getClass())) {
-                    if (decider instanceof DisplayHelper.DisplayBoundsProvider) {
-                        Rectangle containerBounds = ((DisplayHelper.DisplayBoundsProvider<Screen>) decider).getScreenBounds(Minecraft.getInstance().screen);
+                for (OverlayDecider decider : DisplayBoundsRegistry.getInstance().getSortedOverlayDeciders(Minecraft.getInstance().screen.getClass())) {
+                    if (decider instanceof DisplayBoundsRegistry.DisplayBoundsProvider) {
+                        Rectangle containerBounds = ((DisplayBoundsRegistry.DisplayBoundsProvider<Screen>) decider).getScreenBounds(Minecraft.getInstance().screen);
                         return getBottomCenterSearchFieldArea(containerBounds, widthRemoved);
                     }
                 }
@@ -510,7 +511,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl
             ENTRY_LIST_WIDGET.updateSearch(ScreenHelper.getSearchField().getText(), true);
             init();
         } else {
-            for (OverlayDecider decider : DisplayHelper.getInstance().getSortedOverlayDeciders(minecraft.screen.getClass())) {
+            for (OverlayDecider decider : DisplayBoundsRegistry.getInstance().getSortedOverlayDeciders(minecraft.screen.getClass())) {
                 if (decider != null && decider.shouldRecalculateArea(ConfigObject.getInstance().getDisplayPanelLocation(), bounds)) {
                     init();
                     break;
@@ -552,7 +553,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl
                     return new Point(mouseX, mouseY);
                 }
             };
-            for (Map.Entry<Class<? extends Screen>, ClickAreaHandler<?>> area : ((RecipeHelperImpl) RecipeHelper.getInstance()).getClickAreas().entries()) {
+            for (Map.Entry<Class<? extends Screen>, ClickAreaHandler<?>> area : ((RecipeRegistryImpl) RecipeRegistry.getInstance()).getClickAreas().entries()) {
                 if (area.getKey().equals(screen.getClass())) {
                     ClickAreaHandler.Result result = area.getValue().handle(context);
                     if (result.isSuccessful()) {
@@ -563,7 +564,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl
                 }
             }
             if (categories != null && !categories.isEmpty()) {
-                String collect = CollectionUtils.mapAndJoinToString(categories, identifier -> RecipeHelper.getInstance().getCategory(identifier).getCategoryName(), ", ");
+                String collect = CollectionUtils.mapAndJoinToString(categories, identifier -> RecipeRegistry.getInstance().getCategory(identifier).getCategoryName(), ", ");
                 Tooltip.create(new TranslatableComponent("text.rei.view_recipes_for", collect)).queue();
             }
         }
@@ -679,7 +680,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl
             ScreenHelper.toggleOverlayVisible();
             return true;
         }
-        EntryStack<?> stack = RecipeHelper.getInstance().getScreenFocusedStack(Minecraft.getInstance().screen);
+        EntryStack<?> stack = RecipeRegistry.getInstance().getScreenFocusedStack(Minecraft.getInstance().screen);
         if (stack != null && !stack.isEmpty()) {
             stack = stack.copy();
             if (ConfigObject.getInstance().getRecipeKeybind().matchesKey(keyCode, scanCode)) {
@@ -732,7 +733,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl
             ScreenHelper.toggleOverlayVisible();
             return true;
         }
-        EntryStack<?> stack = RecipeHelper.getInstance().getScreenFocusedStack(Minecraft.getInstance().screen);
+        EntryStack<?> stack = RecipeRegistry.getInstance().getScreenFocusedStack(Minecraft.getInstance().screen);
         if (stack != null && !stack.isEmpty()) {
             stack = stack.copy();
             if (ConfigObject.getInstance().getRecipeKeybind().matchesMouse(button)) {
@@ -778,7 +779,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl
                     return new Point(mouseX, mouseY);
                 }
             };
-            for (Map.Entry<Class<? extends Screen>, ClickAreaHandler<?>> area : ((RecipeHelperImpl) RecipeHelper.getInstance()).getClickAreas().entries()) {
+            for (Map.Entry<Class<? extends Screen>, ClickAreaHandler<?>> area : ((RecipeRegistryImpl) RecipeRegistry.getInstance()).getClickAreas().entries()) {
                 if (area.getKey().equals(screen.getClass())) {
                     ClickAreaHandler.Result result = area.getValue().handle(context);
                     if (result.isSuccessful()) {
@@ -825,7 +826,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl
     }
     
     public boolean isNotInExclusionZones(double mouseX, double mouseY) {
-        for (OverlayDecider decider : DisplayHelper.getInstance().getSortedOverlayDeciders(Minecraft.getInstance().screen.getClass())) {
+        for (OverlayDecider decider : DisplayBoundsRegistry.getInstance().getSortedOverlayDeciders(Minecraft.getInstance().screen.getClass())) {
             InteractionResult in = decider.isInZone(mouseX, mouseY);
             if (in != InteractionResult.PASS)
                 return in == InteractionResult.SUCCESS;