diff --git a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java index a173590e4..9f183b560 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElement.java @@ -17,13 +17,13 @@ import java.util.List; */ public interface ICraftingMonitorElement { /** - * @param matrixStack the matrix stack - * @param x position on the x axis to render - * @param y position on the y axis to render - * @param drawers the drawers that this element can use + * @param poseStack the pose stack + * @param x position on the x axis to render + * @param y position on the y axis to render + * @param drawers the drawers that this element can use */ @OnlyIn(Dist.CLIENT) - void draw(PoseStack matrixStack, int x, int y, IElementDrawers drawers); + void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers); /** * Returns the id for the base of this element, used for sorting in the {@link CraftingMonitorElementList} diff --git a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java index b1acfaac6..b51b182d5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElement.java @@ -12,13 +12,13 @@ import net.minecraftforge.api.distmarker.OnlyIn; */ public interface ICraftingPreviewElement { /** - * @param matrixStack the matrix stack - * @param x position on the x axis to render - * @param y position on the y axis to render - * @param drawers the drawers this element can use + * @param poseStack the pose stack + * @param x position on the x axis to render + * @param y position on the y axis to render + * @param drawers the drawers this element can use */ @OnlyIn(Dist.CLIENT) - void draw(PoseStack matrixStack, int x, int y, IElementDrawers drawers); + void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers); /** * @return true when this crafting preview elements signifies an error that disables starting a task diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridTab.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridTab.java index 70dcf9096..bd1c045e6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridTab.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridTab.java @@ -24,19 +24,19 @@ public interface IGridTab { /** * Draws the tooltip of this tab at the given position. * - * @param matrixStack the matrix stack - * @param x the x position - * @param y the y position - * @param screen the screen + * @param poseStack the pose stack + * @param x the x position + * @param y the y position + * @param screen the screen */ - void drawTooltip(PoseStack matrixStack, int x, int y, Screen screen); + void drawTooltip(PoseStack poseStack, int x, int y, Screen screen); /** * Draws the icon. * - * @param matrixStack the matrix stack - * @param x the x position - * @param y the y position + * @param poseStack the pose stack + * @param x the x position + * @param y the y position */ - void drawIcon(PoseStack matrixStack, int x, int y, IElementDrawer itemDrawer, IElementDrawer fluidDrawer); + void drawIcon(PoseStack poseStack, int x, int y, IElementDrawer itemDrawer, IElementDrawer fluidDrawer); } diff --git a/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java index 54e3578e2..1311545d2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java @@ -11,10 +11,10 @@ import com.mojang.blaze3d.vertex.PoseStack; @FunctionalInterface public interface IElementDrawer { /** - * @param matrixStack the matrix stack - * @param x the x axis - * @param y the y axis - * @param element the element type + * @param poseStack the poses stack + * @param x the x axis + * @param y the y axis + * @param element the element type */ - void draw(PoseStack matrixStack, int x, int y, T element); + void draw(PoseStack poseStack, int x, int y, T element); } diff --git a/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawers.java index ccc91326c..16b3607ba 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawers.java @@ -46,7 +46,7 @@ public interface IElementDrawers { * @return a drawer that does nothing */ default IElementDrawer getNullDrawer() { - return (matrixStack, x, y, element) -> { + return (poseStack, x, y, element) -> { // NO OP }; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java index 6e7398c66..8b08cdc07 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java @@ -38,10 +38,10 @@ public class ErrorCraftingMonitorElement implements ICraftingMonitorElement { @Override @SuppressWarnings("unchecked") - public void draw(PoseStack matrixStack, int x, int y, IElementDrawers drawers) { - base.draw(matrixStack, x, y, drawers); + public void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers) { + base.draw(poseStack, x, y, drawers); - drawers.getErrorDrawer().draw(matrixStack, x, y, null); + drawers.getErrorDrawer().draw(poseStack, x, y, null); } @Nullable diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java index 0c253a6c6..4388e7362 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java @@ -54,55 +54,55 @@ public class FluidCraftingMonitorElement implements ICraftingMonitorElement { @Override @OnlyIn(Dist.CLIENT) - public void draw(PoseStack matrixStack, int x, int y, IElementDrawers drawers) { + public void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers) { if (missing > 0) { - drawers.getOverlayDrawer().draw(matrixStack, x, y, COLOR_MISSING); + drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_MISSING); } else if (processing > 0) { - drawers.getOverlayDrawer().draw(matrixStack, x, y, COLOR_PROCESSING); + drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_PROCESSING); } else if (scheduled > 0) { - drawers.getOverlayDrawer().draw(matrixStack, x, y, COLOR_SCHEDULED); + drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_SCHEDULED); } else if (crafting > 0) { - drawers.getOverlayDrawer().draw(matrixStack, x, y, COLOR_CRAFTING); + drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_CRAFTING); } - drawers.getFluidDrawer().draw(matrixStack, x + 4, y + 6, stack); + drawers.getFluidDrawer().draw(poseStack, x + 4, y + 6, stack); float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; - matrixStack.pushPose(); - matrixStack.scale(scale, scale, 1); + poseStack.pushPose(); + poseStack.scale(scale, scale, 1); int yy = y + 7; if (stored > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.stored", API.instance().getQuantityFormatter().formatInBucketForm(stored))); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.stored", API.instance().getQuantityFormatter().formatInBucketForm(stored))); yy += 7; } if (missing > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.missing", API.instance().getQuantityFormatter().formatInBucketForm(missing))); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.missing", API.instance().getQuantityFormatter().formatInBucketForm(missing))); yy += 7; } if (processing > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.processing", API.instance().getQuantityFormatter().formatInBucketForm(processing))); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.processing", API.instance().getQuantityFormatter().formatInBucketForm(processing))); yy += 7; } if (scheduled > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.scheduled", API.instance().getQuantityFormatter().formatInBucketForm(scheduled))); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.scheduled", API.instance().getQuantityFormatter().formatInBucketForm(scheduled))); yy += 7; } if (crafting > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.crafting", API.instance().getQuantityFormatter().formatInBucketForm(crafting))); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.crafting", API.instance().getQuantityFormatter().formatInBucketForm(crafting))); } - matrixStack.popPose(); + poseStack.popPose(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java index 5c809217a..305973f9e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java @@ -54,55 +54,55 @@ public class ItemCraftingMonitorElement implements ICraftingMonitorElement { @Override @OnlyIn(Dist.CLIENT) - public void draw(PoseStack matrixStack, int x, int y, IElementDrawers drawers) { + public void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers) { if (missing > 0) { - drawers.getOverlayDrawer().draw(matrixStack, x, y, COLOR_MISSING); + drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_MISSING); } else if (processing > 0) { - drawers.getOverlayDrawer().draw(matrixStack, x, y, COLOR_PROCESSING); + drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_PROCESSING); } else if (scheduled > 0) { - drawers.getOverlayDrawer().draw(matrixStack, x, y, COLOR_SCHEDULED); + drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_SCHEDULED); } else if (crafting > 0) { - drawers.getOverlayDrawer().draw(matrixStack, x, y, COLOR_CRAFTING); + drawers.getOverlayDrawer().draw(poseStack, x, y, COLOR_CRAFTING); } - drawers.getItemDrawer().draw(matrixStack, x + 4, y + 6, stack); + drawers.getItemDrawer().draw(poseStack, x + 4, y + 6, stack); float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; - matrixStack.pushPose(); - matrixStack.scale(scale, scale, 1); + poseStack.pushPose(); + poseStack.scale(scale, scale, 1); int yy = y + 7; if (stored > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.stored", stored)); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.stored", stored)); yy += 7; } if (missing > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.missing", missing)); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.missing", missing)); yy += 7; } if (processing > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.processing", processing)); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.processing", processing)); yy += 7; } if (scheduled > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.scheduled", scheduled)); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.scheduled", scheduled)); yy += 7; } if (crafting > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.crafting", crafting)); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.crafting", crafting)); } - matrixStack.popPose(); + poseStack.popPose(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java index 98dc8e194..896836c55 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java @@ -33,7 +33,7 @@ public class ErrorCraftingPreviewElement implements ICraftingPreviewElement { } @Override - public void draw(PoseStack matrixStack, int x, int y, IElementDrawers drawers) { + public void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers) { // NO OP } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java index 9a11a42ad..ada261570 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java @@ -57,35 +57,35 @@ public class FluidCraftingPreviewElement implements ICraftingPreviewElement { @Override @OnlyIn(Dist.CLIENT) - public void draw(PoseStack matrixStack, int x, int y, IElementDrawers drawers) { + public void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers) { if (missing) { - drawers.getOverlayDrawer().draw(matrixStack, x, y, 0xFFF2DEDE); + drawers.getOverlayDrawer().draw(poseStack, x, y, 0xFFF2DEDE); } x += 5; y += 7; - drawers.getFluidDrawer().draw(matrixStack, x, y, getStack()); + drawers.getFluidDrawer().draw(poseStack, x, y, getStack()); float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; y += 2; - matrixStack.pushPose(); - matrixStack.scale(scale, scale, 1); + poseStack.pushPose(); + poseStack.scale(scale, scale, 1); if (toCraft > 0) { String format = doesDisableTaskStarting() ? "gui.refinedstorage.crafting_preview.missing" : "gui.refinedstorage.crafting_preview.to_craft"; - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get(format, API.instance().getQuantityFormatter().formatInBucketForm(toCraft))); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get(format, API.instance().getQuantityFormatter().formatInBucketForm(toCraft))); y += 7; } if (available > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get("gui.refinedstorage.crafting_preview.available", API.instance().getQuantityFormatter().formatInBucketForm(available))); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get("gui.refinedstorage.crafting_preview.available", API.instance().getQuantityFormatter().formatInBucketForm(available))); } - matrixStack.popPose(); + poseStack.popPose(); } public void addAvailable(int amount) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java index 67842a395..f1e6f3ff8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java @@ -57,35 +57,35 @@ public class ItemCraftingPreviewElement implements ICraftingPreviewElement { @Override @OnlyIn(Dist.CLIENT) - public void draw(PoseStack matrixStack, int x, int y, IElementDrawers drawers) { + public void draw(PoseStack poseStack, int x, int y, IElementDrawers drawers) { if (missing) { - drawers.getOverlayDrawer().draw(matrixStack, x, y, 0xFFF2DEDE); + drawers.getOverlayDrawer().draw(poseStack, x, y, 0xFFF2DEDE); } x += 5; y += 7; - drawers.getItemDrawer().draw(matrixStack, x, y, stack); + drawers.getItemDrawer().draw(poseStack, x, y, stack); float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; y += 2; - matrixStack.pushPose(); - matrixStack.scale(scale, scale, 1); + poseStack.pushPose(); + poseStack.scale(scale, scale, 1); if (toCraft > 0) { String format = doesDisableTaskStarting() ? "gui.refinedstorage.crafting_preview.missing" : "gui.refinedstorage.crafting_preview.to_craft"; - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get(format, toCraft)); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get(format, toCraft)); y += 7; } if (available > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get("gui.refinedstorage.crafting_preview.available", available)); + drawers.getStringDrawer().draw(poseStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get("gui.refinedstorage.crafting_preview.available", available)); } - matrixStack.popPose(); + poseStack.popPose(); } public void addAvailable(int amount) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java index 238017a40..06e2cc45f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java @@ -36,20 +36,20 @@ public class GridTab implements IGridTab { } @Override - public void drawTooltip(PoseStack matrixStack, int x, int y, Screen screen) { + public void drawTooltip(PoseStack poseStack, int x, int y, Screen screen) { if (name != null) { - screen.renderTooltip(matrixStack, name, x, y); + screen.renderTooltip(poseStack, name, x, y); } } @Override - public void drawIcon(PoseStack matrixStack, int x, int y, IElementDrawer itemDrawer, IElementDrawer fluidDrawer) { + public void drawIcon(PoseStack poseStack, int x, int y, IElementDrawer itemDrawer, IElementDrawer fluidDrawer) { if (!icon.isEmpty()) { Lighting.setupFor3DItems(); - itemDrawer.draw(matrixStack, x, y, icon); + itemDrawer.draw(poseStack, x, y, icon); } else { - fluidDrawer.draw(matrixStack, x, y, fluidIcon); + fluidDrawer.draw(poseStack, x, y, fluidIcon); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java index 172ea6eb2..e1683b1fd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java @@ -14,15 +14,15 @@ public class CraftingMonitorElementDrawers extends ElementDrawers screen, int itemWidth, int itemHeight) { super(screen); - this.overlayDrawer = (matrixStack, x, y, color) -> { + this.overlayDrawer = (poseStack, x, y, color) -> { RenderSystem.setShaderColor(1, 1, 1, 1); - GuiComponent.fill(matrixStack, x, y, x + itemWidth, y + itemHeight, color); + GuiComponent.fill(poseStack, x, y, x + itemWidth, y + itemHeight, color); }; - this.errorDrawer = (matrixStack, x, y, nothing) -> { + this.errorDrawer = (poseStack, x, y, nothing) -> { RenderSystem.setShaderColor(1, 1, 1, 1); screen.bindTexture(RS.ID, "gui/crafting_preview.png"); - screen.blit(matrixStack, x + itemWidth - 12 - 2, y + itemHeight - 12 - 2, 0, 244, 12, 12); + screen.blit(poseStack, x + itemWidth - 12 - 2, y + itemHeight - 12 - 2, 0, 244, 12, 12); }; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java index c2b5dea7a..2c4fbbe64 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java @@ -7,9 +7,9 @@ import net.minecraft.client.gui.GuiComponent; import net.minecraft.world.inventory.AbstractContainerMenu; public class CraftingPreviewElementDrawers extends ElementDrawers { - private final IElementDrawer overlayDrawer = (matrixStack, x, y, color) -> { + private final IElementDrawer overlayDrawer = (poseStack, x, y, color) -> { RenderSystem.setShaderColor(1, 1, 1, 1); - GuiComponent.fill(matrixStack, x, y, x + 73, y + 29, color); + GuiComponent.fill(poseStack, x, y, x + 73, y + 29, color); }; public CraftingPreviewElementDrawers(CraftingPreviewScreen screen) { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java index 15d6ba983..499bb80c1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java @@ -13,7 +13,6 @@ import com.refinedmods.refinedstorage.render.Styles; import com.refinedmods.refinedstorage.render.blockentity.PatternItemBlockEntityRenderer; import com.refinedmods.refinedstorage.util.ItemStackKey; import com.refinedmods.refinedstorage.util.RenderUtils; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.nbt.CompoundTag; @@ -29,7 +28,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import net.minecraftforge.client.IItemRenderProperties; -import net.minecraftforge.common.util.NonNullLazy; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nonnull; @@ -55,11 +53,6 @@ public class PatternItem extends Item implements ICraftingPatternProvider, IItem private static final int VERSION = 1; - private final NonNullLazy renderer = NonNullLazy.of(() -> new PatternItemBlockEntityRenderer( - Minecraft.getInstance().getBlockEntityRenderDispatcher(), - Minecraft.getInstance().getEntityModels() - )); - public PatternItem() { super(new Item.Properties().tab(RS.MAIN_GROUP)); } @@ -217,7 +210,7 @@ public class PatternItem extends Item implements ICraftingPatternProvider, IItem consumer.accept(new IItemRenderProperties() { @Override public BlockEntityWithoutLevelRenderer getItemStackRenderer() { - return renderer.get(); + return PatternItemBlockEntityRenderer.getInstance(); } }); } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java index c54e8f273..01f330f6e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java @@ -72,17 +72,17 @@ public class FluidRenderer { tessellator.end(); } - public void render(PoseStack matrixStack, final int xPosition, final int yPosition, @Nullable FluidStack fluidStack) { + public void render(PoseStack poseStack, final int xPosition, final int yPosition, @Nullable FluidStack fluidStack) { RenderSystem.enableBlend(); - drawFluid(matrixStack, xPosition, yPosition, fluidStack); + drawFluid(poseStack, xPosition, yPosition, fluidStack); RenderSystem.setShaderColor(1, 1, 1, 1); RenderSystem.disableBlend(); } - private void drawFluid(PoseStack matrixStack, final int xPosition, final int yPosition, @Nullable FluidStack fluidStack) { + private void drawFluid(PoseStack poseStack, final int xPosition, final int yPosition, @Nullable FluidStack fluidStack) { if (fluidStack == null) { return; } @@ -105,12 +105,12 @@ public class FluidRenderer { scaledAmount = height; } - drawTiledSprite(matrixStack, xPosition, yPosition, width, height, fluidColor, scaledAmount, fluidStillSprite); + drawTiledSprite(poseStack, xPosition, yPosition, width, height, fluidColor, scaledAmount, fluidStillSprite); } - private void drawTiledSprite(PoseStack matrixStack, final int xPosition, final int yPosition, final int tiledWidth, final int tiledHeight, int color, int scaledAmount, TextureAtlasSprite sprite) { + private void drawTiledSprite(PoseStack poseStack, final int xPosition, final int yPosition, final int tiledWidth, final int tiledHeight, int color, int scaledAmount, TextureAtlasSprite sprite) { RenderSystem.setShaderTexture(0, InventoryMenu.BLOCK_ATLAS); - Matrix4f matrix = matrixStack.last().pose(); + Matrix4f matrix = poseStack.last().pose(); setGLColorFromInt(color); final int xTileCount = tiledWidth / TEX_WIDTH; diff --git a/src/main/java/com/refinedmods/refinedstorage/render/blockentity/PatternItemBlockEntityRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/blockentity/PatternItemBlockEntityRenderer.java index 7f45877e7..199cc8fea 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/blockentity/PatternItemBlockEntityRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/blockentity/PatternItemBlockEntityRenderer.java @@ -3,6 +3,7 @@ package com.refinedmods.refinedstorage.render.blockentity; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; import com.refinedmods.refinedstorage.item.PatternItem; +import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; @@ -10,18 +11,31 @@ import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; import net.minecraft.world.item.ItemStack; import net.minecraftforge.client.RenderProperties; +import net.minecraftforge.common.util.NonNullLazy; public class PatternItemBlockEntityRenderer extends BlockEntityWithoutLevelRenderer { + private static PatternItemBlockEntityRenderer instance; + public PatternItemBlockEntityRenderer(BlockEntityRenderDispatcher dispatcher, EntityModelSet entityModelSet) { super(dispatcher, entityModelSet); } @Override - public void renderByItem(ItemStack stack, ItemTransforms.TransformType transformType, PoseStack matrixStack, MultiBufferSource renderTypeBuffer, int combinedLight, int combinedOverlay) { + public void renderByItem(ItemStack stack, ItemTransforms.TransformType transformType, PoseStack poseStack, MultiBufferSource renderTypeBuffer, int combinedLight, int combinedOverlay) { ICraftingPattern pattern = PatternItem.fromCache(null, stack); ItemStack outputStack = pattern.getOutputs().get(0); - RenderProperties.get(outputStack.getItem()).getItemStackRenderer().renderByItem(outputStack, transformType, matrixStack, renderTypeBuffer, combinedLight, combinedOverlay); + RenderProperties.get(outputStack.getItem()).getItemStackRenderer().renderByItem(outputStack, transformType, poseStack, renderTypeBuffer, combinedLight, combinedOverlay); + } + + public static PatternItemBlockEntityRenderer getInstance() { + if (instance == null) { + instance = new PatternItemBlockEntityRenderer( + Minecraft.getInstance().getBlockEntityRenderDispatcher(), + Minecraft.getInstance().getEntityModels() + ); + } + return instance; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/blockentity/StorageMonitorBlockEntityRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/blockentity/StorageMonitorBlockEntityRenderer.java index b3c1d3166..38150b88d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/blockentity/StorageMonitorBlockEntityRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/blockentity/StorageMonitorBlockEntityRenderer.java @@ -31,7 +31,7 @@ import net.minecraftforge.fluids.FluidStack; public class StorageMonitorBlockEntityRenderer implements BlockEntityRenderer { @Override - public void render(StorageMonitorBlockEntity blockEntity, float partialTicks, PoseStack matrixStack, MultiBufferSource renderTypeBuffer, int i, int i1) { + public void render(StorageMonitorBlockEntity blockEntity, float partialTicks, PoseStack poseStack, MultiBufferSource renderTypeBuffer, int i, int i1) { Direction direction = Direction.NORTH; BlockState state = blockEntity.getLevel().getBlockState(blockEntity.getBlockPos()); @@ -48,36 +48,36 @@ public class StorageMonitorBlockEntityRenderer implements BlockEntityRenderer> 24 & 0xFF; - buffer.vertex(matrixStack.last().pose(), -0.5F, -0.5F, 0F) + buffer.vertex(poseStack.last().pose(), -0.5F, -0.5F, 0F) .color(colorRed, colorGreen, colorBlue, colorAlpha) .uv(sprite.getU0(), sprite.getV0()) .uv2(light) .endVertex(); - buffer.vertex(matrixStack.last().pose(), 0.5F, -0.5F, 0F) + buffer.vertex(poseStack.last().pose(), 0.5F, -0.5F, 0F) .color(colorRed, colorGreen, colorBlue, colorAlpha) .uv(sprite.getU1(), sprite.getV0()) .uv2(light) .endVertex(); - buffer.vertex(matrixStack.last().pose(), 0.5F, -1.5F, 0F) + buffer.vertex(poseStack.last().pose(), 0.5F, -1.5F, 0F) .color(colorRed, colorGreen, colorBlue, colorAlpha) .uv(sprite.getU1(), sprite.getV1()) .uv2(light) .endVertex(); - buffer.vertex(matrixStack.last().pose(), -0.5F, -1.5F, 0F) + buffer.vertex(poseStack.last().pose(), -0.5F, -1.5F, 0F) .color(colorRed, colorGreen, colorBlue, colorAlpha) .uv(sprite.getU0(), sprite.getV1()) .uv2(light) .endVertex(); - matrixStack.popPose(); + poseStack.popPose(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCover.java b/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCover.java index d1dcc7899..11dcbdcb1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCover.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCover.java @@ -67,9 +67,9 @@ public class BakedModelCover extends BakedModelCableCover { } @Override - public BakedModel handlePerspective(ItemTransforms.TransformType cameraTransformType, PoseStack matrixStack) { + public BakedModel handlePerspective(ItemTransforms.TransformType cameraTransformType, PoseStack poseStack) { Transformation transform = RenderUtils.getDefaultBlockTransforms().get(cameraTransformType); - if (transform != null) transform.push(matrixStack); + if (transform != null) transform.push(poseStack); return this; } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/DelegateBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/DelegateBakedModel.java index 35483721e..f662a745f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/DelegateBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/DelegateBakedModel.java @@ -65,7 +65,7 @@ public class DelegateBakedModel implements BakedModel { @Override @SuppressWarnings("deprecation") - public BakedModel handlePerspective(ItemTransforms.TransformType cameraTransformType, PoseStack matrixStack) { - return base.handlePerspective(cameraTransformType, matrixStack); + public BakedModel handlePerspective(ItemTransforms.TransformType cameraTransformType, PoseStack poseStack) { + return base.handlePerspective(cameraTransformType, poseStack); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java index 351691b72..f2050d9e6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java @@ -154,17 +154,17 @@ public abstract class AmountSpecifyingScreen ex } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, getTexture()); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); - amountField.renderButton(matrixStack, 0, 0, 0); + amountField.renderButton(poseStack, 0, 0, 0); } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, title.getString()); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, title.getString()); } protected void onOkButtonPressed(boolean shiftDown) { diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java index da5e539ad..dce27f567 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java @@ -124,19 +124,19 @@ public abstract class BaseScreen extends Abstra } @Override - public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); + public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + renderBackground(poseStack); - super.render(matrixStack, mouseX, mouseY, partialTicks); + super.render(poseStack, mouseX, mouseY, partialTicks); - renderTooltip(matrixStack, mouseX, mouseY); + renderTooltip(poseStack, mouseX, mouseY); } @Override - protected void renderBg(PoseStack matrixStack, float renderPartialTicks, int mouseX, int mouseY) { + protected void renderBg(PoseStack poseStack, float renderPartialTicks, int mouseX, int mouseY) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - renderBackground(matrixStack, leftPos, topPos, mouseX, mouseY); + renderBackground(poseStack, leftPos, topPos, mouseX, mouseY); for (int i = 0; i < this.menu.slots.size(); ++i) { Slot slot = menu.slots.get(i); @@ -145,10 +145,10 @@ public abstract class BaseScreen extends Abstra FluidStack stack = ((FluidFilterSlot) slot).getFluidInventory().getFluid(slot.getSlotIndex()); if (!stack.isEmpty()) { - FluidRenderer.INSTANCE.render(matrixStack, leftPos + slot.x, topPos + slot.y, stack); + FluidRenderer.INSTANCE.render(poseStack, leftPos + slot.x, topPos + slot.y, stack); if (((FluidFilterSlot) slot).isSizeAllowed()) { - renderQuantity(matrixStack, leftPos + slot.x, topPos + slot.y, API.instance().getQuantityFormatter().formatInBucketForm(stack.getAmount()), RenderSettings.INSTANCE.getSecondaryColor()); + renderQuantity(poseStack, leftPos + slot.x, topPos + slot.y, API.instance().getQuantityFormatter().formatInBucketForm(stack.getAmount()), RenderSettings.INSTANCE.getSecondaryColor()); GL11.glDisable(GL11.GL_LIGHTING); } @@ -158,17 +158,17 @@ public abstract class BaseScreen extends Abstra } @Override - protected void renderLabels(PoseStack matrixStack, int mouseX, int mouseY) { + protected void renderLabels(PoseStack poseStack, int mouseX, int mouseY) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); mouseX -= leftPos; mouseY -= topPos; - renderForeground(matrixStack, mouseX, mouseY); + renderForeground(poseStack, mouseX, mouseY); for (Widget button : this.renderables) { if (button instanceof SideButton sideButton) { - sideButton.renderTooltip(matrixStack, mouseX, mouseY); + sideButton.renderTooltip(poseStack, mouseX, mouseY); } } @@ -179,7 +179,7 @@ public abstract class BaseScreen extends Abstra FluidStack stack = ((FluidFilterSlot) slot).getFluidInventory().getFluid(slot.getSlotIndex()); if (!stack.isEmpty() && RenderUtils.inBounds(slot.x, slot.y, 17, 17, mouseX, mouseY)) { - renderTooltip(matrixStack, mouseX, mouseY, stack.getDisplayName().getString()); + renderTooltip(poseStack, mouseX, mouseY, stack.getDisplayName().getString()); } } } @@ -289,11 +289,11 @@ public abstract class BaseScreen extends Abstra RenderSystem.setShaderTexture(0, TEXTURE_CACHE.computeIfAbsent(namespace + ":" + filenameInTexturesFolder, newId -> new ResourceLocation(namespace, "textures/" + filenameInTexturesFolder))); } - public void renderItem(PoseStack matrixStack, int x, int y, ItemStack stack) { - renderItem(matrixStack, x, y, stack, false, null, 0); + public void renderItem(PoseStack poseStack, int x, int y, ItemStack stack) { + renderItem(poseStack, x, y, stack, false, null, 0); } - public void renderItem(PoseStack matrixStack, int x, int y, ItemStack stack, boolean overlay, @Nullable String text, int textColor) { + public void renderItem(PoseStack poseStack, int x, int y, ItemStack stack, boolean overlay, @Nullable String text, int textColor) { try { setBlitOffset(Z_LEVEL_ITEMS); itemRenderer.blitOffset = Z_LEVEL_ITEMS; @@ -308,46 +308,46 @@ public abstract class BaseScreen extends Abstra itemRenderer.blitOffset = 0; if (text != null) { - renderQuantity(matrixStack, x, y, text, textColor); + renderQuantity(poseStack, x, y, text, textColor); } } catch (Throwable t) { logger.warn("Couldn't render stack: {}", stack.getItem().getRegistryName()); } } - public void renderQuantity(PoseStack matrixStack, int x, int y, String qty, int color) { + public void renderQuantity(PoseStack poseStack, int x, int y, String qty, int color) { boolean large = minecraft.isEnforceUnicode() || RS.CLIENT_CONFIG.getGrid().getLargeFont(); - matrixStack.pushPose(); - matrixStack.translate(x, y, Z_LEVEL_QTY); + poseStack.pushPose(); + poseStack.translate(x, y, Z_LEVEL_QTY); if (!large) { - matrixStack.scale(0.5F, 0.5F, 1); + poseStack.scale(0.5F, 0.5F, 1); } - font.drawShadow(matrixStack, qty, (large ? 16 : 30) - font.width(qty), large ? 8 : 22, color); + font.drawShadow(poseStack, qty, (large ? 16 : 30) - font.width(qty), large ? 8 : 22, color); - matrixStack.popPose(); + poseStack.popPose(); } - public void renderString(PoseStack matrixStack, int x, int y, String message) { - renderString(matrixStack, x, y, message, RenderSettings.INSTANCE.getPrimaryColor()); + public void renderString(PoseStack poseStack, int x, int y, String message) { + renderString(poseStack, x, y, message, RenderSettings.INSTANCE.getPrimaryColor()); } - public void renderString(PoseStack matrixStack, int x, int y, String message, int color) { - font.draw(matrixStack, message, x, y, color); + public void renderString(PoseStack poseStack, int x, int y, String message, int color) { + font.draw(poseStack, message, x, y, color); } - public void renderTooltip(PoseStack matrixStack, int x, int y, String lines) { - renderTooltip(matrixStack, ItemStack.EMPTY, x, y, lines); + public void renderTooltip(PoseStack poseStack, int x, int y, String lines) { + renderTooltip(poseStack, ItemStack.EMPTY, x, y, lines); } - public void renderTooltip(PoseStack matrixStack, @Nonnull ItemStack stack, int x, int y, String lines) { - renderTooltip(matrixStack, stack, x, y, Arrays.stream(lines.split("\n")).map(TextComponent::new).collect(Collectors.toList())); + public void renderTooltip(PoseStack poseStack, @Nonnull ItemStack stack, int x, int y, String lines) { + renderTooltip(poseStack, stack, x, y, Arrays.stream(lines.split("\n")).map(TextComponent::new).collect(Collectors.toList())); } - public void renderTooltip(PoseStack matrixStack, @Nonnull ItemStack stack, int x, int y, List lines) { - renderComponentTooltip(matrixStack, lines, x, y, stack); + public void renderTooltip(PoseStack poseStack, @Nonnull ItemStack stack, int x, int y, List lines) { + renderComponentTooltip(poseStack, lines, x, y, stack); } protected void onPreInit() { @@ -358,7 +358,7 @@ public abstract class BaseScreen extends Abstra public abstract void tick(int x, int y); - public abstract void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY); + public abstract void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY); - public abstract void renderForeground(PoseStack matrixStack, int mouseX, int mouseY); + public abstract void renderForeground(PoseStack poseStack, int mouseX, int mouseY); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java index a37779d9b..30166d06f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java @@ -34,15 +34,15 @@ public class ConstructorScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/constructor.png"); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 43, I18n.get("container.inventory")); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, title.getString()); + renderString(poseStack, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java index d378cc451..922a6d3e2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java @@ -44,16 +44,16 @@ public class ControllerScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/controller.png"); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); int energyBarHeightNew = Network.getEnergyScaled(ControllerBlockEntity.ENERGY_STORED.getValue(), ControllerBlockEntity.ENERGY_CAPACITY.getValue(), ENERGY_BAR_HEIGHT); - blit(matrixStack, x + ENERGY_BAR_X, y + ENERGY_BAR_Y + ENERGY_BAR_HEIGHT - energyBarHeightNew, 178, ENERGY_BAR_HEIGHT - energyBarHeightNew, ENERGY_BAR_WIDTH, energyBarHeightNew); + blit(poseStack, x + ENERGY_BAR_X, y + ENERGY_BAR_Y + ENERGY_BAR_HEIGHT - energyBarHeightNew, 178, ENERGY_BAR_HEIGHT - energyBarHeightNew, ENERGY_BAR_WIDTH, energyBarHeightNew); - scrollbar.render(matrixStack); + scrollbar.render(poseStack); } @Override @@ -79,9 +79,9 @@ public class ControllerScreen extends BaseScreen { } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 87, I18n.get("container.inventory")); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, title.getString()); + renderString(poseStack, 7, 87, I18n.get("container.inventory")); int x = 33; int y = 26; @@ -98,22 +98,22 @@ public class ControllerScreen extends BaseScreen { if (slot < nodes.size()) { ClientNode node = nodes.get(slot); - renderItem(matrixStack, x, y + 5, node.getStack()); + renderItem(poseStack, x, y + 5, node.getStack()); float scale = minecraft.isEnforceUnicode() ? 1F : 0.5F; - matrixStack.pushPose(); - matrixStack.scale(scale, scale, 1); + poseStack.pushPose(); + poseStack.scale(scale, scale, 1); renderString( - matrixStack, + poseStack, RenderUtils.getOffsetOnScale(x + 1, scale), RenderUtils.getOffsetOnScale(y - 2, scale), trimNameIfNeeded(!minecraft.isEnforceUnicode(), node.getStack().getHoverName().getString()) ); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 21, scale), RenderUtils.getOffsetOnScale(y + 10, scale), node.getAmount() + "x"); + renderString(poseStack, RenderUtils.getOffsetOnScale(x + 21, scale), RenderUtils.getOffsetOnScale(y + 10, scale), node.getAmount() + "x"); - matrixStack.popPose(); + poseStack.popPose(); if (RenderUtils.inBounds(x, y, 16, 16, mouseX, mouseY)) { hoveringNode = node; @@ -131,11 +131,11 @@ public class ControllerScreen extends BaseScreen { } if (hoveringNode != null) { - renderTooltip(matrixStack, mouseX, mouseY, I18n.get("misc.refinedstorage.energy_usage_minimal", hoveringNode.getEnergyUsage())); + renderTooltip(poseStack, mouseX, mouseY, I18n.get("misc.refinedstorage.energy_usage_minimal", hoveringNode.getEnergyUsage())); } if (RenderUtils.inBounds(ENERGY_BAR_X, ENERGY_BAR_Y, ENERGY_BAR_WIDTH, ENERGY_BAR_HEIGHT, mouseX, mouseY)) { - renderTooltip(matrixStack, mouseX, mouseY, I18n.get("misc.refinedstorage.energy_usage", ControllerBlockEntity.ENERGY_USAGE.getValue()) + "\n" + I18n.get("misc.refinedstorage.energy_stored", ControllerBlockEntity.ENERGY_STORED.getValue(), ControllerBlockEntity.ENERGY_CAPACITY.getValue())); + renderTooltip(poseStack, mouseX, mouseY, I18n.get("misc.refinedstorage.energy_usage", ControllerBlockEntity.ENERGY_USAGE.getValue()) + "\n" + I18n.get("misc.refinedstorage.energy_stored", ControllerBlockEntity.ENERGY_STORED.getValue(), ControllerBlockEntity.ENERGY_CAPACITY.getValue())); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java index 1e282afa1..8a791ebf6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java @@ -79,10 +79,10 @@ public class CrafterManagerScreen extends BaseScreen heading : menu.getHeadings().entrySet()) { @@ -134,9 +134,9 @@ public class CrafterManagerScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/crafter.png"); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, RenderUtils.shorten(title.getString(), 26)); - renderString(matrixStack, 7, 43, I18n.get("container.inventory")); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, RenderUtils.shorten(title.getString(), 26)); + renderString(poseStack, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java index d27f2f32b..bf31f05dc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java @@ -178,23 +178,23 @@ public class CraftingMonitorScreen extends BaseScreen lines = Lists.newArrayList(requested.getItem() != null ? requested.getItem().getHoverName() : requested.getFluid().getDisplayName()); int totalSecs = (int) (System.currentTimeMillis() - executionStarted) / 1000; @@ -302,7 +302,7 @@ public class CraftingMonitorScreen extends BaseScreen itemDrawer, IElementDrawer fluidDrawer) { + public void drawIcon(PoseStack poseStack, int x, int y, IElementDrawer itemDrawer, IElementDrawer fluidDrawer) { if (requested.getItem() != null) { Lighting.setupFor3DItems(); - itemDrawer.draw(matrixStack, x, y, requested.getItem()); + itemDrawer.draw(poseStack, x, y, requested.getItem()); } else { - fluidDrawer.draw(matrixStack, x, y, requested.getFluid()); + fluidDrawer.draw(poseStack, x, y, requested.getFluid()); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java index 0de7d55b1..673e13c7a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java @@ -34,15 +34,15 @@ public class DestructorScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/destructor.png"); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 43, I18n.get("container.inventory")); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, title.getString()); + renderString(poseStack, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java index 5ca354061..33be81ea7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java @@ -61,16 +61,16 @@ public class DetectorScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/detector.png"); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 43, I18n.get("container.inventory")); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, title.getString()); + renderString(poseStack, 7, 43, I18n.get("container.inventory")); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java index 0c08f4272..b69bcd9ca 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java @@ -29,9 +29,9 @@ public class DiskDriveScreen extends StorageScreen { } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 79, 42, I18n.get("gui.refinedstorage.disk_drive.disks")); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 79, 42, I18n.get("gui.refinedstorage.disk_drive.disks")); - super.renderForeground(matrixStack, mouseX, mouseY); + super.renderForeground(poseStack, mouseX, mouseY); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java index f7ac47dd5..1ccf51a94 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java @@ -30,17 +30,17 @@ public class DiskManipulatorScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/exporter.png"); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 43, I18n.get("container.inventory")); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, title.getString()); + renderString(poseStack, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java index 602e7c205..fe8b91cfa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java @@ -113,16 +113,16 @@ public class FilterScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/filter.png"); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 137, I18n.get("container.inventory")); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, title.getString()); + renderString(poseStack, 7, 137, I18n.get("container.inventory")); } public int getType() { diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java index 7776d7b7d..d6e597744 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java @@ -33,33 +33,33 @@ public class FluidInterfaceScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/importer.png"); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 43, I18n.get("container.inventory")); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, title.getString()); + renderString(poseStack, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java index b0d006a2e..6fa7de728 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java @@ -29,16 +29,16 @@ public class InterfaceScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/interface.png"); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, I18n.get("gui.refinedstorage.interface.import")); - renderString(matrixStack, 7, 42, I18n.get("gui.refinedstorage.interface.export")); - renderString(matrixStack, 7, 122, I18n.get("container.inventory")); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, I18n.get("gui.refinedstorage.interface.import")); + renderString(poseStack, 7, 42, I18n.get("gui.refinedstorage.interface.export")); + renderString(poseStack, 7, 122, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java index 221ff249a..74130ee8b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java @@ -29,15 +29,15 @@ public class NetworkTransmitterScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/relay.png"); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 39, I18n.get("container.inventory")); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, title.getString()); + renderString(poseStack, 7, 39, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java index 79cc85f85..1e28fa67e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java @@ -55,24 +55,24 @@ public class SecurityManagerScreen extends BaseScreen getHeight if (RenderUtils.inBounds(permission.x - leftPos, permission.y - topPos, permission.getWidth(), permission.getHeight(), mouseX, mouseY)) { - renderTooltip(matrixStack, mouseX, mouseY, I18n.get("gui.refinedstorage.security_manager.permission." + i + ".tooltip")); + renderTooltip(poseStack, mouseX, mouseY, I18n.get("gui.refinedstorage.security_manager.permission." + i + ".tooltip")); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java index 9559d8071..480032e9a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java @@ -27,15 +27,15 @@ public class StorageMonitorScreen extends BaseScreen extends BaseScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/alternatives.png"); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); - scrollbar.render(matrixStack); + scrollbar.render(poseStack); } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, title.getString()); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, title.getString()); int x = 8; int y = 20; @@ -172,7 +172,7 @@ public class AlternativesScreen extends BaseScreen { if (visible) { lines.get(i).layoutDependantControls(true, leftPos + x + 3, topPos + y + 3); - lines.get(i).render(matrixStack, x, y); + lines.get(i).render(poseStack, x, y); y += 18; } else { @@ -187,7 +187,7 @@ public class AlternativesScreen extends BaseScreen { boolean visible = i >= scrollbar.getOffset() && i < scrollbar.getOffset() + VISIBLE_ROWS; if (visible) { - lines.get(i).renderTooltip(matrixStack, x, y, mouseX, mouseY); + lines.get(i).renderTooltip(poseStack, x, y, mouseX, mouseY); y += 18; } @@ -262,10 +262,10 @@ public class AlternativesScreen extends BaseScreen { } private interface Line { - default void render(PoseStack matrixStack, int x, int y) { + default void render(PoseStack poseStack, int x, int y) { } - default void renderTooltip(PoseStack matrixStack, int x, int y, int mx, int my) { + default void renderTooltip(PoseStack poseStack, int x, int y, int mx, int my) { } default void layoutDependantControls(boolean visible, int x, int y) { @@ -280,10 +280,10 @@ public class AlternativesScreen extends BaseScreen { } @Override - public void render(PoseStack matrixStack, int x, int y) { + public void render(PoseStack poseStack, int x, int y) { RenderSystem.setShaderColor(1, 1, 1, 1); - renderItem(matrixStack, x + 3, y + 2, item); - renderString(matrixStack, x + 4 + 19, y + 7, item.getHoverName().getString()); + renderItem(poseStack, x + 3, y + 2, item); + renderString(poseStack, x + 4 + 19, y + 7, item.getHoverName().getString()); } } @@ -295,9 +295,9 @@ public class AlternativesScreen extends BaseScreen { } @Override - public void render(PoseStack matrixStack, int x, int y) { - FluidRenderer.INSTANCE.render(matrixStack, x + 3, y + 2, fluid); - renderString(matrixStack, x + 4 + 19, y + 7, fluid.getDisplayName().getString()); + public void render(PoseStack poseStack, int x, int y) { + FluidRenderer.INSTANCE.render(poseStack, x + 3, y + 2, fluid); + renderString(poseStack, x + 4 + 19, y + 7, fluid.getDisplayName().getString()); } } @@ -331,19 +331,19 @@ public class AlternativesScreen extends BaseScreen { } @Override - public void render(PoseStack matrixStack, int x, int y) { + public void render(PoseStack poseStack, int x, int y) { for (ItemStack itemInList : items) { - renderItem(matrixStack, x + 3, y, itemInList); + renderItem(poseStack, x + 3, y, itemInList); x += 17; } } @Override - public void renderTooltip(PoseStack matrixStack, int x, int y, int mx, int my) { + public void renderTooltip(PoseStack poseStack, int x, int y, int mx, int my) { for (ItemStack itemInList : items) { if (RenderUtils.inBounds(x + 3, y, 16, 16, mx, my)) { - AlternativesScreen.this.renderTooltip(matrixStack, itemInList, mx, my, RenderUtils.getTooltipFromItem(itemInList)); + AlternativesScreen.this.renderTooltip(poseStack, itemInList, mx, my, RenderUtils.getTooltipFromItem(itemInList)); } x += 17; @@ -359,19 +359,19 @@ public class AlternativesScreen extends BaseScreen { } @Override - public void render(PoseStack matrixStack, int x, int y) { + public void render(PoseStack poseStack, int x, int y) { for (FluidStack fluidInList : fluids) { - FluidRenderer.INSTANCE.render(matrixStack, x + 3, y, fluidInList); + FluidRenderer.INSTANCE.render(poseStack, x + 3, y, fluidInList); x += 17; } } @Override - public void renderTooltip(PoseStack matrixStack, int x, int y, int mx, int my) { + public void renderTooltip(PoseStack poseStack, int x, int y, int mx, int my) { for (FluidStack fluidInList : fluids) { if (RenderUtils.inBounds(x + 3, y, 16, 16, mx, my)) { - AlternativesScreen.this.renderTooltip(matrixStack, mx, my, fluidInList.getDisplayName().getString()); + AlternativesScreen.this.renderTooltip(poseStack, mx, my, fluidInList.getDisplayName().getString()); } x += 17; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java index 553cca6c3..6a4f63070 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java @@ -93,21 +93,21 @@ public class CraftingPreviewScreen extends BaseScreen { } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/crafting_preview.png"); - blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); + blit(poseStack, x, y, 0, 0, imageWidth, imageHeight); if (getError() != null) { - fill(matrixStack, x + 7, y + 20, x + 228, y + 169, 0xFFDBDBDB); + fill(poseStack, x + 7, y + 20, x + 228, y + 169, 0xFFDBDBDB); } - scrollbar.render(matrixStack); + scrollbar.render(poseStack); } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, title.getString()); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, title.getString()); int x = 7; int y = 15; @@ -116,13 +116,13 @@ public class CraftingPreviewScreen extends BaseScreen { ErrorCraftingPreviewElement error = getError(); if (error != null) { - renderError(matrixStack, x, y, scale, error); + renderError(poseStack, x, y, scale, error); } else { - renderPreview(matrixStack, mouseX, mouseY, x, y); + renderPreview(poseStack, mouseX, mouseY, x, y); } } - private void renderPreview(PoseStack matrixStack, int mouseX, int mouseY, int x, int y) { + private void renderPreview(PoseStack poseStack, int mouseX, int mouseY, int x, int y) { int slot = scrollbar != null ? (scrollbar.getOffset() * 3) : 0; Lighting.setupFor3DItems(); @@ -133,7 +133,7 @@ public class CraftingPreviewScreen extends BaseScreen { for (int i = 0; i < 3 * 5; ++i) { if (slot < elements.size()) { - renderElement(matrixStack, mouseX, mouseY, x, y, elements.get(slot)); + renderElement(poseStack, mouseX, mouseY, x, y, elements.get(slot)); } if ((i + 1) % 3 == 0) { @@ -147,8 +147,8 @@ public class CraftingPreviewScreen extends BaseScreen { } } - private void renderElement(PoseStack matrixStack, int mouseX, int mouseY, int x, int y, ICraftingPreviewElement element) { - element.draw(matrixStack, x, y + 5, drawers); + private void renderElement(PoseStack poseStack, int mouseX, int mouseY, int x, int y, ICraftingPreviewElement element) { + element.draw(poseStack, x, y + 5, drawers); if (RenderUtils.inBounds(x + 5, y + 7, 16, 16, mouseX, mouseY)) { this.hoveringStack = element instanceof ItemCraftingPreviewElement ? ((ItemCraftingPreviewElement) element).getStack() : null; @@ -159,49 +159,49 @@ public class CraftingPreviewScreen extends BaseScreen { } } - private void renderError(PoseStack matrixStack, int x, int y, float scale, ErrorCraftingPreviewElement errorElement) { - matrixStack.pushPose(); - matrixStack.scale(scale, scale, 1); + private void renderError(PoseStack poseStack, int x, int y, float scale, ErrorCraftingPreviewElement errorElement) { + poseStack.pushPose(); + poseStack.scale(scale, scale, 1); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 11, scale), I18n.get("gui.refinedstorage.crafting_preview.error")); + renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 11, scale), I18n.get("gui.refinedstorage.crafting_preview.error")); switch (errorElement.getType()) { case RECURSIVE: - renderRecursiveError(matrixStack, x, y, scale, errorElement.getRecursedPattern()); + renderRecursiveError(poseStack, x, y, scale, errorElement.getRecursedPattern()); break; case TOO_COMPLEX: - renderTooComplexError(matrixStack, x, y, scale); + renderTooComplexError(poseStack, x, y, scale); break; default: break; } - matrixStack.popPose(); + poseStack.popPose(); } - private void renderTooComplexError(PoseStack matrixStack, int x, int y, float scale) { - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.get("gui.refinedstorage.crafting_preview.error.too_complex.0")); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.get("gui.refinedstorage.crafting_preview.error.too_complex.1")); + private void renderTooComplexError(PoseStack poseStack, int x, int y, float scale) { + renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.get("gui.refinedstorage.crafting_preview.error.too_complex.0")); + renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.get("gui.refinedstorage.crafting_preview.error.too_complex.1")); } - private void renderRecursiveError(PoseStack matrixStack, int x, int y, float scale, ItemStack recursedPattern) { - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.0")); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.1")); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 41, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.2")); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 51, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.3")); + private void renderRecursiveError(PoseStack poseStack, int x, int y, float scale, ItemStack recursedPattern) { + renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.0")); + renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.1")); + renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 41, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.2")); + renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 51, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.3")); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 61, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.4")); + renderString(poseStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 61, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.4")); ICraftingPattern pattern = PatternItem.fromCache(parent.getMinecraft().level, recursedPattern); int yy = 83; for (ItemStack output : pattern.getOutputs()) { if (output != null) { - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy + 6, scale), output.getHoverName().getString()); + renderString(poseStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy + 6, scale), output.getHoverName().getString()); Lighting.setupFor3DItems(); RenderSystem.enableDepthTest(); - renderItem(matrixStack, x + 5, yy, output); + renderItem(poseStack, x + 5, yy, output); yy += 17; } @@ -209,12 +209,12 @@ public class CraftingPreviewScreen extends BaseScreen { } @Override - public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) { - super.render(matrixStack, mouseX, mouseY, partialTicks); + public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + super.render(poseStack, mouseX, mouseY, partialTicks); if (hoveringStack != null) { renderTooltip( - matrixStack, + poseStack, hoveringStack, mouseX, mouseY, @@ -224,7 +224,7 @@ public class CraftingPreviewScreen extends BaseScreen { ) ); } else if (hoveringFluid != null) { - renderTooltip(matrixStack, mouseX, mouseY, hoveringFluid.getDisplayName().getString()); + renderTooltip(poseStack, mouseX, mouseY, hoveringFluid.getDisplayName().getString()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java index 8145f671c..b0073294d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java @@ -334,8 +334,8 @@ public class GridScreen extends BaseScreen implements IScreen } @Override - public void renderBackground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY) { - tabs.drawBackground(matrixStack, x, y - tabs.getHeight()); + public void renderBackground(PoseStack poseStack, int x, int y, int mouseX, int mouseY) { + tabs.drawBackground(poseStack, x, y - tabs.getHeight()); if (grid instanceof IPortableGrid) { bindTexture(RS.ID, "gui/portable_grid.png"); @@ -349,10 +349,10 @@ public class GridScreen extends BaseScreen implements IScreen int yy = y; - blit(matrixStack, x, yy, 0, 0, imageWidth - 34, getTopHeight()); + blit(poseStack, x, yy, 0, 0, imageWidth - 34, getTopHeight()); // Filters and/or portable grid disk - blit(matrixStack, x + imageWidth - 34 + 4, y, 197, 0, 30, grid instanceof IPortableGrid ? 114 : 82); + blit(poseStack, x + imageWidth - 34 + 4, y, 197, 0, 30, grid instanceof IPortableGrid ? 114 : 82); int rows = getVisibleRows(); @@ -368,12 +368,12 @@ public class GridScreen extends BaseScreen implements IScreen } } - blit(matrixStack, x, yy, 0, yTextureStart, imageWidth - 34, 18); + blit(poseStack, x, yy, 0, yTextureStart, imageWidth - 34, 18); } yy += 18; - blit(matrixStack, x, yy, 0, getTopHeight() + (18 * 3), imageWidth - 34, getBottomHeight()); + blit(poseStack, x, yy, 0, getTopHeight() + (18 * 3), imageWidth - 34, getBottomHeight()); if (grid.getGridType() == GridType.PATTERN) { int ty = 0; @@ -386,35 +386,35 @@ public class GridScreen extends BaseScreen implements IScreen ty = 2; } - blit(matrixStack, x + 172, y + getTopHeight() + (getVisibleRows() * 18) + 22, 240, ty * 16, 16, 16); + blit(poseStack, x + 172, y + getTopHeight() + (getVisibleRows() * 18) + 22, 240, ty * 16, 16, 16); if (processingPattern.selected()) { updatePatternScrollbar(); - patternScrollbar.render(matrixStack); + patternScrollbar.render(poseStack); } } - tabs.drawForeground(matrixStack, x, y - tabs.getHeight(), mouseX, mouseY, true); + tabs.drawForeground(poseStack, x, y - tabs.getHeight(), mouseX, mouseY, true); - searchField.render(matrixStack, 0, 0, 0); + searchField.render(poseStack, 0, 0, 0); - scrollbar.render(matrixStack); + scrollbar.render(poseStack); } @Override - public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) { - super.render(matrixStack, mouseX, mouseY, partialTicks); + public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { + super.render(poseStack, mouseX, mouseY, partialTicks); // Drawn in here for bug #1844 (https://github.com/refinedmods/refinedstorage/issues/1844) // Item tooltips can't be rendered in the foreground layer due to the X offset translation. if (isOverSlotWithStack()) { - drawGridTooltip(matrixStack, view.getStacks().get(slotNumber), mouseX, mouseY); + drawGridTooltip(poseStack, view.getStacks().get(slotNumber), mouseX, mouseY); } } @Override - public void renderForeground(PoseStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, getYPlayerInventory() - 12, I18n.get("container.inventory")); + public void renderForeground(PoseStack poseStack, int mouseX, int mouseY) { + renderString(poseStack, 7, 7, title.getString()); + renderString(poseStack, 7, getYPlayerInventory() - 12, I18n.get("container.inventory")); int x = 8; int y = 19; @@ -431,18 +431,18 @@ public class GridScreen extends BaseScreen implements IScreen } if (slot < view.getStacks().size()) { - view.getStacks().get(slot).draw(matrixStack, this, x, y); + view.getStacks().get(slot).draw(poseStack, this, x, y); } if (RenderUtils.inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isGridActive()) { int color = grid.isGridActive() ? -2130706433 : 0xFF5B5B5B; - matrixStack.pushPose(); + poseStack.pushPose(); RenderSystem.disableDepthTest(); RenderSystem.colorMask(true, true, true, false); - fillGradient(matrixStack, x, y, x + 16, y + 16, color, color); + fillGradient(poseStack, x, y, x + 16, y + 16, color, color); RenderSystem.colorMask(true, true, true, true); - matrixStack.popPose(); + poseStack.popPose(); } slot++; @@ -456,17 +456,17 @@ public class GridScreen extends BaseScreen implements IScreen } if (isOverClear(mouseX, mouseY)) { - renderTooltip(matrixStack, mouseX, mouseY, I18n.get("misc.refinedstorage.clear")); + renderTooltip(poseStack, mouseX, mouseY, I18n.get("misc.refinedstorage.clear")); } if (isOverCreatePattern(mouseX, mouseY)) { - renderTooltip(matrixStack, mouseX, mouseY, I18n.get("gui.refinedstorage.grid.pattern_create")); + renderTooltip(poseStack, mouseX, mouseY, I18n.get("gui.refinedstorage.grid.pattern_create")); } - tabs.drawTooltip(matrixStack, font, mouseX, mouseY); + tabs.drawTooltip(poseStack, font, mouseX, mouseY); } - private void drawGridTooltip(PoseStack matrixStack, IGridStack gridStack, int mouseX, int mouseY) { + private void drawGridTooltip(PoseStack poseStack, IGridStack gridStack, int mouseX, int mouseY) { List textLines = gridStack.getTooltip(true); ItemStack stackContext = gridStack instanceof ItemGridStack ? ((ItemGridStack) gridStack).getStack() : ItemStack.EMPTY; @@ -485,7 +485,7 @@ public class GridScreen extends BaseScreen implements IScreen } } - renderTooltip(matrixStack, stackContext, mouseX, mouseY, textLines); + renderTooltip(poseStack, stackContext, mouseX, mouseY, textLines); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java index aaaf2a74d..c97840054 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java @@ -177,8 +177,8 @@ public class FluidGridStack implements IGridStack { } @Override - public void draw(PoseStack matrixStack, BaseScreen screen, int x, int y) { - FluidRenderer.INSTANCE.render(matrixStack, x, y, stack); + public void draw(PoseStack poseStack, BaseScreen screen, int x, int y) { + FluidRenderer.INSTANCE.render(poseStack, x, y, stack); String text; int color = RenderSettings.INSTANCE.getSecondaryColor(); @@ -192,7 +192,7 @@ public class FluidGridStack implements IGridStack { text = API.instance().getQuantityFormatter().formatInBucketFormWithOnlyTrailingDigitsIfZero(getQuantity()); } - screen.renderQuantity(matrixStack, x, y, text, color); + screen.renderQuantity(poseStack, x, y, text, color); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java index 75b177ee1..ff00882c1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/IGridStack.java @@ -34,7 +34,7 @@ public interface IGridStack { String getFormattedFullQuantity(); - void draw(PoseStack matrixStack, BaseScreen screen, int x, int y); + void draw(PoseStack poseStack, BaseScreen screen, int x, int y); Object getIngredient(); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java index 87ed2bb63..214274d99 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java @@ -191,7 +191,7 @@ public class ItemGridStack implements IGridStack { } @Override - public void draw(PoseStack matrixStack, BaseScreen screen, int x, int y) { + public void draw(PoseStack poseStack, BaseScreen screen, int x, int y) { String text = null; int color = RenderSettings.INSTANCE.getSecondaryColor(); @@ -204,7 +204,7 @@ public class ItemGridStack implements IGridStack { text = API.instance().getQuantityFormatter().formatWithUnits(getQuantity()); } - screen.renderItem(matrixStack, x, y, stack, true, text, color); + screen.renderItem(poseStack, x, y, stack, true, text, color); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java index 898b1e7d3..cc93164a5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java @@ -47,7 +47,7 @@ public class CheckboxWidget extends Checkbox { } @Override - public void renderButton(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { Minecraft minecraft = Minecraft.getInstance(); RenderSystem.setShaderTexture(0, TEXTURE); RenderSystem.enableDepthTest(); @@ -63,9 +63,9 @@ public class CheckboxWidget extends Checkbox { int width = 10; int height = 10; - blit(matrixStack, this.x, this.y, textureX, textureY, width, height, 32, 32); + blit(poseStack, this.x, this.y, textureX, textureY, width, height, 32, 32); - this.renderBg(matrixStack, minecraft, mouseX, mouseY); + this.renderBg(poseStack, minecraft, mouseX, mouseY); int color = 14737632; @@ -76,9 +76,9 @@ public class CheckboxWidget extends Checkbox { } if (shadow) { - drawString(matrixStack, fontRenderer, this.getMessage(), this.x + 13, this.y + (this.height - 8) / 2, color); + drawString(poseStack, fontRenderer, this.getMessage(), this.x + 13, this.y + (this.height - 8) / 2, color); } else { - fontRenderer.draw(matrixStack, this.getMessage().getString(), (float) this.x + 13, this.y + (this.height - 8) / 2F, color); + fontRenderer.draw(poseStack, this.getMessage().getString(), (float) this.x + 13, this.y + (this.height - 8) / 2F, color); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java index 62fb3d3da..23aafc79c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java @@ -60,14 +60,14 @@ public class ScrollbarWidget implements GuiEventListener { this.enabled = enabled; } - public void render(PoseStack matrixStack) { + public void render(PoseStack poseStack) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); screen.bindTexture(RS.ID, "icons.png"); if (small) { - screen.blit(matrixStack, screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 218 : 225, 0, 7, SCROLLER_HEIGHT); + screen.blit(poseStack, screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 218 : 225, 0, 7, SCROLLER_HEIGHT); } else { - screen.blit(matrixStack, screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 232 : 244, 0, 12, SCROLLER_HEIGHT); + screen.blit(poseStack, screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 232 : 244, 0, 12, SCROLLER_HEIGHT); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java index 2664a329e..03265d495 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java @@ -173,10 +173,10 @@ public class SearchWidget extends EditBox { } @Override - public void renderButton(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { if (canSyncFromJEINow() && RSJeiPlugin.getRuntime().getIngredientListOverlay().hasKeyboardFocus()) { setTextFromJEI(); } - super.renderButton(matrixStack, mouseX, mouseY, partialTicks); + super.renderButton(poseStack, mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java index fe1bb793c..41aa5ff85 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/TabListWidget.java @@ -48,14 +48,14 @@ public class TabListWidget { listeners.add(listener); } - public void drawForeground(PoseStack matrixStack, int x, int y, int mouseX, int mouseY, boolean visible) { + public void drawForeground(PoseStack poseStack, int x, int y, int mouseX, int mouseY, boolean visible) { this.tabHovering = -1; if (visible) { int j = 0; for (int i = page.get() * tabsPerPage; i < (page.get() * tabsPerPage) + tabsPerPage; ++i) { if (i < tabs.get().size()) { - drawTab(matrixStack, tabs.get().get(i), true, x, y, i, j); + drawTab(poseStack, tabs.get().get(i), true, x, y, i, j); if (RenderUtils.inBounds(x + getXOffset() + ((IGridTab.TAB_WIDTH + 1) * j), y, IGridTab.TAB_WIDTH, IGridTab.TAB_HEIGHT - (i == selected.get() ? 2 : 7), mouseX, mouseY)) { this.tabHovering = i; @@ -87,11 +87,11 @@ public class TabListWidget { right.active = page.get() < pages.get(); } - public void drawBackground(PoseStack matrixStack, int x, int y) { + public void drawBackground(PoseStack poseStack, int x, int y) { int j = 0; for (int i = page.get() * tabsPerPage; i < (page.get() * tabsPerPage) + tabsPerPage; ++i) { if (i < tabs.get().size()) { - drawTab(matrixStack, tabs.get().get(i), false, x, y, i, j++); + drawTab(poseStack, tabs.get().get(i), false, x, y, i, j++); } } } @@ -108,7 +108,7 @@ public class TabListWidget { return 0; } - private void drawTab(PoseStack matrixStack, IGridTab tab, boolean foregroundLayer, int x, int y, int index, int num) { + private void drawTab(PoseStack poseStack, IGridTab tab, boolean foregroundLayer, int x, int y, int index, int num) { boolean isSelected = index == selected.get(); if ((foregroundLayer && !isSelected) || (!foregroundLayer && isSelected)) { @@ -142,14 +142,14 @@ public class TabListWidget { uvx = 199; } - screen.blit(matrixStack, tx, ty, uvx, uvy, tbw, IGridTab.TAB_HEIGHT); + screen.blit(poseStack, tx, ty, uvx, uvy, tbw, IGridTab.TAB_HEIGHT); - tab.drawIcon(matrixStack, otx + 6, ty + 9 - (!isSelected ? 3 : 0), drawers.getItemDrawer(), drawers.getFluidDrawer()); + tab.drawIcon(poseStack, otx + 6, ty + 9 - (!isSelected ? 3 : 0), drawers.getItemDrawer(), drawers.getFluidDrawer()); } - public void drawTooltip(PoseStack matrixStack, Font fontRenderer, int mouseX, int mouseY) { + public void drawTooltip(PoseStack poseStack, Font fontRenderer, int mouseX, int mouseY) { if (tabHovering >= 0 && tabHovering < tabs.get().size()) { - tabs.get().get(tabHovering).drawTooltip(matrixStack, mouseX, mouseY, screen); + tabs.get().get(tabHovering).drawTooltip(poseStack, mouseX, mouseY, screen); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java index 7d188666b..a6cf3880c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java @@ -19,8 +19,8 @@ public class AccessTypeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { - screen.blit(matrixStack, x, y, 16 * parameter.getValue().getId(), 240, 16, 16); + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + screen.blit(poseStack, x, y, 16 * parameter.getValue().getId(), 240, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java index 8c1108c86..61d1b4404 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java @@ -14,8 +14,8 @@ public class ConstructorDropSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { - screen.blit(matrixStack, x, y, 64 + (Boolean.TRUE.equals(ConstructorBlockEntity.DROP.getValue()) ? 16 : 0), 16, 16, 16); + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + screen.blit(poseStack, x, y, 64 + (Boolean.TRUE.equals(ConstructorBlockEntity.DROP.getValue()) ? 16 : 0), 16, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java index e4acc1365..f245ae6a8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java @@ -19,8 +19,8 @@ public class CrafterModeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { - screen.blit(matrixStack, x, y, CrafterBlockEntity.MODE.getValue() * 16, 0, 16, 16); + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + screen.blit(poseStack, x, y, CrafterBlockEntity.MODE.getValue() * 16, 0, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java index 28d51a2b3..a0b4cf0ee 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java @@ -14,8 +14,8 @@ public class DestructorPickupSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { - screen.blit(matrixStack, x, y, 64 + (Boolean.TRUE.equals(DestructorBlockEntity.PICKUP.getValue()) ? 0 : 16), 0, 16, 16); + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + screen.blit(poseStack, x, y, 64 + (Boolean.TRUE.equals(DestructorBlockEntity.PICKUP.getValue()) ? 0 : 16), 0, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java index d074f7aa8..43597e8da 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java @@ -20,8 +20,8 @@ public class DetectorModeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { - screen.blit(matrixStack, x, y, DetectorBlockEntity.MODE.getValue() * 16, 176, 16, 16); + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + screen.blit(poseStack, x, y, DetectorBlockEntity.MODE.getValue() * 16, 176, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java index 623551934..eb021c34b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java @@ -33,11 +33,11 @@ public class ExactModeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { int ty = 16 * 12; int tx = (parameter.getValue() & MASK) == MASK ? 0 : 16; - screen.blit(matrixStack, x, y, tx, ty, 16, 16); + screen.blit(poseStack, x, y, tx, ty, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java index 496e19936..52e811392 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java @@ -21,8 +21,8 @@ public class FilterTypeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { - filterScreen.blit(matrixStack, x, y, 16 * filterScreen.getType(), 128, 16, 16); + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + filterScreen.blit(poseStack, x, y, 16 * filterScreen.getType(), 128, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java index c61c5033c..9588837b0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java @@ -25,7 +25,7 @@ public class GridSizeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { int size = this.sizeSupplier.get(); int tx = 0; @@ -40,7 +40,7 @@ public class GridSizeSideButton extends SideButton { tx = 32; } - screen.blit(matrixStack, x, y, 64 + tx, 64, 16, 16); + screen.blit(poseStack, x, y, 64 + tx, 64, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java index 6f84e1fb9..5b1df2ec4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java @@ -22,8 +22,8 @@ public class GridSortingDirectionSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { - screen.blit(matrixStack, x, y, grid.getSortingDirection() * 16, 16, 16, 16); + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + screen.blit(poseStack, x, y, grid.getSortingDirection() * 16, 16, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java index 7ee551c54..2d29895c3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java @@ -24,11 +24,11 @@ public class GridSortingTypeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { if (grid.getSortingType() == IGrid.SORTING_TYPE_LAST_MODIFIED) { - screen.blit(matrixStack, x, y, 48, 48, 16, 16); + screen.blit(poseStack, x, y, 48, 48, 16, 16); } else { - screen.blit(matrixStack, x, y, grid.getSortingType() * 16, 32, 16, 16); + screen.blit(poseStack, x, y, grid.getSortingType() * 16, 32, 16, 16); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java index 4b99ccf57..792fea9a6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java @@ -22,8 +22,8 @@ public class GridViewTypeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { - screen.blit(matrixStack, x, y, (grid.getViewType() - (grid.getViewType() >= 3 ? 3 : 0)) * 16, 112, 16, 16); + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + screen.blit(poseStack, x, y, (grid.getViewType() - (grid.getViewType() >= 3 ? 3 : 0)) * 16, 112, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java index d77bc671e..3c7910d0b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java @@ -20,8 +20,8 @@ public class IoModeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { - screen.blit(matrixStack, x, y, DiskManipulatorBlockEntity.IO_MODE.getValue() == DiskManipulatorNetworkNode.IO_MODE_EXTRACT ? 0 : 16, 160, 16, 16); + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + screen.blit(poseStack, x, y, DiskManipulatorBlockEntity.IO_MODE.getValue() == DiskManipulatorNetworkNode.IO_MODE_EXTRACT ? 0 : 16, 160, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java index dfd08f01c..d0e54a8e1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java @@ -22,8 +22,8 @@ public class RedstoneModeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { - screen.blit(matrixStack, x, y, parameter.getValue() * 16, 0, 16, 16); + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + screen.blit(poseStack, x, y, parameter.getValue() * 16, 0, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java index 0cb721e07..e9006f386 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java @@ -35,10 +35,10 @@ public abstract class SearchBoxModeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { int mode = getSearchBoxMode(); - screen.blit(matrixStack, x, y, IGrid.isSearchBoxModeWithAutoselection(mode) ? 16 : 0, 96, 16, 16); + screen.blit(poseStack, x, y, IGrid.isSearchBoxModeWithAutoselection(mode) ? 16 : 0, 96, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java index 0e46eec81..2a3e9f192 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java @@ -24,31 +24,31 @@ public abstract class SideButton extends Button { this.screen = screen; } - public void renderTooltip(PoseStack matrixStack, int mouseX, int mouseY) { + public void renderTooltip(PoseStack poseStack, int mouseX, int mouseY) { boolean isFocused = isFocused(); if (isHovered || isFocused) { int x = isHovered ? mouseX : (this.x - screen.getGuiLeft()) + width; int y = isHovered ? mouseY : (this.y - screen.getGuiTop()) + (height / 2); - screen.renderTooltip(matrixStack, x, y, getTooltip()); + screen.renderTooltip(poseStack, x, y, getTooltip()); } } @Override - public void renderButton(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); isHovered = RenderUtils.inBounds(x, y, width, height, mouseX, mouseY); screen.bindTexture(RS.ID, "icons.png"); - screen.blit(matrixStack, x, y, 238, isHovered ? 35 : 16, WIDTH, HEIGHT); + screen.blit(poseStack, x, y, 238, isHovered ? 35 : 16, WIDTH, HEIGHT); - renderButtonIcon(matrixStack, x + 1, y + 1); + renderButtonIcon(poseStack, x + 1, y + 1); if (isHoveredOrFocused()) { RenderSystem.enableBlend(); RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 0.5f); - screen.blit(matrixStack, x, y, 238, 54, WIDTH, HEIGHT); + screen.blit(poseStack, x, y, 238, 54, WIDTH, HEIGHT); RenderSystem.disableBlend(); } } @@ -57,7 +57,7 @@ public abstract class SideButton extends Button { return height; } - protected abstract void renderButtonIcon(PoseStack matrixStack, int x, int y); + protected abstract void renderButtonIcon(PoseStack poseStack, int x, int y); protected abstract String getTooltip(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java index 5cfbc8cfb..0b0acf8db 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java @@ -23,8 +23,8 @@ public class TypeSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { - screen.blit(matrixStack, x, y, 16 * type.getValue(), 128, 16, 16); + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + screen.blit(poseStack, x, y, 16 * type.getValue(), 128, 16, 16); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java index f01fd9bb0..f0671c504 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java @@ -23,8 +23,8 @@ public class WhitelistBlacklistSideButton extends SideButton { } @Override - protected void renderButtonIcon(PoseStack matrixStack, int x, int y) { - screen.blit(matrixStack, x, y, parameter.getValue() == IWhitelistBlacklist.WHITELIST ? 0 : 16, 64, 16, 16); + protected void renderButtonIcon(PoseStack poseStack, int x, int y) { + screen.blit(poseStack, x, y, parameter.getValue() == IWhitelistBlacklist.WHITELIST ? 0 : 16, 64, 16, 16); } @Override