From f701792763abfed441687b27ef91a62ed09abd9d Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Thu, 23 Apr 2020 16:49:33 +0800
Subject: Update to 20w17a

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 .../me/shedaniel/rei/RoughlyEnoughItemsCore.java   |   8 +-
 .../shedaniel/rei/RoughlyEnoughItemsNetwork.java   |   8 +-
 .../java/me/shedaniel/rei/api/ClientHelper.java    |   5 +-
 .../me/shedaniel/rei/api/DrawableConsumer.java     |   3 +-
 src/main/java/me/shedaniel/rei/api/EntryStack.java |   6 +-
 .../me/shedaniel/rei/api/OptimalEntryStack.java    |   9 +-
 .../shedaniel/rei/api/TransferRecipeCategory.java  |   3 +-
 .../java/me/shedaniel/rei/api/widgets/Button.java  |  15 +--
 .../java/me/shedaniel/rei/api/widgets/Label.java   |  15 +--
 .../java/me/shedaniel/rei/api/widgets/Tooltip.java |  11 ++-
 .../java/me/shedaniel/rei/api/widgets/Widgets.java |  14 +--
 .../shedaniel/rei/gui/ConfigReloadingScreen.java   |   9 +-
 .../shedaniel/rei/gui/ContainerScreenOverlay.java  | 108 +++++++++++----------
 .../me/shedaniel/rei/gui/OverlaySearchField.java   |  23 ++---
 .../shedaniel/rei/gui/PreRecipeViewingScreen.java  |  39 ++++----
 .../shedaniel/rei/gui/RecipeDisplayExporter.java   |  16 +--
 .../me/shedaniel/rei/gui/RecipeViewingScreen.java  |  61 ++++++------
 .../rei/gui/VillagerRecipeViewingScreen.java       |  25 ++---
 .../shedaniel/rei/gui/WarningAndErrorScreen.java   |  73 ++++++--------
 .../rei/gui/config/entry/FilteringEntry.java       |  60 ++++++------
 .../rei/gui/config/entry/NoFilteringEntry.java     |   8 +-
 .../gui/config/entry/RecipeScreenTypeEntry.java    |  21 ++--
 .../rei/gui/credits/CreditsEntryListWidget.java    |  29 +++---
 .../shedaniel/rei/gui/credits/CreditsScreen.java   |  19 ++--
 .../rei/gui/entries/SimpleRecipeEntry.java         |   9 +-
 .../me/shedaniel/rei/gui/subsets/SubsetsMenu.java  |   9 +-
 .../gui/subsets/entries/EntryStackMenuEntry.java   |  11 ++-
 .../rei/gui/subsets/entries/SubMenuEntry.java      |  16 +--
 .../rei/gui/toast/CopyRecipeIdentifierToast.java   |  11 ++-
 .../me/shedaniel/rei/gui/widget/ButtonWidget.java  |  38 ++++----
 .../rei/gui/widget/ClickableLabelWidget.java       |  21 ++--
 .../shedaniel/rei/gui/widget/EntryListWidget.java  | 101 ++++++++++---------
 .../me/shedaniel/rei/gui/widget/EntryWidget.java   |  41 +++++---
 .../rei/gui/widget/FavoritesListWidget.java        |  17 ++--
 .../me/shedaniel/rei/gui/widget/LabelWidget.java   |  33 ++++---
 .../me/shedaniel/rei/gui/widget/PanelWidget.java   |  23 ++---
 .../me/shedaniel/rei/gui/widget/QueuedTooltip.java |  19 ++--
 .../rei/gui/widget/RecipeArrowWidget.java          |   7 +-
 .../rei/gui/widget/RecipeChoosePageWidget.java     |  18 ++--
 .../me/shedaniel/rei/gui/widget/TabWidget.java     |  12 ++-
 .../shedaniel/rei/gui/widget/TextFieldWidget.java  |  60 ++++++------
 .../me/shedaniel/rei/impl/ClientHelperImpl.java    |  15 +--
 .../me/shedaniel/rei/impl/ConfigManagerImpl.java   |  30 +++---
 .../me/shedaniel/rei/impl/EmptyEntryStack.java     |   9 +-
 .../me/shedaniel/rei/impl/EntryRegistryImpl.java   |   2 +-
 .../me/shedaniel/rei/impl/FluidEntryStack.java     |  36 ++++---
 .../me/shedaniel/rei/impl/InternalWidgets.java     |  35 +++----
 .../java/me/shedaniel/rei/impl/ItemEntryStack.java |  39 ++++----
 .../java/me/shedaniel/rei/impl/ScreenHelper.java   |  10 +-
 .../java/me/shedaniel/rei/impl/SearchArgument.java |  15 +--
 .../me/shedaniel/rei/impl/widgets/ArrowWidget.java |   7 +-
 .../rei/impl/widgets/BurningFireWidget.java        |   7 +-
 .../shedaniel/rei/impl/widgets/ButtonWidget.java   |  59 +++++------
 .../shedaniel/rei/impl/widgets/DrawableWidget.java |   5 +-
 .../widgets/FillRectangleDrawableConsumer.java     |   3 +-
 .../me/shedaniel/rei/impl/widgets/LabelWidget.java |  82 ++++++++--------
 .../me/shedaniel/rei/impl/widgets/PanelWidget.java |  27 +++---
 .../rei/impl/widgets/TexturedDrawableConsumer.java |  20 ++--
 .../me/shedaniel/rei/plugin/DefaultPlugin.java     |   8 +-
 .../plugin/beacon/DefaultBeaconBaseCategory.java   |   9 +-
 .../rei/plugin/brewing/DefaultBrewingCategory.java |   6 +-
 .../rei/plugin/brewing/DefaultBrewingDisplay.java  |   8 +-
 .../plugin/campfire/DefaultCampfireCategory.java   |   3 +-
 .../composting/DefaultCompostingCategory.java      |   8 +-
 .../rei/plugin/cooking/DefaultCookingCategory.java |  14 +--
 .../rei/plugin/cooking/DefaultCookingDisplay.java  |   4 +-
 .../plugin/crafting/DefaultCraftingCategory.java   |  11 ++-
 .../rei/plugin/fuel/DefaultFuelCategory.java       |  10 +-
 .../information/DefaultInformationCategory.java    |  22 +++--
 69 files changed, 828 insertions(+), 710 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
index 25d5c716f..0fd28b111 100644
--- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
+++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
@@ -330,10 +330,10 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
             if (!alreadyAdded)
                 screenHooks.cloth_getChildren().add(ScreenHelper.getLastOverlay(true, false));
         });
-        ClothClientHooks.SCREEN_RENDER_POST.register((minecraftClient, screen, i, i1, v) -> {
+        ClothClientHooks.SCREEN_RENDER_POST.register((matrices, minecraftClient, screen, i, i1, v) -> {
             if (shouldReturn(screen))
                 return;
-            ScreenHelper.getLastOverlay().render(i, i1, v);
+            ScreenHelper.getLastOverlay().render(matrices, i, i1, v);
         });
         ClothClientHooks.SCREEN_MOUSE_DRAGGED.register((minecraftClient, screen, v, v1, i, v2, v3) -> {
             if (shouldReturn(screen))
@@ -371,12 +371,12 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
                 return ActionResult.SUCCESS;
             return ActionResult.PASS;
         });
-        ClothClientHooks.SCREEN_LATE_RENDER.register((minecraftClient, screen, i, i1, v) -> {
+        ClothClientHooks.SCREEN_LATE_RENDER.register((matrices, minecraftClient, screen, i, i1, v) -> {
             if (shouldReturn(screen))
                 return;
             if (!ScreenHelper.isOverlayVisible())
                 return;
-            ScreenHelper.getLastOverlay().lateRender(i, i1, v);
+            ScreenHelper.getLastOverlay().lateRender(matrices, i, i1, v);
         });
         ClothClientHooks.SCREEN_KEY_PRESSED.register((minecraftClient, screen, i, i1, i2) -> {
             if (shouldReturn(screen))
diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
index 2898983b7..bce41cdf1 100644
--- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
+++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
@@ -65,7 +65,7 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer {
             ServerSidePacketRegistry.INSTANCE.register(DELETE_ITEMS_PACKET, (packetContext, packetByteBuf) -> {
                 ServerPlayerEntity player = (ServerPlayerEntity) packetContext.getPlayer();
                 if (player.getServer().getPermissionLevel(player.getGameProfile()) < player.getServer().getOpPermissionLevel()) {
-                    player.sendMessage(new TranslatableText("text.rei.no_permission_cheat").formatted(Formatting.RED), false);
+                    player.sendMessage(new TranslatableText("text.rei.no_permission_cheat").method_27692(Formatting.RED), false);
                     return;
                 }
                 if (!player.inventory.getCursorStack().isEmpty())
@@ -74,7 +74,7 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer {
             ServerSidePacketRegistry.INSTANCE.register(CREATE_ITEMS_PACKET, (packetContext, packetByteBuf) -> {
                 ServerPlayerEntity player = (ServerPlayerEntity) packetContext.getPlayer();
                 if (player.getServer().getPermissionLevel(player.getGameProfile()) < player.getServer().getOpPermissionLevel()) {
-                    player.sendMessage(new TranslatableText("text.rei.no_permission_cheat").formatted(Formatting.RED), false);
+                    player.sendMessage(new TranslatableText("text.rei.no_permission_cheat").method_27692(Formatting.RED), false);
                     return;
                 }
                 ItemStack stack = packetByteBuf.readItemStack();
@@ -118,9 +118,9 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer {
                             ServerSidePacketRegistry.INSTANCE.sendToPlayer(player, NOT_ENOUGH_ITEMS_PACKET, buf);
                         }
                     } catch (IllegalStateException e) {
-                        player.sendSystemMessage(new TranslatableText(e.getMessage()).formatted(Formatting.RED));
+                        player.sendSystemMessage(new TranslatableText(e.getMessage()).method_27692(Formatting.RED));
                     } catch (Exception e) {
-                        player.sendSystemMessage(new TranslatableText("error.rei.internal.error", e.getMessage()).formatted(Formatting.RED));
+                        player.sendSystemMessage(new TranslatableText("error.rei.internal.error", e.getMessage()).method_27692(Formatting.RED));
                         e.printStackTrace();
                     }
                 } catch (Exception e) {
diff --git a/src/main/java/me/shedaniel/rei/api/ClientHelper.java b/src/main/java/me/shedaniel/rei/api/ClientHelper.java
index 20577b511..6d9fac19a 100644
--- a/src/main/java/me/shedaniel/rei/api/ClientHelper.java
+++ b/src/main/java/me/shedaniel/rei/api/ClientHelper.java
@@ -26,6 +26,7 @@ package me.shedaniel.rei.api;
 import me.shedaniel.rei.impl.ClientHelperImpl;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -129,7 +130,7 @@ public interface ClientHelper {
      * @param item the item to find
      * @return the mod name with blue and italic formatting
      */
-    String getFormattedModFromItem(Item item);
+    Text getFormattedModFromItem(Item item);
     
     /**
      * Gets the formatted mod from an identifier
@@ -137,7 +138,7 @@ public interface ClientHelper {
      * @param identifier the identifier to find
      * @return the mod name with blue and italic formatting
      */
-    String getFormattedModFromIdentifier(Identifier identifier);
+    Text getFormattedModFromIdentifier(Identifier identifier);
     
     /**
      * Gets the mod from an identifier
diff --git a/src/main/java/me/shedaniel/rei/api/DrawableConsumer.java b/src/main/java/me/shedaniel/rei/api/DrawableConsumer.java
index cef309c89..3aaf05ba6 100644
--- a/src/main/java/me/shedaniel/rei/api/DrawableConsumer.java
+++ b/src/main/java/me/shedaniel/rei/api/DrawableConsumer.java
@@ -24,11 +24,12 @@
 package me.shedaniel.rei.api;
 
 import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.util.math.MatrixStack;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * Consumer of a {@link DrawableHelper} and information of mouse and delta.
  */
 public interface DrawableConsumer {
-    void render(@NotNull DrawableHelper helper, int mouseX, int mouseY, float delta);
+    void render(@NotNull DrawableHelper helper, @NotNull MatrixStack matrices, int mouseX, int mouseY, float delta);
 }
diff --git a/src/main/java/me/shedaniel/rei/api/EntryStack.java b/src/main/java/me/shedaniel/rei/api/EntryStack.java
index 23c232ee1..66c711b3d 100644
--- a/src/main/java/me/shedaniel/rei/api/EntryStack.java
+++ b/src/main/java/me/shedaniel/rei/api/EntryStack.java
@@ -33,12 +33,14 @@ import me.shedaniel.rei.impl.EmptyEntryStack;
 import me.shedaniel.rei.impl.FluidEntryStack;
 import me.shedaniel.rei.impl.ItemEntryStack;
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.StringNbtReader;
+import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.registry.Registry;
@@ -248,7 +250,7 @@ public interface EntryStack {
         return null;
     }
     
-    void render(Rectangle bounds, int mouseX, int mouseY, float delta);
+    void render(MatrixStack matrices, Rectangle bounds, int mouseX, int mouseY, float delta);
     
     enum Type {
         ITEM,
@@ -266,7 +268,7 @@ public interface EntryStack {
         public static final Settings<Supplier<Boolean>> TOOLTIP_ENABLED = new Settings<>(TRUE);
         public static final Settings<Supplier<Boolean>> TOOLTIP_APPEND_MOD = new Settings<>(TRUE);
         public static final Settings<Supplier<Boolean>> RENDER_COUNTS = new Settings<>(TRUE);
-        public static final Settings<Function<EntryStack, List<String>>> TOOLTIP_APPEND_EXTRA = new Settings<>(stack -> Collections.emptyList());
+        public static final Settings<Function<EntryStack, List<Text>>> TOOLTIP_APPEND_EXTRA = new Settings<>(stack -> Collections.emptyList());
         public static final Settings<Function<EntryStack, String>> COUNTS = new Settings<>(stack -> null);
         
         private T defaultValue;
diff --git a/src/main/java/me/shedaniel/rei/api/OptimalEntryStack.java b/src/main/java/me/shedaniel/rei/api/OptimalEntryStack.java
index bade908d8..a7a4a4f04 100644
--- a/src/main/java/me/shedaniel/rei/api/OptimalEntryStack.java
+++ b/src/main/java/me/shedaniel/rei/api/OptimalEntryStack.java
@@ -24,19 +24,20 @@
 package me.shedaniel.rei.api;
 
 import me.shedaniel.math.Rectangle;
+import net.minecraft.client.util.math.MatrixStack;
 import org.jetbrains.annotations.ApiStatus;
 
 @ApiStatus.Internal
 public interface OptimalEntryStack {
-    default void optimisedRenderStart(float delta) {
+    default void optimisedRenderStart(MatrixStack matrices, float delta) {
     }
     
-    default void optimisedRenderBase(Rectangle bounds, int mouseX, int mouseY, float delta) {
+    default void optimisedRenderBase(MatrixStack matrices, Rectangle bounds, int mouseX, int mouseY, float delta) {
     }
     
-    default void optimisedRenderOverlay(Rectangle bounds, int mouseX, int mouseY, float delta) {
+    default void optimisedRenderOverlay(MatrixStack matrices, Rectangle bounds, int mouseX, int mouseY, float delta) {
     }
     
-    default void optimisedRenderEnd(float delta) {
+    default void optimisedRenderEnd(MatrixStack matrices, float delta) {
     }
 }
diff --git a/src/main/java/me/shedaniel/rei/api/TransferRecipeCategory.java b/src/main/java/me/shedaniel/rei/api/TransferRecipeCategory.java
index a841549ef..72fd09335 100644
--- a/src/main/java/me/shedaniel/rei/api/TransferRecipeCategory.java
+++ b/src/main/java/me/shedaniel/rei/api/TransferRecipeCategory.java
@@ -26,11 +26,12 @@ package me.shedaniel.rei.api;
 import it.unimi.dsi.fastutil.ints.IntList;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.gui.widget.Widget;
+import net.minecraft.client.util.math.MatrixStack;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.List;
 
 public interface TransferRecipeCategory<T extends RecipeDisplay> extends RecipeCategory<T> {
     @ApiStatus.OverrideOnly
-    void renderRedSlots(List<Widget> widgets, Rectangle bounds, T display, IntList redSlots);
+    void renderRedSlots(MatrixStack matrices, List<Widget> widgets, Rectangle bounds, T display, IntList redSlots);
 }
diff --git a/src/main/java/me/shedaniel/rei/api/widgets/Button.java b/src/main/java/me/shedaniel/rei/api/widgets/Button.java
index 24b3dd287..0a39cf91d 100644
--- a/src/main/java/me/shedaniel/rei/api/widgets/Button.java
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Button.java
@@ -24,10 +24,13 @@
 package me.shedaniel.rei.api.widgets;
 
 import me.shedaniel.math.Point;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.OptionalInt;
+import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -76,12 +79,12 @@ public abstract class Button extends BaseWidget<Button> {
     }
     
     @NotNull
-    public abstract String getText();
+    public abstract Text getText();
     
-    public abstract void setText(@NotNull String text);
+    public abstract void setText(@NotNull Text text);
     
     @NotNull
-    public final Button text(@NotNull String text) {
+    public final Button text(@NotNull Text text) {
         setText(text);
         return this;
     }
@@ -98,12 +101,12 @@ public abstract class Button extends BaseWidget<Button> {
     }
     
     @Nullable
-    public abstract Consumer<Button> getOnRender();
+    public abstract BiConsumer<MatrixStack, Button> getOnRender();
     
-    public abstract void setOnRender(@Nullable Consumer<Button> onRender);
+    public abstract void setOnRender(@Nullable BiConsumer<MatrixStack, Button> onRender);
     
     @NotNull
-    public final Button onRender(@Nullable Consumer<Button> onRender) {
+    public final Button onRender(@Nullable BiConsumer<MatrixStack, Button> onRender) {
         setOnRender(onRender);
         return this;
     }
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 e51f504e9..a4b296b54 100644
--- a/src/main/java/me/shedaniel/rei/api/widgets/Label.java
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Label.java
@@ -26,9 +26,12 @@ 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 net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -100,14 +103,14 @@ public abstract class Label extends WidgetWithBounds {
      * @return the consumer before render, null if not set.
      */
     @Nullable
-    public abstract Consumer<Label> getOnRender();
+    public abstract BiConsumer<MatrixStack, Label> getOnRender();
     
     /**
      * Sets the consumer before render.
      *
      * @param onRender the consumer before render.
      */
-    public abstract void setOnRender(@Nullable Consumer<Label> onRender);
+    public abstract void setOnRender(@Nullable BiConsumer<MatrixStack, Label> onRender);
     
     /**
      * Sets the consumer before render.
@@ -116,7 +119,7 @@ public abstract class Label extends WidgetWithBounds {
      * @return the label itself.
      */
     @NotNull
-    public final Label onRender(@Nullable Consumer<Label> onRender) {
+    public final Label onRender(@Nullable BiConsumer<MatrixStack, Label> onRender) {
         setOnRender(onRender);
         return this;
     }
@@ -291,12 +294,12 @@ public abstract class Label extends WidgetWithBounds {
     }
     
     @NotNull
-    public abstract String getText();
+    public abstract Text getText();
     
-    public abstract void setText(@NotNull String text);
+    public abstract void setText(@NotNull Text text);
     
     @NotNull
-    public final Label text(@NotNull String text) {
+    public final Label text(@NotNull Text text) {
         setText(text);
         return this;
     }
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 31f7db2d1..c81b0e0bf 100644
--- a/src/main/java/me/shedaniel/rei/api/widgets/Tooltip.java
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Tooltip.java
@@ -26,6 +26,7 @@ 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 net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
@@ -34,25 +35,25 @@ import java.util.List;
 public interface Tooltip {
     @SuppressWarnings("deprecation")
     @NotNull
-    static Tooltip create(Point point, Collection<String> texts) {
+    static Tooltip create(Point point, Collection<Text> texts) {
         return QueuedTooltip.create(point, texts);
     }
     
     @SuppressWarnings("deprecation")
     @NotNull
-    static Tooltip create(Point point, String... texts) {
+    static Tooltip create(Point point, Text... texts) {
         return QueuedTooltip.create(point, texts);
     }
     
     @SuppressWarnings("deprecation")
     @NotNull
-    static Tooltip create(Collection<String> texts) {
+    static Tooltip create(Collection<Text> texts) {
         return QueuedTooltip.create(texts);
     }
     
     @SuppressWarnings("deprecation")
     @NotNull
-    static Tooltip create(String... texts) {
+    static Tooltip create(Text... texts) {
         return QueuedTooltip.create(texts);
     }
     
@@ -60,7 +61,7 @@ public interface Tooltip {
     
     int getY();
     
-    List<String> getText();
+    List<Text> getText();
     
     default void queue() {
         REIHelper.getInstance().queueTooltip(this);
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 df4ddcb6f..489c4c887 100644
--- a/src/main/java/me/shedaniel/rei/api/widgets/Widgets.java
+++ b/src/main/java/me/shedaniel/rei/api/widgets/Widgets.java
@@ -36,6 +36,7 @@ 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.client.util.math.MatrixStack;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
@@ -68,11 +69,11 @@ public final class Widgets {
         }
         
         @Override
-        public void render(int mouseX, int mouseY, float delta) {
+        public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
             if (element instanceof DrawableHelper)
                 ((DrawableHelper) element).setZOffset(getZ());
             if (element instanceof Drawable)
-                ((Drawable) element).render(mouseX, mouseY, delta);
+                ((Drawable) element).render(matrices, mouseX, mouseY, delta);
         }
         
         @Override
@@ -127,12 +128,12 @@ public final class Widgets {
     }
     
     @NotNull
-    public static Label createLabel(@NotNull Point point, @NotNull String text) {
+    public static Label createLabel(@NotNull Point point, @NotNull Text text) {
         return new LabelWidget(point, text);
     }
     
     @NotNull
-    public static Label createClickableLabel(@NotNull Point point, @NotNull String text, @Nullable Consumer<Label> onClick) {
+    public static Label createClickableLabel(@NotNull Point point, @NotNull Text text, @Nullable Consumer<Label> onClick) {
         return new LabelWidget(point, text).clickable().onClick(onClick);
     }
     
@@ -200,11 +201,6 @@ 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);
diff --git a/src/main/java/me/shedaniel/rei/gui/ConfigReloadingScreen.java b/src/main/java/me/shedaniel/rei/gui/ConfigReloadingScreen.java
index f13cefede..bf2c07c8c 100644
--- a/src/main/java/me/shedaniel/rei/gui/ConfigReloadingScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/ConfigReloadingScreen.java
@@ -27,6 +27,7 @@ import me.shedaniel.rei.api.RecipeHelper;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.NarratorManager;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Util;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -46,11 +47,11 @@ public class ConfigReloadingScreen extends Screen {
     }
     
     @Override
-    public void render(int int_1, int int_2, float float_1) {
+    public void render(MatrixStack matrices, int int_1, int int_2, float float_1) {
         this.renderDirtBackground(0);
         if (!RecipeHelper.getInstance().arePluginsLoading())
             client.openScreen(parent);
-        this.drawCenteredString(this.textRenderer, I18n.translate("text.rei.config.is.reloading"), this.width / 2, this.height / 2 - 50, 16777215);
+        this.drawCenteredString(matrices, this.textRenderer, I18n.translate("text.rei.config.is.reloading"), this.width / 2, this.height / 2 - 50, 16777215);
         String string_3;
         switch ((int) (Util.getMeasuringTimeMs() / 300L % 4L)) {
             case 0:
@@ -64,8 +65,8 @@ public class ConfigReloadingScreen extends Screen {
             case 2:
                 string_3 = "o o O";
         }
-        this.drawCenteredString(this.textRenderer, string_3, this.width / 2, this.height / 2 - 41, 8421504);
-        super.render(int_1, int_2, float_1);
+        this.drawCenteredString(matrices, this.textRenderer, string_3, this.width / 2, this.height / 2 - 41, 8421504);
+        super.render(matrices, int_1, int_2, float_1);
     }
     
     @Override
diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
index e54801ff7..696af170b 100644
--- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
+++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
@@ -58,6 +58,8 @@ import net.minecraft.client.world.ClientWorld;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.sound.SoundEvents;
+import net.minecraft.text.LiteralText;
+import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Identifier;
@@ -81,31 +83,32 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
     public boolean shouldReInit = false;
     private int tooltipWidth;
     private int tooltipHeight;
-    private List<String> tooltipLines;
-    public final TriConsumer<Integer, Integer, Float> renderTooltipCallback = (x, y, aFloat) -> {
+    private List<Text> tooltipLines;
+    public final TriConsumer<MatrixStack, Point, Float> renderTooltipCallback = (matrices, mouse, aFloat) -> {
         RenderSystem.disableRescaleNormal();
         RenderSystem.disableDepthTest();
-        setZOffset(999);
-        this.fillGradient(x - 3, y - 4, x + tooltipWidth + 3, y - 3, -267386864, -267386864);
-        this.fillGradient(x - 3, y + tooltipHeight + 3, x + tooltipWidth + 3, y + tooltipHeight + 4, -267386864, -267386864);
-        this.fillGradient(x - 3, y - 3, x + tooltipWidth + 3, y + tooltipHeight + 3, -267386864, -267386864);
-        this.fillGradient(x - 4, y - 3, x - 3, y + tooltipHeight + 3, -267386864, -267386864);
-        this.fillGradient(x + tooltipWidth + 3, y - 3, x + tooltipWidth + 4, y + tooltipHeight + 3, -267386864, -267386864);
-        this.fillGradient(x - 3, y - 3 + 1, x - 3 + 1, y + tooltipHeight + 3 - 1, 1347420415, 1344798847);
-        this.fillGradient(x + tooltipWidth + 2, y - 3 + 1, x + tooltipWidth + 3, y + tooltipHeight + 3 - 1, 1347420415, 1344798847);
-        this.fillGradient(x - 3, y - 3, x + tooltipWidth + 3, y - 3 + 1, 1347420415, 1347420415);
-        this.fillGradient(x - 3, y + tooltipHeight + 2, x + tooltipWidth + 3, y + tooltipHeight + 3, 1344798847, 1344798847);
+        matrices.push();
+        matrices.translate(0, 0, 999);
+        int x = mouse.x;
+        int y = mouse.y;
+        this.fillGradient(matrices, x - 3, y - 4, x + tooltipWidth + 3, y - 3, -267386864, -267386864);
+        this.fillGradient(matrices, x - 3, y + tooltipHeight + 3, x + tooltipWidth + 3, y + tooltipHeight + 4, -267386864, -267386864);
+        this.fillGradient(matrices, x - 3, y - 3, x + tooltipWidth + 3, y + tooltipHeight + 3, -267386864, -267386864);
+        this.fillGradient(matrices, x - 4, y - 3, x - 3, y + tooltipHeight + 3, -267386864, -267386864);
+        this.fillGradient(matrices, x + tooltipWidth + 3, y - 3, x + tooltipWidth + 4, y + tooltipHeight + 3, -267386864, -267386864);
+        this.fillGradient(matrices, x - 3, y - 3 + 1, x - 3 + 1, y + tooltipHeight + 3 - 1, 1347420415, 1344798847);
+        this.fillGradient(matrices, x + tooltipWidth + 2, y - 3 + 1, x + tooltipWidth + 3, y + tooltipHeight + 3 - 1, 1347420415, 1344798847);
+        this.fillGradient(matrices, x - 3, y - 3, x + tooltipWidth + 3, y - 3 + 1, 1347420415, 1347420415);
+        this.fillGradient(matrices, x - 3, y + tooltipHeight + 2, x + tooltipWidth + 3, y + tooltipHeight + 3, 1344798847, 1344798847);
         int currentY = y;
-        MatrixStack matrixStack_1 = new MatrixStack();
         VertexConsumerProvider.Immediate immediate = VertexConsumerProvider.immediate(Tessellator.getInstance().getBuffer());
-        matrixStack_1.translate(0.0D, 0.0D, getZOffset());
-        Matrix4f matrix4f_1 = matrixStack_1.peek().getModel();
+        Matrix4f matrix = matrices.peek().getModel();
         for (int lineIndex = 0; lineIndex < tooltipLines.size(); lineIndex++) {
-            font.draw(tooltipLines.get(lineIndex), x, currentY, -1, true, matrix4f_1, immediate, false, 0, 15728880);
+            font.draw(tooltipLines.get(lineIndex), x, currentY, -1, true, matrix, immediate, false, 0, 15728880);
             currentY += lineIndex == 0 ? 12 : 10;
         }
         immediate.draw();
-        setZOffset(0);
+        matrices.pop();
         RenderSystem.enableDepthTest();
         RenderSystem.enableRescaleNormal();
     };
@@ -195,7 +198,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
                             }
                             ConfigManager.getInstance().openConfigScreen(REIHelper.getInstance().getPreviousHandledScreen());
                         })
-                        .onRender(button -> {
+                        .onRender((matrices, button) -> {
                             if (ClientHelper.getInstance().isCheating() && RoughlyEnoughItemsCore.hasOperatorPermission()) {
                                 button.setTint(RoughlyEnoughItemsCore.hasPermissionToUsePackets() ? 721354752 : 1476440063);
                             } else {
@@ -217,10 +220,10 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
                                 tooltips += "\n" + I18n.translate("text.rei.cheating_limited_enabled");
                             return tooltips;
                         }),
-                Widgets.createDrawableWidget((helper, mouseX, mouseY, delta) -> {
+                Widgets.createDrawableWidget((helper, matrices, mouseX, mouseY, delta) -> {
                     helper.setZOffset(helper.getZOffset() + 1);
                     MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE);
-                    helper.drawTexture(configButtonArea.x + 3, configButtonArea.y + 3, 0, 0, 14, 14);
+                    helper.drawTexture(matrices, configButtonArea.x + 3, configButtonArea.y + 3, 0, 0, 14, 14);
                 })
                 )
         ));
@@ -228,7 +231,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
         if (ConfigObject.getInstance().doesShowUtilsButtons()) {
             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())))
+                    .onRender((matrices, button) -> button.setText(new LiteralText(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)));
@@ -240,17 +243,17 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
                         .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) -> {
+                widgets.add(Widgets.createDrawableWidget((helper, matrices, mouseX, mouseY, delta) -> {
                     MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE);
                     RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-                    helper.drawTexture(weatherButton.getBounds().x + 3, weatherButton.getBounds().y + 3, weather.getId() * 14, 14, 14, 14);
+                    helper.drawTexture(matrices, weatherButton.getBounds().x + 3, weatherButton.getBounds().y + 3, weather.getId() * 14, 14, 14, 14);
                 }));
                 xxx += ConfigObject.getInstance().isLeftHandSidePanel() ? -25 : 25;
             }
         }
         subsetsButtonBounds = getSubsetsButtonBounds();
         if (ConfigObject.getInstance().isSubsetsEnabled()) {
-            widgets.add(InternalWidgets.wrapLateRenderable(Widgets.createButton(subsetsButtonBounds, ((ClientHelperImpl) ClientHelper.getInstance()).isAprilFools.get() ? I18n.translate("text.rei.tiny_potato") : I18n.translate("text.rei.subsets"))
+            widgets.add(InternalWidgets.wrapLateRenderable(Widgets.createButton(subsetsButtonBounds, ((ClientHelperImpl) ClientHelper.getInstance()).isAprilFools.get() ? new TranslatableText("text.rei.tiny_potato") : new TranslatableText("text.rei.subsets"))
                     .onClick(button -> {
                         if (subsetsMenu == null) {
                             wrappedSubsetsMenu = InternalWidgets.wrapTranslate(InternalWidgets.wrapLateRenderable(this.subsetsMenu = SubsetsMenu.createFromRegistry(new Point(this.subsetsButtonBounds.x, this.subsetsButtonBounds.getMaxY()))), 0, 0, 400);
@@ -263,12 +266,12 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
                     })));
         }
         if (!ConfigObject.getInstance().isEntryListWidgetScrolled()) {
-            widgets.add(Widgets.createClickableLabel(new Point(bounds.x + (bounds.width / 2), bounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 10), "", label -> {
+            widgets.add(Widgets.createClickableLabel(new Point(bounds.x + (bounds.width / 2), bounds.y + (ConfigObject.getInstance().getSearchFieldLocation() == SearchFieldLocation.TOP_SIDE ? 24 : 0) + 10), NarratorManager.EMPTY, label -> {
                 ENTRY_LIST_WIDGET.setPage(0);
                 ENTRY_LIST_WIDGET.updateEntriesPosition();
-            }).tooltipLine(I18n.translate("text.rei.go_back_first_page")).focusable(false).onRender(label -> {
+            }).tooltipLine(I18n.translate("text.rei.go_back_first_page")).focusable(false).onRender((matrices, 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)));
+                label.setText(new LiteralText(String.format("%s/%s", ENTRY_LIST_WIDGET.getPage() + 1, Math.max(ENTRY_LIST_WIDGET.getTotalPages(), 1))));
             }));
         }
         if (ConfigObject.getInstance().isCraftableFilterEnabled()) {
@@ -282,10 +285,10 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
                                 ConfigManager.getInstance().toggleCraftableOnly();
                                 ENTRY_LIST_WIDGET.updateSearch(ScreenHelper.getSearchField().getText(), true);
                             })
-                            .onRender(button -> button.setTint(ConfigManager.getInstance().isCraftableOnlyEnabled() ? 939579655 : 956235776))
+                            .onRender((matrices, 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) -> {
+                    Widgets.createDrawableWidget((helper, matrices, mouseX, mouseY, delta) -> {
                         itemRenderer.zOffset = helper.getZOffset();
                         itemRenderer.renderGuiItemIcon(icon, area.x + 2, area.y + 2);
                         itemRenderer.zOffset = 0.0F;
@@ -406,7 +409,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
     }
     
     @Override
-    public void render(int mouseX, int mouseY, float delta) {
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
         List<ItemStack> currentStacks = ClientHelper.getInstance().getInventoryItemsTypes();
         if (shouldReInit) {
             ENTRY_LIST_WIDGET.updateSearch(ScreenHelper.getSearchField().getText(), true);
@@ -424,62 +427,63 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
             ENTRY_LIST_WIDGET.updateSearch(ScreenHelper.getSearchField().getText(), true);
         }
         if (OverlaySearchField.isSearching) {
-            setZOffset(200);
+            matrices.push();
+            matrices.translate(0, 0, 200f);
             if (MinecraftClient.getInstance().currentScreen instanceof HandledScreen) {
                 HandledScreen<?> handledScreen = (HandledScreen<?>) MinecraftClient.getInstance().currentScreen;
                 int x = handledScreen.x, y = handledScreen.y;
                 for (Slot slot : handledScreen.getScreenHandler().slots)
                     if (!slot.hasStack() || !ENTRY_LIST_WIDGET.canLastSearchTermsBeAppliedTo(EntryStack.create(slot.getStack())))
-                        fillGradient(x + slot.x, y + slot.y, x + slot.x + 16, y + slot.y + 16, -601874400, -601874400);
+                        fillGradient(matrices, x + slot.x, y + slot.y, x + slot.x + 16, y + slot.y + 16, -601874400, -601874400);
             }
-            setZOffset(0);
+            matrices.pop();
         }
         RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-        this.renderWidgets(mouseX, mouseY, delta);
+        this.renderWidgets(matrices, mouseX, mouseY, delta);
         if (MinecraftClient.getInstance().currentScreen instanceof HandledScreen && ConfigObject.getInstance().areClickableRecipeArrowsEnabled()) {
             HandledScreen<?> handledScreen = (HandledScreen<?>) MinecraftClient.getInstance().currentScreen;
             for (RecipeHelper.ScreenClickArea area : RecipeHelper.getInstance().getScreenClickAreas())
                 if (area.getScreenClass().equals(MinecraftClient.getInstance().currentScreen.getClass()))
                     if (area.getRectangle().contains(mouseX - handledScreen.x, mouseY - handledScreen.y)) {
                         String collect = CollectionUtils.mapAndJoinToString(area.getCategories(), identifier -> RecipeHelper.getInstance().getCategory(identifier).getCategoryName(), ", ");
-                        TOOLTIPS.add(Tooltip.create(I18n.translate("text.rei.view_recipes_for", collect)));
+                        TOOLTIPS.add(Tooltip.create(new TranslatableText("text.rei.view_recipes_for", collect)));
                         break;
                     }
         }
     }
     
-    public void lateRender(int mouseX, int mouseY, float delta) {
+    public void lateRender(MatrixStack matrices, int mouseX, int mouseY, float delta) {
         if (ScreenHelper.isOverlayVisible()) {
-            ScreenHelper.getSearchField().laterRender(mouseX, mouseY, delta);
+            ScreenHelper.getSearchField().laterRender(matrices, mouseX, mouseY, delta);
             for (Widget widget : widgets) {
                 if (widget instanceof LateRenderable && wrappedSubsetsMenu != widget)
-                    widget.render(mouseX, mouseY, delta);
+                    widget.render(matrices, mouseX, mouseY, delta);
             }
         }
         if (wrappedSubsetsMenu != null) {
             TOOLTIPS.clear();
-            wrappedSubsetsMenu.render(mouseX, mouseY, delta);
+            wrappedSubsetsMenu.render(matrices, mouseX, mouseY, delta);
         }
         Screen currentScreen = MinecraftClient.getInstance().currentScreen;
         if (!(currentScreen instanceof RecipeViewingScreen) || !((RecipeViewingScreen) currentScreen).choosePageActivated)
             for (Tooltip tooltip : TOOLTIPS) {
                 if (tooltip != null)
-                    renderTooltip(tooltip);
+                    renderTooltip(matrices, tooltip);
             }
         TOOLTIPS.clear();
     }
     
-    public void renderTooltip(Tooltip tooltip) {
-        renderTooltip(tooltip.getText(), tooltip.getX(), tooltip.getY());
+    public void renderTooltip(MatrixStack matrices, Tooltip tooltip) {
+        renderTooltip(matrices, tooltip.getText(), tooltip.getX(), tooltip.getY());
     }
     
-    public void renderTooltip(List<String> lines, int mouseX, int mouseY) {
+    public void renderTooltip(MatrixStack matrices, List<Text> lines, int mouseX, int mouseY) {
         if (lines.isEmpty())
             return;
-        tooltipWidth = lines.stream().map(font::getStringWidth).max(Integer::compareTo).get();
+        tooltipWidth = lines.stream().map(font::method_27525).max(Integer::compareTo).get();
         tooltipHeight = lines.size() <= 1 ? 8 : lines.size() * 10;
         tooltipLines = lines;
-        ScreenHelper.drawHoveringWidget(mouseX, mouseY, renderTooltipCallback, tooltipWidth, tooltipHeight, 0);
+        ScreenHelper.drawHoveringWidget(matrices, mouseX, mouseY, renderTooltipCallback, tooltipWidth, tooltipHeight, 0);
     }
     
     private boolean hasSameListContent(List<ItemStack> list1, List<ItemStack> list2) {
@@ -493,7 +497,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
             TOOLTIPS.add(tooltip);
     }
     
-    public void renderWidgets(int int_1, int int_2, float float_1) {
+    public void renderWidgets(MatrixStack matrices, int mouseX, int mouseY, float delta) {
         if (!ScreenHelper.isOverlayVisible())
             return;
         if (!ConfigObject.getInstance().isEntryListWidgetScrolled()) {
@@ -502,15 +506,15 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
         }
         for (Widget widget : widgets) {
             if (!(widget instanceof LateRenderable))
-                widget.render(int_1, int_2, float_1);
+                widget.render(matrices, mouseX, mouseY, delta);
         }
     }
     
     @Override
-    public boolean mouseScrolled(double i, double j, double amount) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
         if (!ScreenHelper.isOverlayVisible())
             return false;
-        if (wrappedSubsetsMenu != null && wrappedSubsetsMenu.mouseScrolled(i, j, amount))
+        if (wrappedSubsetsMenu != null && wrappedSubsetsMenu.mouseScrolled(mouseX, mouseY, amount))
             return true;
         if (isInside(PointHelper.ofMouse())) {
             if (!ConfigObject.getInstance().isEntryListWidgetScrolled()) {
@@ -521,15 +525,15 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
                 else
                     return false;
                 return true;
-            } else if (ENTRY_LIST_WIDGET.mouseScrolled(i, j, amount))
+            } else if (ENTRY_LIST_WIDGET.mouseScrolled(mouseX, mouseY, amount))
                 return true;
         }
         if (isNotInExclusionZones(PointHelper.getMouseX(), PointHelper.getMouseY())) {
-            if (favoritesListWidget != null && favoritesListWidget.mouseScrolled(i, j, amount))
+            if (favoritesListWidget != null && favoritesListWidget.mouseScrolled(mouseX, mouseY, amount))
                 return true;
         }
         for (Widget widget : widgets)
-            if (widget != ENTRY_LIST_WIDGET && (favoritesListWidget == null || widget != favoritesListWidget) && (wrappedSubsetsMenu == null || widget != wrappedSubsetsMenu) && widget.mouseScrolled(i, j, amount))
+            if (widget != ENTRY_LIST_WIDGET && (favoritesListWidget == null || widget != favoritesListWidget) && (wrappedSubsetsMenu == null || widget != wrappedSubsetsMenu) && widget.mouseScrolled(mouseX, mouseY, amount))
                 return true;
         return false;
     }
diff --git a/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java b/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java
index 3bbf58a58..d5d9174cd 100644
--- a/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java
+++ b/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java
@@ -34,6 +34,7 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.client.util.InputUtil;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Pair;
 import org.jetbrains.annotations.ApiStatus;
@@ -72,33 +73,33 @@ public class OverlaySearchField extends TextFieldWidget {
         }
     }
     
-    public void laterRender(int int_1, int int_2, float float_1) {
+    public void laterRender(MatrixStack matrices, int int_1, int int_2, float float_1) {
         RenderSystem.disableDepthTest();
         setEditableColor(isMain && ContainerScreenOverlay.getEntryListWidget().getAllStacks().isEmpty() && !getText().isEmpty() ? 16733525 : isSearching && isMain ? -852212 : (containsMouse(PointHelper.ofMouse()) || isFocused()) ? (REIHelper.getInstance().isDarkThemeEnabled() ? -17587 : -1) : -6250336);
         setSuggestion(!isFocused() && getText().isEmpty() ? I18n.translate("text.rei.search.field.suggestion") : null);
-        super.render(int_1, int_2, float_1);
+        super.render(matrices, int_1, int_2, float_1);
         RenderSystem.enableDepthTest();
     }
     
     @Override
-    protected void renderSuggestion(int x, int y) {
+    protected void renderSuggestion(MatrixStack matrices, int x, int y) {
         if (containsMouse(PointHelper.ofMouse()) || isFocused())
-            this.font.drawWithShadow(this.font.trimToWidth(this.getSuggestion(), this.getWidth()), x, y, REIHelper.getInstance().isDarkThemeEnabled() ? 0xccddaa3d : 0xddeaeaea);
+            this.font.drawWithShadow(matrices, this.font.method_27523(this.getSuggestion(), this.getWidth()), x, y, REIHelper.getInstance().isDarkThemeEnabled() ? 0xccddaa3d : 0xddeaeaea);
         else
-            this.font.drawWithShadow(this.font.trimToWidth(this.getSuggestion(), this.getWidth()), x, y, -6250336);
+            this.font.drawWithShadow(matrices, this.font.method_27523(this.getSuggestion(), this.getWidth()), x, y, -6250336);
     }
     
     @Override
-    public void renderBorder() {
+    public void renderBorder(MatrixStack matrices) {
         if (isMain && isSearching) {
-            fill(this.getBounds().x - 1, this.getBounds().y - 1, this.getBounds().x + this.getBounds().width + 1, this.getBounds().y + this.getBounds().height + 1, -852212);
+            fill(matrices, this.getBounds().x - 1, this.getBounds().y - 1, this.getBounds().x + this.getBounds().width + 1, this.getBounds().y + this.getBounds().height + 1, -852212);
         } else if (isMain && ContainerScreenOverlay.getEntryListWidget().getAllStacks().isEmpty() && !getText().isEmpty()) {
-            fill(this.getBounds().x - 1, this.getBounds().y - 1, this.getBounds().x + this.getBounds().width + 1, this.getBounds().y + this.getBounds().height + 1, -43691);
+            fill(matrices, this.getBounds().x - 1, this.getBounds().y - 1, this.getBounds().x + this.getBounds().width + 1, this.getBounds().y + this.getBounds().height + 1, -43691);
         } else {
-            super.renderBorder();
+            super.renderBorder(matrices);
             return;
         }
-        fill(this.getBounds().x, this.getBounds().y, this.getBounds().x + this.getBounds().width, this.getBounds().y + this.getBounds().height, -16777216);
+        fill(matrices, this.getBounds().x, this.getBounds().y, this.getBounds().x + this.getBounds().width, this.getBounds().y + this.getBounds().height, -16777216);
     }
     
     public int getManhattanDistance(Point point1, Point point2) {
@@ -172,7 +173,7 @@ public class OverlaySearchField extends TextFieldWidget {
     }
     
     @Override
-    public void render(int mouseX, int mouseY, float delta) {
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
     }
     
 }
diff --git a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java
index ab6630070..4ae2b8d96 100644
--- a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java
@@ -38,8 +38,9 @@ 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.resource.language.I18n;
 import net.minecraft.client.util.NarratorManager;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
@@ -104,45 +105,45 @@ public class PreRecipeViewingScreen extends Screen {
         this.children.clear();
         this.widgets.clear();
         this.widgets.add(Widgets.createButton(new Rectangle(width / 2 - 100, height - 40, 200, 20), NarratorManager.EMPTY)
-                .onRender(button -> {
+                .onRender((matrices, button) -> {
                     button.setEnabled(isSet);
-                    button.setText(isSet ? I18n.translate("text.rei.select") : I18n.translate("config.roughlyenoughitems.recipeScreenType.unset"));
+                    button.setText(isSet ? new TranslatableText("text.rei.select") : new TranslatableText("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(Widgets.createLabel(new Point(width / 2 - 200 - 5 + 104, height / 2 - 112 / 2 + 115), new TranslatableText("config.roughlyenoughitems.recipeScreenType.original")).noShadow().color(-1124073473));
         this.widgets.add(new ScreenTypeSelection(width / 2 + 5, height / 2 - 112 / 2 - 10, 112));
-        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.widgets.add(Widgets.createLabel(new Point(width / 2 + 5 + 104, height / 2 - 112 / 2 + 115), new TranslatableText("config.roughlyenoughitems.recipeScreenType.villager")).noShadow().color(-1124073473));
         this.children.addAll(widgets);
     }
     
     @Override
-    public void render(int int_1, int int_2, float float_1) {
+    public void render(MatrixStack matrices, int int_1, int int_2, float float_1) {
         if (this.client.world != null) {
-            this.fillGradient(0, 0, this.width, this.height, -1072689136, -804253680);
+            this.fillGradient(matrices, 0, 0, this.width, this.height, -1072689136, -804253680);
         } else {
-            this.fillGradient(0, 0, this.width, this.height, -16777216, -16777216);
+            this.fillGradient(matrices, 0, 0, this.width, this.height, -16777216, -16777216);
         }
-        this.drawCenteredString(this.textRenderer, this.title.asFormattedString(), this.width / 2, 20, 16777215);
+        this.method_27534(matrices, this.textRenderer, this.title, this.width / 2, 20, 16777215);
         if (showTips) {
             int i = 30;
-            for (String s : this.textRenderer.wrapStringToWidthAsList(I18n.translate("text.rei.recipe_screen_type.selection.sub"), width - 30)) {
-                this.drawCenteredString(this.textRenderer, Formatting.GRAY.toString() + s, width / 2, i, -1);
+            for (Text s : this.textRenderer.wrapStringToWidthAsList(new TranslatableText("text.rei.recipe_screen_type.selection.sub").method_27692(Formatting.GRAY), width - 30)) {
+                this.method_27534(matrices, this.textRenderer, s, width / 2, i, -1);
                 i += 10;
             }
         }
-        super.render(int_1, int_2, float_1);
+        super.render(matrices, int_1, int_2, float_1);
         for (Widget widget : widgets) {
-            widget.render(int_1, int_2, float_1);
+            widget.render(matrices, int_1, int_2, float_1);
         }
         if (isSet) {
             updateFramePosition(float_1);
             int x = (int) (width / 2 - 205 + (210 * frame));
             int y = height / 2 - 112 / 2 - 10;
-            fillGradient(x - 2, y - 4, x - 6 + 208, y - 4 + 2, -1778384897, -1778384897);
-            fillGradient(x - 2, y - 4 + 120 - 2, x - 6 + 208, y - 4 + 120, -1778384897, -1778384897);
-            fillGradient(x - 4, y - 4, x - 4 + 2, y - 4 + 120, -1778384897, -1778384897);
-            fillGradient(x - 4 + 208 - 2, y - 4, x - 4 + 208, y - 4 + 120, -1778384897, -1778384897);
+            fillGradient(matrices, x - 2, y - 4, x - 6 + 208, y - 4 + 2, -1778384897, -1778384897);
+            fillGradient(matrices, x - 2, y - 4 + 120 - 2, x - 6 + 208, y - 4 + 120, -1778384897, -1778384897);
+            fillGradient(matrices, x - 4, y - 4, x - 4 + 2, y - 4 + 120, -1778384897, -1778384897);
+            fillGradient(matrices, x - 4 + 208 - 2, y - 4, x - 4 + 208, y - 4 + 120, -1778384897, -1778384897);
         }
     }
     
@@ -187,9 +188,9 @@ public class PreRecipeViewingScreen extends Screen {
         }
         
         @Override
-        public void render(int i, int i1, float delta) {
+        public void render(MatrixStack matrices, int i, int i1, float delta) {
             MinecraftClient.getInstance().getTextureManager().bindTexture(IDENTIFIER);
-            drawTexture(bounds.x + 4, bounds.y + 4, u, v, 200, 112);
+            drawTexture(matrices, bounds.x + 4, bounds.y + 4, u, v, 200, 112);
         }
         
         @Override
diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java b/src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java
index a0168796f..20c48d5f6 100644
--- a/src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java
+++ b/src/main/java/me/shedaniel/rei/gui/RecipeDisplayExporter.java
@@ -77,6 +77,7 @@ public final class RecipeDisplayExporter extends Widget {
     
     @SuppressWarnings("deprecation")
     private void exportRecipe(Rectangle rectangle, List<Widget> widgets) {
+        MatrixStack matrices = new MatrixStack();
         Framebuffer framebuffer = new Framebuffer(rectangle.width * 8, rectangle.height * 8, true, MinecraftClient.IS_SYSTEM_MAC);
         framebuffer.setClearColor(0, 0, 0, 0);
         //        int color = REIHelper.getInstance().isDarkThemeEnabled() ? -13750738 : -3750202;
@@ -120,7 +121,7 @@ public final class RecipeDisplayExporter extends Widget {
         RenderSystem.disableCull();
         RenderSystem.pushLightingAttributes();
         for (Widget widget : widgets) {
-            widget.render(-1, -1, minecraft.getTickDelta());
+            widget.render(matrices, -1, -1, minecraft.getTickDelta());
         }
         {
             ItemStack stack = new ItemStack(Items.OAK_STAIRS);
@@ -136,10 +137,10 @@ public final class RecipeDisplayExporter extends Widget {
             RenderSystem.blendFunc(GlStateManager.SrcFactor.SRC_ALPHA, GlStateManager.DstFactor.ONE_MINUS_SRC_ALPHA);
             
             RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-            MatrixStack matrixStack = new MatrixStack();
+            matrices.push();
             
-            matrixStack.translate(rectangle.x + 8, rectangle.y + 8, 0);
-            matrixStack.scale(16, -16, 1F);
+            matrices.translate(rectangle.x + 8, rectangle.y + 8, 0);
+            matrices.scale(16, -16, 1F);
             
             boolean disableGuiLight = !model.isSideLit();
             if (disableGuiLight) {
@@ -147,8 +148,9 @@ public final class RecipeDisplayExporter extends Widget {
             }
             
             VertexConsumerProvider.Immediate immediate = MinecraftClient.getInstance().getBufferBuilders().getEntityVertexConsumers();
-            minecraft.getItemRenderer().renderItem(stack, ModelTransformation.Mode.GUI, false, matrixStack, immediate, 15728880, OverlayTexture.DEFAULT_UV, model);
+            minecraft.getItemRenderer().renderItem(stack, ModelTransformation.Mode.GUI, false, matrices, immediate, 15728880, OverlayTexture.DEFAULT_UV, model);
             immediate.draw();
+            matrices.pop();
             
             RenderSystem.enableDepthTest();
             
@@ -209,8 +211,8 @@ public final class RecipeDisplayExporter extends Widget {
     }
     
     @Override
-    public void render(int mouseX, int mouseY, float delta) {
-    
+    public void render(MatrixStack matrixStack, int mouseY, int i, float f) {
+        
     }
     
     @Override
diff --git a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java
index ffe5f9b19..96fe5479a 100644
--- a/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java
@@ -54,6 +54,8 @@ import net.minecraft.client.util.NarratorManager;
 import net.minecraft.client.util.Window;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.sound.SoundEvents;
+import net.minecraft.text.LiteralText;
+import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
@@ -255,7 +257,7 @@ public class RecipeViewingScreen extends Screen implements RecipeScreen {
                         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 -> {
+        widgets.add(Widgets.createClickableLabel(new Point(bounds.getCenterX(), bounds.getY() + 7), new LiteralText(selectedCategory.getCategoryName()), clickableLabelWidget -> {
             ClientHelper.getInstance().executeViewAllRecipesKeyBind();
         }).tooltipLine(I18n.translate("text.rei.view_all_categories")));
         widgets.add(categoryNext = Widgets.createButton(new Rectangle(bounds.getMaxX() - 17, bounds.getY() + 5, 12, 12), new TranslatableText("text.rei.right_arrow"))
@@ -276,11 +278,11 @@ public class RecipeViewingScreen extends Screen implements RecipeScreen {
                         page = getTotalPages(selectedCategory) - 1;
                     RecipeViewingScreen.this.init();
                 }).tooltipLine(I18n.translate("text.rei.previous_page")));
-        widgets.add(Widgets.createClickableLabel(new Point(bounds.getCenterX(), bounds.getY() + 21), "", label -> {
+        widgets.add(Widgets.createClickableLabel(new Point(bounds.getCenterX(), bounds.getY() + 21), NarratorManager.EMPTY, label -> {
             RecipeViewingScreen.this.choosePageActivated = true;
             RecipeViewingScreen.this.init();
-        }).onRender(label -> {
-            label.setText(String.format("%d/%d", page + 1, getTotalPages(selectedCategory)));
+        }).onRender((matrices, label) -> {
+            label.setText(new LiteralText(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 = Widgets.createButton(new Rectangle(bounds.getMaxX() - 17, bounds.getY() + 19, 12, 12), new TranslatableText("text.rei.right_arrow"))
@@ -321,7 +323,7 @@ public class RecipeViewingScreen extends Screen implements RecipeScreen {
             recipeBounds.put(displayBounds, setupDisplay);
             this.widgets.addAll(setupDisplay);
             if (supplier.isPresent() && supplier.get().get(displayBounds) != null)
-                this.widgets.add(InternalWidgets.createAutoCraftingButtonWidget(displayBounds, supplier.get().get(displayBounds), supplier.get().getButtonText(), displaySupplier, setupDisplay, selectedCategory));
+                this.widgets.add(InternalWidgets.createAutoCraftingButtonWidget(displayBounds, supplier.get().get(displayBounds), new LiteralText(supplier.get().getButtonText()), displaySupplier, setupDisplay, selectedCategory));
         }
         if (choosePageActivated)
             recipeChoosePageWidget = new RecipeChoosePageWidget(this, page, getTotalPages(selectedCategory));
@@ -339,7 +341,7 @@ public class RecipeViewingScreen extends Screen implements RecipeScreen {
             preWidgets.add(workingStationsBaseWidget = Widgets.createCategoryBase(new Rectangle(xx - 5, yy - 5, 15 + innerWidth * 16, 10 + actualHeight * 16)));
             preWidgets.add(Widgets.createSlotBase(new Rectangle(xx - 1, yy - 1, innerWidth * 16 + 2, actualHeight * 16 + 2)));
             int index = 0;
-            List<String> list = Collections.singletonList(Formatting.YELLOW.toString() + I18n.translate("text.rei.working_station"));
+            List<Text> list = Collections.singletonList(new TranslatableText("text.rei.working_station").method_27692(Formatting.YELLOW));
             xx += (innerWidth - 1) * 16;
             for (List<EntryStack> workingStation : workingStations) {
                 preWidgets.add(new WorkstationSlotWidget(xx, yy, CollectionUtils.map(workingStation, stack -> stack.copy().setting(EntryStack.Settings.TOOLTIP_APPEND_EXTRA, s -> list))));
@@ -397,34 +399,34 @@ public class RecipeViewingScreen extends Screen implements RecipeScreen {
     }
     
     @Override
-    public void render(int mouseX, int mouseY, float delta) {
-        this.fillGradient(0, 0, this.width, this.height, -1072689136, -804253680);
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        this.fillGradient(matrices, 0, 0, this.width, this.height, -1072689136, -804253680);
         for (Widget widget : preWidgets) {
-            widget.render(mouseX, mouseY, delta);
+            widget.render(matrices, mouseX, mouseY, delta);
         }
-        PanelWidget.render(bounds, -1);
+        PanelWidget.render(matrices, bounds, -1);
         if (REIHelper.getInstance().isDarkThemeEnabled()) {
-            fill(bounds.x + 17, bounds.y + 5, bounds.x + bounds.width - 17, bounds.y + 17, 0xFF404040);
-            fill(bounds.x + 17, bounds.y + 19, bounds.x + bounds.wi