More

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

60 files changed, 209 insertions, 720 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java b/api/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java
index d4c29fcea..ff137ad51 100644
--- a/api/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java
+++ b/api/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java
@@ -25,6 +25,8 @@ package me.shedaniel.rei.api;
 
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
+import me.shedaniel.rei.api.registry.display.Display;
+import me.shedaniel.rei.api.registry.display.TransferDisplayCategory;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
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 34f5c2213..c1ff48e21 100644
--- a/api/src/main/java/me/shedaniel/rei/api/ClientHelper.java
+++ b/api/src/main/java/me/shedaniel/rei/api/ClientHelper.java
@@ -24,10 +24,11 @@
 package me.shedaniel.rei.api;
 
 import me.shedaniel.rei.api.ingredient.EntryStack;
-import me.shedaniel.rei.api.registry.category.DisplayCategory;
+import me.shedaniel.rei.api.registry.display.Display;
+import me.shedaniel.rei.api.registry.display.DisplayCategory;
+import me.shedaniel.rei.api.util.CollectionUtils;
+import me.shedaniel.rei.api.util.FormattingUtils;
 import me.shedaniel.rei.impl.Internals;
-import me.shedaniel.rei.utils.CollectionUtils;
-import me.shedaniel.rei.utils.FormattingUtils;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.ChatFormatting;
diff --git a/api/src/main/java/me/shedaniel/rei/api/ConfigObject.java b/api/src/main/java/me/shedaniel/rei/api/ConfigObject.java
index 1eec1243c..fc802346d 100644
--- a/api/src/main/java/me/shedaniel/rei/api/ConfigObject.java
+++ b/api/src/main/java/me/shedaniel/rei/api/ConfigObject.java
@@ -26,7 +26,7 @@ package me.shedaniel.rei.api;
 import me.shedaniel.clothconfig2.api.ModifierKeyCode;
 import me.shedaniel.rei.api.favorites.FavoriteEntry;
 import me.shedaniel.rei.api.ingredient.EntryStack;
-import me.shedaniel.rei.gui.config.*;
+import me.shedaniel.rei.api.gui.config.*;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import org.jetbrains.annotations.ApiStatus;
diff --git a/api/src/main/java/me/shedaniel/rei/api/DisplayBoundsRegistry.java b/api/src/main/java/me/shedaniel/rei/api/DisplayBoundsRegistry.java
index 070fc4460..14ea6d244 100644
--- a/api/src/main/java/me/shedaniel/rei/api/DisplayBoundsRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/DisplayBoundsRegistry.java
@@ -24,7 +24,7 @@
 package me.shedaniel.rei.api;
 
 import me.shedaniel.math.Rectangle;
-import me.shedaniel.rei.gui.config.DisplayPanelLocation;
+import me.shedaniel.rei.api.gui.config.DisplayPanelLocation;
 import me.shedaniel.rei.impl.Internals;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
diff --git a/api/src/main/java/me/shedaniel/rei/api/DisplayVisibilityHandler.java b/api/src/main/java/me/shedaniel/rei/api/DisplayVisibilityHandler.java
index 8dcb57197..cfea1316d 100644
--- a/api/src/main/java/me/shedaniel/rei/api/DisplayVisibilityHandler.java
+++ b/api/src/main/java/me/shedaniel/rei/api/DisplayVisibilityHandler.java
@@ -23,7 +23,8 @@
 
 package me.shedaniel.rei.api;
 
-import me.shedaniel.rei.api.registry.category.DisplayCategory;
+import me.shedaniel.rei.api.registry.display.Display;
+import me.shedaniel.rei.api.registry.display.DisplayCategory;
 import net.minecraft.world.InteractionResult;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/api/src/main/java/me/shedaniel/rei/api/LiveRecipeGenerator.java b/api/src/main/java/me/shedaniel/rei/api/LiveRecipeGenerator.java
index dcf2517e6..8549b95b7 100644
--- a/api/src/main/java/me/shedaniel/rei/api/LiveRecipeGenerator.java
+++ b/api/src/main/java/me/shedaniel/rei/api/LiveRecipeGenerator.java
@@ -24,6 +24,7 @@
 package me.shedaniel.rei.api;
 
 import me.shedaniel.rei.api.ingredient.EntryStack;
+import me.shedaniel.rei.api.registry.display.Display;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.List;
diff --git a/api/src/main/java/me/shedaniel/rei/api/OverlayDecider.java b/api/src/main/java/me/shedaniel/rei/api/OverlayDecider.java
index 1eac57611..84840d523 100644
--- a/api/src/main/java/me/shedaniel/rei/api/OverlayDecider.java
+++ b/api/src/main/java/me/shedaniel/rei/api/OverlayDecider.java
@@ -24,7 +24,7 @@
 package me.shedaniel.rei.api;
 
 import me.shedaniel.math.Rectangle;
-import me.shedaniel.rei.gui.config.DisplayPanelLocation;
+import me.shedaniel.rei.api.gui.config.DisplayPanelLocation;
 import net.minecraft.world.InteractionResult;
 
 import static net.minecraft.world.InteractionResult.PASS;
diff --git a/api/src/main/java/me/shedaniel/rei/api/REIHelper.java b/api/src/main/java/me/shedaniel/rei/api/REIHelper.java
index c4bc5b429..bbc08a38b 100644
--- a/api/src/main/java/me/shedaniel/rei/api/REIHelper.java
+++ b/api/src/main/java/me/shedaniel/rei/api/REIHelper.java
@@ -23,8 +23,8 @@
 
 package me.shedaniel.rei.api;
 
-import me.shedaniel.rei.api.widgets.Tooltip;
-import me.shedaniel.rei.gui.widget.TextFieldWidget;
+import me.shedaniel.rei.api.gui.widgets.TextField;
+import me.shedaniel.rei.api.gui.widgets.Tooltip;
 import me.shedaniel.rei.impl.Internals;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -55,7 +55,7 @@ public interface REIHelper {
     boolean isDarkThemeEnabled();
     
     @Nullable
-    TextFieldWidget getSearchTextField();
+    TextField getSearchTextField();
     
     void queueTooltip(@Nullable Tooltip tooltip);
     
diff --git a/api/src/main/java/me/shedaniel/rei/api/RecipeRegistry.java b/api/src/main/java/me/shedaniel/rei/api/RecipeRegistry.java
index 6c700c0d6..50bcd8016 100644
--- a/api/src/main/java/me/shedaniel/rei/api/RecipeRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/RecipeRegistry.java
@@ -25,7 +25,8 @@ package me.shedaniel.rei.api;
 
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.ingredient.EntryStack;
-import me.shedaniel.rei.api.registry.category.DisplayCategory;
+import me.shedaniel.rei.api.registry.display.Display;
+import me.shedaniel.rei.api.registry.display.DisplayCategory;
 import me.shedaniel.rei.impl.Internals;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
diff --git a/api/src/main/java/me/shedaniel/rei/api/favorites/FavoriteEntry.java b/api/src/main/java/me/shedaniel/rei/api/favorites/FavoriteEntry.java
index 8f943a015..0f8f3dd1a 100644
--- a/api/src/main/java/me/shedaniel/rei/api/favorites/FavoriteEntry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/favorites/FavoriteEntry.java
@@ -25,7 +25,7 @@ package me.shedaniel.rei.api.favorites;
 
 import com.google.gson.JsonObject;
 import me.shedaniel.rei.api.ingredient.EntryStack;
-import me.shedaniel.rei.api.util.Renderer;
+import me.shedaniel.rei.api.gui.Renderer;
 import me.shedaniel.rei.impl.Internals;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
diff --git a/api/src/main/java/me/shedaniel/rei/api/favorites/FavoriteMenuEntry.java b/api/src/main/java/me/shedaniel/rei/api/favorites/FavoriteMenuEntry.java
index 575682f58..9d2d26883 100644
--- a/api/src/main/java/me/shedaniel/rei/api/favorites/FavoriteMenuEntry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/favorites/FavoriteMenuEntry.java
@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.api.favorites;
 
-import me.shedaniel.rei.gui.widget.Widget;
+import me.shedaniel.rei.api.gui.widgets.Widget;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/api/src/main/java/me/shedaniel/rei/gui/entries/DisplayRenderer.java b/api/src/main/java/me/shedaniel/rei/api/gui/DisplayRenderer.java
index 0ccc2476d..281d79a18 100644
--- a/api/src/main/java/me/shedaniel/rei/gui/entries/DisplayRenderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/gui/DisplayRenderer.java
@@ -21,11 +21,11 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.entries;
+package me.shedaniel.rei.api.gui;
 
 import me.shedaniel.math.Point;
 import me.shedaniel.rei.api.ingredient.entry.AbstractRenderer;
-import me.shedaniel.rei.api.widgets.Tooltip;
+import me.shedaniel.rei.api.gui.widgets.Tooltip;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/api/src/main/java/me/shedaniel/rei/api/util/DrawableConsumer.java b/api/src/main/java/me/shedaniel/rei/api/gui/DrawableConsumer.java
index 580d61f80..b98b777e5 100644
--- a/api/src/main/java/me/shedaniel/rei/api/util/DrawableConsumer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/gui/DrawableConsumer.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.api.util;
+package me.shedaniel.rei.api.gui;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.GuiComponent;
diff --git a/api/src/main/java/me/shedaniel/rei/api/util/Renderer.java b/api/src/main/java/me/shedaniel/rei/api/gui/Renderer.java
index 32d12fa52..f76e0ec1a 100644
--- a/api/src/main/java/me/shedaniel/rei/api/util/Renderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/gui/Renderer.java
@@ -21,12 +21,12 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.api.util;
+package me.shedaniel.rei.api.gui;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
-import me.shedaniel.rei.api.widgets.Tooltip;
+import me.shedaniel.rei.api.gui.widgets.Tooltip;
 import org.jetbrains.annotations.Nullable;
 
 public interface Renderer {
diff --git a/api/src/main/java/me/shedaniel/rei/gui/entries/SimpleDisplayRenderer.java b/api/src/main/java/me/shedaniel/rei/api/gui/SimpleDisplayRenderer.java
index daa5579e8..3f42e72b2 100644
--- a/api/src/main/java/me/shedaniel/rei/gui/entries/SimpleDisplayRenderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/gui/SimpleDisplayRenderer.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.entries;
+package me.shedaniel.rei.api.gui;
 
 import com.google.common.collect.Maps;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -30,13 +30,13 @@ import it.unimi.dsi.fastutil.ints.IntSet;
 import me.shedaniel.architectury.utils.Fraction;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
+import me.shedaniel.rei.api.gui.widgets.Slot;
+import me.shedaniel.rei.api.gui.widgets.Tooltip;
+import me.shedaniel.rei.api.gui.widgets.Widgets;
 import me.shedaniel.rei.api.ingredient.EntryIngredient;
 import me.shedaniel.rei.api.ingredient.EntryStack;
 import me.shedaniel.rei.api.ingredient.util.EntryStacks;
-import me.shedaniel.rei.api.widgets.Slot;
-import me.shedaniel.rei.api.widgets.Tooltip;
-import me.shedaniel.rei.api.widgets.Widgets;
-import me.shedaniel.rei.utils.CollectionUtils;
+import me.shedaniel.rei.api.util.CollectionUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
diff --git a/api/src/main/java/me/shedaniel/rei/gui/config/AppearanceTheme.java b/api/src/main/java/me/shedaniel/rei/api/gui/config/AppearanceTheme.java
index 3fcba4383..3d0f3d211 100644
--- a/api/src/main/java/me/shedaniel/rei/gui/config/AppearanceTheme.java
+++ b/api/src/main/java/me/shedaniel/rei/api/gui/config/AppearanceTheme.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.config;
+package me.shedaniel.rei.api.gui.config;
 
 import me.shedaniel.clothconfig2.gui.entries.SelectionListEntry;
 import net.fabricmc.api.EnvType;
diff --git a/api/src/main/java/me/shedaniel/rei/gui/config/ConfigButtonPosition.java b/api/src/main/java/me/shedaniel/rei/api/gui/config/ConfigButtonPosition.java
index fe5641165..a77fc32a7 100644
--- a/api/src/main/java/me/shedaniel/rei/gui/config/ConfigButtonPosition.java
+++ b/api/src/main/java/me/shedaniel/rei/api/gui/config/ConfigButtonPosition.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.config;
+package me.shedaniel.rei.api.gui.config;
 
 import me.shedaniel.clothconfig2.gui.entries.SelectionListEntry;
 import net.fabricmc.api.EnvType;