From f741a73dd39c3b4d893d26dbff60cb618ab61612 Mon Sep 17 00:00:00 2001 From: Vecoo Date: Mon, 3 Mar 2025 22:54:21 +1100 Subject: [PATCH] Update MachineInventoryScreen.java --- .../gui/machine/MachineInventoryScreen.java | 96 +++++++++---------- 1 file changed, 44 insertions(+), 52 deletions(-) diff --git a/src/main/java/ru/magistu/siegemachines/client/gui/machine/MachineInventoryScreen.java b/src/main/java/ru/magistu/siegemachines/client/gui/machine/MachineInventoryScreen.java index 68ed898..673814b 100644 --- a/src/main/java/ru/magistu/siegemachines/client/gui/machine/MachineInventoryScreen.java +++ b/src/main/java/ru/magistu/siegemachines/client/gui/machine/MachineInventoryScreen.java @@ -1,71 +1,63 @@ package ru.magistu.siegemachines.client.gui.machine; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import ru.magistu.siegemachines.SiegeMachines; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.jetbrains.annotations.NotNull; +import ru.magistu.siegemachines.SiegeMachines; @OnlyIn(Dist.CLIENT) -public class MachineInventoryScreen extends AbstractContainerScreen -{ - private static final ResourceLocation DISPLAY_CASE_GUI = new ResourceLocation(SiegeMachines.ID, - "textures/gui/machine_inventory.png"); +public class MachineInventoryScreen extends AbstractContainerScreen { + private static final ResourceLocation DISPLAY_CASE_GUI = new ResourceLocation(SiegeMachines.ID, + "textures/gui/machine_inventory.png"); - public MachineInventoryScreen(MachineContainer screenContainer, Inventory inv, Component titleIn) - { - super(screenContainer, inv, titleIn); + public MachineInventoryScreen(MachineContainer screenContainer, Inventory inv, Component titleIn) { + super(screenContainer, inv, titleIn); - this.leftPos = 0; - this.topPos = 0; - this.imageWidth = 176; - this.imageHeight = 166; - } - - @Override - public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) - { - this.renderBackground(matrixStack); - super.render(matrixStack, mouseX, mouseY, partialTicks); - this.renderTooltip(matrixStack, mouseX, mouseY); - } + this.leftPos = 0; + this.topPos = 0; + this.imageWidth = 176; + this.imageHeight = 166; + } @Override - protected void renderTooltip(@NotNull PoseStack matrixStack, int x, int y) - { - if (this.minecraft.player.getInventory().getSelected().isEmpty() && this.hoveredSlot != null && this.hoveredSlot.hasItem()) - { - this.renderTooltip(matrixStack, this.hoveredSlot.getItem(), x, y); - } - } + public void render(GuiGraphics matrixStack, int mouseX, int mouseY, float partialTicks) { + this.renderBackground(matrixStack); + super.render(matrixStack, mouseX, mouseY, partialTicks); + this.renderTooltip(matrixStack, mouseX, mouseY); + } - @Override - protected void renderBg(@NotNull PoseStack matrixStack, float partialTicks, int mouseX, int mouseY) - { - RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - RenderSystem.setShaderTexture(0, DISPLAY_CASE_GUI); - int x = (this.width - this.imageWidth) / 2; - int y = (this.height - this.imageHeight) / 2; - this.blit(matrixStack, x, y, 0, 0, this.imageWidth, this.imageHeight); - } + @Override + protected void renderTooltip(@NotNull GuiGraphics matrixStack, int x, int y) { + if (this.minecraft.player.getInventory().getSelected().isEmpty() && this.hoveredSlot != null && this.hoveredSlot.hasItem()) { + this.renderTooltip(matrixStack, x, y); + } + } - @Override - public boolean keyPressed(int key, int b, int c) - { - assert this.minecraft != null; - if (key == 256) - { - assert this.minecraft.player != null; - this.minecraft.player.closeContainer(); - return true; - } - return super.keyPressed(key, b, c); - } + @Override + protected void renderBg(@NotNull GuiGraphics matrixStack, float partialTicks, int mouseX, int mouseY) { + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.setShaderTexture(0, DISPLAY_CASE_GUI); + int x = (this.width - this.imageWidth) / 2; + int y = (this.height - this.imageHeight) / 2; + matrixStack.blit(DISPLAY_CASE_GUI, x, y, 0, 0, this.imageWidth, this.imageHeight); + } + + @Override + public boolean keyPressed(int key, int b, int c) { + assert this.minecraft != null; + if (key == 256) { + assert this.minecraft.player != null; + this.minecraft.player.closeContainer(); + return true; + } + return super.keyPressed(key, b, c); + } }