Fixed broken button highliting

mistersecret312 · Jun 28, 2023 · dfb5116 · dfb5116
1 parent 2d0b1c0
commit dfb5116
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 7 deletions.
diff --git a/src/main/java/net/povstalec/sgjourney/client/DHDBigButton.java b/src/main/java/net/povstalec/sgjourney/client/DHDBigButton.java
@@ -37,13 +37,15 @@ else if(p_93668_)
 	}
 
     @Override
-    public void render(PoseStack p_93676_, int p_93677_, int p_93678_, float p_93679_) {
+    public void render(PoseStack p_93676_, int x, int y, float p_93679_)
+    {
+    	this.isHovered = x >= this.getX() && y >= this.getY() && x < this.getX() + this.width && y < this.getY() + this.height;
         Minecraft minecraft = Minecraft.getInstance();
         Font font = minecraft.font;
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
         RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
-        int i = this.getYImage(this.isHoveredOrFocused());
+        int i = this.getYImage(this.isHovered);
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.enableDepthTest();

diff --git a/src/main/java/net/povstalec/sgjourney/client/DHDButton.java b/src/main/java/net/povstalec/sgjourney/client/DHDButton.java
@@ -24,14 +24,31 @@ public DHDButton(int x, int y, AbstractDHDMenu menu, int i)
 		super(x, y, 16, 16, symbol(menu.symbolsType, i), (n) -> {menu.engageChevron(i);}, Button.DEFAULT_NARRATION);
 	}
 
+    protected int getYImage(boolean p_93668_)
+    {
+    	int i = 1;
+    	if (!this.active)
+    	{
+    		i = 0;
+    	}
+    	else if(p_93668_)
+    	{
+    		i = 2;
+    	}
+
+    	return i;
+	}
+
     @Override
-    public void render(PoseStack p_93676_, int p_93677_, int p_93678_, float p_93679_) {
-        Minecraft minecraft = Minecraft.getInstance();
+    public void render(PoseStack p_93676_, int x, int y, float p_93679_)
+    {
+    	this.isHovered = x >= this.getX() && y >= this.getY() && x < this.getX() + this.width && y < this.getY() + this.height;
+    	Minecraft minecraft = Minecraft.getInstance();
         Font font = minecraft.font;
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
         RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
-        int i = 0/*this.getYImage(this.isHoveredOrFocused())*/;
+        int i = this.getYImage(this.isHovered);
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.enableDepthTest();

diff --git a/src/main/java/net/povstalec/sgjourney/client/RingPanelButton.java b/src/main/java/net/povstalec/sgjourney/client/RingPanelButton.java
@@ -21,14 +21,31 @@ public RingPanelButton(int x, int y, Component component, OnPress press)
 		super(x, y, 32, 16, component, press, Button.DEFAULT_NARRATION);
 	}
 
+    protected int getYImage(boolean p_93668_)
+    {
+    	int i = 1;
+    	if (!this.active)
+    	{
+    		i = 0;
+    	}
+    	else if(p_93668_)
+    	{
+    		i = 2;
+    	}
+
+    	return i;
+	}
+
     @Override
-    public void render(PoseStack p_93676_, int p_93677_, int p_93678_, float p_93679_) {
+    public void render(PoseStack p_93676_, int x, int y, float p_93679_)
+    {
+    	this.isHovered = x >= this.getX() && y >= this.getY() && x < this.getX() + this.width && y < this.getY() + this.height;
         Minecraft minecraft = Minecraft.getInstance();
         Font font = minecraft.font;
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
         RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
-        int i = 0/*this.getYImage(this.isHoveredOrFocused())*/;
+        int i = this.getYImage(this.isHovered);
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.enableDepthTest();