Relocate api classes

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

13 files changed, 29 insertions, 34 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/ClientHelper.java b/api/src/main/java/me/shedaniel/rei/api/ClientHelper.java
index 9b1a3e99d..1250d381a 100644
--- a/api/src/main/java/me/shedaniel/rei/api/ClientHelper.java
+++ b/api/src/main/java/me/shedaniel/rei/api/ClientHelper.java
@@ -23,6 +23,7 @@
 
 package me.shedaniel.rei.api;
 
+import me.shedaniel.rei.api.config.ConfigManager;
 import me.shedaniel.rei.api.ingredient.EntryStack;
 import me.shedaniel.rei.api.util.FormattingUtils;
 import me.shedaniel.rei.api.view.ViewSearchBuilder;
diff --git a/api/src/main/java/me/shedaniel/rei/api/REIOverlay.java b/api/src/main/java/me/shedaniel/rei/api/REIOverlay.java
index 2b66857d4..fd1f2dbea 100644
--- a/api/src/main/java/me/shedaniel/rei/api/REIOverlay.java
+++ b/api/src/main/java/me/shedaniel/rei/api/REIOverlay.java
@@ -27,7 +27,6 @@ import me.shedaniel.rei.api.gui.drag.DraggingContext;
 import me.shedaniel.rei.api.gui.widgets.WidgetWithBounds;
 import org.jetbrains.annotations.ApiStatus;
 
-@ApiStatus.Experimental
 public abstract class REIOverlay extends WidgetWithBounds {
     @ApiStatus.Internal
     public abstract void closeOverlayMenu();
diff --git a/api/src/main/java/me/shedaniel/rei/api/ConfigManager.java b/api/src/main/java/me/shedaniel/rei/api/config/ConfigManager.java
index ea09dbd2c..cd5b75dc9 100644
--- a/api/src/main/java/me/shedaniel/rei/api/ConfigManager.java
+++ b/api/src/main/java/me/shedaniel/rei/api/config/ConfigManager.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.api;
+package me.shedaniel.rei.api.config;
 
 import me.shedaniel.rei.api.plugins.PluginManager;
 import me.shedaniel.rei.api.registry.Reloadable;
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.NotNull;
 @Environment(EnvType.CLIENT)
 public interface ConfigManager extends Reloadable {
     /**
-     * @return the instance of {@link me.shedaniel.rei.api.ConfigManager}
+     * @return the instance of {@link ConfigManager}
      */
     @NotNull
     static ConfigManager getInstance() {
diff --git a/api/src/main/java/me/shedaniel/rei/api/ConfigObject.java b/api/src/main/java/me/shedaniel/rei/api/config/ConfigObject.java
index a92300e00..bc471d90f 100644
--- a/api/src/main/java/me/shedaniel/rei/api/ConfigObject.java
+++ b/api/src/main/java/me/shedaniel/rei/api/config/ConfigObject.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.api;
+package me.shedaniel.rei.api.config;
 
 import me.shedaniel.clothconfig2.api.ModifierKeyCode;
 import me.shedaniel.rei.api.favorites.FavoriteEntry;
@@ -36,7 +36,7 @@ import java.util.List;
 @Environment(EnvType.CLIENT)
 public interface ConfigObject {
     /**
-     * @return the instance of {@link me.shedaniel.rei.api.ConfigObject}
+     * @return the instance of {@link ConfigObject}
      */
     static ConfigObject getInstance() {
         return ConfigManager.getInstance().getConfig();
diff --git a/api/src/main/java/me/shedaniel/rei/api/gui/widgets/Widgets.java b/api/src/main/java/me/shedaniel/rei/api/gui/widgets/Widgets.java
index c0ef26b7d..ac9423e4d 100644
--- a/api/src/main/java/me/shedaniel/rei/api/gui/widgets/Widgets.java
+++ b/api/src/main/java/me/shedaniel/rei/api/gui/widgets/Widgets.java
@@ -28,7 +28,7 @@ import com.mojang.math.Matrix4f;
 import me.shedaniel.math.Dimension;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
-import me.shedaniel.rei.api.ConfigObject;
+import me.shedaniel.rei.api.config.ConfigObject;
 import me.shedaniel.rei.api.gui.DrawableConsumer;
 import me.shedaniel.rei.api.gui.Renderer;
 import me.shedaniel.rei.impl.Internals;
diff --git a/api/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java b/api/src/main/java/me/shedaniel/rei/api/registry/category/ButtonArea.java
index 323b8d810..668214007 100644
--- a/api/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java
+++ b/api/src/main/java/me/shedaniel/rei/api/registry/category/ButtonArea.java
@@ -21,16 +21,16 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.api;
+package me.shedaniel.rei.api.registry.category;
 
 import me.shedaniel.math.Rectangle;
 
 /**
- * The supplier for the + button area.
+ * The area for the + button.
  */
 @FunctionalInterface
-public interface ButtonAreaSupplier {
-    static ButtonAreaSupplier defaultArea() {
+public interface ButtonArea {
+    static ButtonArea defaultArea() {
         return bounds -> new Rectangle(bounds.getMaxX() + 2, bounds.getMaxY() - 16, 10, 10);
     }
     
diff --git a/api/src/main/java/me/shedaniel/rei/api/registry/category/CategoryRegistry.java b/api/src/main/java/me/shedaniel/rei/api/registry/category/CategoryRegistry.java
index 6f0ca0d18..b9e686def 100644
--- a/api/src/main/java/me/shedaniel/rei/api/registry/category/CategoryRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/registry/category/CategoryRegistry.java
@@ -23,7 +23,6 @@
 
 package me.shedaniel.rei.api.registry.category;
 
-import me.shedaniel.rei.api.ButtonAreaSupplier;
 import me.shedaniel.rei.api.ingredient.EntryIngredient;
 import me.shedaniel.rei.api.ingredient.EntryStack;
 import me.shedaniel.rei.api.plugins.PluginManager;
@@ -109,8 +108,8 @@ public interface CategoryRegistry extends Reloadable, Iterable<CategoryRegistry.
         configure(category, CategoryConfiguration::removePlusButton);
     }
     
-    default void setPlusButtonArea(ResourceLocation category, ButtonAreaSupplier supplier) {
-        configure(category, config -> config.setPlusButtonArea(supplier));
+    default void setPlusButtonArea(ResourceLocation category, ButtonArea area) {
+        configure(category, config -> config.setPlusButtonArea(area));
     }
     
     interface CategoryConfiguration<T extends Display> extends Identifiable {
@@ -140,16 +139,16 @@ public interface CategoryRegistry extends Reloadable, Iterable<CategoryRegistry.
         /**
          * Sets the plus button area
          *
-         * @param supplier the supplier of the button area
+         * @param area the button area
          */
-        void setPlusButtonArea(ButtonAreaSupplier supplier);
+        void setPlusButtonArea(ButtonArea area);
         
         /**
          * Returns the optional plus button area
          *
          * @return the optional plus button area
          */
-        Optional<ButtonAreaSupplier> getPlusButtonArea();
+        Optional<ButtonArea> getPlusButtonArea();
         
         List<EntryIngredient> getWorkstations();
         
diff --git a/api/src/main/java/me/shedaniel/rei/api/registry/display/DisplayRegistry.java b/api/src/main/java/me/shedaniel/rei/api/registry/display/DisplayRegistry.java
index 4b970ebd5..978c00319 100644
--- a/api/src/main/java/me/shedaniel/rei/api/registry/display/DisplayRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/registry/display/DisplayRegistry.java
@@ -23,8 +23,7 @@
 
 package me.shedaniel.rei.api.registry.display;
 
-import me.shedaniel.rei.api.DisplayVisibilityPredicate;
-import me.shedaniel.rei.api.LiveDisplayGenerator;
+import me.shedaniel.rei.api.registry.display.visibility.DisplayVisibilityPredicate;
 import me.shedaniel.rei.api.plugins.PluginManager;
 import me.shedaniel.rei.api.registry.RecipeManagerContext;
 import me.shedaniel.rei.api.registry.Reloadable;
diff --git a/api/src/main/java/me/shedaniel/rei/api/LiveDisplayGenerator.java b/api/src/main/java/me/shedaniel/rei/api/registry/display/LiveDisplayGenerator.java
index efaea4eed..263bda029 100644
--- a/api/src/main/java/me/shedaniel/rei/api/LiveDisplayGenerator.java
+++ b/api/src/main/java/me/shedaniel/rei/api/registry/display/LiveDisplayGenerator.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.api;
+package me.shedaniel.rei.api.registry.display;
 
 import me.shedaniel.rei.api.ingredient.EntryStack;
 import me.shedaniel.rei.api.registry.display.Display;
diff --git a/api/src/main/java/me/shedaniel/rei/api/DisplayVisibilityPredicate.java b/api/src/main/java/me/shedaniel/rei/api/registry/display/visibility/DisplayVisibilityPredicate.java
index 655342941..68777fe03 100644
--- a/api/src/main/java/me/shedaniel/rei/api/DisplayVisibilityPredicate.java
+++ b/api/src/main/java/me/shedaniel/rei/api/registry/display/visibility/DisplayVisibilityPredicate.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.api;
+package me.shedaniel.rei.api.registry.display.visibility;
 
 import me.shedaniel.rei.api.registry.display.Display;
 import me.shedaniel.rei.api.registry.display.DisplayCategory;
diff --git a/api/src/main/java/me/shedaniel/rei/api/FocusedStackProvider.java b/api/src/main/java/me/shedaniel/rei/api/registry/screen/FocusedStackProvider.java
index 96816d610..6e0c682fd 100644
--- a/api/src/main/java/me/shedaniel/rei/api/FocusedStackProvider.java
+++ b/api/src/main/java/me/shedaniel/rei/api/registry/screen/FocusedStackProvider.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.api;
+package me.shedaniel.rei.api.registry.screen;
 
 import me.shedaniel.rei.api.ingredient.EntryStack;
 import net.minecraft.client.gui.screens.Screen;
diff --git a/api/src/main/java/me/shedaniel/rei/api/registry/screen/ScreenRegistry.java b/api/src/main/java/me/shedaniel/rei/api/registry/screen/ScreenRegistry.java
index 7284c01c3..b4d89b033 100644
--- a/api/src/main/java/me/shedaniel/rei/api/registry/screen/ScreenRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/registry/screen/ScreenRegistry.java
@@ -24,8 +24,6 @@
 package me.shedaniel.rei.api.registry.screen;
 
 import me.shedaniel.math.Rectangle;
-import me.shedaniel.rei.api.FocusedStackProvider;
-import me.shedaniel.rei.api.ScreenClickAreaProvider;
 import me.shedaniel.rei.api.gui.config.DisplayPanelLocation;
 import me.shedaniel.rei.api.ingredient.EntryStack;
 import me.shedaniel.rei.api.plugins.PluginManager;
@@ -102,32 +100,32 @@ public interface ScreenRegistry extends Reloadable {
     /**
      * Registers a click area for a container screen.
      *
-     * @param provider    The click area provider that is offset to the container screen's top left corner.
+     * @param area        The click area that is offset to the container screen's top left corner.
      * @param screenClass The class of the screen.
      * @param categories  The categories of result.
      * @param <T>         The screen type to be registered to.
      */
-    <C extends AbstractContainerMenu, T extends AbstractContainerScreen<C>> void registerContainerClickArea(ScreenClickAreaProvider<T> provider, Class<? extends T> screenClass, ResourceLocation... categories);
+    <C extends AbstractContainerMenu, T extends AbstractContainerScreen<C>> void registerContainerClickArea(SimpleClickArea<T> area, Class<? extends T> screenClass, ResourceLocation... categories);
     
     /**
      * Registers a click area for a screen.
      *
-     * @param provider    The click area provider that is offset to the window's top left corner.
+     * @param area        The click area that is offset to the window's top left corner.
      * @param screenClass The class of the screen.
      * @param categories  The categories of result.
      * @param <T>         The screen type to be registered to.
      */
-    default <T extends Screen> void registerClickArea(ScreenClickAreaProvider<T> provider, Class<? extends T> screenClass, ResourceLocation... categories) {
-        registerClickArea(screenClass, provider.toHandler(() -> categories));
+    default <T extends Screen> void registerClickArea(SimpleClickArea<T> area, Class<? extends T> screenClass, ResourceLocation... categories) {
+        registerClickArea(screenClass, area.toClickArea(() -> categories));
     }
     
     /**
      * Registers a click area handler for a screen. A handler allows more specific implementation of click areas.
      *
      * @param screenClass The class of the screen.
-     * @param area        The click area provider that is offset to the window's top left corner.
+     * @param area        The click area that is offset to the window's top left corner.
      * @param <T>         The screen type to be registered to.
-     * @see #registerClickArea(ScreenClickAreaProvider, Class, ResourceLocation...) for a simpler way to handle areas without custom categories.
+     * @see #registerClickArea(SimpleClickArea, Class, ResourceLocation...) for a simpler way to handle areas without custom categories.
      */
     <T extends Screen> void registerClickArea(Class<? extends T> screenClass, ClickArea<T> area);
     
diff --git a/api/src/main/java/me/shedaniel/rei/api/ScreenClickAreaProvider.java b/api/src/main/java/me/shedaniel/rei/api/registry/screen/SimpleClickArea.java
index 5a5ac101c..55ff1fa70 100644
--- a/api/src/main/java/me/shedaniel/rei/api/ScreenClickAreaProvider.java
+++ b/api/src/main/java/me/shedaniel/rei/api/registry/screen/SimpleClickArea.java
@@ -21,10 +21,9 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.api;
+package me.shedaniel.rei.api.registry.screen;
 
 import me.shedaniel.math.Rectangle;
-import me.shedaniel.rei.api.registry.screen.ClickArea;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
@@ -33,11 +32,11 @@ import java.util.Arrays;
 import java.util.function.Supplier;
 
 @FunctionalInterface
-public interface ScreenClickAreaProvider<T extends Screen> {
+public interface SimpleClickArea<T extends Screen> {
     @NotNull
     Rectangle provide(@NotNull T screen);
     
-    default ClickArea<T> toHandler(Supplier<ResourceLocation[]> categories) {
+    default ClickArea<T> toClickArea(Supplier<ResourceLocation[]> categories) {
         return context -> {
             return provide(context.getScreen()).contains(context.getMousePosition())
                     ? ClickArea.Result.success().categories(Arrays.asList(categories.get()))