keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fixed error GUIs showing a white screen and replaced a rogue direct GL call.

This commit is contained in:
Lunatrius 2015-06-26 21:53:53 +02:00
parent 637e2c6f56
commit 44077774be
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fml/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
View File

@ -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));

2
src/main/java/net/minecraftforge/client/GuiIngameForge.java
View File

@ -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);
}