From 9ce069457bca016c8793c73844e5cc984deac365 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Tue, 10 Mar 2020 02:03:11 +0800
Subject: new widget api

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 .../me/shedaniel/rei/api/DrawableConsumer.java     |  33 +++
 .../java/me/shedaniel/rei/api/RecipeCategory.java  |  24 +-
 .../java/me/shedaniel/rei/api/widgets/Arrow.java   |  78 ++++++
 .../me/shedaniel/rei/api/widgets/BurningFire.java  |  78 ++++++
 .../java/me/shedaniel/rei/api/widgets/Label.java   | 191 +++++++++++++++
 .../java/me/shedaniel/rei/api/widgets/Panel.java   |  86 +++++++
 .../java/me/shedaniel/rei/api/widgets/Slot.java    | 104 ++++++++
 .../java/me/shedaniel/rei/api/widgets/Widgets.java | 142 +++++++++++
 .../shedaniel/rei/gui/ContainerScreenOverlay.java  |  28 +--
 .../shedaniel/rei/gui/PreRecipeViewingScreen.java  |   6 +-
 .../me/shedaniel/rei/gui/RecipeViewingScreen.java  |  29 +--
 .../rei/gui/VillagerRecipeViewingScreen.java       |  18 +-
 .../rei/gui/widget/ClickableLabelWidget.java       |  18 +-
 .../shedaniel/rei/gui/widget/EntryListWidget.java  |   3 +-
 .../me/shedaniel/rei/gui/widget/EntryWidget.java   |  86 ++++++-
 .../me/shedaniel/rei/gui/widget/LabelWidget.java   |  40 ++-
 .../me/shedaniel/rei/gui/widget/QueuedTooltip.java |  24 +-
 .../rei/gui/widget/RecipeArrowWidget.java          |   5 +
 .../shedaniel/rei/gui/widget/RecipeBaseWidget.java |  10 +
 .../shedaniel/rei/gui/widget/SlotBaseWidget.java   |  10 +
 .../java/me/shedaniel/rei/gui/widget/Widget.java   |   1 +
 .../me/shedaniel/rei/impl/ConfigObjectImpl.java    |   2 +-
 .../me/shedaniel/rei/impl/widgets/ArrowWidget.java |  78 ++++++
 .../rei/impl/widgets/BurningFireWidget.java        |  78 ++++++
 .../shedaniel/rei/impl/widgets/DrawableWidget.java |  49 ++++
 .../widgets/FillRectangleDrawableConsumer.java     |  67 ++++++
 .../me/shedaniel/rei/impl/widgets/LabelWidget.java | 268 +++++++++++++++++++++
 .../me/shedaniel/rei/impl/widgets/PanelWidget.java | 162 +++++++++++++
 .../rei/impl/widgets/TexturedDrawableConsumer.java |  75 ++++++
 .../shedaniel/rei/impl/widgets/package-info.java   |  27 +++
 .../plugin/beacon/DefaultBeaconBaseCategory.java   |  25 +-
 .../rei/plugin/brewing/DefaultBrewingCategory.java |  42 ++--
 .../plugin/campfire/DefaultCampfireCategory.java   |  44 ++--
 .../composting/DefaultCompostingCategory.java      |  32 +--
 .../rei/plugin/cooking/DefaultCookingCategory.java |  47 ++--
 .../plugin/crafting/DefaultCraftingCategory.java   |  39 ++-
 .../rei/plugin/fuel/DefaultFuelCategory.java       |  49 ++--
 .../information/DefaultInformationCategory.java    |  31 +--
 .../stonecutting/DefaultStoneCuttingCategory.java  |  29 +--
 .../plugin/stripping/DefaultStrippingCategory.java |  30 +--
 .../me/shedaniel/rei/utils/CollectionUtils.java    |   2 -
 41 files changed, 1898 insertions(+), 292 deletions(-)
 create mode 100644 src/main/java/me/shedaniel/rei/api/DrawableConsumer.java
 create mode 100644 src/main/java/me/shedaniel/rei/api/widgets/Arrow.java
 create mode 100644 src/main/java/me/shedaniel/rei/api/widgets/BurningFire.java
 create mode 100644 src/main/java/me/shedaniel/rei/api/widgets/Label.java
 create mode 100644 src/main/java/me/shedaniel/rei/api/widgets/Panel.java
 create mode 100644 src/main/java/me/shedaniel/rei/api/widgets/Slot.java
 create mode 100644 src/main/java/me/shedaniel/rei/api/widgets/Widgets.java
 create mode 100644 src/main/java/me/shedaniel/rei/impl/widgets/ArrowWidget.java
 create mode 100644 src/main/java/me/shedaniel/rei/impl/widgets/BurningFireWidget.java
 create mode 100644 src/main/java/me/shedaniel/rei/impl/widgets/DrawableWidget.java
 create mode 100644 src/main/java/me/shedaniel/rei/impl/widgets/FillRectangleDrawableConsumer.java
 create mode 100644 src/main/java/me/shedaniel/rei/impl/widgets/LabelWidget.java
 create mode 100644 src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java
 create mode 100644 src/main/java/me/shedaniel/rei/impl/widgets/TexturedDrawableConsumer.java
 create mode 100644 src/main/java/me/shedaniel/rei/impl/widgets/package-info.java

(limited to 'src/main/java/me')

diff --git a/src/main/java/me/shedaniel/rei/api/DrawableConsumer.java b/src/main/java/me/shedaniel/rei/api/DrawableConsumer.java
new file mode 100644
index 000000000..77ebfd9f7
--- /dev/null
+++ b/src/main/java/me/shedaniel/rei/api/DrawableConsumer.java
@@ -0,0 +1,33 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020 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;
+
+import net.minecraft.client.gui.DrawableHelper;
+
+/**
+ * Consumer of a {@link DrawableHelper} and information of mouse and delta.
+ */
+public interface DrawableConsumer {
+    void render(DrawableHelper helper, int mouseX, int mouseY, float delta);
+}
diff --git a/src/main/java/me/shedaniel/rei/api/RecipeCategory.java b/src/main/java/me/shedaniel/rei/api/RecipeCategory.java
index 826c0add1..631217963 100644
--- a/src/main/java/me/shedaniel/rei/api/RecipeCategory.java
+++ b/src/main/java/me/shedaniel/rei/api/RecipeCategory.java
@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.api;
 
-import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.gui.RecipeViewingScreen;
 import me.shedaniel.rei.gui.entries.RecipeEntry;
 import me.shedaniel.rei.gui.entries.SimpleRecipeEntry;
@@ -81,12 +81,27 @@ public interface RecipeCategory<T extends RecipeDisplay> {
      * @param recipeDisplaySupplier the supplier for getting the recipe
      * @param bounds                the bounds of the display, configurable with overriding the width, height methods.
      * @return the list of widgets
+     * @deprecated use {@link #setupDisplay(RecipeDisplay, me.shedaniel.math.Rectangle)}
      */
     @ApiStatus.OverrideOnly
-    default List<Widget> setupDisplay(Supplier<T> recipeDisplaySupplier, Rectangle bounds) {
+    @ApiStatus.ScheduledForRemoval
+    @Deprecated
+    default List<Widget> setupDisplay(Supplier<T> recipeDisplaySupplier, me.shedaniel.math.api.Rectangle bounds) {
         return Collections.singletonList(new RecipeBaseWidget(bounds));
     }
     
+    /**
+     * Setup the widgets for displaying the recipe
+     *
+     * @param recipeDisplay the recipe
+     * @param bounds        the bounds of the display, configurable with overriding the width, height methods.
+     * @return the list of widgets
+     */
+    @ApiStatus.OverrideOnly
+    default List<Widget> setupDisplay(T recipeDisplay, Rectangle bounds) {
+        return setupDisplay(() -> recipeDisplay, new me.shedaniel.math.api.Rectangle(bounds));
+    }
+    
     /**
      * Draws the category background, used in {@link RecipeViewingScreen}
      *
@@ -94,9 +109,12 @@ public interface RecipeCategory<T extends RecipeDisplay> {
      * @param mouseX the x coordinates for the mouse
      * @param mouseY the y coordinates for the mouse
      * @param delta  the delta
+     * @deprecated there is no replacement for this as this is just a dumb idea, please contact me if you want to change my mind
      */
     @ApiStatus.OverrideOnly
-    default void drawCategoryBackground(Rectangle bounds, int mouseX, int mouseY, float delta) {
+    @Deprecated
+    @ApiStatus.ScheduledForRemoval
+    default void drawCategoryBackground(me.shedaniel.math.api.Rectangle bounds, int mouseX, int mouseY, float delta) {
         PanelWidget.render(bounds, -1);
         if (REIHelper.getInstance().isDarkThemeEnabled()) {
             DrawableHelper.fill(bounds.x + 17, bounds.y + 5, bounds.x + bounds.width - 17, bounds.y + 17, 0xFF404040);
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Arrow.java b/src/main/java/me/shedaniel/rei/api/widgets/Arrow.java
new file mode 100644
index 000000000..90d840ce2
--- /dev/null
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Arrow.java
@@ -0,0 +1,78 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020 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.widgets;
+
+import me.shedaniel.rei.gui.widget.WidgetWithBounds;
+
+public abstract class Arrow extends WidgetWithBounds {
+    public final int getX() {
+        return getBounds().getX();
+    }
+    
+    public final int getY() {
+        return getBounds().getY();
+    }
+    
+    /**
+     * Gets the animation duration in milliseconds, -1 if animation is disabled.
+     */
+    public abstract double getAnimationDuration();
+    
+    /**
+     * Sets the animation duration in milliseconds.
+     *
+     * @param animationDurationMS animation duration in milliseconds, animation is disabled when below or equals to 0
+     */
+    public abstract void setAnimationDuration(double animationDurationMS);
+    
+    /**
+     * Sets the animation duration in milliseconds.
+     *
+     * @param animationDurationMS animation duration in milliseconds, animation is disabled when below or equals to 0
+     * @return the arrow itself
+     */
+    public final Arrow animationDurationMS(double animationDurationMS) {
+        setAnimationDuration(animationDurationMS);
+        return this;
+    }
+    
+    /**
+     * Sets the animation duration in ticks.
+     *
+     * @param animationDurationTicks animation duration in ticks, animation is disabled when below or equals to 0
+     * @return the arrow itself
+     */
+    public final Arrow animationDurationTicks(double animationDurationTicks) {
+        return animationDurationMS(animationDurationTicks * 50);
+    }
+    
+    /**
+     * Disables the animation.
+     *
+     * @return the arrow itself
+     */
+    public final Arrow disableAnimation() {
+        return animationDurationMS(-1);
+    }
+}
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/BurningFire.java b/src/main/java/me/shedaniel/rei/api/widgets/BurningFire.java
new file mode 100644
index 000000000..8ea7759e9
--- /dev/null
+++ b/src/main/java/me/shedaniel/rei/api/widgets/BurningFire.java
@@ -0,0 +1,78 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020 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.widgets;
+
+import me.shedaniel.rei.gui.widget.WidgetWithBounds;
+
+public abstract class BurningFire extends WidgetWithBounds {
+    public final int getX() {
+        return getBounds().getX();
+    }
+    
+    public final int getY() {
+        return getBounds().getY();
+    }
+    
+    /**
+     * Gets the animation duration in milliseconds, -1 if animation is disabled.
+     */
+    public abstract double getAnimationDuration();
+    
+    /**
+     * Sets the animation duration in milliseconds.
+     *
+     * @param animationDurationMS animation duration in milliseconds, animation is disabled when below or equals to 0
+     */
+    public abstract void setAnimationDuration(double animationDurationMS);
+    
+    /**
+     * Sets the animation duration in milliseconds.
+     *
+     * @param animationDurationMS animation duration in milliseconds, animation is disabled when below or equals to 0
+     * @return the arrow itself
+     */
+    public final BurningFire animationDurationMS(double animationDurationMS) {
+        setAnimationDuration(animationDurationMS);
+        return this;
+    }
+    
+    /**
+     * Sets the animation duration in ticks.
+     *
+     * @param animationDurationTicks animation duration in ticks, animation is disabled when below or equals to 0
+     * @return the arrow itself
+     */
+    public final BurningFire animationDurationTicks(double animationDurationTicks) {
+        return animationDurationMS(animationDurationTicks * 50);
+    }
+    
+    /**
+     * Disables the animation.
+     *
+     * @return the arrow itself
+     */
+    public final BurningFire disableAnimation() {
+        return animationDurationMS(-1);
+    }
+}
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Label.java b/src/main/java/me/shedaniel/rei/api/widgets/Label.java
new file mode 100644
index 000000000..8d4d0247f
--- /dev/null
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Label.java
@@ -0,0 +1,191 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020 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.widgets;
+
+import me.shedaniel.math.Point;
+import me.shedaniel.rei.api.REIHelper;
+import me.shedaniel.rei.gui.widget.WidgetWithBounds;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public abstract class Label extends WidgetWithBounds {
+    public static final int LEFT_ALIGNED = -1;
+    public static final int CENTER = 0;
+    public static final int RIGHT_ALIGNED = 1;
+    
+    public abstract boolean isClickable();
+    
+    public abstract void setClickable(boolean clickable);
+    
+    public final Label clickable() {
+        return clickable(true);
+    }
+    
+    public final Label clickable(boolean clickable) {
+        setClickable(clickable);
+        return this;
+    }
+    
+    @Nullable
+    public abstract Consumer<Label> getOnClick();
+    
+    public abstract void setOnClick(@Nullable Consumer<Label> onClick);
+    
+    public final Label onClick(@Nullable Consumer<Label> onClick) {
+        setOnClick(onClick);
+        return this;
+    }
+    
+    @Nullable
+    public abstract Consumer<Label> getOnRender();
+    
+    public abstract void setOnRender(@Nullable Consumer<Label> onRender);
+    
+    public final Label onRender(@Nullable Consumer<Label> onRender) {
+        setOnRender(onRender);
+        return this;
+    }
+    
+    public abstract boolean isFocusable();
+    
+    public abstract void setFocusable(boolean focusable);
+    
+    public final Label focusable(boolean focusable) {
+        setFocusable(focusable);
+        return this;
+    }
+    
+    @Nullable
+    public abstract String getTooltip();
+    
+    public abstract void setTooltip(@Nullable Function<Label, @Nullable String> tooltip);
+    
+    public final Label tooltipLines(@NotNull String... tooltip) {
+        return tooltipLine(String.join("\n", tooltip));
+    }
+    
+    public final Label tooltipLine(@Nullable String tooltip) {
+        return tooltipSupplier(label -> tooltip);
+    }
+    
+    public final Label tooltipSupplier(@Nullable Function<Label, @Nullable String> tooltip) {
+        setTooltip(tooltip);
+        return this;
+    }
+    
+    public abstract int getHorizontalAlignment();
+    
+    public final Label centered() {
+        return horizontalAlignment(CENTER);
+    }
+    
+    public final Label leftAligned() {
+        return horizontalAlignment(LEFT_ALIGNED);
+    }
+    
+    public final Label rightAligned() {
+        return horizontalAlignment(RIGHT_ALIGNED);
+    }
+    
+    public abstract void setHorizontalAlignment(int horizontalAlignment);
+    
+    public final Label horizontalAlignment(int horizontalAlignment) {
+        setHorizontalAlignment(horizontalAlignment);
+        return this;
+    }
+    
+    public abstract boolean hasShadow();
+    
+    public final Label noShadow() {
+        return shadow(false);
+    }
+    
+    public final Label shadow() {
+        return shadow(true);
+    }
+    
+    public abstract void setShadow(boolean hasShadow);
+    
+    public final Label shadow(boolean hasShadow) {
+        setShadow(hasShadow);
+        return this;
+    }
+    
+    public abstract int getColor();
+    
+    public abstract void setColor(int color);
+    
+    public final Label color(int lightModeColor, int darkModeColor) {
+        return color(REIHelper.getInstance().isDarkThemeEnabled() ? darkModeColor : lightModeColor);
+    }
+    
+    public final Label color(int color) {
+        setColor(color);
+        return this;
+    }
+    
+    public abstract int getHoveredColor();
+    
+    public abstract void setHoveredColor(int hoveredColor);
+    
+    public final Label hoveredColor(int lightModeColor, int darkModeColor) {
+        return hoveredColor(REIHelper.getInstance().isDarkThemeEnabled() ? darkModeColor : lightModeColor);
+    }
+    
+    public final Label hoveredColor(int color) {
+        setHoveredColor(color);
+        return this;
+    }
+    
+    @NotNull
+    public abstract Point getPoint();
+    
+    public final int getX() {
+        return getPoint().getX();
+    }
+    
+    public final int getY() {
+        return getPoint().getY();
+    }
+    
+    public abstract void setPoint(@NotNull Point point);
+    
+    public final Label point(@NotNull Point point) {
+        setPoint(point);
+        return this;
+    }
+    
+    @NotNull
+    public abstract String getText();
+    
+    public abstract void setText(@NotNull String text);
+    
+    public final Label text(@NotNull String text) {
+        setText(text);
+        return this;
+    }
+}
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Panel.java b/src/main/java/me/shedaniel/rei/api/widgets/Panel.java
new file mode 100644
index 000000000..441068b62
--- /dev/null
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Panel.java
@@ -0,0 +1,86 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020 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.widgets;
+
+import me.shedaniel.rei.api.REIHelper;
+import me.shedaniel.rei.gui.widget.WidgetWithBounds;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Predicate;
+
+public abstract class Panel extends WidgetWithBounds {
+    public abstract int getInnerColor();
+    
+    public abstract void setInnerColor(int innerColor);
+    
+    public final Panel innerColor(int innerColor) {
+        setInnerColor(innerColor);
+        return this;
+    }
+    
+    public final Panel innerColor(int lightColor, int darkColor) {
+        return innerColor(REIHelper.getInstance().isDarkThemeEnabled() ? darkColor : lightColor);
+    }
+    
+    public abstract int getXTextureOffset();
+    
+    public abstract void setXTextureOffset(int xTextureOffset);
+    
+    public final Panel xTextureOffset(int xTextureOffset) {
+        setXTextureOffset(xTextureOffset);
+        return this;
+    }
+    
+    public abstract int getYTextureOffset();
+    
+    public abstract void setYTextureOffset(int yTextureOffset);
+    
+    public final Panel yTextureOffset(int yTextureOffset) {
+        setYTextureOffset(yTextureOffset);
+        return this;
+    }
+    
+    public abstract int getColor();
+    
+    public abstract void setColor(int color);
+    
+    public final Panel color(int color) {
+        setColor(color);
+        return this;
+    }
+    
+    public final Panel color(int lightColor, int darkColor) {
+        return color(REIHelper.getInstance().isDarkThemeEnabled() ? darkColor : lightColor);
+    }
+    
+    @NotNull
+    public abstract Predicate<Panel> getRendering();
+    
+    public abstract void setRendering(@NotNull Predicate<Panel> rendering);
+    
+    public final Panel rendering(@NotNull Predicate<Panel> rendering) {
+        setRendering(rendering);
+        return this;
+    }
+}
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Slot.java b/src/main/java/me/shedaniel/rei/api/widgets/Slot.java
new file mode 100644
index 000000000..e12143d0e
--- /dev/null
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Slot.java
@@ -0,0 +1,104 @@
+package me.shedaniel.rei.api.widgets;
+
+import me.shedaniel.rei.api.EntryStack;
+import me.shedaniel.rei.gui.widget.QueuedTooltip;
+import me.shedaniel.rei.gui.widget.WidgetWithBounds;
+
+import java.util.Collection;
+import java.util.List;
+
+public abstract class Slot extends WidgetWithBounds {
+    public Slot unmarkInputOrOutput() {
+        setNoticeMark((byte) 0);
+        return this;
+    }
+    
+    public final Slot markInput() {
+        setNoticeMark((byte) 1);
+        return this;
+    }
+    
+    public final Slot markOutput() {
+        setNoticeMark((byte) 2);
+        return this;
+    }
+    
+    public abstract void setNoticeMark(byte mark);
+    
+    public abstract byte getNoticeMark();
+    
+    public abstract void setInteractable(boolean interactable);
+    
+    public abstract boolean isInteractable();
+    
+    public Slot interactable(boolean interactable) {
+        setInteractable(interactable);
+        return this;
+    }
+    
+    public Slot noInteractable() {
+        return interactable(false);
+    }
+    
+    public abstract void setInteractableFavorites(boolean interactableFavorites);
+    
+    public abstract boolean isInteractableFavorites();
+    
+    public Slot interactableFavorites(boolean interactableFavorites) {
+        setInteractableFavorites(interactableFavorites);
+        return this;
+    }
+    
+    public Slot noFavoritesInteractable() {
+        return interactableFavorites(false);
+    }
+    
+    public abstract void setHighlightEnabled(boolean highlights);
+    
+    public abstract boolean isHighlightEnabled();
+    
+    public final Slot highlightEnabled(boolean highlight) {
+        setHighlightEnabled(highlight);
+        return this;
+    }
+    
+    public final Slot disableHighlight() {
+        return highlightEnabled(false);
+    }
+    
+    public abstract void setTooltipsEnabled(boolean tooltipsEnabled);
+    
+    public abstract boolean isTooltipsEnabled();
+    
+    public final Slot tooltipsEnabled(boolean tooltipsEnabled) {
+        setTooltipsEnabled(tooltipsEnabled);
+        return this;
+    }
+    
+    public final Slot disableTooltips() {
+        return tooltipsEnabled(false);
+    }
+    
+    public abstract void setBackgroundEnabled(boolean backgroundEnabled);
+    
+    public abstract boolean isBackgroundEnabled();
+    
+    public final Slot backgroundEnabled(boolean backgroundEnabled) {
+        setBackgroundEnabled(backgroundEnabled);
+        return this;
+    }
+    
+    public final Slot disableBackground() {
+        return backgroundEnabled(false);
+    }
+    
+    public abstract Slot clearEntries();
+    
+    public abstract Slot entry(EntryStack stack);
+    
+    public abstract Slot entries(Collection<EntryStack> stacks);
+    
+    public abstract List<EntryStack> getEntries();
+    
+    public abstract QueuedTooltip getCurrentTooltip(int mouseX, int mouseY);
+}
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Widgets.java b/src/main/java/me/shedaniel/rei/api/widgets/Widgets.java
new file mode 100644
index 000000000..286120716
--- /dev/null
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Widgets.java
@@ -0,0 +1,142 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020 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.widgets;
+
+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.DrawableConsumer;
+import me.shedaniel.rei.gui.widget.EntryWidget;
+import me.shedaniel.rei.gui.widget.Widget;
+import me.shedaniel.rei.impl.widgets.*;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.sound.PositionedSoundInstance;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Consumer;
+
+public final class Widgets {
+    private Widgets() {}
+    
+    public static Widget createDrawableWidget(DrawableConsumer drawable) {
+        return new DrawableWidget(drawable);
+    }
+    
+    public static Widget createTexturedWidget(Identifier identifier, Rectangle bounds) {
+        return createTexturedWidget(identifier, bounds, 0, 0);
+    }
+    
+    public static Widget createTexturedWidget(Identifier identifier, int x, int y, int width, int height) {
+        return createTexturedWidget(identifier, x, y, 0, 0, width, height);
+    }
+    
+    public static Widget createTexturedWidget(Identifier identifier, Rectangle bounds, float u, float v) {
+        return createTexturedWidget(identifier, bounds, u, v, 256, 256);
+    }
+    
+    public static Widget createTexturedWidget(Identifier identifier, int x, int y, float u, float v, int width, int height) {
+        return createTexturedWidget(identifier, x, y, u, v, width, height, 256, 256);
+    }
+    
+    public static Widget createTexturedWidget(Identifier identifier, Rectangle bounds, float u, float v, int textureWidth, int textureHeight) {
+        return createTexturedWidget(identifier, bounds.x, bounds.y, u, v, bounds.width, bounds.height, bounds.width, bounds.height, textureWidth, textureHeight);
+    }
+    
+    public static Widget createTexturedWidget(Identifier identifier, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) {
+        return createTexturedWidget(identifier, x, y, u, v, width, height, width, height, textureWidth, textureHeight);
+    }
+    
+    public static Widget createTexturedWidget(Identifier identifier, Rectangle bounds, float u, float v, int uWidth, int vHeight, int textureWidth, int textureHeight) {
+        return createTexturedWidget(identifier, bounds.x, bounds.y, u, v, bounds.width, bounds.height, uWidth, vHeight, textureWidth, textureHeight);
+    }
+    
+    public static Widget createTexturedWidget(Identifier identifier, int x, int y, float u, float v, int width, int height, int uWidth, int vHeight, int textureWidth, int textureHeight) {
+        return createDrawableWidget(new TexturedDrawableConsumer(identifier, x, y, width, height, u, v, uWidth, vHeight, textureWidth, textureHeight));
+    }
+    
+    public static Widget createFilledRectangle(Rectangle rectangle, int color) {
+        return createDrawableWidget(new FillRectangleDrawableConsumer(rectangle, color));
+    }
+    
+    public static Label createLabel(Point point, @NotNull String text) {
+        return new LabelWidget(point, text);
+    }
+    
+    public static Label createClickableLabel(Point point, @NotNull String text, @Nullable Consumer<Label> onClick) {
+        return new LabelWidget(point, text).clickable().onClick(onClick);
+    }
+    
+    public static Arrow createArrow(Point point) {
+        return new ArrowWidget(new Rectangle(point, new Dimension(24, 17)));
+    }
+    
+    public static BurningFire createBurningFire(Point point) {
+        return new BurningFireWidget(new Rectangle(point, new Dimension(14, 14)));
+    }
+    
+    public static Widget createSlotBackground(Point point) {
+        return createSlotBase(new Rectangle(point.x - 1, point.y - 1, 18, 18));
+    }
+    
+    public static Widget createResultSlotBackground(Point point) {
+        return createSlotBase(new Rectangle(point.x - 5, point.y - 5, 26, 26));
+    }
+    
+    public static Panel createRecipeBase(Rectangle rectangle) {
+        return new PanelWidget(rectangle).yTextureOffset(ConfigObject.getInstance().getRecipeBorderType().getYOffset()).rendering(Widgets::shouldRecipeBaseRender);
+    }
+    
+    private static boolean shouldRecipeBaseRender(Panel panel) {
+        return ConfigObject.getInstance().getRecipeBorderType().isRendering() && PanelWidget.isRendering(panel);
+    }
+    
+    public static Panel createRecipeBase(Rectangle rectangle, int color) {
+        return createRecipeBase(rectangle).color(color);
+    }
+    
+    public static Panel createSlotBase(Rectangle rectangle) {
+        return new PanelWidget(rectangle).yTextureOffset(-66).rendering(Widgets::shouldSlotBaseRender).innerColor(-7631989, -13619152);
+    }
+    
+    private static boolean shouldSlotBaseRender(Panel panel) {
+        return true;
+    }
+    
+    public static Panel createSlotBase(Rectangle rectangle, int color) {
+        return createSlotBase(rectangle).color(color);
+    }
+    
+    @SuppressWarnings("deprecation")
+    public static Slot createSlot(Point point) {
+        return EntryWidget.create(point.x, point.y);
+    }
+    
+    public static void produceClickSound() {
+        MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
+    }
+}
diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
index 46cf478f0..f41298751 100644
--- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
+++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
@@ -30,6 +30,7 @@ import me.shedaniel.math.api.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.api.*;
+import me.shedaniel.rei.api.widgets.Widgets;
 import me.shedaniel.rei.gui.config.SearchFieldLocation;
 import me.shedaniel.rei.gui.widget.*;
 import me.shedaniel.rei.impl.ScreenHelper;
@@ -271,26 +272,13 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
             }
         }
         if (!ConfigObject.getInstance().isEntryListWidgetScrolled()) {
-            widgets.add(new ClickableLabelWidget(new Point(bounds.x + (bounds.width / 2), bounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 10), "") {
-                @Override
-                public void render(int mouseX, int mouseY, float delta) {
-                    clickable(ENTRY_LIST_WIDGET.getTotalPages() > 1);
-                    setText(String.format("%s/%s", ENTRY_LIST_WIDGET.getPage() + 1, Math.max(ENTRY_LIST_WIDGET.getTotalPages(), 1)));
-                    super.render(mouseX, mouseY, delta);
-                }
-                
-                @Override
-                public void onLabelClicked() {
-                    MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
-                    ENTRY_LIST_WIDGET.setPage(0);
-                    ENTRY_LIST_WIDGET.updateEntriesPosition();
-                }
-                
-                @Override
-                public boolean changeFocus(boolean boolean_1) {
-                    return false;
-                }
-            }.tooltip(() -> I18n.translate("text.rei.go_back_first_page")));
+            widgets.add(Widgets.createClickableLabel(new Point(bounds.x + (bounds.width / 2), bounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 10), "", label -> {
+                ENTRY_LIST_WIDGET.setPage(0);
+                ENTRY_LIST_WIDGET.updateEntriesPosition();
+            }).tooltipLine(I18n.translate("text.rei.go_back_first_page")).focusable(false).onRender(label -> {
+                label.setClickable(ENTRY_LIST_WIDGET.getTotalPages() > 1);
+                label.setText(String.format("%s/%s", ENTRY_LIST_WIDGET.getPage() + 1, Math.max(ENTRY_LIST_WIDGET.getTotalPages(), 1)));
+            }));
         }
         if (ConfigObject.getInstance().isCraftableFilterEnabled()) {
             this.widgets.add(craftableToggleButton = new CraftableToggleButtonWidget(getCraftableToggleArea()) {
diff --git a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java
index 13fd15027..09a853d6a 100644
--- a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java
@@ -29,9 +29,9 @@ import me.shedaniel.clothconfig2.gui.widget.DynamicNewSmoothScrollingEntryListWi
 import me.shedaniel.clothconfig2.impl.EasingMethod;
 import me.shedaniel.math.api.Point;
 import me.shedaniel.math.api.Rectangle;
+import me.shedaniel.rei.api.widgets.Widgets;
 import me.shedaniel.rei.gui.config.RecipeScreenType;
 import me.shedaniel.rei.gui.widget.ButtonWidget;
-import me.shedaniel.rei.gui.widget.LabelWidget;
 import me.shedaniel.rei.gui.widget.Widget;
 import me.shedaniel.rei.gui.widget.WidgetWithBounds;
 import me.shedaniel.rei.impl.ScreenHelper;
@@ -117,9 +117,9 @@ public class PreRecipeViewingScreen extends Screen {
             }
         });
         this.widgets.add(new ScreenTypeSelection(width / 2 - 200 - 5, height / 2 - 112 / 2 - 10, 0));
-        this.widgets.add(LabelWidget.create(new Point(width / 2 - 200 - 5 + 104, height / 2 - 112 / 2 + 115), I18n.translate("config.roughlyenoughitems.recipeScreenType.original")).noShadow().color(-1124073473));
+        this.widgets.add(Widgets.createLabel(new Point(width / 2 - 200 - 5 + 104, height / 2 - 112 / 2 + 115), I18n.translate("config.roughlyenoughitems.recipeScreenType.original")).noShadow().color(-1124073473));
         this.widgets.add(new ScreenTypeSelection(width / 2 + 5, height / 2 - 112 / 2 - 10, 112));
-        this.widgets.add(LabelWidget.create(new Point(width / 2 + 5 + 104, height / 2 - 112 / 2 + 115), I18n.translate("config.roughlyenoughitems.recipeScreenType.villager")).noShadow().color(-1124073473));
+        this.widgets.add(Widgets.createLabel(new Point(width / 2 + 5 + 104, height / 2 - 112 / 2 + 115), I18n.translate("config.roughlyenoughitems.recipeScreenType.villager")).noShadow().color(-1124073473));
         this.children.addAll(widgets);
     }
     
diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java
index f058ee63a..7d273ae3c 100644
--- a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java
@@ -31,6 +31,7 @@ import me.shedaniel.math.api.Point;
 import me.shedaniel.math.api.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.*;
+import me.shedaniel.rei.api.widgets.Widgets;
 import me.shedaniel.rei.gui.widget.*;
 import me.shedaniel.rei.impl.ClientHelperImpl;
 import me.shedaniel.rei.impl.ScreenHelper;
@@ -244,10 +245,9 @@ public class RecipeViewingScreen extends Screen implements RecipeScreen {
                 currentCategoryIndex = categories.size() - 1;
             ClientHelperImpl.getInstance().openRecipeViewingScreen(categoriesMap, categories.get(currentCategoryIndex).getIdentifier(), ingredientStackToNotice, resultStackToNotice);
         }).tooltip(() -> I18n.translate("text.rei.previous_category")));
-        widgets.add(LabelWidget.createClickable(new Point(bounds.getCenterX(), bounds.getY() + 7), selectedCategory.getCategoryName(), clickableLabelWidget -> {
-            MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
+        widgets.add(Widgets.createClickableLabel(new Point(bounds.getCenterX(), bounds.getY() + 7), selectedCategory.getCategoryName(), clickableLabelWidget -> {
             ClientHelper.getInstance().executeViewAllRecipesKeyBind();
-        }).tooltip(() -> I18n.translate("text.rei.view_all_categories")));
+        }).tooltipLine(I18n.translate("text.rei.view_all_categories")));
         widgets.add(categoryNext = ButtonWidget.create(new Rectangle(bounds.getMaxX() - 17, bounds.getY() + 5, 12, 12), new TranslatableText("text.rei.right_arrow"), buttonWidget -> {
             int currentCategoryIndex = categories.indexOf(selectedCategory);
             currentCategoryIndex++;
@@ -264,20 +264,13 @@ public class RecipeViewingScreen extends Screen implements RecipeScreen {
                 page = getTotalPages(selectedCategory) - 1;
             RecipeViewingScreen.this.init();
         }).tooltip(() -> I18n.translate("text.rei.previous_page")));
-        widgets.add(new ClickableLabelWidget(new Point(bounds.getCenterX(), bounds.getY() + 21), "") {
-            @Override
-            public void render(int mouseX, int mouseY, float delta) {
-                setText(String.format("%d/%d", page + 1, getTotalPages(selectedCategory)));
-                super.render(mouseX, mouseY, delta);
-            }
-            
-            @Override
-            public void onLabelClicked() {
-                MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
-                RecipeViewingScreen.this.choosePageActivated = true;
-                RecipeViewingScreen.this.init();
-            }
-        }.clickable(categoriesMap.get(selectedCategory).size() > getRecipesPerPageByHeight()).tooltip(() -> I18n.translate("text.rei.choose_page")));
+        widgets.add(Widgets.createClickableLabel(new Point(bounds.getCenterX(), bounds.getY() + 21), "", label -> {
+            RecipeViewingScreen.this.choosePageActivated = true;
+            RecipeViewingScreen.this.init();
+        }).onRender(label -> {
+            label.setText(String.format("%d/%d", page + 1, getTotalPages(selectedCategory)));
+            label.setClickable(categoriesMap.get(selectedCategory).size() > getRecipesPerPageByHeight());
+        }).tooltipSupplier(label -> label.isClickable() ? I18n.translate("text.rei.choose_page") : null));
         widgets.add(recipeNext = ButtonWidget.create(new Rectangle(bounds.getMaxX() - 17, bounds.getY() + 19, 12, 12), new TranslatableText("text.rei.right_arrow"), buttonWidget -> {
             page++;
             if (page >= getTotalPages(selectedCategory))
@@ -308,7 +301,7 @@ public class RecipeViewingScreen extends Screen implements RecipeScreen {
             final Supplier<RecipeDisplay> displaySupplier = () -> display;
             int displayWidth = selectedCategory.getDisplayWidth(displaySupplier.get());
             final Rectangle displayBounds = new Rectangle(getBounds().getCenterX() - displayWidth / 2, getBounds().y - 2 + 36 + recipeHeight * i + 4 * i, displayWidth, recipeHeight);
-            List<Widget> setupDisplay = selectedCategory.setupDisplay(displaySupplier, displayBounds);
+            List<Widget> setupDisplay = selectedCategory.setupDisplay(display, displayBounds);
             transformIngredientNotice(setupDisplay, ingredientStackToNotice);
             transformResultNotice(setupDisplay, resultStackToNotice);
             recipeBounds.put(displayBounds, setupDisplay);
diff --git a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java
index d20000a30..17561850c 100644
--- a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java
@@ -31,6 +31,7 @@ import me.shedaniel.math.api.Point;
 import me.shedaniel.math.api.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.*;
+import me.shedaniel.rei.api.widgets.Widgets;
 import me.shedaniel.rei.gui.entries.RecipeEntry;
 import me.shedaniel.rei.gui.widget.*;
 import me.shedaniel.rei.impl.ClientHelperImpl;
@@ -173,7 +174,7 @@ public class VillagerRecipeViewingScreen extends Screen implements RecipeScreen
         this.widgets.add(new SlotBaseWidget(scrollListBounds));
         
         Rectangle recipeBounds = new Rectangle(bounds.x + 100 + (guiWidth - 100) / 2 - category.getDisplayWidth(display) / 2, bounds.y + bounds.height / 2 - category.getDisplayHeight() / 2, category.getDisplayWidth(display), category.getDisplayHeight());
-        List<Widget> setupDisplay = category.setupDisplay(() -> display, recipeBounds);
+        List<Widget> setupDisplay = category.setupDisplay(display, recipeBounds);
         RecipeViewingScreen.transformIngredientNotice(setupDisplay, ingredientStackToNotice);
         RecipeViewingScreen.transformResultNotice(setupDisplay, resultStackToNotice);
         this.widgets.addAll(setupDisplay);
@@ -247,18 +248,9 @@ public class VillagerRecipeViewingScreen extends Screen implements RecipeScreen
         }));
         w.enabled = w2.enabled = categories.size() > tabsPerPage;
         
-        this.widgets.add(new ClickableLabelWidget(new Point(bounds.x + 4 + scrollListBounds.width / 2, bounds.y + 6), categories.get(selectedCategoryIndex).getCategoryName()) {
-            @Override
-            public void onLabelClicked() {
-                MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
-                ClientHelper.getInstance().executeViewAllRecipesKeyBind();
-            }
-            
-            @Override
-            public Optional<String> getTooltips() {
-                return Optional.ofNullable(I18n.translate("text.rei.view_all_categories"));
-            }
-        });
+        this.widgets.add(Widgets.createClickableLabel(new Point(bounds.x + 4 + scrollListBounds.width / 2, bounds.y + 6), categories.get(selectedCategoryIndex).getCategoryName(), label -> {
+            ClientHelper.getInstance().executeViewAllRecipesKeyBind();
+        }).tooltipLine(I18n.translate("text.rei.view_all_categories")).noShadow().color(0xFF404040, 0xFFBBBBBB).hoveredColor(0xFF0041FF, 0xFFFFBD4D));
         
         this.children.addAll(buttonWidgets);
         this.widgets.addAll(tabs);
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java
index ad40fcd1b..354edb29d 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java
@@ -23,10 +23,18 @@
 
 package me.shedaniel.rei.gui.widget;
 
-import me.shedaniel.math.api.Point;
+import me.shedaniel.math.Point;
 import me.shedaniel.rei.api.REIHelper;
+import me.shedaniel.rei.api.widgets.Widgets;
 import org.jetbrains.annotations.ApiStatus;
 
+import java.util.function.Consumer;
+
+/**
+ * @see Widgets#createClickableLabel(Point, String, Consumer)
+ */
+@Deprecated
+@ApiStatus.ScheduledForRemoval
 public abstract class ClickableLabelWidget extends LabelWidget {
     
     public boolean focused;
@@ -39,6 +47,12 @@ public abstract class ClickableLabelWidget extends LabelWidget {
         this.hoveredColor = REIHelper.getInstance().isDarkThemeEnabled() ? -1 : 0xFF66FFCC;
     }
     
+    @ApiStatus.Internal
+    protected ClickableLabelWidget(me.shedaniel.math.api.Point point, String text) {
+        super(point, text);
+        this.hoveredColor = REIHelper.getInstance().isDarkThemeEnabled() ? -1 : 0xFF66FFCC;
+    }
+    
     public LabelWidget hoveredColor(int hoveredColor) {
         this.hoveredColor = hoveredColor;
         return this;
@@ -58,7 +72,7 @@ public abstract class ClickableLabelWidget extends LabelWidget {
         int color = getDefaultColor();
         if (isClickable() && isHovered(mouseX, mouseY))
             color = getHoveredColor();
-        Point pos = getPosition();
+        Point pos = getLocation();
         int width = font.getStringWidth(getText());
         if (isCentered()) {
             if (isHasShadows())
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java
index 1a38d5dc7..e1f7c0bcf 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java
@@ -33,6 +33,7 @@ import me.shedaniel.math.api.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.api.*;
+import me.shedaniel.rei.api.widgets.Widgets;
 import me.shedaniel.rei.gui.ContainerScreenOverlay;
 import me.shedaniel.rei.gui.config.ItemListOrdering;
 import me.shedaniel.rei.impl.ScreenHelper;
@@ -593,7 +594,7 @@ public class EntryListWidget extends WidgetWithBounds {
                 int skippedFavorites = page * (entries.size() - width);
                 int j = 0;
                 if (skippedFavorites < favorites.size()) {
-                    renders.add(LabelWidget.create(new Point(innerBounds.x + 2, innerBounds.y + 6), I18n.translate("text.rei.favorites")).leftAligned());
+                    renders.add(Widgets.createLabel(new Point(innerBounds.x + 2, innerBounds.y + 6), I18n.translate("text.rei.favorites")).leftAligned());
                     j += width;
                 }
                 List<EntryStack> subFavoritesList = favorites.stream().skip(skippedFavorites).limit(Math.max(0, entries.size() - width)).collect(Collectors.toList());
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java
index e333ec131..b5a430174 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java
@@ -29,6 +29,7 @@ import me.shedaniel.math.api.Point;
 import me.shedaniel.math.api.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.*;
+import me.shedaniel.rei.api.widgets.Slot;
 import me.shedaniel.rei.gui.ContainerScreenOverlay;
 import me.shedaniel.rei.impl.ScreenHelper;
 import me.shedaniel.rei.utils.CollectionUtils;
@@ -42,7 +43,7 @@ import org.jetbrains.annotations.ApiStatus;
 
 import java.util.*;
 
-public class EntryWidget extends WidgetWithBounds {
+public class EntryWidget extends Slot {
     
     protected static final Identifier RECIPE_GUI = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png");
     protected static final Identifier RECIPE_GUI_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png");
@@ -66,14 +67,25 @@ public class EntryWidget extends WidgetWithBounds {
         this.entryStacks = new ArrayList<>();
     }
     
+    /**
+     * @see me.shedaniel.rei.api.widgets.Widgets#createSlot(me.shedaniel.math.Point)
+     */
+    @ApiStatus.ScheduledForRemoval
+    @Deprecated
     public static EntryWidget create(int x, int y) {
         return create(new Point(x, y));
     }
     
+    /**
+     * @see me.shedaniel.rei.api.widgets.Widgets#createSlot(me.shedaniel.math.Point)
+     */
+    @ApiStatus.ScheduledForRemoval
+    @Deprecated
     public static EntryWidget create(Point point) {
         return new EntryWidget(point);
     }
     
+    @Override
     public EntryWidget unmarkInputOrOutput() {
         noticeMark = 0;
         return this;
@@ -89,15 +101,41 @@ public class EntryWidget extends WidgetWithBounds {
         return this;
     }
     
-    @ApiStatus.Internal
+    @Override
     public byte getNoticeMark() {
         return noticeMark;
     }
     
+    @Override
+    public void setNoticeMark(byte noticeMark) {
+        this.noticeMark = noticeMark;
+    }
+    
+    @Override
+    public void setInteractable(boolean interactable) {
+        interactable(interactable);
+    }
+    
+    @Override
+    public boolean isInteractable() {
+        return this.interactable;
+    }
+    
+    @Override
+    public void setInteractableFavorites(boolean interactableFavorites) {
+        interactableFavorites(interactableFavorites);
+    }
+    
+    @Override
+    public boolean isInteractableFavorites() {
+        return interactableFavorites;
+    }
+    
     public EntryWidget disableInteractions() {
         return interactable(false);
     }
     
+    @Override
     public EntryWidget interactable(boolean b) {
         interactable = b;
         interactableFavorites = interactableFavorites && interactable;
@@ -108,6 +146,7 @@ public class EntryWidget extends WidgetWithBounds {
         return interactableFavorites(false);
     }
     
+    @Override
     public EntryWidget interactableFavorites(boolean b) {
         interactableFavorites = b && interactable;
         return this;
@@ -122,6 +161,16 @@ public class EntryWidget extends WidgetWithBounds {
         return this;
     }
     
+    @Override
+    public boolean isHighlightEnabled() {
+        return highlight;
+    }
+    
+    @Override
+    public void setHighlightEnabled(boolean highlights) {
+        highlight(highlights);
+    }
+    
     public EntryWidget noTooltips() {
         return tooltips(false);
     }
@@ -131,6 +180,16 @@ public class EntryWidget extends WidgetWithBounds {
         return this;
     }
     
+    @Override
+    public void setTooltipsEnabled(boolean tooltipsEnabled) {
+        tooltips(tooltipsEnabled);
+    }
+    
+    @Override
+    public boolean isTooltipsEnabled() {
+        return tooltips;
+    }
+    
     public EntryWidget noBackground() {
         return background(false);
     }
@@ -140,16 +199,33 @@ public class EntryWidget extends WidgetWithBounds {
         return this;
     }
     
+    @Override
+    public void setBackgroundEnabled(boolean backgroundEnabled) {
+        background(backgroundEnabled);
+    }
+    
+    @Override
+    public boolean isBackgroundEnabled() {
+        return background;
+    }
+    
     public EntryWidget clearStacks() {
         entryStacks.clear();
         return this;
     }
     
+    @Override
+    public Slot clearEntries() {
+        return clearStacks();
+    }
+    
+    @Override
     public EntryWidget entry(EntryStack stack) {
         entryStacks.add(stack);
         return this;
     }
     
+    @Override
     public EntryWidget entries(Collection<EntryStack> stacks) {
         entryStacks.addAll(stacks);
         return this;
@@ -163,6 +239,11 @@ public class EntryWidget extends WidgetWithBounds {
         return entryStacks.get(MathHelper.floor((System.currentTimeMillis() / 500 % (double) entryStacks.size()) / 1f));
     }
     
+    @Override
+    public List<EntryStack> getEntries() {
+        return entryStacks;
+    }
+    
     public List<EntryStack> entries() {
         return entryStacks;
     }
@@ -225,6 +306,7 @@ public class EntryWidget extends WidgetWithBounds {
         }
     }
     
+    @Override
     public QueuedTooltip getCurrentTooltip(int mouseX, int mouseY) {
         return getCurrentEntry().getTooltip(mouseX, mouseY);
     }
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java
index a878f45be..376a49e65 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java
@@ -23,9 +23,10 @@
 
 package me.shedaniel.rei.gui.widget;
 
-import me.shedaniel.math.api.Point;
+import me.shedaniel.math.Point;
 import me.shedaniel.math.api.Rectangle;
 import me.shedaniel.rei.api.REIHelper;
+import me.shedaniel.rei.api.widgets.Widgets;
 import net.minecraft.client.gui.Element;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -35,6 +36,12 @@ import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+/**
+ * @see Widgets#createLabel(Point, String)
+ * @see Widgets#createClickableLabel(Point, String, Consumer)
+ */
+@Deprecated
+@ApiStatus.ScheduledForRemoval
 public class LabelWidget extends WidgetWithBounds {
     
     private Point pos;
@@ -44,6 +51,11 @@ public class LabelWidget extends WidgetWithBounds {
     private boolean centered = true;
     private Supplier<String> tooltipSupplier;
     
+    @ApiStatus.Internal
+    public LabelWidget(me.shedaniel.math.api.Point point, String text) {
+        this((Point) point, text);
+    }
+    
     @ApiStatus.Internal
     public LabelWidget(Point point, String text) {
         this.pos = point;
@@ -55,6 +67,14 @@ public class LabelWidget extends WidgetWithBounds {
         return new LabelWidget(point, text);
     }
     
+    public static LabelWidget create(me.shedaniel.math.api.Point point, String text) {
+        return new LabelWidget(point, text);
+    }
+    
+    public static ClickableLabelWidget createClickable(me.shedaniel.math.api.Point point, String text, Consumer<ClickableLabelWidget> onClicked) {
+        return createClickable((Point) point, text, onClicked);
+    }
+    
     public static ClickableLabelWidget createClickable(Point point, String text, Consumer<ClickableLabelWidget> onClicked) {
         ClickableLabelWidget[] widget = {null};
         widget[0] = new ClickableLabelWidget(point, text) {
@@ -110,11 +130,25 @@ public class LabelWidget extends WidgetWithBounds {
         this.defaultColor = defaultColor;
     }
     
-    public Point getPosition() {
+    /**
+     * @return the position of this label
+     * @deprecated Use {@link #getLocation()}
+     */
+    @Deprecated
+    @ApiStatus.ScheduledForRemoval
+    public me.shedaniel.math.api.Point getPosition() {
+        return new me.shedaniel.math.api.Point(getLocation());
+    }
+    
+    public Point getLocation() {
         return pos;
     }
     
-    public LabelWidget setPosition(Point position) {
+    public LabelWidget setPosition(me.shedaniel.math.api.Point position) {
+        return setLocation(position);
+    }
+    
+    public LabelWidget setLocation(Point position) {
         this.pos = position;
         return this;
     }
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java b/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java
index 4951189e8..f99218a62 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java
@@ -25,7 +25,7 @@ package me.shedaniel.rei.gui.widget;
 
 
 import com.google.common.collect.Lists;
-import me.shedaniel.math.api.Point;
+import me.shedaniel.math.Point;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.REIHelper;
 import org.jetbrains.annotations.ApiStatus;
@@ -44,6 +44,14 @@ public class QueuedTooltip {
         this.text = Lists.newArrayList(text);
     }
     
+    public static QueuedTooltip create(me.shedaniel.math.api.Point location, List<String> text) {
+        return new QueuedTooltip(location, text);
+    }
+    
+    public static QueuedTooltip create(me.shedaniel.math.api.Point location, String... text) {
+        return QueuedTooltip.create(location, Lists.newArrayList(text));
+    }
+    
     public static QueuedTooltip create(Point location, List<String> text) {
         return new QueuedTooltip(location, text);
     }
@@ -71,16 +79,22 @@ public class QueuedTooltip {
         return consumer;
     }
     
-    public Point getLocation() {
-        return location;
+    /**
+     * @return the absolute location of the tooltip.
+     * @deprecated Use {@link #getX()} and {@link #getY()} instead.
+     */
+    @Deprecated
+    @ApiStatus.ScheduledForRemoval
+    public me.shedaniel.math.api.Point getLocation() {
+        return new me.shedaniel.math.api.Point(location);
     }
     
     public int getX() {
-        return getLocation().x;
+        return location.x;
     }
     
     public int getY() {
-        return getLocation().y;
+        return location.y;
     }
     
     public List<String> getText() {
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java
index 0edb7e831..c0976b2d1 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java
@@ -34,6 +34,11 @@ import org.jetbrains.annotations.ApiStatus;
 import java.util.Collections;
 import java.util.List;
 
+/**
+ * @see me.shedaniel.rei.api.widgets.Widgets#createArrow(me.shedaniel.math.Point)
+ */
+@ApiStatus.ScheduledForRemoval
+@Deprecated
 public class RecipeArrowWidget extends WidgetWithBounds {
     
     private int x, y;
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java
index 7d4af047a..c3bdec3c8 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java
@@ -25,9 +25,19 @@ package me.shedaniel.rei.gui.widget;
 
 import me.shedaniel.math.api.Rectangle;
 import me.shedaniel.rei.api.ConfigObject;
+import org.jetbrains.annotations.ApiStatus;
 
 public class RecipeBaseWidget extends PanelWidget {
     
+    /**
+     * Creates a recipe base drawable
+     *
+     * @param bounds the bounds of the base
+     * @see me.shedaniel.rei.api.widgets.Widgets#createRecipeBase(me.shedaniel.math.Rectangle)
+     * @see me.shedaniel.rei.api.widgets.Widgets#createRecipeBase(me.shedaniel.math.Rectangle, int)
+     */
+    @ApiStatus.Internal
+    @Deprecated
     public RecipeBaseWidget(Rectangle bounds) {
         super(bounds);
     }
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java
index eda14a19f..80e81ee31 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java
@@ -25,9 +25,19 @@ package me.shedaniel.rei.gui.widget;
 
 import me.shedaniel.math.api.Rectangle;
 import me.shedaniel.rei.api.REIHelper;
+import org.jetbrains.annotations.ApiStatus;
 
 public class SlotBaseWidget extends RecipeBaseWidget {
     
+    /**
+     * Creates a recipe base drawable
+     *
+     * @param bounds the bounds of the base
+     * @see me.shedaniel.rei.api.widgets.Widgets#createSlotBase(me.shedaniel.math.Rectangle)
+     * @see me.shedaniel.rei.api.widgets.Widgets#createSlotBase(me.shedaniel.math.Rectangle, int)
+     */
+    @ApiStatus.Internal
+    @Deprecated
     public SlotBaseWidget(Rectangle bounds) {
         super(bounds);
     }
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/Widget.java b/src/main/java/me/shedaniel/rei/gui/widget/Widget.java
index ed78a13d3..cc8ec6955 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/Widget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/Widget.java
@@ -57,6 +57,7 @@ public abstract class Widget extends AbstractParentElement implements Drawable {
         return false;
     }
     
+    @SuppressWarnings("RedundantCast")
     public final boolean containsMouse(int mouseX, int mouseY) {
         return containsMouse((double) mouseX, (double) mouseY);
     }
diff --git a/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java b/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java
index 287042bc1..d51369219 100644
--- a/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java
+++ b/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java
@@ -371,9 +371,9 @@ public class ConfigObjectImpl implements ConfigObject, ConfigData {
     
     public static class Appearance {
         @UseSpecialRecipeTypeScreen private RecipeScreenType recipeScreenType = RecipeScreenType.UNSET;
+        @