From 550fe32e612801daa99493aa0bade083f3330133 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Wed, 18 Mar 2020 00:35:36 +0800
Subject: 4.0.14: Better widgets system

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 .../java/me/shedaniel/rei/api/widgets/Arrow.java   |  22 +-
 .../me/shedaniel/rei/api/widgets/BaseWidget.java   |  30 +++
 .../me/shedaniel/rei/api/widgets/BurningFire.java  |  22 +-
 .../java/me/shedaniel/rei/api/widgets/Button.java  | 160 ++++++++++++
 .../java/me/shedaniel/rei/api/widgets/Label.java   | 112 ++++++++
 .../java/me/shedaniel/rei/api/widgets/Panel.java   |   7 +
 .../java/me/shedaniel/rei/api/widgets/Slot.java    |  32 ++-
 .../java/me/shedaniel/rei/api/widgets/Tooltip.java |   5 +
 .../java/me/shedaniel/rei/api/widgets/Widgets.java |  43 ++++
 .../shedaniel/rei/gui/ContainerScreenOverlay.java  | 273 +++++++++-----------
 .../shedaniel/rei/gui/PreRecipeViewingScreen.java  |  22 +-
 .../me/shedaniel/rei/gui/RecipeViewingScreen.java  | 132 +++++-----
 .../rei/gui/VillagerRecipeViewingScreen.java       | 104 ++++----
 .../rei/gui/widget/AutoCraftingButtonWidget.java   | 192 --------------
 .../me/shedaniel/rei/gui/widget/ButtonWidget.java  |   9 +
 .../gui/widget/CraftableToggleButtonWidget.java    |  82 ------
 .../shedaniel/rei/gui/widget/EntryListWidget.java  |   2 +
 .../me/shedaniel/rei/gui/widget/EntryWidget.java   |   8 +
 .../rei/gui/widget/FavoritesListWidget.java        |   2 +
 .../me/shedaniel/rei/gui/widget/LabelWidget.java   |   2 +
 .../rei/gui/widget/LateRenderedButton.java         |  35 ---
 .../me/shedaniel/rei/gui/widget/PanelWidget.java   |   2 +
 .../me/shedaniel/rei/gui/widget/QueuedTooltip.java |  10 +
 .../rei/gui/widget/RecipeArrowWidget.java          |   2 +
 .../rei/gui/widget/RecipeChoosePageWidget.java     |  16 +-
 .../me/shedaniel/rei/gui/widget/TabWidget.java     |   2 +
 .../shedaniel/rei/gui/widget/TextFieldWidget.java  |   7 +
 .../shedaniel/rei/gui/widget/WidgetWithBounds.java |   2 +
 .../me/shedaniel/rei/impl/InternalWidgets.java     | 242 ++++++++++++++++++
 .../java/me/shedaniel/rei/impl/ScreenHelper.java   |   3 +
 .../me/shedaniel/rei/impl/widgets/ArrowWidget.java |   5 +-
 .../rei/impl/widgets/BurningFireWidget.java        |   2 +-
 .../shedaniel/rei/impl/widgets/ButtonWidget.java   | 284 +++++++++++++++++++++
 .../widgets/FillRectangleDrawableConsumer.java     |   2 +-
 .../me/shedaniel/rei/impl/widgets/LabelWidget.java |   1 +
 .../me/shedaniel/rei/impl/widgets/PanelWidget.java |   1 +
 .../rei/impl/widgets/TexturedDrawableConsumer.java |   2 +-
 .../plugin/beacon/DefaultBeaconBaseCategory.java   |   2 +
 .../information/DefaultInformationCategory.java    |   2 +
 39 files changed, 1269 insertions(+), 614 deletions(-)
 create mode 100644 src/main/java/me/shedaniel/rei/api/widgets/BaseWidget.java
 create mode 100644 src/main/java/me/shedaniel/rei/api/widgets/Button.java
 delete mode 100644 src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java
 delete mode 100644 src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java
 delete mode 100644 src/main/java/me/shedaniel/rei/gui/widget/LateRenderedButton.java
 create mode 100644 src/main/java/me/shedaniel/rei/impl/InternalWidgets.java
 create mode 100644 src/main/java/me/shedaniel/rei/impl/widgets/ButtonWidget.java

(limited to 'src/main/java')

diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Arrow.java b/src/main/java/me/shedaniel/rei/api/widgets/Arrow.java
index 90d840ce2..98a0da428 100644
--- a/src/main/java/me/shedaniel/rei/api/widgets/Arrow.java
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Arrow.java
@@ -24,12 +24,19 @@
 package me.shedaniel.rei.api.widgets;
 
 import me.shedaniel.rei.gui.widget.WidgetWithBounds;
+import org.jetbrains.annotations.NotNull;
 
 public abstract class Arrow extends WidgetWithBounds {
+    /**
+     * @return the x coordinate for the top left corner of this widget.
+     */
     public final int getX() {
         return getBounds().getX();
     }
     
+    /**
+     * @return the y coordinate for the top left corner of this widget.
+     */
     public final int getY() {
         return getBounds().getY();
     }
@@ -42,16 +49,17 @@ public abstract class Arrow extends WidgetWithBounds {
     /**
      * Sets the animation duration in milliseconds.
      *
-     * @param animationDurationMS animation duration in milliseconds, animation is disabled when below or equals to 0
+     * @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
+     * @param animationDurationMS animation duration in milliseconds, animation is disabled when below or equals to 0.
+     * @return the arrow itself.
      */
+    @NotNull
     public final Arrow animationDurationMS(double animationDurationMS) {
         setAnimationDuration(animationDurationMS);
         return this;
@@ -60,9 +68,10 @@ public abstract class Arrow extends WidgetWithBounds {
     /**
      * 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
+     * @param animationDurationTicks animation duration in ticks, animation is disabled when below or equals to 0.
+     * @return the arrow itself.
      */
+    @NotNull
     public final Arrow animationDurationTicks(double animationDurationTicks) {
         return animationDurationMS(animationDurationTicks * 50);
     }
@@ -70,8 +79,9 @@ public abstract class Arrow extends WidgetWithBounds {
     /**
      * Disables the animation.
      *
-     * @return the arrow itself
+     * @return the arrow itself.
      */
+    @NotNull
     public final Arrow disableAnimation() {
         return animationDurationMS(-1);
     }
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/BaseWidget.java b/src/main/java/me/shedaniel/rei/api/widgets/BaseWidget.java
new file mode 100644
index 000000000..fe6212473
--- /dev/null
+++ b/src/main/java/me/shedaniel/rei/api/widgets/BaseWidget.java
@@ -0,0 +1,30 @@
+package me.shedaniel.rei.api.widgets;
+
+import me.shedaniel.math.Point;
+import me.shedaniel.rei.gui.widget.WidgetWithBounds;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.BiPredicate;
+
+public abstract class BaseWidget<T extends BaseWidget<T>> extends WidgetWithBounds {
+    @Nullable
+    private BiPredicate<T, Point> containsMousePredicate;
+    
+    public final void setContainsMousePredicate(@Nullable BiPredicate<T, Point> predicate) {
+        this.containsMousePredicate = predicate;
+    }
+    
+    @NotNull
+    public final T containsMousePredicate(@Nullable BiPredicate<T, Point> predicate) {
+        setContainsMousePredicate(predicate);
+        return (T) this;
+    }
+    
+    @Override
+    public boolean containsMouse(double mouseX, double mouseY) {
+        if (containsMousePredicate != null)
+            return containsMousePredicate.test((T) this, new Point(mouseX, mouseY));
+        return super.containsMouse(mouseX, mouseY);
+    }
+}
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/BurningFire.java b/src/main/java/me/shedaniel/rei/api/widgets/BurningFire.java
index 8ea7759e9..fab8f95b9 100644
--- a/src/main/java/me/shedaniel/rei/api/widgets/BurningFire.java
+++ b/src/main/java/me/shedaniel/rei/api/widgets/BurningFire.java
@@ -24,12 +24,19 @@
 package me.shedaniel.rei.api.widgets;
 
 import me.shedaniel.rei.gui.widget.WidgetWithBounds;
+import org.jetbrains.annotations.NotNull;
 
 public abstract class BurningFire extends WidgetWithBounds {
+    /**
+     * @return the x coordinate for the top left corner of this widget.
+     */
     public final int getX() {
         return getBounds().getX();
     }
     
+    /**
+     * @return the y coordinate for the top left corner of this widget.
+     */
     public final int getY() {
         return getBounds().getY();
     }
@@ -42,16 +49,17 @@ public abstract class BurningFire extends WidgetWithBounds {
     /**
      * Sets the animation duration in milliseconds.
      *
-     * @param animationDurationMS animation duration in milliseconds, animation is disabled when below or equals to 0
+     * @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
+     * @param animationDurationMS animation duration in milliseconds, animation is disabled when below or equals to 0.
+     * @return the arrow itself.
      */
+    @NotNull
     public final BurningFire animationDurationMS(double animationDurationMS) {
         setAnimationDuration(animationDurationMS);
         return this;
@@ -60,9 +68,10 @@ public abstract class BurningFire extends WidgetWithBounds {
     /**
      * 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
+     * @param animationDurationTicks animation duration in ticks, animation is disabled when below or equals to 0.
+     * @return the arrow itself.
      */
+    @NotNull
     public final BurningFire animationDurationTicks(double animationDurationTicks) {
         return animationDurationMS(animationDurationTicks * 50);
     }
@@ -70,8 +79,9 @@ public abstract class BurningFire extends WidgetWithBounds {
     /**
      * Disables the animation.
      *
-     * @return the arrow itself
+     * @return the arrow itself.
      */
+    @NotNull
     public final BurningFire disableAnimation() {
         return animationDurationMS(-1);
     }
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Button.java b/src/main/java/me/shedaniel/rei/api/widgets/Button.java
new file mode 100644
index 000000000..2bf51e5bc
--- /dev/null
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Button.java
@@ -0,0 +1,160 @@
+package me.shedaniel.rei.api.widgets;
+
+import me.shedaniel.math.api.Point;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.OptionalInt;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public abstract class Button extends BaseWidget<Button> {
+    public abstract void setTextColor(@Nullable BiFunction<@NotNull Button, @NotNull Point, @NotNull Integer> textColorFunction);
+    
+    public final Button textColor(@Nullable BiFunction<@NotNull Button, @NotNull Point, @NotNull Integer> textColorFunction) {
+        setTextColor(textColorFunction);
+        return this;
+    }
+    
+    public abstract int getTextColor(Point mouse);
+    
+    public abstract void setTextureId(@Nullable BiFunction<@NotNull Button, @NotNull Point, @NotNull Integer> textureIdFunction);
+    
+    public final Button textureId(@Nullable BiFunction<@NotNull Button, @NotNull Point, @NotNull Integer> textureIdFunction) {
+        setTextureId(textureIdFunction);
+        return this;
+    }
+    
+    public abstract int getTextureId(Point mouse);
+    
+    public abstract void onClick();
+    
+    public abstract boolean isEnabled();
+    
+    public abstract void setEnabled(boolean enabled);
+    
+    public final Button enabled(boolean enabled) {
+        setEnabled(enabled);
+        return this;
+    }
+    
+    public abstract OptionalInt getTint();
+    
+    public abstract void setTint(int tint);
+    
+    public abstract void removeTint();
+    
+    public final Button tint(@Nullable Integer tint) {
+        if (tint == null)
+            removeTint();
+        else setTint(tint);
+        return this;
+    }
+    
+    @NotNull
+    public abstract String getText();
+    
+    public abstract void setText(@NotNull String text);
+    
+    @NotNull
+    public final Button text(@NotNull String text) {
+        setText(text);
+        return this;
+    }
+    
+    @Nullable
+    public abstract Consumer<Button> getOnClick();
+    
+    public abstract void setOnClick(@Nullable Consumer<Button> onClick);
+    
+    @NotNull
+    public final Button onClick(@Nullable Consumer<Button> onClick) {
+        setOnClick(onClick);
+        return this;
+    }
+    
+    @Nullable
+    public abstract Consumer<Button> getOnRender();
+    
+    public abstract void setOnRender(@Nullable Consumer<Button> onRender);
+    
+    @NotNull
+    public final Button onRender(@Nullable Consumer<Button> onRender) {
+        setOnRender(onRender);
+        return this;
+    }
+    
+    /**
+     * @return whether the button is focusable by pressing tab, ignored if not clickable.
+     */
+    public abstract boolean isFocusable();
+    
+    /**
+     * Sets whether the button is focusable by pressing tab, ignored if not clickable.
+     *
+     * @param focusable whether the button is focusable by pressing tab, ignored if not clickable.
+     */
+    public abstract void setFocusable(boolean focusable);
+    
+    /**
+     * Sets whether the button is focusable by pressing tab, ignored if not clickable.
+     *
+     * @param focusable whether the label is focusable by pressing tab, ignored if not clickable.
+     * @return the button itself.
+     */
+    @NotNull
+    public final Button focusable(boolean focusable) {
+        setFocusable(focusable);
+        return this;
+    }
+    
+    /**
+     * @return the tooltip from the current tooltip function, null if no tooltip.
+     */
+    @Nullable
+    public abstract String getTooltip();
+    
+    /**
+     * Sets the tooltip function used to get the tooltip.
+     *
+     * @param tooltip the tooltip function used to get the tooltip.
+     */
+    public abstract void setTooltip(@Nullable Function<@NotNull Button, @Nullable String> tooltip);
+    
+    /**
+     * Sets the tooltip.
+     *
+     * @param tooltip the lines of tooltip.
+     * @return the button itself.
+     */
+    @NotNull
+    public final Button tooltipLines(@NotNull String... tooltip) {
+        return tooltipLine(String.join("\n", tooltip));
+    }
+    
+    /**
+     * Sets the tooltip.
+     *
+     * @param tooltip the line of tooltip.
+     * @return the button itself.
+     */
+    @NotNull
+    public final Button tooltipLine(@Nullable String tooltip) {
+        return tooltipSupplier(label -> tooltip);
+    }
+    
+    /**
+     * Sets the tooltip function.
+     *
+     * @param tooltip the tooltip function used to get the tooltip.
+     * @return the button itself.
+     */
+    @NotNull
+    public final Button tooltipSupplier(@Nullable Function<@NotNull Button, @Nullable String> tooltip) {
+        setTooltip(tooltip);
+        return this;
+    }
+    
+    public abstract boolean isFocused();
+}
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Label.java b/src/main/java/me/shedaniel/rei/api/widgets/Label.java
index 8d4d0247f..e51f504e9 100644
--- a/src/main/java/me/shedaniel/rei/api/widgets/Label.java
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Label.java
@@ -37,76 +37,179 @@ public abstract class Label extends WidgetWithBounds {
     public static final int CENTER = 0;
     public static final int RIGHT_ALIGNED = 1;
     
+    /**
+     * @return whether the label is clickable, ignores if onClick is set.
+     */
     public abstract boolean isClickable();
     
+    /**
+     * Sets whether the label is clickable, ignores if onClick is set.
+     *
+     * @param clickable whether the label is clickable.
+     */
     public abstract void setClickable(boolean clickable);
     
+    /**
+     * Sets the label as clickable, ignores if onClick is set.
+     *
+     * @return the label itself.
+     */
+    @NotNull
     public final Label clickable() {
         return clickable(true);
     }
     
+    /**
+     * Sets whether the label is clickable, ignores if onClick is set.
+     *
+     * @param clickable whether the label is clickable.
+     * @return the label itself.
+     */
+    @NotNull
     public final Label clickable(boolean clickable) {
         setClickable(clickable);
         return this;
     }
     
+    /**
+     * @return the consumer on click, only applicable if the label is clickable, null if not set.
+     */
     @Nullable
     public abstract Consumer<Label> getOnClick();
     
+    /**
+     * Sets the on click consumer, only applicable if the label is clickable.
+     *
+     * @param onClick the on click consumer, only applicable if the label is clickable.
+     */
     public abstract void setOnClick(@Nullable Consumer<Label> onClick);
     
+    /**
+     * Sets the on click consumer, only applicable if the label is clickable.
+     *
+     * @param onClick the on click consumer, only applicable if the label is clickable.
+     * @return the label itself.
+     */
+    @NotNull
     public final Label onClick(@Nullable Consumer<Label> onClick) {
         setOnClick(onClick);
         return this;
     }
     
+    /**
+     * @return the consumer before render, null if not set.
+     */
     @Nullable
     public abstract Consumer<Label> getOnRender();
     
+    /**
+     * Sets the consumer before render.
+     *
+     * @param onRender the consumer before render.
+     */
     public abstract void setOnRender(@Nullable Consumer<Label> onRender);
     
+    /**
+     * Sets the consumer before render.
+     *
+     * @param onRender the consumer before render.
+     * @return the label itself.
+     */
+    @NotNull
     public final Label onRender(@Nullable Consumer<Label> onRender) {
         setOnRender(onRender);
         return this;
     }
     
+    /**
+     * @return whether the label is focusable by pressing tab, ignored if not clickable.
+     */
     public abstract boolean isFocusable();
     
+    /**
+     * Sets whether the label is focusable by pressing tab, ignored if not clickable.
+     *
+     * @param focusable whether the label is focusable by pressing tab, ignored if not clickable.
+     */
     public abstract void setFocusable(boolean focusable);
     
+    /**
+     * Sets whether the label is focusable by pressing tab, ignored if not clickable.
+     *
+     * @param focusable whether the label is focusable by pressing tab, ignored if not clickable.
+     * @return the label itself.
+     */
+    @NotNull
     public final Label focusable(boolean focusable) {
         setFocusable(focusable);
         return this;
     }
     
+    /**
+     * @return the tooltip from the current tooltip function, null if no tooltip.
+     */
     @Nullable
     public abstract String getTooltip();
     
+    /**
+     * Sets the tooltip function used to get the tooltip.
+     *
+     * @param tooltip the tooltip function used to get the tooltip.
+     */
     public abstract void setTooltip(@Nullable Function<Label, @Nullable String> tooltip);
     
+    /**
+     * Sets the tooltip.
+     *
+     * @param tooltip the lines of tooltip.
+     * @return the label itself.
+     */
+    @NotNull
     public final Label tooltipLines(@NotNull String... tooltip) {
         return tooltipLine(String.join("\n", tooltip));
     }
     
+    /**
+     * Sets the tooltip.
+     *
+     * @param tooltip the line of tooltip.
+     * @return the label itself.
+     */
+    @NotNull
     public final Label tooltipLine(@Nullable String tooltip) {
         return tooltipSupplier(label -> tooltip);
     }
     
+    /**
+     * Sets the tooltip function.
+     *
+     * @param tooltip the tooltip function used to get the tooltip.
+     * @return the label itself.
+     */
+    @NotNull
     public final Label tooltipSupplier(@Nullable Function<Label, @Nullable String> tooltip) {
         setTooltip(tooltip);
         return this;
     }
     
+    /**
+     * Gets the horizontal alignment of the label, defaulted as centered.
+     *
+     * @return {@link Label#LEFT_ALIGNED} if left aligned, {@link Label#CENTER} if centered or {@link Label#RIGHT_ALIGNED} if right aligned}.
+     */
     public abstract int getHorizontalAlignment();
     
+    @NotNull
     public final Label centered() {
         return horizontalAlignment(CENTER);
     }
     
+    @NotNull
     public final Label leftAligned() {
         return horizontalAlignment(LEFT_ALIGNED);
     }
     
+    @NotNull
     public final Label rightAligned() {
         return horizontalAlignment(RIGHT_ALIGNED);
     }
@@ -120,16 +223,19 @@ public abstract class Label extends WidgetWithBounds {
     
     public abstract boolean hasShadow();
     
+    @NotNull
     public final Label noShadow() {
         return shadow(false);
     }
     
+    @NotNull
     public final Label shadow() {
         return shadow(true);
     }
     
     public abstract void setShadow(boolean hasShadow);
     
+    @NotNull
     public final Label shadow(boolean hasShadow) {
         setShadow(hasShadow);
         return this;
@@ -139,10 +245,12 @@ public abstract class Label extends WidgetWithBounds {
     
     public abstract void setColor(int color);
     
+    @NotNull
     public final Label color(int lightModeColor, int darkModeColor) {
         return color(REIHelper.getInstance().isDarkThemeEnabled() ? darkModeColor : lightModeColor);
     }
     
+    @NotNull
     public final Label color(int color) {
         setColor(color);
         return this;
@@ -152,10 +260,12 @@ public abstract class Label extends WidgetWithBounds {
     
     public abstract void setHoveredColor(int hoveredColor);
     
+    @NotNull
     public final Label hoveredColor(int lightModeColor, int darkModeColor) {
         return hoveredColor(REIHelper.getInstance().isDarkThemeEnabled() ? darkModeColor : lightModeColor);
     }
     
+    @NotNull
     public final Label hoveredColor(int color) {
         setHoveredColor(color);
         return this;
@@ -174,6 +284,7 @@ public abstract class Label extends WidgetWithBounds {
     
     public abstract void setPoint(@NotNull Point point);
     
+    @NotNull
     public final Label point(@NotNull Point point) {
         setPoint(point);
         return this;
@@ -184,6 +295,7 @@ public abstract class Label extends WidgetWithBounds {
     
     public abstract void setText(@NotNull String text);
     
+    @NotNull
     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
index 441068b62..68d336ad0 100644
--- a/src/main/java/me/shedaniel/rei/api/widgets/Panel.java
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Panel.java
@@ -34,11 +34,13 @@ public abstract class Panel extends WidgetWithBounds {
     
     public abstract void setInnerColor(int innerColor);
     
+    @NotNull
     public final Panel innerColor(int innerColor) {
         setInnerColor(innerColor);
         return this;
     }
     
+    @NotNull
     public final Panel innerColor(int lightColor, int darkColor) {
         return innerColor(REIHelper.getInstance().isDarkThemeEnabled() ? darkColor : lightColor);
     }
@@ -47,6 +49,7 @@ public abstract class Panel extends WidgetWithBounds {
     
     public abstract void setXTextureOffset(int xTextureOffset);
     
+    @NotNull
     public final Panel xTextureOffset(int xTextureOffset) {
         setXTextureOffset(xTextureOffset);
         return this;
@@ -56,6 +59,7 @@ public abstract class Panel extends WidgetWithBounds {
     
     public abstract void setYTextureOffset(int yTextureOffset);
     
+    @NotNull
     public final Panel yTextureOffset(int yTextureOffset) {
         setYTextureOffset(yTextureOffset);
         return this;
@@ -65,11 +69,13 @@ public abstract class Panel extends WidgetWithBounds {
     
     public abstract void setColor(int color);
     
+    @NotNull
     public final Panel color(int color) {
         setColor(color);
         return this;
     }
     
+    @NotNull
     public final Panel color(int lightColor, int darkColor) {
         return color(REIHelper.getInstance().isDarkThemeEnabled() ? darkColor : lightColor);
     }
@@ -79,6 +85,7 @@ public abstract class Panel extends WidgetWithBounds {
     
     public abstract void setRendering(@NotNull Predicate<Panel> rendering);
     
+    @NotNull
     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
index 285dddd22..adbd0c49a 100644
--- a/src/main/java/me/shedaniel/rei/api/widgets/Slot.java
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Slot.java
@@ -27,22 +27,26 @@ import me.shedaniel.math.Point;
 import me.shedaniel.rei.api.EntryStack;
 import me.shedaniel.rei.gui.widget.QueuedTooltip;
 import me.shedaniel.rei.gui.widget.WidgetWithBounds;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.List;
 
 public abstract class Slot extends WidgetWithBounds {
+    @NotNull
     public Slot unmarkInputOrOutput() {
         setNoticeMark((byte) 0);
         return this;
     }
     
+    @NotNull
     public final Slot markInput() {
         setNoticeMark((byte) 1);
         return this;
     }
     
+    @NotNull
     public final Slot markOutput() {
         setNoticeMark((byte) 2);
         return this;
@@ -56,12 +60,19 @@ public abstract class Slot extends WidgetWithBounds {
     
     public abstract boolean isInteractable();
     
+    @NotNull
     public Slot interactable(boolean interactable) {
         setInteractable(interactable);
         return this;
     }
     
-    public Slot noInteractable() {
+    @NotNull
+    public final Slot noInteractable() {
+        return interactable(false);
+    }
+    
+    @NotNull
+    public final Slot notInteractable() {
         return interactable(false);
     }
     
@@ -69,12 +80,19 @@ public abstract class Slot extends WidgetWithBounds {
     
     public abstract boolean isInteractableFavorites();
     
+    @NotNull
     public Slot interactableFavorites(boolean interactableFavorites) {
         setInteractableFavorites(interactableFavorites);
         return this;
     }
     
-    public Slot noFavoritesInteractable() {
+    @NotNull
+    public final Slot noFavoritesInteractable() {
+        return interactableFavorites(false);
+    }
+    
+    @NotNull
+    public final Slot notFavoritesInteractable() {
         return interactableFavorites(false);
     }
     
@@ -82,11 +100,13 @@ public abstract class Slot extends WidgetWithBounds {
     
     public abstract boolean isHighlightEnabled();
     
+    @NotNull
     public final Slot highlightEnabled(boolean highlight) {
         setHighlightEnabled(highlight);
         return this;
     }
     
+    @NotNull
     public final Slot disableHighlight() {
         return highlightEnabled(false);
     }
@@ -95,11 +115,13 @@ public abstract class Slot extends WidgetWithBounds {
     
     public abstract boolean isTooltipsEnabled();
     
+    @NotNull
     public final Slot tooltipsEnabled(boolean tooltipsEnabled) {
         setTooltipsEnabled(tooltipsEnabled);
         return this;
     }
     
+    @NotNull
     public final Slot disableTooltips() {
         return tooltipsEnabled(false);
     }
@@ -108,21 +130,27 @@ public abstract class Slot extends WidgetWithBounds {
     
     public abstract boolean isBackgroundEnabled();
     
+    @NotNull
     public final Slot backgroundEnabled(boolean backgroundEnabled) {
         setBackgroundEnabled(backgroundEnabled);
         return this;
     }
     
+    @NotNull
     public final Slot disableBackground() {
         return backgroundEnabled(false);
     }
     
+    @NotNull
     public abstract Slot clearEntries();
     
+    @NotNull
     public abstract Slot entry(EntryStack stack);
     
+    @NotNull
     public abstract Slot entries(Collection<EntryStack> stacks);
     
+    @NotNull
     public abstract List<EntryStack> getEntries();
     
     /**
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Tooltip.java b/src/main/java/me/shedaniel/rei/api/widgets/Tooltip.java
index 147fcbf37..0abc3357f 100644
--- a/src/main/java/me/shedaniel/rei/api/widgets/Tooltip.java
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Tooltip.java
@@ -26,23 +26,28 @@ package me.shedaniel.rei.api.widgets;
 import me.shedaniel.math.Point;
 import me.shedaniel.rei.api.REIHelper;
 import me.shedaniel.rei.gui.widget.QueuedTooltip;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 import java.util.List;
 
 public interface Tooltip {
+    @NotNull
     static Tooltip create(Point point, Collection<String> texts) {
         return QueuedTooltip.create(point, texts);
     }
     
+    @NotNull
     static Tooltip create(Point point, String... texts) {
         return QueuedTooltip.create(point, texts);
     }
     
+    @NotNull
     static Tooltip create(Collection<String> texts) {
         return QueuedTooltip.create(texts);
     }
     
+    @NotNull
     static Tooltip create(String... texts) {
         return QueuedTooltip.create(texts);
     }
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Widgets.java b/src/main/java/me/shedaniel/rei/api/widgets/Widgets.java
index da1f1ad02..9ab31a290 100644
--- a/src/main/java/me/shedaniel/rei/api/widgets/Widgets.java
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Widgets.java
@@ -32,12 +32,19 @@ 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.gui.Drawable;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.Element;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.sound.SoundEvents;
+import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 public final class Widgets {
@@ -48,6 +55,32 @@ public final class Widgets {
         return new DrawableWidget(drawable);
     }
     
+    @NotNull
+    public static Widget wrapVanillaWidget(@NotNull Element element) {
+        return new VanillaWrappedWidget(element);
+    }
+    
+    private static class VanillaWrappedWidget extends Widget {
+        private Element element;
+        
+        public VanillaWrappedWidget(Element element) {
+            this.element = Objects.requireNonNull(element);
+        }
+        
+        @Override
+        public void render(int mouseX, int mouseY, float delta) {
+            if (element instanceof DrawableHelper)
+                ((DrawableHelper) element).setZOffset(getZ());
+            if (element instanceof Drawable)
+                ((Drawable) element).render(mouseX, mouseY, delta);
+        }
+        
+        @Override
+        public List<? extends Element> children() {
+            return Collections.singletonList(element);
+        }
+    }
+    
     @NotNull
     public static Widget createTexturedWidget(@NotNull Identifier identifier, @NotNull Rectangle bounds) {
         return createTexturedWidget(identifier, bounds, 0, 0);
@@ -167,6 +200,16 @@ public final class Widgets {
         return EntryWidget.create(point.x, point.y);
     }
     
+    @NotNull
+    public static Button createButton(@NotNull Rectangle bounds, @NotNull String text) {
+        return new ButtonWidget(bounds, text);
+    }
+    
+    @NotNull
+    public static Button createButton(@NotNull Rectangle bounds, @NotNull Text text) {
+        return new ButtonWidget(bounds, text);
+    }
+    
     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 730233796..6081901ce 100644
--- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
+++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
@@ -30,20 +30,24 @@ 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.Button;
 import me.shedaniel.rei.api.widgets.Tooltip;
 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.InternalWidgets;
 import me.shedaniel.rei.impl.ScreenHelper;
 import me.shedaniel.rei.impl.Weather;
 import me.shedaniel.rei.listeners.ContainerScreenHooks;
 import me.shedaniel.rei.utils.CollectionUtils;
+import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.client.util.NarratorManager;
@@ -60,6 +64,7 @@ import net.minecraft.util.Identifier;
 import net.minecraft.world.GameMode;
 import org.apache.logging.log4j.util.TriConsumer;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -105,9 +110,8 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
     };
     private Rectangle bounds;
     private Window window;
-    @Nullable private LateRenderedButton craftableToggleButton;
-    private LateRenderedButton configButton;
-    private ButtonWidget leftButton, rightButton;
+    private List<LateRenderable> lateRenderables = Lists.newArrayList();
+    private Button leftButton, rightButton;
     
     public static EntryListWidget getEntryListWidget() {
         return ENTRY_LIST_WIDGET;
@@ -144,131 +148,98 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
         this.widgets.add(ScreenHelper.getSearchField());
         ScreenHelper.getSearchField().setChangedListener(s -> ENTRY_LIST_WIDGET.updateSearch(s, false));
         if (!ConfigObject.getInstance().isEntryListWidgetScrolled()) {
-            widgets.add(leftButton = new ButtonWidget(new Rectangle(bounds.x, bounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 5, 16, 16), new TranslatableText("text.rei.left_arrow")) {
-                @Override
-                public void onPressed() {
-                    ENTRY_LIST_WIDGET.previousPage();
-                    if (ENTRY_LIST_WIDGET.getPage() < 0)
-                        ENTRY_LIST_WIDGET.setPage(ENTRY_LIST_WIDGET.getTotalPages() - 1);
-                    ENTRY_LIST_WIDGET.updateEntriesPosition();
-                }
-                
-                @Override
-                public boolean containsMouse(double mouseX, double mouseY) {
-                    return isNotInExclusionZones(mouseX, mouseY) && super.containsMouse(mouseX, mouseY);
-                }
-            }.tooltip(() -> I18n.translate("text.rei.previous_page")).canChangeFocuses(false));
-            widgets.add(rightButton = new ButtonWidget(new Rectangle(bounds.x + bounds.width - 18, bounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 5, 16, 16), new TranslatableText("text.rei.right_arrow")) {
-                @Override
-                public void onPressed() {
-                    ENTRY_LIST_WIDGET.nextPage();
-                    if (ENTRY_LIST_WIDGET.getPage() >= ENTRY_LIST_WIDGET.getTotalPages())
-                        ENTRY_LIST_WIDGET.setPage(0);
-                    ENTRY_LIST_WIDGET.updateEntriesPosition();
-                }
-                
-                @Override
-                public boolean containsMouse(double mouseX, double mouseY) {
-                    return isNotInExclusionZones(mouseX, mouseY) && super.containsMouse(mouseX, mouseY);
-                }
-            }.tooltip(() -> I18n.translate("text.rei.next_page")).canChangeFocuses(false));
+            widgets.add(leftButton = Widgets.createButton(new Rectangle(bounds.x, bounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 5, 16, 16), new TranslatableText("text.rei.left_arrow"))
+                    .onClick(button -> {
+                        ENTRY_LIST_WIDGET.previousPage();
+                        if (ENTRY_LIST_WIDGET.getPage() < 0)
+                            ENTRY_LIST_WIDGET.setPage(ENTRY_LIST_WIDGET.getTotalPages() - 1);
+                        ENTRY_LIST_WIDGET.updateEntriesPosition();
+                    })
+                    .containsMousePredicate((button, point) -> button.getBounds().contains(point) && isNotInExclusionZones(point.x, point.y))
+                    .tooltipLine(I18n.translate("text.rei.previous_page"))
+                    .focusable(false));
+            widgets.add(rightButton = Widgets.createButton(new Rectangle(bounds.x + bounds.width - 18, bounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 5, 16, 16), new TranslatableText("text.rei.right_arrow"))
+                    .onClick(button -> {
+                        ENTRY_LIST_WIDGET.nextPage();
+                        if (ENTRY_LIST_WIDGET.getPage() >= ENTRY_LIST_WIDGET.getTotalPages())
+                            ENTRY_LIST_WIDGET.setPage(0);
+                        ENTRY_LIST_WIDGET.updateEntriesPosition();
+                    })
+                    .containsMousePredicate((button, point) -> button.getBounds().contains(point) && isNotInExclusionZones(point.x, point.y))
+                    .tooltipLine(I18n.translate("text.rei.next_page"))
+                    .focusable(false));
         }
         
-        widgets.add(configButton = new LateRenderedButton(getConfigButtonArea(), NarratorManager.EMPTY) {
-            @Override
-            public void onPressed() {
-                if (Screen.hasShiftDown()) {
-                    ClientHelper.getInstance().setCheating(!ClientHelper.getInstance().isCheating());
-                    return;
-                }
-                ConfigManager.getInstance().openConfigScreen(ScreenHelper.getLastHandledScreen());
-            }
-            
-            @Override
-            public void render(int mouseX, int mouseY, float delta) {
-            }
-            
-            @Override
-            public void lateRender(int mouseX, int mouseY, float delta) {
-                setZOffset(600);
-                super.render(mouseX, mouseY, delta);
-                Rectangle bounds = getBounds();
-                if (ClientHelper.getInstance().isCheating() && RoughlyEnoughItemsCore.hasOperatorPermission()) {
-                    if (RoughlyEnoughItemsCore.hasPermissionToUsePackets())
-                        fillGradient(bounds.x + 1, bounds.y + 1, bounds.getMaxX() - 1, bounds.getMaxY() - 1, 721354752, 721354752);
-                    else
-                        fillGradient(bounds.x + 1, bounds.y + 1, bounds.getMaxX() - 1, bounds.getMaxY() - 1, 1476440063, 1476440063);
-                }
-                MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE);
-                RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-                blit(bounds.x + 3, bounds.y + 3, 0, 0, 14, 14);
-                setZOffset(0);
-            }
-            
-            @Override
-            public Optional<String> getTooltips() {
-                String tooltips = I18n.translate("text.rei.config_tooltip");
-                tooltips += "\n  ";
-                if (!ClientHelper.getInstance().isCheating())
-                    tooltips += "\n" + I18n.translate("text.rei.cheating_disabled");
-                else if (!RoughlyEnoughItemsCore.hasOperatorPermission())
-                    tooltips += "\n" + I18n.translate("text.rei.cheating_enabled_no_perms");
-                else if (RoughlyEnoughItemsCore.hasPermissionToUsePackets())
-                    tooltips += "\n" + I18n.translate("text.rei.cheating_enabled");
-                else
-                    tooltips += "\n" + I18n.translate("text.rei.cheating_limited_enabled");
-                return Optional.ofNullable(tooltips);
-            }
-            
-            @Override
-            public boolean changeFocus(boolean boolean_1) {
-                return false;
-            }
-            
-            @Override
-            public boolean containsMouse(double mouseX, double mouseY) {
-                return isNotInExclusionZones(mouseX, mouseY) && super.containsMouse(mouseX, mouseY);
-            }
-        });
+        final Rectangle configButtonArea = getConfigButtonArea();
+        LateRenderable tmp;
+        widgets.add((Widget) (tmp = InternalWidgets.wrapLateRenderable(InternalWidgets.mergeWidgets(
+                Widgets.createButton(configButtonArea, NarratorManager.EMPTY)
+                        .onClick(button -> {
+                            if (Screen.hasShiftDown()) {
+                                ClientHelper.getInstance().setCheating(!ClientHelper.getInstance().isCheating());
+                                return;
+                            }
+                            ConfigManager.getInstance().openConfigScreen(ScreenHelper.getLastHandledScreen());
+                        })
+                        .onRender(button -> {
+                            if (ClientHelper.getInstance().isCheating() && RoughlyEnoughItemsCore.hasOperatorPermission()) {
+                                button.setTint(RoughlyEnoughItemsCore.hasPermissionToUsePackets() ? 721354752 : 1476440063);
+                            } else {
+                                button.removeTint();
+                            }
+                        })
+                        .focusable(false)
+                        .containsMousePredicate((button, point) -> button.getBounds().contains(point) && isNotInExclusionZones(point.x, point.y))
+                        .tooltipSupplier(button -> {
+                            String tooltips = I18n.translate("text.rei.config_tooltip");
+                            tooltips += "\n  ";
+                            if (!ClientHelper.getInstance().isCheating())
+                                tooltips += "\n" + I18n.translate("text.rei.cheating_disabled");
+                            else if (!RoughlyEnoughItemsCore.hasOperatorPermission())
+                                tooltips += "\n" + I18n.translate("text.rei.cheating_enabled_no_perms");
+                            else if (RoughlyEnoughItemsCore.hasPermissionToUsePackets())
+                                tooltips += "\n" + I18n.translate("text.rei.cheating_enabled");
+                            else
+                                tooltips += "\n" + I18n.translate("text.rei.cheating_limited_enabled");
+                            return tooltips;
+                        }),
+                Widgets.createDrawableWidget((helper, mouseX, mouseY, delta) -> {
+                    helper.setZOffset(helper.getZOffset() + 1);
+                    MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE);
+                    helper.blit(configButtonArea.x + 3, configButtonArea.y + 3, 0, 0, 14, 14);
+                })
+                )
+        )));
+        ((Widget) tmp).setZ(600);
+        lateRenderables.add(tmp);
+//        widgets.add((Widget) (tmp = InternalWidgets.wrapLateRenderable(Widgets.createTexturedWidget(CHEST_GUI_TEXTURE, configButtonArea.x + 3, configButtonArea.y + 3, 0, 0, 14, 14))));
+//        widgets.add((Widget) (tmp = InternalWidgets.wrapLateRenderable(Widgets.createDrawableWidget((helper, mouseX, mouseY, delta) -> {
+//            RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+//            MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE);
+//            helper.blit(configButtonArea.x + 3, configButtonArea.y + 3, 0, 0, 14, 14);
+//        }))));
+//        ((Widget) tmp).setZ(600);
+//        lateRenderables.add(tmp);
         if (ConfigObject.getInstance().doesShowUtilsButtons()) {
-            widgets.add(new ButtonWidget(ConfigObject.getInstance().isLowerConfigButton() ? new Rectangle(ConfigObject.getInstance().isLeftHandSidePanel() ? window.getScaledWidth() - 30 : 10, 10, 20, 20) : new Rectangle(ConfigObject.getInstance().isLeftHandSidePanel() ? window.getScaledWidth() - 55 : 35, 10, 20, 20), NarratorManager.EMPTY) {
-                @Override
-                public void onPressed() {
-                    MinecraftClient.getInstance().player.sendChatMessage(ConfigObject.getInstance().getGamemodeCommand().replaceAll("\\{gamemode}", getNextGameMode(Screen.hasShiftDown()).getName()));
-                }
-                
-                @Override
-                public void render(int mouseX, int mouseY, float delta) {
-                    setText(getGameModeShortText(getCurrentGameMode()));
-                    super.render(mouseX, mouseY, delta);
-                }
-                
-                @Override
-                public boolean containsMouse(double mouseX, double mouseY) {
-                    return isNotInExclusionZones(mouseX, mouseY) && super.containsMouse(mouseX, mouseY);
-                }
-            }.tooltip(() -> I18n.translate("text.rei.gamemode_button.tooltip", getGameModeText(getNextGameMode(Screen.hasShiftDown())))).canChangeFocuses(false));
+            widgets.add(Widgets.createButton(ConfigObject.getInstance().isLowerConfigButton() ? new Rectangle(ConfigObject.getInstance().isLeftHandSidePanel() ? window.getScaledWidth() - 30 : 10, 10, 20, 20) : new Rectangle(ConfigObject.getInstance().isLeftHandSidePanel() ? window.getScaledWidth() - 55 : 35, 10, 20, 20), NarratorManager.EMPTY)
+                    .onClick(button -> MinecraftClient.getInstance().player.sendChatMessage(ConfigObject.getInstance().getGamemodeCommand().replaceAll("\\{gamemode}", getNextGameMode(Screen.hasShiftDown()).getName())))
+                    .onRender(button -> button.setText(getGameModeShortText(getCurrentGameMode())))
+                    .focusable(false)
+                    .tooltipLine(I18n.translate("text.rei.gamemode_button.tooltip", getGameModeText(getNextGameMode(Screen.hasShiftDown()))))
+                    .containsMousePredicate((button, point) -> button.getBounds().contains(point) && isNotInExclusionZones(point.x, point.y)));
             int xxx = ConfigObject.getInstance().isLeftHandSidePanel() ? window.getScaledWidth() - 30 : 10;
             for (Weather weather : Weather.values()) {
-                widgets.add(new ButtonWidget(new Rectangle(xxx, 35, 20, 20), NarratorManager.EMPTY) {
-                    @Override
-                    public void onPressed() {
-                        MinecraftClient.getInstance().player.sendChatMessage(ConfigObject.getInstance().getWeatherCommand().replaceAll("\\{weather}", weather.name().toLowerCase(Locale.ROOT)));
-                    }
-                    
-                    @Override
-                    public void render(int mouseX, int mouseY, float delta) {
-                        super.render(mouseX, mouseY, delta);
-                        MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE);
-                        RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-                        blit(getBounds().x + 3, getBounds().y + 3, weather.getId() * 14, 14, 14, 14);
-                    }
-                    
-                    @Override
-                    public boolean containsMouse(double mouseX, double mouseY) {
-                        return isNotInExclusionZones(mouseX, mouseY) && super.containsMouse(mouseX, mouseY);
-                    }
-                }.tooltip(() -> I18n.translate("text.rei.weather_button.tooltip", I18n.translate(weather.getTranslateKey()))).canChangeFocuses(false));
+                Button weatherButton;
+                widgets.add(weatherButton = Widgets.createButton(new Rectangle(xxx, 35, 20, 20), NarratorManager.EMPTY)
+                        .onClick(button -> MinecraftClient.getInstance().player.sendChatMessage(ConfigObject.getInstance().getWeatherCommand().replaceAll("\\{weather}", weather.name().toLowerCase(Locale.ROOT))))
+                        .tooltipLine(I18n.translate("text.rei.weather_button.tooltip", I18n.translate(weather.getTranslateKey())))
+                        .focusable(false)
+                        .containsMousePredicate((button, point) -> button.getBounds().contains(point) && isNotInExclusionZones(point.x, point.y)));
+                widgets.add(Widgets.createDrawableWidget((helper, mouseX, mouseY, delta) -> {
+                    MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE);
+                    RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+                    helper.blit(weatherButton.getBounds().x + 3, weatherButton.getBounds().y + 3, weather.getId() * 14, 14, 14, 14);
+                }));
                 xxx += ConfigObject.getInstance().isLeftHandSidePanel() ? -25 : 25;
             }
         }
@@ -282,20 +253,27 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
             }));
         }
         if (ConfigObject.getInstance().isCraftableFilterEnabled()) {
-            this.widgets.add(craftableToggleButton = new CraftableToggleButtonWidget(getCraftableToggleArea()) {
-                @Override
-                public void onPressed() {
-                    ConfigManager.getInstance().toggleCraftableOnly();
-                    ENTRY_LIST_WIDGET.updateSearch(ScreenHelper.getSearchField().getText(), true);
-                }
-                
-                @Override
-                public boolean containsMouse(double mouseX, double mouseY) {
-                    return isNotInExclusionZones(mouseX, mouseY) && super.containsMouse(mouseX, mouseY);
-                }
-            });
-        } else {
-            craftableToggleButton = null;
+            Rectangle area = getCraftableToggleArea();
+            ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
+            ItemStack icon = new ItemStack(Blocks.CRAFTING_TABLE);
+            this.widgets.add((Widget) (tmp = InternalWidgets.wrapLateRenderable(InternalWidgets.mergeWidgets(
+                    Widgets.createButton(area, NarratorManager.EMPTY)
+                            .focusable(false)
+                            .onClick(button -> {
+                                ConfigManager.getInstance().toggleCraftableOnly();
+                                ENTRY_LIST_WIDGET.updateSearch(ScreenHelper.getSearchField().getText(), true);
+                            })
+                            .onRender(button -> button.setTint(ConfigManager.getInstance().isCraftableOnlyEnabled() ? 939579655 : 956235776))
+                            .containsMousePredicate((button, point) -> button.getBounds().contains(point) && isNotInExclusionZones(point.x, point.y))
+                            .tooltipSupplier(button -> I18n.translate(ConfigManager.getInstance().isCraftableOnlyEnabled() ? "text.rei.showing_craftable" : "text.rei.showing_all")),
+                    Widgets.createDrawableWidget((helper, mouseX, mouseY, delta) -> {
+                        itemRenderer.zOffset = helper.getZOffset();
+                        itemRenderer.renderGuiItemIcon(icon, area.x + 2, area.y + 2);
+                        itemRenderer.zOffset = 0.0F;
+                    }))
+            )));
+            ((Widget) tmp).setZ(600);
+            lateRenderables.add(tmp);
         }
     }
     
@@ -387,6 +365,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
         return I18n.translate(String.format("%s%s", "text.rei.", ClientHelper.getInstance().isCheating() ? "cheat" : "nocheat"));
     }
     
+    @NotNull
     @Override
     public Rectangle getBounds() {
         return bounds;
@@ -438,9 +417,9 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
     public void lateRender(int mouseX, int mouseY, float delta) {
         if (ScreenHelper.isOverlayVisible()) {
             ScreenHelper.getSearchField().laterRender(mouseX, mouseY, delta);
-            if (craftableToggleButton != null)
-                craftableToggleButton.lateRender(mouseX, mouseY, delta);
-            configButton.lateRender(mouseX, mouseY, delta);
+            for (LateRenderable lateRenderable : lateRenderables) {
+                lateRenderable.lateRender(mouseX, mouseY, delta);
+            }
         }
         Screen currentScreen = MinecraftClient.getInstance().currentScreen;
         if (!(currentScreen instanceof RecipeViewingScreen) || !((RecipeViewingScreen) currentScreen).choosePageActivated)
@@ -478,8 +457,10 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
     public void renderWidgets(int int_1, int int_2, float float_1) {
         if (!ScreenHelper.isOverlayVisible())
             return;
-        if (!ConfigObject.getInstance().isEntryListWidgetScrolled())
-            leftButton.enabled = rightButton.enabled = ENTRY_LIST_WIDGET.getTotalPages() > 1;
+        if (!ConfigObject.getInstance().isEntryListWidgetScrolled()) {
+            leftButton.setEnabled(ENTRY_LIST_WIDGET.getTotalPages() > 1);
+            rightButton.setEnabled(ENTRY_LIST_WIDGET.getTotalPages() > 1);
+        }
         for (Widget widget : widgets) {
             widget.render(int_1, int_2, float_1);
         }
@@ -491,10 +472,10 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
             return false;
         if (isInside(PointHelper.ofMouse())) {
             if (!ConfigObject.getInstance().isEntryListWidgetScrolled()) {
-                if (amount > 0 && leftButton.enabled)
-                    leftButton.onPressed();
-                else if (amount < 0 && rightButton.enabled)
-                    rightButton.onPressed();
+                if (amount > 0 && leftButton.isEnabled())
+                    leftButton.onClick();
+                else if (amount < 0 && rightButton.isEnabled())
+                    rightButton.onClick();
                 else
                     return false;
                 return true;
diff --git a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java
index 3c5322254..f146e9fef 100644
--- a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java
@@ -31,7 +31,6 @@ 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.Widget;
 import me.shedaniel.rei.gui.widget.WidgetWithBounds;
 import me.shedaniel.rei.impl.ScreenHelper;
@@ -46,6 +45,7 @@ import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 import java.util.List;
@@ -103,19 +103,12 @@ public class PreRecipeViewingScreen extends Screen {
     protected void init() {
         this.children.clear();
         this.widgets.clear();
-        this.widgets.add(new ButtonWidget(new Rectangle(width / 2 - 100, height - 40, 200, 20), NarratorManager.EMPTY) {
-            @Override
-            public void render(int mouseX, int mouseY, float delta) {
-                enabled = isSet;
-                setText(enabled ? I18n.translate("text.rei.select") : I18n.translate("config.roughlyenoughitems.recipeScreenType.unset"));
-                super.render(mouseX, mouseY, delta);
-            }
-            
-            @Override
-            public void onPressed() {
-                callback.accept(original);
-            }
-        });
+        this.widgets.add(Widgets.createButton(new Rectangle(width / 2 - 100, height - 40, 200, 20), NarratorManager.EMPTY)
+                .onRender(button -> {
+                    button.setEnabled(isSet);
+                    button.setText(isSet ? I18n.translate("text.rei.select") : I18n.translate("config.roughlyenoughitems.recipeScreenType.unset"));
+                })
+                .onClick(button -> callback.accept(original)));
         this.widgets.add(new ScreenTypeSelection(width / 2 - 200 - 5, height / 2 - 112 / 2 - 10, 0));
         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));
@@ -187,6 +180,7 @@ public class PreRecipeViewingScreen extends Screen {
             this.v = v;
         }
         
+        @NotNull
         @Override
         public Rectangle getBounds() {
             return bounds;
diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java
index 112c652f3..fd2085f74 100644
--- a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java
@@ -31,10 +31,15 @@ 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.Button;
 import me.shedaniel.rei.api.widgets.Panel;
 import me.shedaniel.rei.api.widgets.Widgets;
-import me.shedaniel.rei.gui.widget.*;
+import me.shedaniel.rei.gui.widget.EntryWidget;
+import me.shedaniel.rei.gui.widget.RecipeChoosePageWidget;
+import me.shedaniel.rei.gui.widget.TabWidget;
+import me.shedaniel.rei.gui.widget.Widget;
 import me.shedaniel.rei.impl.ClientHelperImpl;
+import me.shedaniel.rei.impl.InternalWidgets;
 import me.shedaniel.rei.impl.ScreenHelper;
 import me.shedaniel.rei.impl.widgets.PanelWidget;
 import me.shedaniel.rei.utils.CollectionUtils;
@@ -82,7 +87,7 @@ public class RecipeViewingScreen extends Screen implements RecipeScreen {
     private Rectangle bounds;
     @Nullable
     private Panel workingStationsBaseWidget;
-    private ButtonWidget recipeBack, recipeNext, categoryBack, categoryNext;
+    private Button recipeBack, recipeNext, categoryBack, categoryNext;
     private EntryStack ingredientStackToNotice = EntryStack.empty();
     private EntryStack resultStackToNotice = EntryStack.empty();
     
@@ -174,13 +179,13 @@ public class RecipeViewingScreen extends Screen implements RecipeScreen {
         if (choosePageActivated)
             return recipeChoosePageWidget.keyPressed(int_1, int_2, int_3);
         else if (ConfigObject.getInstance().getNextPageKeybind().matchesKey(int_1, int_2)) {
-            if (recipeNext.enabled)
-                recipeNext.onPressed();
-            return recipeNext.enabled;
+            if (recipeNext.isEnabled())
+                recipeNext.onClick();
+            return recipeNext.isEnabled();
         } else if (ConfigObject.getInstance().getPreviousPageKeybind().matchesKey(int_1, int_2)) {
-            if (recipeBack.enabled)
-                recipeBack.onPressed();
-            return recipeBack.enabled;
+            if (recipeBack.isEnabled())
+                recipeBack.onClick();
+            return recipeBack.isEnabled();
         }
         for (Element element : children())
             if (element.keyPressed(int_1, int_2, int_3))
@@ -226,46 +231,51 @@ public class RecipeViewingScreen extends Screen implements RecipeScreen {
         }
         this.bounds = new Rectangle(width / 2 - guiWidth / 2, height / 2 - guiHeight / 2, guiWidth, guiHeight);
         this.page = MathHelper.clamp(page, 0, getTotalPages(selectedCategory) - 1);
-        ButtonWidget w, w2;
-        this.widgets.add(w = ButtonWidget.create(new Rectangle(bounds.x + 2, bounds.y - 16, 10, 10), new TranslatableText("text.rei.left_arrow"), buttonWidget -> {
-            categoryPages--;
-            if (categoryPages < 0)
-                categoryPages = MathHelper.ceil(categories.size() / (float) tabsPerPage) - 1;
-            RecipeViewingScreen.this.init();
-        }));
-        this.widgets.add(w2 = ButtonWidget.create(new Rectangle(bounds.x + bounds.width - 12, bounds.y - 16, 10, 10), new TranslatableText("text.rei.right_arrow"), buttonWidget -> {
-            categoryPages++;
-            if (categoryPages > MathHelper.ceil(categories.size() / (float) tabsPerPage) - 1)
-                categoryPages = 0;
-            RecipeViewingScreen.this.init();
-        }));
-        w.enabled = w2.enabled = categories.size() > tabsPerPage;
-        widgets.add(categoryBack = ButtonWidget.create(new Rectangle(bounds.getX() + 5, bounds.getY() + 5, 12, 12), new TranslatableText("text.rei.left_arrow"), buttonWidget -> {
-            int currentCategoryIndex = categories.indexOf(selectedCategory);
-            currentCategoryIndex--;
-            if (currentCategoryIndex < 0)
-                currentCategoryIndex = categories.size() - 1;
-            ClientHelperImpl.getInstance().openRecipeViewingScreen(categoriesMap, categories.get(currentCategoryIndex).getIdentifier(), ingredientStackToNotice, resultStackToNotice);
-        }).tooltip(() -> I18n.translate("text.rei.previous_category")));
+        this.widgets.add(Widgets.createButton(new Rectangle(bounds.x + 2, bounds.y - 16, 10, 10), new TranslatableText("text.rei.left_arrow"))
+                .onClick(button -> {
+                    categoryPages--;
+                    if (categoryPages < 0)
+                        categoryPages = MathHelper.ceil(categories.size() / (float) tabsPerPage) - 1;
+                    RecipeViewingScreen.this.init();
+                })
+                .enabled(categories.size() > tabsPerPage));
+        this.widgets.add(Widgets.createButton(new Rectangle(bounds.x + bounds.width - 12, bounds.y - 16, 10, 10), new TranslatableText("text.rei.right_arrow"))
+                .onClick(button -> {
+                    categoryPages++;
+                    if (categoryPages > MathHelper.ceil(categories.size() / (float) tabsPerPage) - 1)
+                        categoryPages = 0;
+                    RecipeViewingScreen.this.init();
+                })
+                .enabled(categories.size() > tabsPerPage));
+        widgets.add(categoryBack = Widgets.createButton(new Rectangle(bounds.getX() + 5, bounds.getY() + 5, 12, 12), new TranslatableText("text.rei.left_arrow"))
+                .onClick(button -> {
+                    int currentCategoryIndex = categories.indexOf(selectedCategory);
+                    currentCategoryIndex--;
+                    if (currentCategoryIndex < 0)
+                        currentCategoryIndex = categories.size() - 1;
+                    ClientHelperImpl.getInstance().openRecipeViewingScreen(categoriesMap, categories.get(currentCategoryIndex).getIdentifier(), ingredientStackToNotice, resultStackToNotice);
+                }).tooltipLine(I18n.translate("text.rei.previous_category")));
         widgets.add(Widgets.createClickableLabel(new Point(bounds.getCenterX(), bounds.getY() + 7), selectedCategory.getCategoryName(), clickableLabelWidget -> {
             ClientHelper.getInstance().executeViewAllRecipesKeyBind();
         }).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++;
-            if (currentCategoryI