From 0cf1d74fd5df580439bfc951db3d22f8b46f66dd Mon Sep 17 00:00:00 2001 From: Electroblob <35599699+Electroblob77@users.noreply.github.com> Date: Sat, 7 Apr 2018 20:31:48 +0100 Subject: [PATCH] Fix buttons rendering incorrectly in wizard's handbook --- .../wizardry/client/GuiButtonInvisible.java | 10 +++------- .../wizardry/client/GuiButtonTurnPage.java | 13 ++++++------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/main/java/electroblob/wizardry/client/GuiButtonInvisible.java b/src/main/java/electroblob/wizardry/client/GuiButtonInvisible.java index edaea534..70e9c2e4 100644 --- a/src/main/java/electroblob/wizardry/client/GuiButtonInvisible.java +++ b/src/main/java/electroblob/wizardry/client/GuiButtonInvisible.java @@ -9,16 +9,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; class GuiButtonInvisible extends GuiButton { public GuiButtonInvisible(int id, int x, int y, int width, int height){ - super(id, x, y, width, height, ""); } - /** - * Draws this button to the screen. - */ - public void drawButton(Minecraft par1Minecraft, int par2, int par3){ - this.hovered = par2 >= this.x && par3 >= this.y && par2 < this.x + this.width - && par3 < this.y + this.height; + @Override + public void drawButton(Minecraft minecraft, int mouseX, int mouseY, float partialTicks){ + this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height; } } diff --git a/src/main/java/electroblob/wizardry/client/GuiButtonTurnPage.java b/src/main/java/electroblob/wizardry/client/GuiButtonTurnPage.java index 43bcdaa7..2bdeb44e 100644 --- a/src/main/java/electroblob/wizardry/client/GuiButtonTurnPage.java +++ b/src/main/java/electroblob/wizardry/client/GuiButtonTurnPage.java @@ -22,15 +22,14 @@ class GuiButtonTurnPage extends GuiButton { this.nextPage = isNextPage; } - /** - * Draws this button to the screen. - */ - public void drawButton(Minecraft par1Minecraft, int par2, int par3){ + @Override + public void drawButton(Minecraft minecraft, int mouseX, int mouseY, float partialTicks){ + if(this.visible){ - boolean flag = par2 >= this.x && par3 >= this.y && par2 < this.x + this.width - && par3 < this.y + this.height; + + boolean flag = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height; GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - par1Minecraft.getTextureManager().bindTexture(texture); + minecraft.getTextureManager().bindTexture(texture); int k = 0; int l = 192;