fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix button rendering

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-07 12:30:00 +02:00
parent 46b1d1ffdc
commit 53fc345e88
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/AEBaseGui.java
+4 -4
View File
@@ -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.Widget;
import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.gui.widget.button.Button;
import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -679,11 +680,10 @@ public abstract class AEBaseGui<T extends AEBaseContainer> extends ContainerScre
{ {
this.itemRenderer.zLevel = 100.0F; this.itemRenderer.zLevel = 100.0F;
// FIXME: Check if this is actually required, vanilla doesnt have it anymore // FIXME I dont think this is needed anymore...
// FIXME RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableStandardItemLighting();
RenderSystem.enableDepthTest();
this.itemRenderer.renderItemAndEffectIntoGUI( is, x, y ); this.itemRenderer.renderItemAndEffectIntoGUI( is, x, y );
RenderSystem.disableDepthTest(); RenderHelper.disableStandardItemLighting();
this.itemRenderer.zLevel = 0.0F; this.itemRenderer.zLevel = 0.0F;
} }
src/main/java/appeng/client/gui/widgets/GuiImgButton.java
+1 -1
View File
@@ -23,7 +23,6 @@ import appeng.api.config.*;
import appeng.core.localization.ButtonToolTips; import appeng.core.localization.ButtonToolTips;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.widget.Widget;
import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.gui.widget.button.Button;
import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@@ -189,6 +188,7 @@ public class GuiImgButton extends Button implements ITooltip
TextureManager textureManager = minecraft.getTextureManager(); TextureManager textureManager = minecraft.getTextureManager();
textureManager.bindTexture(TEXTURE_STATES); textureManager.bindTexture(TEXTURE_STATES);
RenderSystem.disableDepthTest(); RenderSystem.disableDepthTest();
RenderSystem.enableBlend(); // FIXME: This should be the _default_ state, but some vanilla widget disables it :|
if( this.halfSize ) if( this.halfSize )
{ {
this.width = 8; this.width = 8;
src/main/java/appeng/client/gui/widgets/GuiTabButton.java
+2 -3
View File
@@ -91,10 +91,9 @@ public class GuiTabButton extends Button implements ITooltip
{ {
this.itemRenderer.zLevel = 100.0F; this.itemRenderer.zLevel = 100.0F;
RenderSystem.enableDepthTest(); RenderHelper.enableStandardItemLighting();
// FIXME RenderHelper.enableGUIStandardItemLighting();
this.itemRenderer.renderItemAndEffectIntoGUI( this.myItem, offsetX + this.x + 3, this.y + 3 ); this.itemRenderer.renderItemAndEffectIntoGUI( this.myItem, offsetX + this.x + 3, this.y + 3 );
RenderSystem.disableDepthTest(); RenderHelper.disableStandardItemLighting();
this.itemRenderer.zLevel = 0.0F; this.itemRenderer.zLevel = 0.0F;
} }