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

Fix items rendering on the GUI with invalid state due to glint rendering changing it. Thanks iChun.

Browse source
This commit is contained in:
Lex Manos 2013-12-23 20:58:48 -08:00
parent ecf8d29724
commit d795f1b898
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch
View file

@ -160,11 +160,18 @@
int i1 = par3ItemStack.getItem().getColorFromItemStack(par3ItemStack, l); int i1 = par3ItemStack.getItem().getColorFromItemStack(par3ItemStack, l);
f = (float)(i1 >> 16 & 255) / 255.0F; f = (float)(i1 >> 16 & 255) / 255.0F;
float f1 = (float)(i1 >> 8 & 255) / 255.0F; float f1 = (float)(i1 >> 8 & 255) / 255.0F;
@@ -442,6 +479,11 @@ @@ -441,7 +478,18 @@
GL11.glColor4f(f, f1, f2, 1.0F);
} }
+ GL11.glDisable(GL11.GL_LIGHTING); //Forge: Make sure that render states are reset, ad renderEffect can derp them up.
+ GL11.glEnable(GL11.GL_ALPHA_TEST);
+
this.renderIcon(par4, par5, iicon, 16, 16); this.renderIcon(par4, par5, iicon, 16, 16);
+ +
+ GL11.glDisable(GL11.GL_ALPHA_TEST);
+ GL11.glEnable(GL11.GL_LIGHTING);
+
+ if (renderEffect && par3ItemStack.hasEffect(l)) + if (renderEffect && par3ItemStack.hasEffect(l))
+ { + {
+ renderEffect(par2TextureManager, par4, par5); + renderEffect(par2TextureManager, par4, par5);
@ -172,19 +179,27 @@
} }
GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glDisable(GL11.GL_ALPHA_TEST);
@@ -469,6 +511,11 @@ @@ -468,8 +516,19 @@
GL11.glColor4f(f4, f3, f, 1.0F);
} }
+ GL11.glDisable(GL11.GL_LIGHTING); //Forge: Make sure that render states are reset, ad renderEffect can derp them up.
+ GL11.glEnable(GL11.GL_ALPHA_TEST);
+
this.renderIcon(par4, par5, (IIcon)object, 16, 16); this.renderIcon(par4, par5, (IIcon)object, 16, 16);
+ +
+ GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_LIGHTING);
+
+ if (renderEffect && par3ItemStack.hasEffect(0)) + if (renderEffect && par3ItemStack.hasEffect(0))
+ { + {
+ renderEffect(par2TextureManager, par4, par5); + renderEffect(par2TextureManager, par4, par5);
+ } + }
GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_LIGHTING);
} }
@@ -484,7 +531,10 @@ GL11.glEnable(GL11.GL_CULL_FACE);
@@ -484,7 +543,10 @@
try try
{ {
@ -196,7 +211,7 @@
} }
catch (Throwable throwable) catch (Throwable throwable)
{ {
@@ -525,6 +575,7 @@ @@ -525,6 +587,7 @@
throw new ReportedException(crashreport); throw new ReportedException(crashreport);
} }
@ -204,7 +219,7 @@
if (par3ItemStack.hasEffect()) if (par3ItemStack.hasEffect())
{ {
GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDepthFunc(GL11.GL_EQUAL);
@@ -540,11 +591,28 @@ @@ -540,11 +603,28 @@
GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDepthFunc(GL11.GL_LEQUAL); GL11.glDepthFunc(GL11.GL_LEQUAL);
} }
@ -233,7 +248,7 @@
private void renderGlint(int par1, int par2, int par3, int par4, int par5) private void renderGlint(int par1, int par2, int par3, int par4, int par5)
{ {
for (int j1 = 0; j1 < 2; ++j1) for (int j1 = 0; j1 < 2; ++j1)
@@ -649,4 +717,42 @@ @@ -649,4 +729,42 @@
{ {
this.doRender((EntityItem)par1Entity, par2, par4, par6, par8, par9); this.doRender((EntityItem)par1Entity, par2, par4, par6, par8, par9);
} }