diff options
4 files changed, 24 insertions, 25 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. diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java index f9cb37fac..949c5c241 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java @@ -360,27 +360,26 @@ public class CompositeDisplayViewingScreen extends AbstractDisplayViewingScreen } @Override - public void render(PoseStack matrices, int mouseX, int mouseY, float delta) { + public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) { int yOffset = 0; - matrices.pushPose(); + graphics.pose().pushPose(); ScissorsHandler.INSTANCE.scissor(scrolling.getBounds()); for (Button button : buttonList) { button.getBounds().y = scrollListBounds.y + 1 + yOffset - scrolling.scrollAmountInt(); if (button.getBounds().getMaxY() > scrollListBounds.getMinY() && button.getBounds().getMinY() < scrollListBounds.getMaxY()) { - button.render(matrices, mouseX, mouseY, delta); + button.render(graphics, mouseX, mouseY, delta); } yOffset += button.getBounds().height; } for (int i = 0; i < buttonList.size(); i++) { if (buttonList.get(i).getBounds().getMaxY() > scrollListBounds.getMinY() && buttonList.get(i).getBounds().getMinY() < scrollListBounds.getMaxY()) { - displayRenderers.get(i).setZ(1); - displayRenderers.get(i).render(matrices, buttonList.get(i).getBounds(), mouseX, mouseY, delta); + displayRenderers.get(i).render(graphics, buttonList.get(i).getBounds(), mouseX, mouseY, delta); Optional.ofNullable(displayRenderers.get(i).getTooltip(TooltipContext.of(new Point(mouseX, mouseY)))).ifPresent(Tooltip::queue); } } - scrolling.renderScrollBar(0, scrollBarAlpha, REIRuntime.getInstance().isDarkThemeEnabled() ? 0.8f : 1f); + scrolling.renderScrollBar(graphics, 0, scrollBarAlpha, REIRuntime.getInstance().isDarkThemeEnabled() ? 0.8f : 1f); ScissorsHandler.INSTANCE.removeLastScissor(); - matrices.popPose(); + graphics.pose().popPose(); } @Override diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/DefaultScreenOverlayRenderer.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/DefaultScreenOverlayRenderer.java index 520b89bb7..55f840854 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/DefaultScreenOverlayRenderer.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/DefaultScreenOverlayRenderer.java @@ -50,23 +50,23 @@ public enum DefaultScreenOverlayRenderer implements OverlayRendererProvider { ClientGuiEvent.ContainerScreenRenderBackground renderContainerBg; ClientGuiEvent.ContainerScreenRenderForeground renderContainerFg; ClientGuiEvent.ScreenRenderPost renderPost; - ClientGuiEvent.RENDER_PRE.register(renderPre = (screen, matrices, mouseX, mouseY, delta) -> { + ClientGuiEvent.RENDER_PRE.register(renderPre = (screen, graphics, mouseX, mouseY, delta) -> { if (shouldReturn(screen)) return EventResult.pass(); rendered[0] = 0; return EventResult.pass(); }); - ClientGuiEvent.RENDER_CONTAINER_BACKGROUND.register(renderContainerBg = (screen, matrices, mouseX, mouseY, delta) -> { + ClientGuiEvent.RENDER_CONTAINER_BACKGROUND.register(renderContainerBg = (screen, graphics, mouseX, mouseY, delta) -> { if (shouldReturn(screen)) return; rendered[0] = 1; resetFocused(screen); if (!(screen instanceof DisplayScreen)) { - sink.render(matrices, mouseX, mouseY, delta); + sink.render(graphics, mouseX, mouseY, delta); } resetFocused(screen); }); - ClientGuiEvent.RENDER_CONTAINER_FOREGROUND.register(renderContainerFg = (screen, matrices, mouseX, mouseY, delta) -> { + ClientGuiEvent.RENDER_CONTAINER_FOREGROUND.register(renderContainerFg = (screen, graphics, mouseX, mouseY, delta) -> { if (shouldReturn(screen)) return; rendered[0] = 2; @@ -75,12 +75,12 @@ public enum DefaultScreenOverlayRenderer implements OverlayRendererProvider { poseStack.pushPose(); poseStack.translate(-screen.leftPos, -screen.topPos, 0.0); RenderSystem.applyModelViewMatrix(); - sink.lateRender(matrices, mouseX, mouseY, delta); + sink.lateRender(graphics, mouseX, mouseY, delta); poseStack.popPose(); RenderSystem.applyModelViewMatrix(); resetFocused(screen); }); - ClientGuiEvent.RENDER_POST.register(renderPost = (screen, matrices, mouseX, mouseY, delta) -> { + ClientGuiEvent.RENDER_POST.register(renderPost = (screen, graphics, mouseX, mouseY, delta) -> { if (shouldReturn(screen) || rendered[0] == 2) return; if (screen instanceof AbstractContainerScreen) { @@ -88,11 +88,11 @@ public enum DefaultScreenOverlayRenderer implements OverlayRendererProvider { } resetFocused(screen); if (rendered[0] == 0 && !(screen instanceof DisplayScreen)) { - sink.render(matrices, mouseX, mouseY, delta); + sink.render(graphics, mouseX, mouseY, delta); } rendered[0] = 1; if (rendered[0] == 1) { - sink.lateRender(matrices, mouseX, mouseY, delta); + sink.lateRender(graphics, mouseX, mouseY, delta); } resetFocused(screen); }); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java index 248f76cfc..065c0c221 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java @@ -26,7 +26,6 @@ package me.shedaniel.rei.impl.client.registry.screen; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.vertex.PoseStack; import dev.architectury.event.CompoundEventResult; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; @@ -52,6 +51,7 @@ import me.shedaniel.rei.impl.common.InternalLogger; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; 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.AbstractContainerScreen; import net.minecraft.world.InteractionResult; @@ -370,18 +370,18 @@ public class ScreenRegistryImpl implements ScreenRegistry { if (this.lastRendererProvider != null) { this.lastRendererProvider.onApplied(new OverlayRendererProvider.Sink() { @Override - public void render(PoseStack matrices, int mouseX, int mouseY, float delta) { + public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) { if (ScreenRegistryImpl.this.lastRendererProvider == provider) { - ScreenOverlayImpl.getInstance().render(matrices, mouseX, mouseY, delta); + ScreenOverlayImpl.getInstance().render(graphics, mouseX, mouseY, delta); } else { InternalLogger.getInstance().warn("Renderer provider %s still tries to render after being removed!", provider); } } @Override - public void lateRender(PoseStack matrices, int mouseX, int mouseY, float delta) { + public void lateRender(GuiGraphics graphics, int mouseX, int mouseY, float delta) { if (ScreenRegistryImpl.this.lastRendererProvider == provider) { - ScreenOverlayImpl.getInstance().lateRender(matrices, mouseX, mouseY, delta); + ScreenOverlayImpl.getInstance().lateRender(graphics, mouseX, mouseY, delta); } else { InternalLogger.getInstance().warn("Renderer provider %s still tries to render after being removed!", provider); } |