From 44077774bec581c938116b145ae7512193d97a2c Mon Sep 17 00:00:00 2001 From: Lunatrius Date: Fri, 26 Jun 2015 21:53:53 +0200 Subject: [PATCH] Fixed error GUIs showing a white screen and replaced a rogue direct GL call. --- .../java/net/minecraftforge/fml/client/FMLClientHandler.java | 4 ++++ src/main/java/net/minecraftforge/client/GuiIngameForge.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java index 8943b8e1e..3fc95c606 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java @@ -40,6 +40,7 @@ import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.network.OldServerPinger; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.resources.AbstractResourcePack; import net.minecraft.client.resources.FallbackResourceManager; @@ -382,6 +383,9 @@ public class FMLClientHandler implements IFMLSidedHandler } public void onInitializationComplete() { + // re-sync TEXTURE_2D, splash screen disables it with a direct GL call + GlStateManager.disableTexture2D(); + GlStateManager.enableTexture2D(); if (wrongMC != null) { showGuiScreen(new GuiWrongMinecraft(wrongMC)); diff --git a/src/main/java/net/minecraftforge/client/GuiIngameForge.java b/src/main/java/net/minecraftforge/client/GuiIngameForge.java index 2627e53eb..8025d44e0 100644 --- a/src/main/java/net/minecraftforge/client/GuiIngameForge.java +++ b/src/main/java/net/minecraftforge/client/GuiIngameForge.java @@ -206,7 +206,7 @@ public class GuiIngameForge extends GuiIngame GlStateManager.enableAlpha(); drawTexturedModalRect(width / 2 - 7, height / 2 - 7, 0, 0, 16, 16); GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); } post(CROSSHAIRS); }