More

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

67 files changed, 889 insertions, 196 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
index 5c57aad51..c5baedb59 100644
--- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
+++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
@@ -42,13 +42,13 @@ import me.shedaniel.rei.api.fluid.FluidSupportProvider;
 import me.shedaniel.rei.api.ingredient.util.EntryStacks;
 import me.shedaniel.rei.api.plugins.REIPluginV0;
 import me.shedaniel.rei.api.subsets.SubsetsRegistry;
-import me.shedaniel.rei.api.util.DrawableConsumer;
-import me.shedaniel.rei.api.util.Renderer;
-import me.shedaniel.rei.api.widgets.*;
+import me.shedaniel.rei.api.gui.DrawableConsumer;
+import me.shedaniel.rei.api.gui.Renderer;
+import me.shedaniel.rei.api.gui.widgets.*;
 import me.shedaniel.rei.gui.ContainerScreenOverlay;
 import me.shedaniel.rei.gui.widget.EntryWidget;
 import me.shedaniel.rei.gui.widget.QueuedTooltip;
-import me.shedaniel.rei.gui.widget.Widget;
+import me.shedaniel.rei.api.gui.widgets.Widget;
 import me.shedaniel.rei.impl.*;
 import me.shedaniel.rei.impl.entry.EmptyEntryDefinition;
 import me.shedaniel.rei.impl.subsets.SubsetsRegistryImpl;
@@ -184,7 +184,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
             }
             
             @Override
-            public me.shedaniel.rei.api.widgets.Slot createSlot(Point point) {
+            public me.shedaniel.rei.api.gui.widgets.Slot createSlot(Point point) {
                 return new EntryWidget(point);
             }
             
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringAddRuleScreen.java b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/FilteringAddRuleScreen.java
index 44781b6ea..7f8dc15fa 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringAddRuleScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/FilteringAddRuleScreen.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.config.entry;
+package me.shedaniel.rei.api.gui.config.entry;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.clothconfig2.gui.widget.DynamicElementListWidget;
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringEntry.java b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/FilteringEntry.java
index 985c29ef8..79c71af8b 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/FilteringEntry.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.config.entry;
+package me.shedaniel.rei.api.gui.config.entry;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringRuleOptionsScreen.java b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/FilteringRuleOptionsScreen.java
index a30664901..cc951f58a 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringRuleOptionsScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/FilteringRuleOptionsScreen.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.config.entry;
+package me.shedaniel.rei.api.gui.config.entry;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.clothconfig2.gui.widget.DynamicElementListWidget;
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringRulesScreen.java b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/FilteringRulesScreen.java
index f8a071c5a..daffac707 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringRulesScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/FilteringRulesScreen.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.config.entry;
+package me.shedaniel.rei.api.gui.config.entry;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.clothconfig2.gui.widget.DynamicElementListWidget;
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringScreen.java b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/FilteringScreen.java
index e773a7ef7..59f96faed 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/FilteringScreen.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.config.entry;
+package me.shedaniel.rei.api.gui.config.entry;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -39,7 +39,7 @@ import me.shedaniel.rei.api.ConfigObject;
 import me.shedaniel.rei.api.EntryRegistry;
 import me.shedaniel.rei.api.ingredient.EntryStack;
 import me.shedaniel.rei.api.REIHelper;
-import me.shedaniel.rei.api.widgets.Tooltip;
+import me.shedaniel.rei.api.gui.widgets.Tooltip;
 import me.shedaniel.rei.gui.OverlaySearchField;
 import me.shedaniel.rei.gui.widget.EntryWidget;
 import me.shedaniel.rei.impl.ScreenHelper;
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/NoFilteringEntry.java b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/NoFilteringEntry.java
index 078200135..4d2d187af 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/NoFilteringEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/NoFilteringEntry.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.config.entry;
+package me.shedaniel.rei.api.gui.config.entry;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.platform.Window;
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/RecipeScreenTypeEntry.java b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/RecipeScreenTypeEntry.java
index b8da82947..ed3aff6b7 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/RecipeScreenTypeEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/RecipeScreenTypeEntry.java
@@ -21,14 +21,14 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.config.entry;
+package me.shedaniel.rei.api.gui.config.entry;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.clothconfig2.gui.entries.TooltipListEntry;
 import me.shedaniel.rei.gui.PreRecipeViewingScreen;
-import me.shedaniel.rei.gui.config.RecipeScreenType;
+import me.shedaniel.rei.api.gui.config.RecipeScreenType;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.client.gui.components.AbstractButton;
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/ReloadPluginsEntry.java b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/ReloadPluginsEntry.java
index 38d45a058..fa88aed37 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/ReloadPluginsEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/ReloadPluginsEntry.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.config.entry;
+package me.shedaniel.rei.api.gui.config.entry;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.platform.Window;
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/SearchFilterSyntaxHighlightingEntry.java b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/SearchFilterSyntaxHighlightingEntry.java
index 15e127c1d..43357289b 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/config/entry/SearchFilterSyntaxHighlightingEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/SearchFilterSyntaxHighlightingEntry.java
@@ -21,13 +21,13 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.gui.config.entry;
+package me.shedaniel.rei.api.gui.config.entry;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.clothconfig2.gui.entries.TooltipListEntry;
-import me.shedaniel.rei.gui.config.SyntaxHighlightingMode;
+import me.shedaniel.rei.api.gui.config.SyntaxHighlightingMode;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.chat.NarratorChatListener;
 import net.minecraft.client.gui.components.AbstractButton;
@@ -35,7 +35,6 @@ import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/runtime/src/main/java/me/shedaniel/rei/api/server/InputSlotCrafter.java b/runtime/src/main/java/me/shedaniel/rei/api/server/InputSlotCrafter.java
index 5396d451c..aa9a21568 100644
--- a/runtime/src/main/java/me/shedaniel/rei/api/server/InputSlotCrafter.java
+++ b/runtime/src/main/java/me/shedaniel/rei/api/server/InputSlotCrafter.java
@@ -25,7 +25,7 @@ package me.shedaniel.rei.api.server;
 
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
-import me.shedaniel.rei.utils.CollectionUtils;
+import me.shedaniel.rei.api.util.CollectionUtils;
 import net.minecraft.core.NonNullList;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
diff --git a/runtime/src/main/java/me/shedaniel/rei/compat/LBASupportPlugin.java b/runtime/src/main/java/me/shedaniel/rei/compat/LBASupportPlugin.java
index 58282ccf7..6b8f629bb 100644
--- a/runtime/src/main/java/me/shedaniel/rei/compat/LBASupportPlugin.java
+++ b/runtime/src/main/java/me/shedaniel/rei/compat/LBASupportPlugin.java
@@ -28,21 +28,15 @@ import alexiil.mc.lib.attributes.fluid.GroupedFluidInvView;
 import alexiil.mc.lib.attributes.fluid.amount.FluidAmount;
 import me.shedaniel.architectury.utils.Fraction;
 import me.shedaniel.rei.api.RecipeRegistry;
-import me.shedaniel.rei.api.ingredient.util.EntryStacks;
 import me.shedaniel.rei.api.fluid.FluidSupportProvider;
+import me.shedaniel.rei.api.ingredient.util.EntryStacks;
 import me.shedaniel.rei.api.plugins.REIPluginV0;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.InteractionResultHolder;
 
 import java.util.stream.Stream;
 
 public class LBASupportPlugin implements REIPluginV0 {
     @Override
-    public ResourceLocation getPluginIdentifier() {
-        return new ResourceLocation("roughlyenoughitems", "lba_support");
-    }
-    
-    @Override
     public void registerOthers(RecipeRegistry registry) {
         FluidSupportProvider.getInstance().registerProvider(entry -> {
             GroupedFluidInvView view = FluidAttributes.GROUPED_INV_VIEW.get(entry.getValue());
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 5e5ec1ae3..f576a55fe 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
+++ b/runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
@@ -35,19 +35,17 @@ 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.gui.widgets.*;
 import me.shedaniel.rei.api.ingredient.EntryStack;
 import me.shedaniel.rei.api.ingredient.util.EntryStacks;