From ddb48e2032d1986709cad973067693eec3118504 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 26 Oct 2024 16:55:52 +0800
Subject: Update to 1.21.2 (Please read Primer)
 https://hackmd.io/@shedaniel/rei17_primer

---
 .../rei/api/client/config/ConfigObject.java        |   1 -
 .../client/config/entry/EntryStackProvider.java    |  21 +-
 .../client/favorites/CompoundFavoriteRenderer.java |   5 +-
 .../rei/api/client/gui/SimpleDisplayRenderer.java  |   3 +-
 .../api/client/gui/config/RecipeBorderType.java    |  34 +-
 .../rei/api/client/gui/widgets/Button.java         |   9 -
 .../rei/api/client/gui/widgets/Panel.java          |  21 +-
 .../rei/api/client/gui/widgets/Tooltip.java        |   6 +
 .../rei/api/client/gui/widgets/Widget.java         |  11 +-
 .../rei/api/client/gui/widgets/Widgets.java        |  11 +-
 .../client/gui/widgets/utils/PanelTextures.java    |  48 ++
 .../display/DisplayGeneratorsRegistry.java         |  71 +++
 .../display/DisplayPredicatesRegistry.java         |  63 +++
 .../client/registry/display/DisplayRegistry.java   | 398 +----------------
 .../display/reason/DisplayAdditionReason.java      |  12 +-
 .../client/registry/transfer/TransferHandler.java  |   5 +-
 .../shedaniel/rei/api/common/display/Display.java  |  46 +-
 .../rei/api/common/display/DisplaySerializer.java  |  47 +-
 .../common/display/DisplaySerializerRegistry.java  |  65 +--
 .../common/display/SimpleDisplaySerializer.java    |  77 ----
 .../api/common/display/SimpleGridMenuDisplay.java  |  26 +-
 .../rei/api/common/display/basic/BasicDisplay.java | 245 -----------
 .../rei/api/common/entry/EntryIngredient.java      |  54 +--
 .../rei/api/common/entry/EntrySerializer.java      |  35 +-
 .../shedaniel/rei/api/common/entry/EntryStack.java |  91 ++--
 .../entry/comparison/EntryComparatorRegistry.java  |   4 +-
 .../entry/comparison/FluidComparatorRegistry.java  |   2 +-
 .../entry/comparison/ItemComparatorRegistry.java   |   2 +-
 .../settings/EntrySettingsAdapterRegistry.java     |   4 +-
 .../api/common/entry/type/EntryTypeRegistry.java   |   6 +-
 .../rei/api/common/fluid/FluidSupportProvider.java |   4 +-
 .../rei/api/common/plugins/PluginManager.java      |  11 +-
 .../rei/api/common/plugins/PluginView.java         |   6 +-
 .../rei/api/common/plugins/REICommonPlugin.java    | 111 +++++
 .../rei/api/common/plugins/REIPlugin.java          |  64 +--
 .../rei/api/common/plugins/REIServerPlugin.java    |  38 --
 .../api/common/registry/RecipeManagerContext.java  |  69 ---
 .../common/registry/display/DisplayConsumer.java   | 424 ++++++++++++++++++
 .../registry/display/DisplayRegistryCommon.java    |  68 +++
 .../registry/display/ServerDisplayRegistry.java    |  36 ++
 .../rei/api/common/transfer/ItemRecipeFinder.java  | 102 +++++
 .../rei/api/common/transfer/RecipeFinder.java      | 483 ++++++++++++---------
 .../api/common/transfer/RecipeFinderPopulator.java |  34 --
 .../rei/api/common/transfer/info/MenuInfo.java     | 221 ----------
 .../api/common/transfer/info/MenuInfoContext.java  |  40 --
 .../api/common/transfer/info/MenuInfoProvider.java |  49 ---
 .../api/common/transfer/info/MenuInfoRegistry.java |  59 ---
 .../transfer/info/MenuSerializationContext.java    |  68 ---
 .../transfer/info/clean/InputCleanHandler.java     |  65 ---
 .../common/transfer/info/simple/DumpHandler.java   |  60 ---
 .../info/simple/RecipeBookGridMenuInfo.java        |  75 ----
 .../transfer/info/simple/SimpleGridMenuInfo.java   |  75 ----
 .../info/simple/SimpleMenuInfoProvider.java        |  74 ----
 .../info/simple/SimplePlayerInventoryMenuInfo.java | 118 -----
 .../transfer/info/stack/ContainerSlotAccessor.java |  67 ---
 .../common/transfer/info/stack/SlotAccessor.java   |   6 -
 .../transfer/info/stack/SlotAccessorRegistry.java  |   6 +-
 .../rei/api/common/util/CollectionUtils.java       |  11 -
 .../rei/api/common/util/EntryIngredients.java      | 182 +++++---
 .../shedaniel/rei/api/common/util/EntryStacks.java |  17 +
 .../me/shedaniel/rei/impl/ClientInternals.java     |   3 -
 .../main/java/me/shedaniel/rei/impl/Internals.java |  14 +-
 62 files changed, 1563 insertions(+), 2520 deletions(-)
 create mode 100644 api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/utils/PanelTextures.java
 create mode 100644 api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayGeneratorsRegistry.java
 create mode 100644 api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayPredicatesRegistry.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/display/SimpleDisplaySerializer.java
 create mode 100644 api/src/main/java/me/shedaniel/rei/api/common/plugins/REICommonPlugin.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/plugins/REIServerPlugin.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java
 create mode 100644 api/src/main/java/me/shedaniel/rei/api/common/registry/display/DisplayConsumer.java
 create mode 100644 api/src/main/java/me/shedaniel/rei/api/common/registry/display/DisplayRegistryCommon.java
 create mode 100644 api/src/main/java/me/shedaniel/rei/api/common/registry/display/ServerDisplayRegistry.java
 create mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/ItemRecipeFinder.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/RecipeFinderPopulator.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfoContext.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfoProvider.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfoRegistry.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuSerializationContext.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/info/clean/InputCleanHandler.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/DumpHandler.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/RecipeBookGridMenuInfo.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimpleGridMenuInfo.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimpleMenuInfoProvider.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/SimplePlayerInventoryMenuInfo.java
 delete mode 100644 api/src/main/java/me/shedaniel/rei/api/common/transfer/info/stack/ContainerSlotAccessor.java

(limited to 'api')

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
index a15816f24..11fbe4a37 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
@@ -267,7 +267,6 @@ public interface ConfigObject {
     
     RecipeBorderType getRecipeBorderType();
     
-    
     boolean isCompositeScrollBarPermanent();
     
     boolean doesRegisterRecipesInAnotherThread();
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/config/entry/EntryStackProvider.java b/api/src/main/java/me/shedaniel/rei/api/client/config/entry/EntryStackProvider.java
index c103a2d94..ac15be536 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/config/entry/EntryStackProvider.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/config/entry/EntryStackProvider.java
@@ -23,11 +23,13 @@
 
 package me.shedaniel.rei.api.client.config.entry;
 
-import me.shedaniel.rei.api.common.entry.EntrySerializer;
+import me.shedaniel.rei.api.common.display.basic.BasicDisplay;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.entry.type.EntryDefinition;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.Tag;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Objects;
@@ -53,11 +55,10 @@ public interface EntryStackProvider<T> {
      *
      * @return the saved tag
      * @throws UnsupportedOperationException if the {@link EntryDefinition} does not support saving to a tag
-     * @see EntrySerializer#supportSaving()
-     * @see EntryStack#saveStack()
+     * @see EntryStack#codec()
      * @since 8.3
      */
-    CompoundTag save();
+    Tag save();
     
     /**
      * Returns whether the {@link EntryStack} is valid.
@@ -67,14 +68,14 @@ public interface EntryStackProvider<T> {
     boolean isValid();
     
     /**
-     * Creates a new {@link EntryStackProvider} from the given {@link CompoundTag},
+     * Creates a new {@link EntryStackProvider} from the given {@link Tag},
      * the stack is not resolved immediately, but rather deferred until {@link #provide()} is called.
      *
      * @param tag the tag to load from
      * @param <T> the type of {@link EntryStack}
      * @return the {@link EntryStackProvider}
      */
-    static <T> EntryStackProvider<T> defer(CompoundTag tag) {
+    static <T> EntryStackProvider<T> defer(Tag tag) {
         return new EntryStackProvider<T>() {
             private EntryStack<T> stack;
             
@@ -82,7 +83,7 @@ public interface EntryStackProvider<T> {
             public EntryStack<T> provide() {
                 if (stack == null) {
                     try {
-                        stack = (EntryStack<T>) EntryStack.read(tag);
+                        stack = EntryStack.codec().parse(BasicDisplay.registryAccess().createSerializationContext(NbtOps.INSTANCE), tag).getOrThrow().cast();
                     } catch (Exception e) {
                         e.printStackTrace();
                         return (EntryStack<T>) EntryStack.empty();
@@ -95,7 +96,7 @@ public interface EntryStackProvider<T> {
             }
             
             @Override
-            public CompoundTag save() {
+            public Tag save() {
                 return tag.copy();
             }
             
@@ -137,8 +138,8 @@ public interface EntryStackProvider<T> {
             }
             
             @Override
-            public CompoundTag save() {
-                return finalStack.saveStack();
+            public Tag save() {
+                return EntryStack.codec().encodeStart(BasicDisplay.registryAccess().createSerializationContext(NbtOps.INSTANCE), finalStack).getOrThrow();
             }
             
             @Override
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/favorites/CompoundFavoriteRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/favorites/CompoundFavoriteRenderer.java
index 701a2e611..ad1c7b3b2 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/favorites/CompoundFavoriteRenderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/favorites/CompoundFavoriteRenderer.java
@@ -23,7 +23,6 @@
 
 package me.shedaniel.rei.api.client.favorites;
 
-import me.shedaniel.clothconfig2.api.ScissorsHandler;
 import me.shedaniel.clothconfig2.api.animator.NumberAnimator;
 import me.shedaniel.clothconfig2.api.animator.ValueAnimator;
 import me.shedaniel.math.Rectangle;
@@ -96,7 +95,7 @@ public class CompoundFavoriteRenderer implements Renderer {
         Vector4f vector4f2 = new Vector4f(bounds.getMaxX(), bounds.getMaxY(), 0, 1.0F);
         graphics.pose().last().pose().transform(vector4f2);
         scissorArea.setBounds((int) vector4f.x(), (int) vector4f.y(), (int) vector4f2.x() - (int) vector4f.x(), (int) vector4f2.y() - (int) vector4f.y());
-        ScissorsHandler.INSTANCE.scissor(scissorArea);
+        graphics.enableScissor(scissorArea.x, scissorArea.y, scissorArea.getMaxX(), scissorArea.getMaxY());
         graphics.pose().pushPose();
         graphics.pose().translate(0, this.offset.floatValue() * -bounds.getHeight(), 0);
         for (int i = 0; i < count; i++) {
@@ -104,7 +103,7 @@ public class CompoundFavoriteRenderer implements Renderer {
             graphics.pose().translate(0, bounds.height, 0);
         }
         graphics.pose().popPose();
-        ScissorsHandler.INSTANCE.removeLastScissor();
+        graphics.disableScissor();
     }
     
     private void updateAnimator(float delta) {
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java
index c3963ec93..f7863abcc 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java
@@ -36,6 +36,7 @@ import me.shedaniel.rei.api.common.util.CollectionUtils;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.ApiStatus;
@@ -135,7 +136,7 @@ public class SimpleDisplayRenderer extends DisplayRenderer implements WidgetHold
         graphics.pose().popPose();
         xx = bounds.x + 4 + 18 * (getItemsPerLine() - 2);
         yy = bounds.y + getHeight() / 2 - 8;
-        graphics.blit(CHEST_GUI_TEXTURE, xx, yy, 0, 28, 18, 18);
+        graphics.blit(RenderType::guiTextured, CHEST_GUI_TEXTURE, xx, yy, 0, 28, 18, 18, 256, 256);
         xx += 18;
         yy += outputWidgets.size() * -9 + 9;
         graphics.pose().pushPose();
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/RecipeBorderType.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/RecipeBorderType.java
index 86db371be..279a9d62e 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/config/RecipeBorderType.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/config/RecipeBorderType.java
@@ -23,36 +23,36 @@
 
 package me.shedaniel.rei.api.client.gui.config;
 
+import me.shedaniel.rei.api.client.gui.widgets.utils.PanelTextures;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.resources.language.I18n;
+import net.minecraft.resources.ResourceLocation;
 
 import java.util.Locale;
 
 @Environment(EnvType.CLIENT)
-public enum RecipeBorderType {
-    DEFAULT(66),
-    LIGHTER(0),
-    NONE(0, false);
+public enum RecipeBorderType implements PanelTextures {
+    DEFAULT(ResourceLocation.parse("roughlyenoughitems:widget/panel_default"), ResourceLocation.parse("roughlyenoughitems:widget/panel_default_dark")),
+    LIGHTER(ResourceLocation.parse("roughlyenoughitems:widget/panel_lighter"), ResourceLocation.parse("roughlyenoughitems:widget/panel_lighter_dark")),
+    NONE(ResourceLocation.parse("roughlyenoughitems:widget/panel_none"), ResourceLocation.parse("roughlyenoughitems:widget/panel_none_dark"));
     
-    private int offset;
-    private boolean render;
+    private final ResourceLocation texture;
+    private final ResourceLocation darkTexture;
     
-    RecipeBorderType(int offset) {
-        this(offset, true);
+    RecipeBorderType(ResourceLocation texture, ResourceLocation darkTexture) {
+        this.texture = texture;
+        this.darkTexture = darkTexture;
     }
     
-    RecipeBorderType(int offset, boolean render) {
-        this.offset = offset;
-        this.render = render;
-    }
-    
-    public int getYOffset() {
-        return offset;
+    @Override
+    public ResourceLocation texture() {
+        return texture;
     }
     
-    public boolean isRendering() {
-        return render;
+    @Override
+    public ResourceLocation darkTexture() {
+        return darkTexture;
     }
     
     @Override
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Button.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Button.java
index 4705c3969..2c4ec2260 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Button.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Button.java
@@ -44,15 +44,6 @@ public abstract class Button extends BaseWidget<Button> {
     
     public abstract int getTextColor(Point mouse);
     
-    public abstract void setTextureId(@Nullable BiFunction<Button, Point, Integer> textureIdFunction);
-    
-    public final Button textureId(@Nullable BiFunction<Button, Point, Integer> textureIdFunction) {
-        setTextureId(textureIdFunction);
-        return this;
-    }
-    
-    public abstract int getTextureId(Point mouse);
-    
     public abstract void onClick();
     
     public abstract boolean isEnabled();
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Panel.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Panel.java
index e7fa9926c..17eb766e7 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Panel.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Panel.java
@@ -24,26 +24,25 @@
 package me.shedaniel.rei.api.client.gui.widgets;
 
 import me.shedaniel.rei.api.client.REIRuntime;
+import me.shedaniel.rei.api.client.gui.widgets.utils.PanelTextures;
+import net.minecraft.resources.ResourceLocation;
 
 import java.util.function.Predicate;
 
 public abstract class Panel extends WidgetWithBounds {
-    public abstract int getXTextureOffset();
+    public abstract void setTexture(ResourceLocation texture, ResourceLocation darkTexture);
     
-    public abstract void setXTextureOffset(int xTextureOffset);
+    public final void setTexture(PanelTextures textures) {
+        setTexture(textures.texture(), textures.darkTexture());
+    }
     
-    public final Panel xTextureOffset(int xTextureOffset) {
-        setXTextureOffset(xTextureOffset);
+    public final Panel texture(ResourceLocation texture, ResourceLocation darkTexture) {
+        setTexture(texture, darkTexture);
         return this;
     }
     
-    public abstract int getYTextureOffset();
-    
-    public abstract void setYTextureOffset(int yTextureOffset);
-    
-    public final Panel yTextureOffset(int yTextureOffset) {
-        setYTextureOffset(yTextureOffset);
-        return this;
+    public final Panel texture(PanelTextures textures) {
+        return texture(textures.texture(), textures.darkTexture());
     }
     
     public abstract int getColor();
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java
index 168db401e..a877311af 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Tooltip.java
@@ -33,6 +33,7 @@ import me.shedaniel.rei.impl.ClientInternals;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.inventory.tooltip.TooltipComponent;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
@@ -125,6 +126,11 @@ public interface Tooltip {
     
     Tooltip withContextStack(EntryStack<?> stack);
     
+    @Nullable
+    ResourceLocation getTooltipStyle();
+    
+    Tooltip withTooltipStyle(@Nullable ResourceLocation styleLocation);
+    
     default void queue() {
         EnvExecutor.runInEnv(Env.CLIENT, () -> () -> REIRuntime.getInstance().queueTooltip(this));
     }
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widget.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widget.java
index 82b07c256..06a770620 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widget.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widget.java
@@ -24,7 +24,6 @@
 package me.shedaniel.rei.api.client.gui.widgets;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import me.shedaniel.clothconfig2.api.ScissorsHandler;
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
@@ -120,12 +119,8 @@ public abstract class Widget extends AbstractContainerEventHandler implements Re
     
     @ApiStatus.Experimental
     public static CloseableScissors scissor(GuiGraphics graphics, Rectangle bounds) {
-        return scissor(graphics.pose().last().pose(), bounds);
-    }
-    
-    @ApiStatus.Experimental
-    public static CloseableScissors scissor(Matrix4f matrix, Rectangle bounds) {
-        ScissorsHandler.INSTANCE.scissor(MatrixUtils.transform(matrix, bounds));
-        return ScissorsHandler.INSTANCE::removeLastScissor;
+        bounds = MatrixUtils.transform(graphics.pose().last().pose(), bounds);
+        graphics.enableScissor(bounds.x, bounds.y, bounds.getMaxX(), bounds.getMaxY());
+        return graphics::disableScissor;
     }
 }
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java
index 45a31d515..6b4567038 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java
@@ -30,6 +30,7 @@ import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.config.ConfigObject;
 import me.shedaniel.rei.api.client.gui.DrawableConsumer;
 import me.shedaniel.rei.api.client.gui.Renderer;
+import me.shedaniel.rei.api.client.gui.widgets.utils.PanelTextures;
 import me.shedaniel.rei.impl.ClientInternals;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -250,21 +251,15 @@ public final class Widgets {
     
     public static Panel createRecipeBase(Rectangle rectangle) {
         return ClientInternals.getWidgetsProvider().createPanelWidget(rectangle)
-                .yTextureOffset(ConfigObject.getInstance().getRecipeBorderType().getYOffset())
-                .rendering(Widgets::shouldRecipeBaseRender);
+                .texture(ConfigObject.getInstance().getRecipeBorderType());
     }
     
     public static Panel createRecipeBase(Rectangle rectangle, int color) {
         return createRecipeBase(rectangle).color(color);
     }
     
-    private static boolean shouldRecipeBaseRender(Panel panel) {
-        return ConfigObject.getInstance().getRecipeBorderType().isRendering() && ClientInternals.getWidgetsProvider().isRenderingPanel(panel);
-    }
-    
-    
     public static Panel createSlotBase(Rectangle rectangle) {
-        return ClientInternals.getWidgetsProvider().createPanelWidget(rectangle).yTextureOffset(-66).rendering(Widgets::shouldSlotBaseRender);
+        return ClientInternals.getWidgetsProvider().createPanelWidget(rectangle).texture(PanelTextures.SLOT).rendering(Widgets::shouldSlotBaseRender);
     }
     
     private static boolean shouldSlotBaseRender(Panel panel) {
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/utils/PanelTextures.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/utils/PanelTextures.java
new file mode 100644
index 000000000..17d14ab4c
--- /dev/null
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/utils/PanelTextures.java
@@ -0,0 +1,48 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package me.shedaniel.rei.api.client.gui.widgets.utils;
+
+import me.shedaniel.rei.api.client.gui.config.RecipeBorderType;
+import net.minecraft.resources.ResourceLocation;
+
+public interface PanelTextures {
+    PanelTextures DEFAULT = RecipeBorderType.DEFAULT;
+    PanelTextures LIGHTER = RecipeBorderType.LIGHTER;
+    PanelTextures NONE = RecipeBorderType.NONE;
+    PanelTextures SLOT = new PanelTextures() {
+        @Override
+        public ResourceLocation texture() {
+            return ResourceLocation.parse("roughlyenoughitems:widget/panel_slot");
+        }
+        
+        @Override
+        public ResourceLocation darkTexture() {
+            return ResourceLocation.parse("roughlyenoughitems:widget/panel_slot_dark");
+        }
+    };
+    
+    ResourceLocation texture();
+    
+    ResourceLocation darkTexture();
+}
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayGeneratorsRegistry.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayGeneratorsRegistry.java
new file mode 100644
index 000000000..9f19db6b8
--- /dev/null
+++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayGeneratorsRegistry.java
@@ -0,0 +1,71 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package me.shedaniel.rei.api.client.registry.display;
+
+import me.shedaniel.rei.api.common.category.CategoryIdentifier;
+import me.shedaniel.rei.api.common.display.Display;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public interface DisplayGeneratorsRegistry {
+    /**
+     * Registers a global category-less display generator
+     *
+     * @param generator the generator to register
+     */
+    <A extends Display> void registerGlobalDisplayGenerator(DynamicDisplayGenerator<A> generator);
+    
+    /**
+     * Registers a display generator
+     *
+     * @param categoryId the identifier of the category
+     * @param generator  the generator to register
+     */
+    <A extends Display> void registerDisplayGenerator(CategoryIdentifier<A> categoryId, DynamicDisplayGenerator<A> generator);
+    
+    /**
+     * Returns an unmodifiable map of display generators
+     *
+     * @return an unmodifiable map of display generators
+     */
+    Map<CategoryIdentifier<?>, List<DynamicDisplayGenerator<?>>> getCategoryDisplayGenerators();
+    
+    /**
+     * Returns an unmodifiable list of category-less display generators
+     *
+     * @return an unmodifiable list of category-less display generators
+     */
+    List<DynamicDisplayGenerator<?>> getGlobalDisplayGenerators();
+    
+    /**
+     * Returns the list of display generators for a category
+     *
+     * @return the list of display generators
+     */
+    default <D extends Display> List<DynamicDisplayGenerator<?>> getCategoryDisplayGenerators(CategoryIdentifier<D> categoryId) {
+        return getCategoryDisplayGenerators().getOrDefault(categoryId, Collections.emptyList());
+    }
+}
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayPredicatesRegistry.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayPredicatesRegistry.java
new file mode 100644
index 000000000..fda081c00
--- /dev/null
+++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayPredicatesRegistry.java
@@ -0,0 +1,63 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package me.shedaniel.rei.api.client.registry.display;
+
+import me.shedaniel.rei.api.client.registry.display.visibility.DisplayVisibilityPredicate;
+import me.shedaniel.rei.api.common.display.Display;
+
+public interface DisplayPredicatesRegistry {
+    /**
+     * Registers a display visibility predicate
+     *
+     * @param predicate the predicate to be registered
+     */
+    void registerVisibilityPredicate(DisplayVisibilityPredicate predicate);
+    
+    /**
+     * Tests the display against all visibility predicates to determine whether it is visible
+     *
+     * @param display the display to test against
+     * @return whether the display is visible
+     */
+    boolean isDisplayVisible(Display display);
+    
+    /**
+     * Tests the display against all visibility predicates to determine whether it is visible
+     *
+     * @param category the category of the display
+     * @param display the display to test against
+     * @return whether the display is visible
+     */
+    boolean isDisplayVisible(DisplayCategory<?> category, Display display);
+    
+    /**
+     * Tests the display against all visibility predicates to determine whether it is invisible
+     *
+     * @param display the display to test against
+     * @return whether the display is invisible
+     */
+    default boolean isDisplayInvisible(Display display) {
+        return !isDisplayVisible(display);
+    }
+}
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayRegistry.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayRegistry.java
index 9e309c943..ebb1001d0 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayRegistry.java
@@ -23,27 +23,17 @@
 
 package me.shedaniel.rei.api.client.registry.display;
 
-import com.google.common.base.Predicates;
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
-import me.shedaniel.rei.api.client.registry.display.reason.DisplayAdditionReason;
-import me.shedaniel.rei.api.client.registry.display.reason.DisplayAdditionReasons;
 import me.shedaniel.rei.api.client.registry.display.visibility.DisplayVisibilityPredicate;
-import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.api.common.plugins.PluginManager;
-import me.shedaniel.rei.api.common.registry.RecipeManagerContext;
+import me.shedaniel.rei.api.common.registry.display.DisplayConsumer;
+import me.shedaniel.rei.api.common.registry.display.DisplayRegistryCommon;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.world.item.crafting.Recipe;
-import net.minecraft.world.item.crafting.RecipeHolder;
-import net.minecraft.world.item.crafting.RecipeType;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
-import java.util.function.BiPredicate;
-import java.util.function.Function;
-import java.util.function.Predicate;
+import java.util.List;
 
 /**
  * Registry for registering displays for categories, this is called right after
@@ -67,7 +57,7 @@ import java.util.function.Predicate;
  * @see REIClientPlugin#registerDisplays(DisplayRegistry)
  */
 @Environment(EnvType.CLIENT)
-public interface DisplayRegistry extends RecipeManagerContext<REIClientPlugin> {
+public interface DisplayRegistry extends DisplayRegistryCommon<REIClientPlugin>, DisplayGeneratorsRegistry, DisplayPredicatesRegistry, DisplayConsumer.RecipeDisplayConsumer {
     /**
      * @return the instance of {@link DisplayRegistry}
      */
@@ -75,390 +65,10 @@ public interface DisplayRegistry extends RecipeManagerContext<REIClientPlugin> {
         return PluginManager.getClientInstance().get(DisplayRegistry.class);
     }
     
-    /**
-     * Returns the total display count
-     *
-     * @return the recipe count
-     */
-    int displaySize();
-    
-    /**
-     * Registers a display.
-     *
-     * @param display the display
-     */
-    default void add(Display display) {
-        add(display, null);
-    }
-    
-    /**
-     * Registers a display with an origin attached.
-     *
-     * @param display the display
-     */
-    void add(Display display, @Nullable Object origin);
-    
-    /**
-     * Registers a display by the object provided, to be filled during {@link #tryFillDisplay(Object)}.
-     *
-     * @param object the object to be filled
-     */
-    default void add(Object object) {
-        addWithReason(object, DisplayAdditionReason.NONE);
-    }
-    
-    /**
-     * Registers a display by the object provided, to be filled during {@link #tryFillDisplay(Object)}.
-     *
-     * @param object the object to be filled
-     */
-    @ApiStatus.Experimental
-    default void addWithReason(Object object, DisplayAdditionReason... reasons) {
-        if (object instanceof Display) {
-            add((Display) object, null);
-        } else {
-            for (Display display : tryFillDisplay(object, reasons)) {
-                add(display, object);
-            }
-        }
-    }
-    
-    /**
-     * Returns an unmodifiable map of displays visible to the player
-     *
-     * @return an unmodifiable map of displays
-     */
-    Map<CategoryIdentifier<?>, List<Display>> getAll();
-    
-    /**
-     * Returns the list of displays visible to the player for a category
-     *
-     * @return the list of displays
-     */
-    default <D extends Display> List<D> get(CategoryIdentifier<D> categoryId) {
-        return (List<D>) getAll().getOrDefault(categoryId, Collections.emptyList());
-    }
-    
-    /**
-     * Registers a global category-less display generator
-     *
-     * @param generator the generator to register
-     */
-    <A extends Display> void registerGlobalDisplayGenerator(DynamicDisplayGenerator<A> generator);
-    
-    /**
-     * Registers a display generator
-     *
-     * @param categoryId the identifier of the category
-     * @param generator  the generator to register
-     */
-    <A extends Display> void registerDisplayGenerator(CategoryIdentifier<A> categoryId, DynamicDisplayGenerator<A> generator);
-    
-    /**
-     * Returns an unmodifiable map of display generators
-     *
-     * @return an unmodifiable map of display generators
-     */
-    Map<CategoryIdentifier<?>, List<DynamicDisplayGenerator<?>>> getCategoryDisplayGenerators();
-    
-    /**
-     * Returns an unmodifiable list of category-less display generators
-     *
-     * @return an unmodifiable list of category-less display generators
-     */
-    List<DynamicDisplayGenerator<?>> getGlobalDisplayGenerators();
-    
-    /**
-     * Returns the list of display generators for a category
-     *
-     * @return the list of display generators
-     */
-    default <D extends Display> List<DynamicDisplayGenerator<?>> getCategoryDisplayGenerators(CategoryIdentifier<D> categoryId) {
-        return getCategoryDisplayGenerators().getOrDefault(categoryId, Collections.emptyList());
-    }
-    
-    /**
-     * Registers a display visibility predicate
-     *
-     * @param predicate the predicate to be registered
-     */
-    void registerVisibilityPredicate(DisplayVisibilityPredicate predicate);
-    
-    /**
-     * Tests the display against all visibility predicates to determine whether it is visible
-     *
-     * @param display the display to test against
-     * @return whether the display is visible
-     */
-    boolean isDisplayVisible(Display display);
-    
-    /**
-     * Tests the display against all visibility predicates to determine whether it is invisible
-     *
-     * @param display the display to test against
-     * @return whether the display is invisible
-     */
-    default boolean isDisplayInvisible(Display display) {
-        return !isDisplayVisible(display);
-    }
-    
     /**
      * Returns an unmodifiable list of visibility predicates.
      *
      * @return an unmodifiable list of visibility predicates.
      */
     List<DisplayVisibilityPredicate> getVisibilityPredicates();
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param typeClass the type of {@code T}
-     * @param filler    the filler, taking a {@code T} and returning a {@code D}
-     * @param <T>       the type of object
-     * @param <D>       the type of display
-     */
-    default <T extends Recipe<?>, D extends Display> void registerRecipeFiller(Class<T> typeClass, RecipeType<? super T> recipeType, Function<? extends RecipeHolder<T>, @Nullable D> filler) {
-        registerRecipeFiller(typeClass, type -> Objects.equals(recipeType, type), filler);
-    }
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param typeClass the type of {@code T}
-     * @param filler    the filler, taking a {@code T} and returning a {@code D}
-     * @param <T>       the type of object
-     * @param <D>       the type of display
-     * @since 8.4
-     */
-    @ApiStatus.Experimental
-    default <T extends Recipe<?>, D extends Display> void registerRecipesFiller(Class<T> typeClass, RecipeType<? super T> recipeType, Function<? extends RecipeHolder<T>, @Nullable Collection<? extends D>> filler) {
-        registerRecipesFiller(typeClass, type -> Objects.equals(recipeType, type), filler);
-    }
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param typeClass the type of {@code T}
-     * @param filler    the filler, taking a {@code T} and returning a {@code D}
-     * @param <T>       the type of object
-     * @param <D>       the type of display
-     */
-    default <T extends Recipe<?>, D extends Display> void registerRecipeFiller(Class<T> typeClass, Predicate<RecipeType<? super T>> recipeType, Function<? extends RecipeHolder<T>, @Nullable D> filler) {
-        registerRecipeFiller(typeClass, recipeType, Predicates.alwaysTrue(), filler);
-    }
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param typeClass the type of {@code T}
-     * @param filler    the filler, taking a {@code T} and returning a {@code D}
-     * @param <T>       the type of object
-     * @param <D>       the type of display
-     * @since 8.4
-     */
-    @ApiStatus.Experimental
-    default <T extends Recipe<?>, D extends Display> void registerRecipesFiller(Class<T> typeClass, Predicate<RecipeType<? super T>> recipeType, Function<? extends RecipeHolder<T>, @Nullable Collection<? extends D>> filler) {
-        registerRecipesFiller(typeClass, recipeType, Predicates.alwaysTrue(), filler);
-    }
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param typeClass the type of {@code T}
-     * @param filler    the filler, taking a {@code T} and returning a {@code D}
-     * @param <T>       the type of object
-     * @param <D>       the type of display
-     */
-    default <T extends Recipe<?>, D extends Display> void registerRecipeFiller(Class<T> typeClass, Predicate<RecipeType<? super T>> recipeType, Predicate<? extends RecipeHolder<T>> predicate, Function<? extends RecipeHolder<T>, @Nullable D> filler) {
-        registerFiller(RecipeHolder.class, recipe -> {
-            return typeClass.isInstance(recipe.value())
-                    && recipeType.test((RecipeType<? super T>) recipe.value().getType())
-                    && ((Predicate<RecipeHolder<T>>) predicate).test(recipe);
-        }, filler);
-    }
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param typeClass the type of {@code T}
-     * @param filler    the filler, taking a {@code T} and returning a {@code D}
-     * @param <T>       the type of object
-     * @param <D>       the type of display
-     * @since 8.4
-     */
-    @ApiStatus.Experimental
-    default <T extends Recipe<?>, D extends Display> void registerRecipesFiller(Class<T> typeClass, Predicate<RecipeType<? super T>> recipeType, Predicate<? extends RecipeHolder<T>> predicate, Function<? extends RecipeHolder<T>, @Nullable Collection<? extends D>> filler) {
-        registerDisplaysFiller(RecipeHolder.class, recipe -> {
-            return typeClass.isInstance(recipe.value())
-                    && recipeType.test((RecipeType<? super T>) recipe.value().getType())
-                    && ((Predicate<RecipeHolder<T>>) predicate).test(recipe);
-        }, filler);
-    }
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param typeClass the type of {@code T}
-     * @param filler    the filler, taking a {@code T} and returning a {@code D}
-     * @param <T>       the type of object
-     * @param <D>       the type of display
-     */
-    default <T, D extends Display> void registerFiller(Class<T> typeClass, Function<? extends T, @Nullable D> filler) {
-        registerFiller(typeClass, Predicates.alwaysTrue(), filler);
-    }
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param typeClass the type of {@code T}
-     * @param filler    the filler, taking a {@code T} and returning a {@code D}
-     * @param <T>       the type of object
-     * @param <D>       the type of display
-     * @since 8.4
-     */
-    @ApiStatus.Experimental
-    default <T, D extends Display> void registerDisplaysFiller(Class<T> typeClass, Function<? extends T, @Nullable Collection<? extends D>> filler) {
-        registerDisplaysFiller(typeClass, Predicates.alwaysTrue(), filler);
-    }
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param typeClass the type of {@code T}
-     * @param predicate the predicate of {@code T}
-     * @param filler    the filler, taking a {@code T} and returning a {@code D}
-     * @param <T>       the type of object
-     * @param <D>       the type of display
-     */
-    <T, D extends Display> void registerFiller(Class<T> typeClass, Predicate<? extends T> predicate, Function<? extends T, @Nullable D> filler);
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param typeClass the type of {@code T}
-     * @param predicate the predicate of {@code T}
-     * @param filler    the filler, taking a {@code T} and returning a {@code D}
-     * @param <T>       the type of object
-     * @param <D>       the type of display
-     * @since 8.4
-     */
-    @ApiStatus.Experimental
-    <T, D extends Display> void registerDisplaysFiller(Class<T> typeClass, Predicate<? extends T> predicate, Function<? extends T, @Nullable Collection<? extends D>> filler);
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param typeClass the type of {@code T}
-     * @param predicate the predicate of {@code T} and reason
-     * @param filler    the filler, taking a {@code T} and returning a {@code D}
-     * @param <T>       the type of object
-     * @param <D>       the type of display
-     */
-    @ApiStatus.Experimental
-    <T, D extends Display> void registerFiller(Class<T> typeClass, BiPredicate<? extends T, DisplayAdditionReasons> predicate, Function<? extends T, @Nullable D> filler);
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param typeClass the type of {@code T}
-     * @param predicate the predicate of {@code T} and reason
-     * @param filler    the filler, taking a {@code T} and returning a {@code D}
-     * @param <T>       the type of object
-     * @param <D>       the type of display
-     * @since 8.4
-     */
-    @ApiStatus.Experimental
-    <T, D extends Display> void registerDisplaysFiller(Class<T> typeClass, BiPredicate<? extends T, DisplayAdditionReasons> predicate, Function<? extends T, @Nullable Collection<? extends D>> filler);
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param predicate the predicate of the object
-     * @param filler    the filler, taking an object and returning a {@code D}
-     * @param <D>       the type of display
-     */
-    <D extends Display> void registerFiller(Predicate<?> predicate, Function<?, @Nullable D> filler);
-    
-    /**
-     * Registers a display filler, to be filled during {@link #tryFillDisplay(Object)}.
-     * <p>
-     * Vanilla {@link Recipe} are by default filled, display filters
-     * can be used to automatically generate displays for vanilla {@link Recipe}.
-     *
-     * @param predicate the predicate of the object
-     * @param filler    the filler, taking an object and returning a {@code D}
-     * @param <D>       the type of display
-     * @since 8.4
-     */
-    @ApiStatus.Experimental
-    <D extends Display> void registerDisplaysFiller(Predicate<?> predicate, Function<?, @Nullable Collection<? extends D>> filler);
-    
-    /**
-     * Tries to fill displays from {@code T}.
-     *
-     * @param value the object
-     * @param <T>   the type of object
-     * @return the collection of displays
-     */
-    default <T> Collection<Display> tryFillDisplay(T value) {
-        return tryFillDisplay(value, DisplayAdditionReason.NONE);
-    }
-    
-    /**
-     * Tries to fill displays from {@code T}.
-     *
-     * @param value the object
-     * @param <T>   the type of object
-     * @return the collection of displays
-     */
-    @ApiStatus.Experimental
-    <T> Collection<Display> tryFillDisplay(T value, DisplayAdditionReason... reasons);
-    
-    /**
-     * Returns the origin of the display, this may be the recipe which the display was created from.
-     *
-     * @param display the display
-     * @return the origin
-     */
-    @Nullable
-    Object getDisplayOrigin(Display display);
 }
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/reason/DisplayAdditionReason.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/reason/DisplayAdditionReason.java
index 8f7218fbd..1b187559e 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/reason/DisplayAdditionReason.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/reason/DisplayAdditionReason.java
@@ -23,6 +23,7 @@
 
 package me.shedaniel.rei.api.client.registry.display.reason;
 
+import net.minecraft.world.item.crafting.display.RecipeDisplayId;
 import org.jetbrains.annotations.ApiStatus;
 
 /**
@@ -39,6 +40,15 @@ public interface DisplayAdditionReason {
     DisplayAdditionReason RECIPE_MANAGER = simple();
     
     static DisplayAdditionReason simple() {
-        return new DisplayAdditionReason() {};
+        return new DisplayAdditionReason() {
+        };
+    }
+    
+    static DisplayAdditionReason.WithId withId(RecipeDisplayId id) {
+        return () -> id;
+    }
+    
+    interface WithId extends DisplayAdditionReason {
+        RecipeDisplayId id();
     }
 }
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandler.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandler.java
index d639d340e..8636599f5 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandler.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandler.java
@@ -25,9 +25,9 @@ package me.shedaniel.rei.api.client.registry.transfer;
 
 import me.shedaniel.math.Point;
 import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
+import me.shedaniel.rei.api.client.registry.transfer.simple.SimpleTransferHandler;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.api.common.entry.EntryIngredient;
-import me.shedaniel.rei.api.common.transfer.info.MenuTransferException;
 import me.shedaniel.rei.impl.ClientInternals;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -41,14 +41,13 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 
 /**
  * Handler for display transfer, only executed on the client, implementations of this handler should sync recipes to the server to transfer recipes themselves.
  * <p>
- * REI provides a {@link TransferHandler} that handles displays that are provided with {@link me.shedaniel.rei.api.common.transfer.info.MenuInfo},
+ * REI provides a {@link SimpleTransferHandler} that handles displays,
  * as a lightweight and simple way to implement recipe transfers.
  *
  * @see TransferHandlerRegistry
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/Display.java b/api/src/main/java/me/shedaniel/rei/api/common/display/Display.java
index 4e436efcb..420a4dc2f 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/display/Display.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/display/Display.java
@@ -23,14 +23,15 @@
 
 package me.shedaniel.rei.api.common.display;
 
+import com.mojang.serialization.Codec;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.entry.EntryIngredient;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.entry.InputIngredient;
-import me.shedaniel.rei.api.common.transfer.info.MenuInfo;
-import me.shedaniel.rei.api.common.transfer.info.MenuSerializationContext;
 import me.shedaniel.rei.api.common.util.CollectionUtils;
 import me.shedaniel.rei.impl.display.DisplaySpec;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -50,31 +51,21 @@ import java.util.Optional;
  * @see me.shedaniel.rei.api.client.registry.display.DisplayRegistry
  */
 public interface Display extends DisplaySpec {
-    /**
-     * Returns the list of inputs for this display. This only affects the stacks resolving for the display,
-     * and not necessarily the stacks that are displayed.
-     *
-     * @return a list of inputs
-     */
-    List<EntryIngredient> getInputEntries();
+    static Codec<Display> codec() {
+        return DisplaySerializerRegistry.getInstance().codec();
+    }
     
-    @Deprecated(forRemoval = true)
-    default List<EntryIngredient> getInputEntries(MenuSerializationContext<?, ?, ?> context, MenuInfo<?, ?> info, boolean fill) {
-        return getInputEntries();
+    static StreamCodec<RegistryFriendlyByteBuf, Display> streamCodec() {
+        return DisplaySerializerRegistry.getInstance().streamCodec();
     }
     
     /**
-     * Returns the list of inputs for this display, aligned for the menu. This only affects the stacks resolving for the display,
+     * Returns the list of inputs for this display. This only affects the stacks resolving for the display,
      * and not necessarily the stacks that are displayed.
-     * <p>
-     * Each ingredient is also provided with the corresponding index slot-wise. The order of the list does not matter.
      *
      * @return a list of inputs
      */
-    @Deprecated(forRemoval = true)
-    default List<InputIngredient<EntryStack<?>>> getInputIngredients(MenuSerializationContext<?, ?, ?> context, MenuInfo<?, ?> info, boolean fill) {
-        return CollectionUtils.mapIndexed(getInputEntries(context, info, fill), InputIngredient::of);
-    }
+    List<EntryIngredient> getInputEntries();
     
     /**
      * Returns the list of inputs for this display, aligned for the menu. This only affects the stacks resolving for the display,
@@ -117,9 +108,20 @@ public interface Display extends DisplaySpec {
      *
      * @return the display location
      */
-    default Optional<ResourceLocation> getDisplayLocation() {
-        return Optional.empty();
-    }
+    Optional<ResourceLocation> getDisplayLocation();
+    
+    /**
+     * Returns the serializer for this display.
+     * <p>
+     * Returning {@code null} is allowed but not preferred, only if this display is never going to be synced from the server.
+     * <p>
+     * Any serializer returned here must be registered with {@link DisplaySerializerRegistry}.
+     * Plugins that would like to save / read recipes should use the generic {@link #codec()} and {@link #streamCodec()} instead.
+     *
+     * @return the serializer for this display
+     */
+    @Nullable
+    DisplaySerializer<? extends Display> getSerializer();
     
     @Override
     @ApiStatus.NonExtendable
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializer.java b/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializer.java
index 564bd1925..ff4cce3f1 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializer.java
@@ -23,32 +23,22 @@
 
 package me.shedaniel.rei.api.common.display;
 
-import net.minecraft.nbt.CompoundTag;
+import com.mojang.serialization.MapCodec;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import org.jetbrains.annotations.ApiStatus;
 
 /**
  * The display serializer used for display serialization, useful for persistent displays across reloads,
  * and server-client communication.
  *
- * @see SimpleDisplaySerializer
  * @see DisplaySerializerRegistry
  */
+@ApiStatus.NonExtendable
 public interface DisplaySerializer<D extends Display> {
-    /**
-     * Serializes the display into a tag.
-     *
-     * @param tag     the tag to serialize into
-     * @param display the display to serialize
-     * @return the tag
-     */
-    CompoundTag save(CompoundTag tag, D display);
+    MapCodec<D> codec();
     
-    /**
-     * Deserializes the display from a tag.
-     *
-     * @param tag the tag to deserialize from
-     * @return the display
-     */
-    D read(CompoundTag tag);
+    StreamCodec<RegistryFriendlyByteBuf, D> streamCodec();
     
     /**
      * Returns whether the serialized output is persistent across differing reboots, thus enabling serialization support for saving to disk.
@@ -58,4 +48,27 @@ public interface DisplaySerializer<D extends Display> {
     default boolean isPersistent() {
         return true;
     }
+    
+    static <D extends Display> DisplaySerializer<D> of(MapCodec<D> codec, StreamCodec<RegistryFriendlyByteBuf, D> streamCodec) {
+        return of(codec, streamCodec, true);
+    }
+    
+    static <D extends Display> DisplaySerializer<D> of(MapCodec<D> codec, StreamCodec<RegistryFriendlyByteBuf, D> streamCodec, boolean persistent) {
+        return new DisplaySerializer<>() {
+            @Override
+            public MapCodec<D> codec() {
+                return codec;
+            }
+            
+            @Override
+            public StreamCodec<RegistryFriendlyByteBuf, D> streamCodec() {
+                return streamCodec;
+            }
+            
+            @Override
+            public boolean isPersistent() {
+                return persistent;
+            }
+        };
+    }
 }
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java b/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java
index dbd1178eb..0f63cce02 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java
@@ -23,22 +23,22 @@
 
 package me.shedaniel.rei.api.common.display;
 
-import me.shedaniel.rei.api.common.category.CategoryIdentifier;
+import com.mojang.serialization.Codec;
 import me.shedaniel.rei.api.common.plugins.PluginManager;
-import me.shedaniel.rei.api.common.plugins.REIPlugin;
+import me.shedaniel.rei.api.common.plugins.REICommonPlugin;
 import me.shedaniel.rei.api.common.registry.Reloadable;
-import me.shedaniel.rei.api.common.transfer.info.MenuSerializationContext;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * The registry for display serializers used for display serialization, useful for persistent displays across reloads,
  * and server-client communication.
  *
- * <p>This is mostly a fallback system for {@link me.shedaniel.rei.api.common.transfer.info.MenuInfo#save(MenuSerializationContext, Display)}.
- *
- * @see REIPlugin#registerDisplaySerializer(DisplaySerializerRegistry)
+ * @see REICommonPlugin#registerDisplaySerializer(DisplaySerializerRegistry)
  */
-public interface DisplaySerializerRegistry extends Reloadable<REIPlugin<?>> {
+public interface DisplaySerializerRegistry extends Reloadable<REICommonPlugin> {
     static DisplaySerializerRegistry getInstance() {
         return PluginManager.getInstance().get(DisplaySerializerRegistry.class);
     }
@@ -47,46 +47,49 @@ public interface DisplaySerializerRegistry extends Reloadable<REIPlugin<?>> {
      * Registers a {@link DisplaySerializer} for serializing a {@link Display} for syncing across server-client, and
      * for serializing displays to disk for favorites.
      *
-     * @param categoryId the category identifier of the display
+     * @param id         the identifier of the display serializer
      * @param serializer the serializer of the display
      * @param <D>        the type of the display
      */
-    <D extends Display> void register(CategoryIdentifier<? extends D> categoryId, DisplaySerializer<D> serializer);
+    <D extends Display> void register(ResourceLocation id, DisplaySerializer<D> serializer);
     
     /**
-     * Marks a {@link Display} as unavailable to sync across server-client, and
-     * for serializing displays to disk for favorites.
+     * Returns the display serializer for the given id.
      *
-     * @param categoryId the category identifier of the display
-     * @param <D>        the type of the display
+     * @param id the identifier of the display serializer
+     * @return the display serializer
      */
-    <D extends Display> void registerNotSerializable(CategoryIdentifier<D> categoryId);
+    @Nullable
+    DisplaySerializer<?> get(ResourceLocation id);
     
     /**
-     * Returns whether a {@link DisplaySerializer} is registered for the given {@link CategoryIdentifier}.
+     * Returns the id of the display serializer.
      *
-     * @param categoryId the identifier of the category
-     * @param <D>        the type of the display
-     * @return whether a serializer is registered for the given category
+     * @param serializer the display serializer
+     * @return the id of the display serializer
+     */
+    @Nullable
+    ResourceLocation getId(DisplaySerializer<?> serializer);
+    
+    /**
+     * Returns whether the display serializer is registered.
+     *
+     * @param serializer the display serializer
+     * @return whether the display serializer is registered
      */
-    <D extends Display> boolean hasSerializer(CategoryIdentifier<D> categoryId);
+    boolean isRegistered(DisplaySerializer<?> serializer);
     
     /**
-     * Serializes the display into a tag.
+     * Returns a generic codec for any registered displays.
      *
-     * @param tag     the tag to serialize into
-     * @param display the display to serialize
-     * @return the tag
-     * @see DisplaySerializer#save(CompoundTag, Display)
+     * @return a generic codec for any registered displays
      */
-    <D extends Display> CompoundTag save(D display, CompoundTag tag);
+    Codec<Display> codec();
     
     /**
-     * Deserializes the display from a tag.
+     * Returns a generic stream codec for any registered displays.
      *
-     * @param tag the tag to deserialize from
-     * @return the display
-     * @see Display