diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-06-08 13:49:19 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2023-06-08 14:50:50 +0800 |
| commit | e0031d020f0a1d76cd971b45dffa8b6864b2c5d8 (patch) | |
| tree | f0ec70ae38bad6a71203bd7b050adaa3b5e30da5 /api | |
| parent | 3d0de007896f853e70f337fc421649104859099f (diff) | |
| download | RoughlyEnoughItems-e0031d020f0a1d76cd971b45dffa8b6864b2c5d8.tar.gz RoughlyEnoughItems-e0031d020f0a1d76cd971b45dffa8b6864b2c5d8.tar.bz2 RoughlyEnoughItems-e0031d020f0a1d76cd971b45dffa8b6864b2c5d8.zip | |
Fix merge conflicts
Diffstat (limited to 'api')
| -rw-r--r-- | api/src/main/java/me/shedaniel/rei/api/client/registry/screen/OverlayRendererProvider.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/OverlayRendererProvider.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/OverlayRendererProvider.java index e690218b7..be9a31372 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/OverlayRendererProvider.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/OverlayRendererProvider.java @@ -23,8 +23,8 @@ package me.shedaniel.rei.api.client.registry.screen; -import com.mojang.blaze3d.vertex.PoseStack; import me.shedaniel.rei.api.client.overlay.ScreenOverlay; +import net.minecraft.client.gui.GuiGraphics; import org.jetbrains.annotations.ApiStatus; /** @@ -51,23 +51,23 @@ public interface OverlayRendererProvider { /** * Renders the overlay. * - * @param matrices the matrices + * @param graphics the graphics context * @param mouseX the mouse x * @param mouseY the mouse y * @param delta the delta */ - void render(PoseStack matrices, int mouseX, int mouseY, float delta); + void render(GuiGraphics graphics, int mouseX, int mouseY, float delta); /** * Renders the overlay components that are supposed to be rendered last, * for example, menu entries, or tooltips. * - * @param matrices the matrices + * @param graphics the graphics context * @param mouseX the mouse x * @param mouseY the mouse y * @param delta the delta */ - void lateRender(PoseStack matrices, int mouseX, int mouseY, float delta); + void lateRender(GuiGraphics graphics, int mouseX, int mouseY, float delta); /** * Returns the overlay. |