Update to 1.20-pre6

2 files changed, 9 insertions, 10 deletions

diff --git a/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplFabric.java b/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplFabric.java
index be099c741..ad6bedf4b 100644
--- a/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplFabric.java
+++ b/fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplFabric.java
@@ -23,11 +23,11 @@
 
 package me.shedaniel.rei.impl.client.gui.fabric;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
 import me.shedaniel.rei.impl.ClientInternals;
 import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
 import net.minecraft.client.gui.screens.inventory.tooltip.DefaultTooltipPositioner;
@@ -43,7 +43,7 @@ import java.util.stream.Stream;
 
 public class ScreenOverlayImplFabric extends ScreenOverlayImpl {
     @Override
-    public void renderTooltipInner(Screen screen, PoseStack matrices, Tooltip tooltip, int mouseX, int mouseY) {
+    public void renderTooltipInner(Screen screen, GuiGraphics graphics, Tooltip tooltip, int mouseX, int mouseY) {
         List<ClientTooltipComponent> lines = tooltip.entries().stream()
                 .flatMap(component -> {
                     if (component.isText()) {
@@ -72,15 +72,15 @@ public class ScreenOverlayImplFabric extends ScreenOverlayImpl {
                 }
             }
         }
-        renderTooltipInner(matrices, lines, tooltip.getX(), tooltip.getY());
+        renderTooltipInner(graphics, lines, tooltip.getX(), tooltip.getY());
     }
     
-    public static void renderTooltipInner(PoseStack matrices, List<ClientTooltipComponent> lines, int mouseX, int mouseY) {
+    public static void renderTooltipInner(GuiGraphics graphics, List<ClientTooltipComponent> lines, int mouseX, int mouseY) {
         if (lines.isEmpty()) {
             return;
         }
-        matrices.pushPose();
-        Minecraft.getInstance().screen.renderTooltipInternal(matrices, lines, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE);
-        matrices.popPose();
+        graphics.pose().pushPose();
+        graphics.renderTooltipInternal(Minecraft.getInstance().font, lines, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE);
+        graphics.pose().popPose();
     }
 }
diff --git a/fabric/src/main/resources/roughlyenoughitems.accessWidener b/fabric/src/main/resources/roughlyenoughitems.accessWidener
index f38aa63a4..39c484b83 100644
--- a/fabric/src/main/resources/roughlyenoughitems.accessWidener
+++ b/fabric/src/main/resources/roughlyenoughitems.accessWidener
@@ -20,8 +20,7 @@ accessible    field  net/minecraft/world/item/alchemy/PotionBrewing
 accessible    field  net/minecraft/world/item/alchemy/PotionBrewing$Mix                        from                    Ljava/lang/Object;
 accessible    field  net/minecraft/world/item/alchemy/PotionBrewing$Mix                        ingredient              Lnet/minecraft/world/item/crafting/Ingredient;
 accessible    field  net/minecraft/world/item/alchemy/PotionBrewing$Mix                        to                      Ljava/lang/Object;
-accessible    method net/minecraft/client/gui/GuiComponent                                     innerBlit               (Lorg/joml/Matrix4f;IIIIIFFFF)V
-accessible    method net/minecraft/client/gui/screens/Screen                                   addWidget               (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
+accessible    method net/minecraft/client/gui/GuiGraphics                                      innerBlit               (Lnet/minecraft/resources/ResourceLocation;IIIIIFFFF)V
 accessible    method net/minecraft/client/gui/screens/Screen                                   init                    ()V
 accessible    method net/minecraft/client/gui/screens/Screen                                   insertText              (Ljava/lang/String;Z)V
 accessible    method net/minecraft/client/gui/screens/Screen                                   isValidCharacterForName (Ljava/lang/String;CI)Z
@@ -31,7 +30,7 @@ extendable    method net/minecraft/client/gui/screens/Screen
 accessible    method net/minecraft/client/gui/screens/Screen                                   addRenderableWidget     (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
 accessible    method net/minecraft/client/gui/screens/Screen                                   addRenderableOnly       (Lnet/minecraft/client/gui/components/Renderable;)Lnet/minecraft/client/gui/components/Renderable;
 accessible    method net/minecraft/client/gui/screens/Screen                                   addWidget               (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
-accessible    method net/minecraft/client/gui/screens/Screen                                   renderTooltipInternal   (Lcom/mojang/blaze3d/vertex/PoseStack;Ljava/util/List;IILnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner;)V
+accessible    method net/minecraft/client/gui/GuiGraphics                                      renderTooltipInternal   (Lnet/minecraft/client/gui/Font;Ljava/util/List;IILnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner;)V
 accessible method net/minecraft/client/renderer/RenderType create (Ljava/lang/String;Lcom/mojang/blaze3d/vertex/VertexFormat;Lcom/mojang/blaze3d/vertex/VertexFormat$Mode;ILnet/minecraft/client/renderer/RenderType$CompositeState;)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType;
 accessible field net/minecraft/tags/TagEntry tag Z
 accessible field net/minecraft/tags/TagEntry id Lnet/minecraft/resources/ResourceLocation;