From 53fc345e889bf97c0cd99eebcd3a61635b9fca7a Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 7 Jun 2020 12:30:00 +0200 Subject: [PATCH] Fix button rendering --- src/main/java/appeng/client/gui/AEBaseGui.java | 8 ++++---- src/main/java/appeng/client/gui/widgets/GuiImgButton.java | 2 +- src/main/java/appeng/client/gui/widgets/GuiTabButton.java | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 762f1434c..35fdcfe80 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -48,6 +48,7 @@ import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.gui.widget.Widget; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -679,11 +680,10 @@ public abstract class AEBaseGui extends ContainerScre { this.itemRenderer.zLevel = 100.0F; -// FIXME: Check if this is actually required, vanilla doesnt have it anymore -// FIXME RenderHelper.enableGUIStandardItemLighting(); - RenderSystem.enableDepthTest(); + // FIXME I dont think this is needed anymore... + RenderHelper.enableStandardItemLighting(); this.itemRenderer.renderItemAndEffectIntoGUI( is, x, y ); - RenderSystem.disableDepthTest(); + RenderHelper.disableStandardItemLighting(); this.itemRenderer.zLevel = 0.0F; } diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java index dc38d651f..5b0df1f97 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java @@ -23,7 +23,6 @@ import appeng.api.config.*; import appeng.core.localization.ButtonToolTips; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.widget.Widget; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; @@ -189,6 +188,7 @@ public class GuiImgButton extends Button implements ITooltip TextureManager textureManager = minecraft.getTextureManager(); textureManager.bindTexture(TEXTURE_STATES); RenderSystem.disableDepthTest(); + RenderSystem.enableBlend(); // FIXME: This should be the _default_ state, but some vanilla widget disables it :| if( this.halfSize ) { this.width = 8; diff --git a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java index 018210e5f..f7e48735f 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java @@ -91,10 +91,9 @@ public class GuiTabButton extends Button implements ITooltip { this.itemRenderer.zLevel = 100.0F; - RenderSystem.enableDepthTest(); -// FIXME RenderHelper.enableGUIStandardItemLighting(); + RenderHelper.enableStandardItemLighting(); this.itemRenderer.renderItemAndEffectIntoGUI( this.myItem, offsetX + this.x + 3, this.y + 3 ); - RenderSystem.disableDepthTest(); + RenderHelper.disableStandardItemLighting(); this.itemRenderer.zLevel = 0.0F; }